diff options
author | Tim Smith <tsmith84@gmail.com> | 2019-10-02 10:57:23 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2019-10-02 11:00:13 -0700 |
commit | e3991fa9374ece7fe00d950ad9db45d66bc125c6 (patch) | |
tree | a839398a80ed618470bc9434189182377b4cd9c8 | |
parent | 39cba20eaed01ee6202b6ab1cce6b4d23ba60c67 (diff) | |
download | chef-e3991fa9374ece7fe00d950ad9db45d66bc125c6.tar.gz |
Remove specs from Chef 15 that accidently came inbackports
Merge conflicts strike again
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | spec/unit/node/attribute_spec.rb | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/spec/unit/node/attribute_spec.rb b/spec/unit/node/attribute_spec.rb index 9b1687305f..4c543282dc 100644 --- a/spec/unit/node/attribute_spec.rb +++ b/spec/unit/node/attribute_spec.rb @@ -1274,36 +1274,6 @@ describe Chef::Node::Attribute do end end - describe "deep merging with nils" do - it "nils when deep merging between default levels knocks out values" do - @attributes.default["foo"] = "bar" - expect(@attributes["foo"]).to eql("bar") - @attributes.force_default["foo"] = nil - expect(@attributes["foo"]).to be nil - end - - it "nils when deep merging between override levels knocks out values" do - @attributes.override["foo"] = "bar" - expect(@attributes["foo"]).to eql("bar") - @attributes.force_override["foo"] = nil - expect(@attributes["foo"]).to be nil - end - - it "nils when deep merging between default+override levels knocks out values" do - @attributes.default["foo"] = "bar" - expect(@attributes["foo"]).to eql("bar") - @attributes.override["foo"] = nil - expect(@attributes["foo"]).to be nil - end - - it "nils when deep merging between normal+automatic levels knocks out values" do - @attributes.normal["foo"] = "bar" - expect(@attributes["foo"]).to eql("bar") - @attributes.automatic["foo"] = nil - expect(@attributes["foo"]).to be nil - end - end - describe "to_json" do it "should convert to a valid json string" do json = @attributes["hot"].to_json |