Merge pull request #2900 from chef/tball/complete-2310

Completing tests for https://github.com/chef/chef/pull/2310

2 files changed, 24 insertions, 0 deletions

diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb
index 9d8738f637..45f2ef01ee 100644
--- a/lib/chef/node/attribute.rb
+++ b/lib/chef/node/attribute.rb
@@ -475,6 +475,10 @@ class Chef
          end
        end
 
+       def to_s
+         merged_attributes.to_s
+       end
+
        def inspect
          "#<#{self.class} " << (COMPONENTS + [:@merged_attributes, :@properties]).map{|iv|
            "#{iv}=#{instance_variable_get(iv).inspect}"
diff --git a/spec/unit/node/attribute_spec.rb b/spec/unit/node/attribute_spec.rb
index c924ee2811..250b8c630c 100644
--- a/spec/unit/node/attribute_spec.rb
+++ b/spec/unit/node/attribute_spec.rb
@@ -1108,6 +1108,26 @@ describe Chef::Node::Attribute do
     end
   end
 
+  describe "to_s" do
+    it "should output simple attributes" do
+      attributes = Chef::Node::Attribute.new(nil, nil, nil, nil)
+      expect(attributes.to_s).to eq("{}")
+    end
+
+    it "should output merged attributes" do
+      default_hash = {
+          "a" => 1,
+          "b" => 2
+      }
+      override_hash = {
+          "b" => 3,
+          "c" => 4
+      }
+      attributes = Chef::Node::Attribute.new(nil, default_hash, override_hash, nil)
+      expect(attributes.to_s).to eq('{"a"=>1, "b"=>3, "c"=>4}')
+    end
+  end
+
   describe "inspect" do
     it "should be readable" do
       # NOTE: previous implementation hid the values, showing @automatic={...}