Merge pull request #893 from opscode/error_description_formatting

Change error description sections elements to be hashes.

2 files changed, 6 insertions, 5 deletions

diff --git a/lib/chef/formatters/error_descriptor.rb b/lib/chef/formatters/error_descriptor.rb
index abf10076be..3f0756df73 100644
--- a/lib/chef/formatters/error_descriptor.rb
+++ b/lib/chef/formatters/error_descriptor.rb
@@ -31,7 +31,7 @@ class Chef
       end
 
       def section(heading, text)
-        @sections << [heading, text]
+        @sections << {heading => text}
       end
 
       def display(out)
@@ -40,7 +40,9 @@ class Chef
         out.puts "=" * 80
         out.puts "\n"
         sections.each do |section|
-          display_section(section, out)
+          section.each do |heading, text|
+            display_section(heading, text, out)
+          end
         end
       end
 
@@ -53,8 +55,7 @@ class Chef
 
       private
 
-      def display_section(section, out)
-        heading, text = section
+      def display_section(heading, text, out)
         out.puts heading
         out.puts "-" * heading.size
         out.puts text
diff --git a/spec/unit/resource_reporter_spec.rb b/spec/unit/resource_reporter_spec.rb
index d9f8172539..cb4f5bce94 100644
--- a/spec/unit/resource_reporter_spec.rb
+++ b/spec/unit/resource_reporter_spec.rb
@@ -408,7 +408,7 @@ describe Chef::ResourceReporter do
 
       it "includes the error inspector output in the event data" do
         @report["data"]["exception"].should have_key("description")
-        @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[["Unexpected Error:", "RSpec::Mocks::Mock: Object not found"]]})
+        @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[{"Unexpected Error:" => "RSpec::Mocks::Mock: Object not found"}]})
       end
 
     end