Merge pull request #2255 from xeron/node_to_hash_run_list_fix

Make empty run_list to produce an empty array when using node.to_hash

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index 327da67b1c..5f788af4d4 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -397,7 +397,7 @@ class Chef
       end
       index_hash["recipe"] = run_list.recipe_names if run_list.recipe_names.length > 0
       index_hash["role"] = run_list.role_names if run_list.role_names.length > 0
-      index_hash["run_list"] = run_list.run_list if run_list.run_list.length > 0
+      index_hash["run_list"] = run_list.run_list_items
       index_hash
     end
 
@@ -409,7 +409,7 @@ class Chef
       display["normal"]           = normal_attrs
       display["default"]          = attributes.combined_default
       display["override"]         = attributes.combined_override
-      display["run_list"]         = run_list.run_list
+      display["run_list"]         = run_list.run_list_items
       display
     end
 
diff --git a/spec/unit/node_spec.rb b/spec/unit/node_spec.rb
index 00879dcb13..da7a67aec1 100644
--- a/spec/unit/node_spec.rb
+++ b/spec/unit/node_spec.rb
@@ -700,6 +700,10 @@ describe Chef::Node do
       h["run_list"].should be_include("recipe[stalinist]")
       h["chef_environment"].should == "dev"
     end
+
+    it 'should return an empty array for empty run_list' do
+      node.to_hash["run_list"].should == []
+    end
   end
 
   describe "converting to or from json" do