summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-06-26 16:34:22 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-06-26 16:34:22 -0700
commiteb75a34b7891f416c3c3f4f71bee86f6c500a4d7 (patch)
treec060b07538db082cf6d9b92ba09ed84e50c2629e
parent4e39c729c5981067c028bd3abcb50b066d760a28 (diff)
downloadchef-lcg/spec-to-remove-cookbook-merging.tar.gz
add spec to force really remove cookbook merginglcg/spec-to-remove-cookbook-merging
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--spec/unit/cookbook_loader_spec.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/unit/cookbook_loader_spec.rb b/spec/unit/cookbook_loader_spec.rb
index 19f3160d0c..8bc215360a 100644
--- a/spec/unit/cookbook_loader_spec.rb
+++ b/spec/unit/cookbook_loader_spec.rb
@@ -59,13 +59,18 @@ describe Chef::CookbookLoader do
cookbook_loader.load_cookbooks
end
- it "should be possible to reload all the cookbooks without triggering deprecation warnings on all of them" do
+ it "should be possible to reload all the cookbooks without triggering deprecation warnings on all of them", chef: "< 15" do
start_merged_cookbooks = cookbook_loader.merged_cookbooks
expect(Chef::Log).to receive(:deprecation).with(/The cookbook\(s\): openldap exist in multiple places in your cookbook_path./)
cookbook_loader.load_cookbooks
expect(cookbook_loader.merged_cookbooks).to eql(start_merged_cookbooks)
end
+ it "should not support multiple merged cookbooks in the cookbook path", chef: ">= 15" do
+ start_merged_cookbooks = cookbook_loader.merged_cookbooks
+ expect { cookbook_loader.load_cookbooks }.to raise_error("FIXME WITH THE CLASS YOU DECIDE TO USE HERE")
+ end
+
describe "[]" do
it "should return cookbook objects with []" do
expect(cookbook_loader[:openldap]).to be_a_kind_of(Chef::CookbookVersion)