diff options
author | Serdar Sutay <serdar@opscode.com> | 2013-07-12 03:38:03 -0700 |
---|---|---|
committer | Serdar Sutay <serdar@opscode.com> | 2013-07-12 03:38:03 -0700 |
commit | aca2fa7ba0641c1198b2ea575a6828e1b8f6020c (patch) | |
tree | 2d9510aba58510c1737287e8c5215fd028de2aa1 | |
parent | 232f137a8b64863c125bf95e5d0229668e8eac86 (diff) | |
parent | 5eeefe93cb9bcf8b26a0c40bf8307251073ab860 (diff) | |
download | chef-aca2fa7ba0641c1198b2ea575a6828e1b8f6020c.tar.gz |
Merge pull request #893 from opscode/error_description_formatting
Change error description sections elements to be hashes.
-rw-r--r-- | lib/chef/formatters/error_descriptor.rb | 9 | ||||
-rw-r--r-- | spec/unit/resource_reporter_spec.rb | 2 |
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 |