diff options
author | Thom May <thom@may.lt> | 2015-12-15 10:24:21 +0000 |
---|---|---|
committer | Thom May <thom@may.lt> | 2015-12-15 10:24:21 +0000 |
commit | 33aba5c6cc2d028223732bb3802504a95be9b0d8 (patch) | |
tree | f2425533f33e6e2d2f2c76f324ce0323f6159695 | |
parent | fbf1f7d21c059d75b9978b34f9b9b5021c6dbfa3 (diff) | |
parent | 54799d8d25ed4565177f2a752088a220220c7344 (diff) | |
download | chef-33aba5c6cc2d028223732bb3802504a95be9b0d8.tar.gz |
Merge pull request #4309 from chef/lcg/fix-tags-and-set-unless
tags always an array; fix set_unless
-rw-r--r-- | lib/chef/node.rb | 5 | ||||
-rw-r--r-- | lib/chef/node/attribute.rb | 2 | ||||
-rw-r--r-- | lib/chef/node/attribute_collections.rb | 4 | ||||
-rw-r--r-- | spec/unit/node_spec.rb | 26 |
4 files changed, 30 insertions, 7 deletions
diff --git a/lib/chef/node.rb b/lib/chef/node.rb index b04e607624..0c13e5474a 100644 --- a/lib/chef/node.rb +++ b/lib/chef/node.rb @@ -1,9 +1,8 @@ -# # Author:: Adam Jacob (<adam@opscode.com>) # Author:: Christopher Brown (<cb@opscode.com>) # Author:: Christopher Walters (<cw@opscode.com>) # Author:: Tim Hinderliter (<tim@opscode.com>) -# Copyright:: Copyright (c) 2008-2011 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -372,7 +371,7 @@ class Chef # Lazy initializer for tags attribute def tags - normal[:tags] = [] unless attribute?(:tags) + normal[:tags] = Array(normal[:tags]) normal[:tags] end diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb index 45f2ef01ee..7ffac40bf4 100644 --- a/lib/chef/node/attribute.rb +++ b/lib/chef/node/attribute.rb @@ -1,7 +1,7 @@ #-- # Author:: Adam Jacob (<adam@opscode.com>) # Author:: AJ Christensen (<aj@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/node/attribute_collections.rb b/lib/chef/node/attribute_collections.rb index b912904534..1dcc950c6e 100644 --- a/lib/chef/node/attribute_collections.rb +++ b/lib/chef/node/attribute_collections.rb @@ -1,6 +1,6 @@ #-- # Author:: Daniel DeLeo (<dan@opscode.com>) -# Copyright:: Copyright (c) 2012 Opscode, Inc. +# Copyright:: Copyright (c) 2012-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -148,7 +148,7 @@ class Chef def []=(key, value) root.top_level_breadcrumb ||= key - if set_unless? && key?(key) + if set_unless? && key?(key) && !self[key].nil? self[key] else root.reset_cache(root.top_level_breadcrumb) diff --git a/spec/unit/node_spec.rb b/spec/unit/node_spec.rb index 4b57a93009..76cf451323 100644 --- a/spec/unit/node_spec.rb +++ b/spec/unit/node_spec.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, Inc. +# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -264,6 +264,12 @@ describe Chef::Node do expect(node[:snoopy][:is_a_puppy]).to eq(true) end + it "should allow you to set an attribute with set_unless if is a nil value" do + node.attributes.normal = { snoopy: { is_a_puppy: nil } } + node.set_unless[:snoopy][:is_a_puppy] = false + expect(node[:snoopy][:is_a_puppy]).to eq(false) + end + it "should allow you to set a value after a set_unless" do # this tests for set_unless_present state bleeding between statements CHEF-3806 node.set_unless[:snoopy][:is_a_puppy] = false @@ -798,6 +804,24 @@ describe Chef::Node do expect(node.tags).to eql([ "radiohead" ]) end + it "should set the tags attribute to an empty array if it is nil" do + node.attributes.normal = { 'tags' => nil } + node.consume_external_attrs(@ohai_data, {}) + expect(node.tags).to eql([]) + end + + it "should return an array if it is fed a string" do + node.normal[:tags] = "string" + node.consume_external_attrs(@ohai_data, {}) + expect(node.tags).to eql(["string"]) + end + + it "should return an array if it is fed a hash" do + node.normal[:tags] = {} + node.consume_external_attrs(@ohai_data, {}) + expect(node.tags).to eql([]) + end + it "deep merges attributes instead of overwriting them" do node.consume_external_attrs(@ohai_data, "one" => {"two" => {"three" => "four"}}) expect(node.one.to_hash).to eq({"two" => {"three" => "four"}}) |