From 38ce60d04f0e0bc80b6c679303a764392670471d Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Thu, 16 May 2019 18:47:09 +0200 Subject: [PATCH] [core] Rename option for FailureList formatter to "failures" The name was not matching case statement in formatters.rb and it is much simplier to have an argument with that name. Discussion: - https://github.com/rspec/rspec-core/pull/2624/files#r284776400 --- This commit was imported from https://github.com/rspec/rspec-core/commit/63179c7e673fb6159fcef35df4e66a1387dc4b45. --- rspec-core/lib/rspec/core/formatters.rb | 2 +- rspec-core/lib/rspec/core/option_parser.rb | 2 +- .../spec/rspec/core/formatters/failure_list_formatter_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rspec-core/lib/rspec/core/formatters.rb b/rspec-core/lib/rspec/core/formatters.rb index 326a692a3..7a412a1a1 100644 --- a/rspec-core/lib/rspec/core/formatters.rb +++ b/rspec-core/lib/rspec/core/formatters.rb @@ -213,7 +213,7 @@ def built_in_formatter(key) JsonFormatter when 'bisect-drb' BisectDRbFormatter - when 'f', 'failure_list' + when 'f', 'failures' FailureListFormatter end end diff --git a/rspec-core/lib/rspec/core/option_parser.rb b/rspec-core/lib/rspec/core/option_parser.rb index 9e13b6b16..8855f3f8a 100644 --- a/rspec-core/lib/rspec/core/option_parser.rb +++ b/rspec-core/lib/rspec/core/option_parser.rb @@ -112,7 +112,7 @@ def parser(options) ' [d]ocumentation (group and example names)', ' [h]tml', ' [j]son', - ' [f]ailure list (suitable for editors integration)', + ' [f]ailures ("file:line:reason", suitable for editors integration)', ' custom formatter class name') do |o| options[:formatters] ||= [] options[:formatters] << [o] diff --git a/rspec-core/spec/rspec/core/formatters/failure_list_formatter_spec.rb b/rspec-core/spec/rspec/core/formatters/failure_list_formatter_spec.rb index 4c64a46ea..54c5c3996 100644 --- a/rspec-core/spec/rspec/core/formatters/failure_list_formatter_spec.rb +++ b/rspec-core/spec/rspec/core/formatters/failure_list_formatter_spec.rb @@ -5,7 +5,7 @@ module RSpec::Core::Formatters include FormatterSupport it 'produces the expected full output' do - output = run_example_specs_with_formatter('failure_list') + output = run_example_specs_with_formatter('failures') expect(output).to eq(<<-EOS.gsub(/^\s+\|/, '')) |./spec/rspec/core/resources/formatter_specs.rb:4:is marked as pending but passes |./spec/rspec/core/resources/formatter_specs.rb:36:fails