cucumber 2.99.0 → 3.0.0.pre.1

data/lib/cucumber/formatter/progress.rb

@@ -1,4 +1,9 @@
+# frozen_string_literal: true
+require 'cucumber/core/report/summary'
+require 'cucumber/formatter/backtrace_filter'
 require 'cucumber/formatter/console'
+require 'cucumber/formatter/console_counts'
+require 'cucumber/formatter/console_issues'
 require 'cucumber/formatter/io'
 require 'cucumber/formatter/duration_extractor'
 require 'cucumber/formatter/hook_query_visitor'
@@ -10,32 +15,60 @@ module Cucumber
       include Console
       include Io
       attr_reader :runtime
+      attr_reader :config, :summary
 
-      def initialize(runtime, path_or_io, options)
-        @runtime, @io, @options = runtime, ensure_io(path_or_io), options
+      def initialize(config)
+        @config, @io = config, ensure_io(config.out_stream)
         @previous_step_keyword = nil
         @snippets_input = []
         @total_duration = 0
+        @summary = Cucumber::Core::Report::Summary.new(config.event_bus)
+        @matches = {}
+        @pending_step_matches = []
+        @failed_results = []
+        @failed_test_cases = []
+        @passed_test_cases = []
+        @counts = ConsoleCounts.new(config)
+        @issues = ConsoleIssues.new(config)
+        config.on_event :step_match, &method(:on_step_match)
+        config.on_event :test_case_starting, &method(:on_test_case_starting)
+        config.on_event :test_step_finished, &method(:on_test_step_finished)
+        config.on_event :test_case_finished, &method(:on_test_case_finished)
+        config.on_event :test_run_finished, &method(:on_test_run_finished)
       end
 
-      def before_test_case(_test_case)
+      def on_step_match(event)
+        @matches[event.test_step.source] = event.step_match
+      end
+
+      def on_test_case_starting(_event)
         unless @profile_information_printed
-          print_profile_information
+          do_print_profile_information(config.profiles) unless config.skip_profile_information? || config.profiles.nil? || config.profiles.empty?
           @profile_information_printed = true
         end
         @previous_step_keyword = nil
       end
 
-      def after_test_step(test_step, result)
+      def on_test_step_finished(event)
+        test_step = event.test_step
+        result = event.result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
         progress(result.to_sym) if !HookQueryVisitor.new(test_step).hook? || result.failed?
-        collect_snippet_data(test_step, result) unless HookQueryVisitor.new(test_step).hook?
+        unless HookQueryVisitor.new(test_step).hook?
+          collect_snippet_data(test_step, result)
+          @pending_step_matches << @matches[test_step.source] if result.pending?
+          @failed_results << result if result.failed?
+        end
       end
 
-      def after_test_case(_test_case, result)
+      def on_test_case_finished(event)
+        test_case = event.test_case
+        result = event.result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
+        @failed_test_cases << test_case if result.failed?
+        @passed_test_cases << test_case if result.passed?
         @total_duration += DurationExtractor.new(result).result_duration
       end
 
-      def done
+      def on_test_run_finished(_event)
         @io.puts
         @io.puts
         print_summary
@@ -44,11 +77,19 @@ module Cucumber
       private
 
       def print_summary
-        print_steps(:pending)
-        print_steps(:failed)
-        print_statistics(@total_duration, @options)
-        print_snippets(@options)
-        print_passing_wip(@options)
+        print_elements(@pending_step_matches, :pending, 'steps')
+        print_elements(@failed_results, :failed, 'steps')
+        print_statistics(@total_duration, @config, @counts, @issues)
+        snippet_text_proc = lambda { |step_keyword, step_name, multiline_arg|
+          snippet_text(step_keyword, step_name, multiline_arg)
+        }
+        do_print_snippets(snippet_text_proc) if config.snippets? && summary.test_steps.total(:undefined) > 0
+        if config.wip?
+          messages = @passed_test_cases.map do |test_case|
+            message = linebreaks("#{test_case.location.on_line(test_case.location.line)}:in `#{test_case.name}'", ENV['CUCUMBER_TRUNCATE_OUTPUT'].to_i)
+          end
+          do_print_passing_wip(messages)
+        end
       end
 
       CHARS = {
@@ -68,6 +109,8 @@ module Cucumber
       def table_header_cell?(status)
         status == :skipped_param
       end
+
+      TestCaseData = Struct.new(:name, :location)
     end
   end
 end

data/lib/cucumber/formatter/rerun.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'cucumber/formatter/io'
 
 module Cucumber
@@ -5,28 +6,24 @@ module Cucumber
     class Rerun
       include Formatter::Io
 
-      def initialize(runtime, path_or_io, options)
-        @io = ensure_io(path_or_io)
+      def initialize(config)
+        @io = ensure_io(config.out_stream)
+        @config = config
         @failures = {}
-        @options = options
-      end
-
-      def after_test_case(test_case, result)
-        return if result.ok?(@options[:strict])
-        @failures[test_case.location.file] ||= []
-        @failures[test_case.location.file] << test_case.location.line
-      end
-
-      def done
-        return if @failures.empty?
-        @io.print file_failures.join(' ')
-      end
-
-      [:before_test_case, :before_test_step, :after_test_step].each do |method|
-        define_method(method) { |*| }
+        config.on_event :test_case_finished do |event|
+          test_case, result = *event.attributes
+          next if result.ok?(@config.strict?)
+          @failures[test_case.location.file] ||= []
+          @failures[test_case.location.file] << test_case.location.line
+        end
+        config.on_event :test_run_finished do
+          next if @failures.empty?
+          @io.print file_failures.join(' ')
+        end
       end
 
       private
+
       def file_failures
         @failures.map { |file, lines| [file, lines].join(':') }
       end

data/lib/cucumber/formatter/stepdefs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'cucumber/formatter/usage'
 
 module Cucumber

data/lib/cucumber/formatter/steps.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format steps</tt>

data/lib/cucumber/formatter/summary.rb

@@ -1,35 +1,58 @@
+# frozen_string_literal: true
+require 'cucumber/formatter/io'
+require 'cucumber/formatter/console'
+require 'cucumber/formatter/console_counts'
+require 'cucumber/formatter/console_issues'
+require 'cucumber/core/test/result'
+
 module Cucumber
   module Formatter
-    module Summary
 
-      def scenario_summary(runtime, &block)
-        scenarios_proc = lambda{|status| runtime.scenarios(status)}
-        dump_count(runtime.scenarios.length, "scenario") + dump_status_counts(scenarios_proc, &block)
-      end
+    # Summary formatter, outputting only feature / scenario titles
+    class Summary
+      include Io
+      include Console
+
+      def initialize(config)
+        @config, @io = config, ensure_io(config.out_stream)
+        @counts = ConsoleCounts.new(@config)
+        @issues = ConsoleIssues.new(@config)
+        @start_time = Time.now
 
-      def step_summary(runtime, &block)
-        steps_proc = lambda{|status| runtime.steps(status)}
-        dump_count(runtime.steps.length, "step") + dump_status_counts(steps_proc, &block)
+        @config.on_event :test_case_starting do |event|
+          print_feature event.test_case
+          print_test_case event.test_case
+        end
+
+        @config.on_event :test_case_finished do |event|
+          print_result event.result
+        end
+
+        @config.on_event :test_run_finished do |event|
+          duration = Time.now - @start_time
+          @io.puts
+          print_statistics(duration, @config, @counts, @issues)
+        end
       end
 
       private
 
-      def dump_status_counts(find_elements_proc)
-        counts = [:failed, :skipped, :undefined, :pending, :passed].map do |status|
-          elements = find_elements_proc.call(status)
-          elements.any? ? yield("#{elements.length} #{status.to_s}", status) : nil
-        end.compact
-        if counts.any?
-          " (#{counts.join(', ')})"
-        else
-          ""
-        end
+      def print_feature(test_case)
+        feature = test_case.feature
+        return if @current_feature == feature
+        @io.puts unless @current_feature.nil?
+        @io.puts feature
+        @current_feature = feature
       end
 
-      def dump_count(count, what, state=nil)
-        [count, state, "#{what}#{count == 1 ? '' : 's'}"].compact.join(" ")
+      def print_test_case(test_case)
+        @io.print "  #{test_case.name} "
       end
 
+      def print_result(result)
+        @io.puts format_string(result, result.to_sym)
+      end
     end
   end
 end
+

data/lib/cucumber/formatter/unicode.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Require this file if you need Unicode support.
 # Tips for improvement - esp. ruby 1.9: http://www.ruby-forum.com/topic/184730
 require 'cucumber/platform'

data/lib/cucumber/formatter/usage.rb

@@ -1,30 +1,42 @@
+# frozen_string_literal: true
 require 'cucumber/formatter/progress'
 require 'cucumber/step_definition_light'
 
 module Cucumber
   module Formatter
     class Usage < Progress
-      include Console
 
       class StepDefKey < StepDefinitionLight
         attr_accessor :mean_duration, :status
       end
 
-      def initialize(runtime, path_or_io, options)
-        @runtime = runtime
-        @io = ensure_io(path_or_io)
-        @options = options
+      def initialize(config)
+        super
         @stepdef_to_match = Hash.new { |h, stepdef_key| h[stepdef_key] = [] }
         @total_duration = 0
         @matches = {}
-        runtime.configuration.on_event :step_match do |event|
-          @matches[event.test_step.source] = event.step_match
+        config.on_event :step_match do |event|
+          test_step, step_match = *event.attributes
+          @matches[test_step.source] = step_match
         end
+        config.on_event :step_definition_registered, &method(:on_step_definition_registered)
+      end
+
+      def on_step_definition_registered(event)
+        stepdef_key = StepDefKey.new(event.step_definition.regexp_source, event.step_definition.location)
+        @stepdef_to_match[stepdef_key] = []
+      end
+
+      def on_step_match(event)
+        @matches[event.test_step.source] = event.step_match
+        super
       end
 
-      def after_test_step(test_step, result)
-        return if HookQueryVisitor.new(test_step).hook?
+      def on_test_step_finished(event)
+        return if HookQueryVisitor.new(event.test_step).hook?
 
+        test_step = event.test_step
+        result = event.result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
         step_match = @matches[test_step.source]
         step_definition = step_match.step_definition
         stepdef_key = StepDefKey.new(step_definition.regexp_source, step_definition.location)
@@ -45,10 +57,9 @@ module Cucumber
       private
 
       def print_summary
-        add_unused_stepdefs
         aggregate_info
 
-        if @options[:dry_run]
+        if config.dry_run?
           keys = @stepdef_to_match.keys.sort {|a,b| a.regexp_source <=> b.regexp_source}
         else
           keys = @stepdef_to_match.keys.sort {|a,b| a.mean_duration <=> b.mean_duration}.reverse
@@ -68,9 +79,9 @@ module Cucumber
       end
 
       def print_step_definition(stepdef_key)
-        @io.print format_string(sprintf("%.7f", stepdef_key.mean_duration), :skipped) + " " unless @options[:dry_run]
+        @io.print format_string(sprintf("%.7f", stepdef_key.mean_duration), :skipped) + " " unless config.dry_run?
         @io.print format_string(stepdef_key.regexp_source, stepdef_key.status)
-        if @options[:source]
+        if config.source?
           indent = max_length - stepdef_key.regexp_source.unpack('U*').length
           line_comment = "   # #{stepdef_key.location}".indent(indent)
           @io.print(format_string(line_comment, :comment))
@@ -81,9 +92,9 @@ module Cucumber
       def print_steps(stepdef_key)
         @stepdef_to_match[stepdef_key].each do |step|
           @io.print "  "
-          @io.print format_string(sprintf("%.7f", step[:duration]), :skipped) + " " unless @options[:dry_run]
+          @io.print format_string(sprintf("%.7f", step[:duration]), :skipped) + " " unless config.dry_run?
           @io.print format_step(step[:keyword], step[:step_match], step[:status], nil)
-          if @options[:source]
+          if config.source?
             indent = max_length - (step[:keyword].unpack('U*').length + step[:step_match].format_args.unpack('U*').length)
             line_comment = " # #{step[:location]}".indent(indent)
             @io.print(format_string(line_comment, :comment))
@@ -125,12 +136,6 @@ module Cucumber
         end
       end
 
-      def add_unused_stepdefs
-        @runtime.unmatched_step_definitions.each do |step_definition|
-          stepdef_key = StepDefKey.new(step_definition.regexp_source, step_definition.location)
-          @stepdef_to_match[stepdef_key] = []
-        end
-      end
     end
   end
 end

data/lib/cucumber/gherkin/data_table_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'gherkin/token_scanner'
 require 'gherkin/parser'
 require 'gherkin/dialect'

data/lib/cucumber/gherkin/formatter/ansi_escapes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Cucumber
 module Gherkin
   module Formatter

data/lib/cucumber/gherkin/formatter/escaping.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Cucumber
 module Gherkin
   module Formatter

data/lib/cucumber/gherkin/i18n.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Cucumber
   module Gherkin
     module I18n

data/lib/cucumber/gherkin/steps_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'gherkin/token_scanner'
 require 'gherkin/token_matcher'
 require 'gherkin/parser'

data/lib/cucumber/hooks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'cucumber/core/ast/location'
 require 'cucumber/core/test/around_hook'

data/lib/cucumber/load_path.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Cucumber
   module LoadPath
     def add_dirs(*dirs)

data/lib/cucumber/multiline_argument.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'delegate'
 require 'cucumber/multiline_argument/data_table'
 require 'cucumber/multiline_argument/doc_string'
@@ -67,5 +68,3 @@ module Cucumber
     end
   end
 end
-
-require 'cucumber/ast'

data/lib/cucumber/multiline_argument/data_table.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'forwardable'
 require 'cucumber/gherkin/data_table_parser'
 require 'cucumber/gherkin/formatter/escaping'
@@ -469,7 +470,8 @@ module Cucumber
 
         c = Cucumber::Term::ANSIColor.coloring?
         Cucumber::Term::ANSIColor.coloring = options[:color]
-        formatter = Formatter::Pretty.new(nil, io, options)
+        runtime = Struct.new(:configuration).new(Configuration.new)
+        formatter = Formatter::Pretty.new(runtime, io, options)
         formatter.instance_variable_set('@indent', options[:indent])
         Formatter::LegacyApi::Ast::MultilineArg.for(self).accept(Formatter::Fanout.new([formatter]))
         Cucumber::Term::ANSIColor.coloring = c

data/lib/cucumber/multiline_argument/doc_string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Cucumber
   module MultilineArgument
     class DocString < SimpleDelegator

data/lib/cucumber/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Detect the platform we're running on so we can tweak behaviour
 # in various places.
 require 'rbconfig'

data/lib/cucumber/project_initializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Cucumber
 
   # Generates generic file structure for a cucumber project
@@ -40,4 +41,4 @@ module Cucumber
       puts "  create   #{file}"
     end
   end
-end
+end

data/lib/cucumber/rake/task.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'cucumber/platform'
 require 'cucumber/gherkin/formatter/ansi_escapes'
 begin