diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-20 17:47:56 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-21 15:04:45 -0800 |
commit | 0507c08bc75bde24c3e4f32878a2d0ab6b2db591 (patch) | |
tree | d1f087de31659e0880d3b69705a8ce2b7cdc20cc | |
parent | eff333bfae96c3ce7de1e93b2199425778b3dced (diff) | |
download | chef-0507c08bc75bde24c3e4f32878a2d0ab6b2db591.tar.gz |
remove invalid invalidsubtractivemerge specs
-rw-r--r-- | spec/unit/mixin/deep_merge_spec.rb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/spec/unit/mixin/deep_merge_spec.rb b/spec/unit/mixin/deep_merge_spec.rb index 779445e04e..d107323f32 100644 --- a/spec/unit/mixin/deep_merge_spec.rb +++ b/spec/unit/mixin/deep_merge_spec.rb @@ -290,32 +290,6 @@ describe Chef::Mixin::DeepMerge do end - describe "role_merge" do - it "errors out if knockout merge use is detected in an array" do - hash_dst = {"property" => ["2","4"]} - hash_src = {"property" => ["1","!merge:4"]} - expect {@dm.role_merge(hash_dst, hash_src)}.to raise_error(Chef::Mixin::DeepMerge::InvalidSubtractiveMerge) - end - - it "errors out if knockout merge use is detected in an array (reversed merge order)" do - hash_dst = {"property" => ["1","!merge:4"]} - hash_src = {"property" => ["2","4"]} - expect {@dm.role_merge(hash_dst, hash_src)}.to raise_error(Chef::Mixin::DeepMerge::InvalidSubtractiveMerge) - end - - it "errors out if knockout merge use is detected in a string" do - hash_dst = {"property" => ["2","4"]} - hash_src = {"property" => "!merge"} - expect {@dm.role_merge(hash_dst, hash_src)}.to raise_error(Chef::Mixin::DeepMerge::InvalidSubtractiveMerge) - end - - it "errors out if knockout merge use is detected in a string (reversed merge order)" do - hash_dst = {"property" => "!merge"} - hash_src= {"property" => ["2","4"]} - expect {@dm.role_merge(hash_dst, hash_src)}.to raise_error(Chef::Mixin::DeepMerge::InvalidSubtractiveMerge) - end - end - describe "hash-only merging" do it "merges Hashes like normal deep merge" do merge_ee_hash = {"top_level_a" => {"1_deep_a" => "1-a-merge-ee", "1_deep_b" => "1-deep-b-merge-ee"}, "top_level_b" => "top-level-b-merge-ee"} |