really always return an Arraylcg/fix-tags-and-set-unless

2 files changed, 13 insertions, 2 deletions

diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index b2ef3aaf2f..0c13e5474a 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -1,4 +1,3 @@
-#
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Christopher Brown (<cb@opscode.com>)
 # Author:: Christopher Walters (<cw@opscode.com>)
@@ -372,7 +371,7 @@ class Chef
 
     # Lazy initializer for tags attribute
     def tags
-      normal_unless[:tags] = []
+      normal[:tags] = Array(normal[:tags])
       normal[:tags]
     end
 
diff --git a/spec/unit/node_spec.rb b/spec/unit/node_spec.rb
index 40e8cf8898..76cf451323 100644
--- a/spec/unit/node_spec.rb
+++ b/spec/unit/node_spec.rb
@@ -810,6 +810,18 @@ describe Chef::Node do
       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"}})