summaryrefslogtreecommitdiff
path: root/spec/unit/cookbook_loader_spec.rb
diff options
context:
space:
mode:
authordanielsdeleo <dan@getchef.com>2015-02-06 09:43:09 -0800
committerdanielsdeleo <dan@getchef.com>2015-02-11 10:52:49 -0800
commit6c9f246b04c23906dd5297d178a423c96bc7b369 (patch)
treeb12595c7931c0c9a8d9962ec9e6469f7483998aa /spec/unit/cookbook_loader_spec.rb
parent677ca0d7e3366ea9b3b6a912c8c6c28d543e2046 (diff)
downloadchef-6c9f246b04c23906dd5297d178a423c96bc7b369.tar.gz
Temporarily implement deprecation warnings as errors
This is an intermediate step where we're cleaning up all internal code to convert cookbook version objects to JSON in the new way.
Diffstat (limited to 'spec/unit/cookbook_loader_spec.rb')
-rw-r--r--spec/unit/cookbook_loader_spec.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/spec/unit/cookbook_loader_spec.rb b/spec/unit/cookbook_loader_spec.rb
index 51532778e4..45a985bafd 100644
--- a/spec/unit/cookbook_loader_spec.rb
+++ b/spec/unit/cookbook_loader_spec.rb
@@ -190,6 +190,11 @@ describe Chef::CookbookLoader do
end
describe "loading only one cookbook" do
+
+ let(:openldap_cookbook) { cookbook_loader["openldap"] }
+
+ let(:cookbook_as_hash) { Chef::CookbookManifest.new(openldap_cookbook).to_hash }
+
before(:each) do
cookbook_loader.load_cookbook("openldap")
end
@@ -205,12 +210,11 @@ describe Chef::CookbookLoader do
it "should not duplicate keys when serialized to JSON" do
# Chef JSON serialization will generate duplicate keys if given
# a Hash containing matching string and symbol keys. See CHEF-4571.
- aa = cookbook_loader["openldap"]
- expect(aa.to_hash["metadata"].recipes.keys).not_to include(:openldap)
- expect(aa.to_hash["metadata"].recipes.keys).to include("openldap")
+ expect(cookbook_as_hash["metadata"].recipes.keys).not_to include(:openldap)
+ expect(cookbook_as_hash["metadata"].recipes.keys).to include("openldap")
expected_desc = "Main Open LDAP configuration"
- expect(aa.to_hash["metadata"].recipes["openldap"]).to eq(expected_desc)
- raw = Chef::JSONCompat.to_json(aa.to_hash["metadata"].recipes)
+ expect(cookbook_as_hash["metadata"].recipes["openldap"]).to eq(expected_desc)
+ raw = Chef::JSONCompat.to_json(cookbook_as_hash["metadata"].recipes)
search_str = "\"openldap\":\""
key_idx = raw.index(search_str)
expect(key_idx).to be > 0