summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2015-10-05 16:45:28 +0100
committerThom May <thom@may.lt>2015-10-05 16:45:28 +0100
commit132c85844dfdaef1d5acfe2bb272f961147509d8 (patch)
treefaf26df32767196006de490ba2a1a9b4c5b24aa2 /spec
parentf42e439686db89a1e123ed5293b9e63ebb426bf1 (diff)
parent53380ccb30465f003ddc2fb3461007c135110577 (diff)
downloadchef-132c85844dfdaef1d5acfe2bb272f961147509d8.tar.gz
Merge pull request #4003 from chef/tm/duplicate_recipes
Ensure that our list of recipes is backwards compat
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/client_spec.rb3
-rw-r--r--spec/unit/run_list/versioned_recipe_list_spec.rb5
2 files changed, 7 insertions, 1 deletions
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index f736c38859..8fbf56844e 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -375,7 +375,8 @@ describe Chef::Client do
expect(node[:roles].length).to eq(1)
expect(node[:roles]).to include("role_containing_cookbook1")
expect(node[:recipes]).not_to be_nil
- expect(node[:recipes].length).to eq(1)
+ expect(node[:recipes].length).to eq(2)
+ expect(node[:recipes]).to include("cookbook1")
expect(node[:recipes]).to include("cookbook1::default")
expect(node[:expanded_run_list]).not_to be_nil
expect(node[:expanded_run_list].length).to eq(1)
diff --git a/spec/unit/run_list/versioned_recipe_list_spec.rb b/spec/unit/run_list/versioned_recipe_list_spec.rb
index 9c3ecaa0dd..be57d6c944 100644
--- a/spec/unit/run_list/versioned_recipe_list_spec.rb
+++ b/spec/unit/run_list/versioned_recipe_list_spec.rb
@@ -187,4 +187,9 @@ describe Chef::RunList::VersionedRecipeList do
end
end
+ context "with duplicated names", :chef_gte_13_only do
+ it "should fail in Chef 13" do
+ expect(list).to_not respond_to(:with_duplicate_names)
+ end
+ end
end