cucumber 2.99.0 → 3.0.0.pre.1

data/lib/cucumber/formatter/console_counts.rb

@@ -0,0 +1,57 @@
+require 'cucumber/formatter/console'
+
+module Cucumber
+  module Formatter
+    class ConsoleCounts
+      include Console
+
+      def initialize(config)
+        @test_case_summary = Core::Test::Result::Summary.new
+        @test_step_summary = Core::Test::Result::Summary.new
+
+        config.on_event :test_case_finished do |event|
+          event.result.describe_to @test_case_summary
+        end
+
+        config.on_event :test_step_finished do |event|
+          event.result.describe_to @test_step_summary if from_gherkin?(event.test_step)
+        end
+      end
+
+      def to_s
+        [
+          [scenario_count, status_counts(@test_case_summary)].compact.join(" "),
+          [step_count, status_counts(@test_step_summary)].compact.join(" ")
+        ].join("\n")
+      end
+
+      private
+
+      def from_gherkin?(test_step)
+        test_step.source.last.location.file.match(/\.feature$/)
+      end
+
+      def scenario_count
+        count = @test_case_summary.total
+        "#{count} scenario" + (count == 1 ? "" : "s")
+      end
+
+      def step_count
+        count = @test_step_summary.total
+        "#{count} step" + (count == 1 ? "" : "s")
+      end
+
+      def status_counts(summary)
+        counts = [:failed, :skipped, :undefined, :pending, :passed].map { |status|
+          count = summary.total(status)
+          [status, count]
+        }.select { |status, count|
+          count > 0
+        }.map { |status, count|
+          format_string("#{count} #{status}", status)
+        }
+        "(#{counts.join(", ")})" if counts.any?
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/console_issues.rb

@@ -0,0 +1,37 @@
+require 'cucumber/formatter/console'
+
+module Cucumber
+  module Formatter
+    class ConsoleIssues
+      include Console
+
+      def initialize(config)
+        @failures = []
+        @config = config
+        @config.on_event(:test_case_finished) do |event|
+          @failures << event.test_case if event.result.failed?
+        end
+      end
+
+      def to_s
+        return if @failures.empty?
+        result = [ format_string("Failing Scenarios:", :failed) ] + @failures.map { |failure|
+          source = @config.source? ? format_string(" # #{failure.keyword}: #{failure.name}", :comment) : ''
+          format_string("cucumber #{profiles_string}" + failure.location, :failed) + source
+        }
+        result.join("\n")
+      end
+
+      def any?
+        @failures.any?
+      end
+
+      private
+
+      def profiles_string
+        return if @config.custom_profiles.empty?
+        @config.custom_profiles.map { |profile| "-p #{profile}" }.join(' ') + ' '
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/debug.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'cucumber/formatter/progress'
 require 'cucumber/step_definition_light'
 

data/lib/cucumber/formatter/duration.rb

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

data/lib/cucumber/formatter/duration_extractor.rb

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

data/lib/cucumber/formatter/fail_fast.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'cucumber/formatter/io'
 require 'cucumber/formatter/console'
 
@@ -7,8 +8,9 @@ module Cucumber
     class FailFast
 
       def initialize(configuration)
-        configuration.on_event :after_test_case do |event|
-          Cucumber.wants_to_quit = true unless event.result.ok?(configuration.strict?)
+        configuration.on_event :test_case_finished do |event|
+          test_case, result = *event.attributes
+          Cucumber.wants_to_quit = true unless result.ok?(configuration.strict?)
         end
       end
 

data/lib/cucumber/formatter/fanout.rb

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

data/lib/cucumber/formatter/hook_query_visitor.rb

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

data/lib/cucumber/formatter/html.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'erb'
 require 'builder'
 require 'cucumber/formatter/duration'
@@ -589,13 +590,13 @@ module Cucumber
         (["#{exception.message}"] + exception.backtrace).join("\n")
       end
 
-      def backtrace_line(line)
-        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*).*$/) do
-          if ENV['TM_PROJECT_DIRECTORY']
+     def backtrace_line(line)
+        if ENV['TM_PROJECT_DIRECTORY']
+          line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*).*$/) do
             "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
-          else
-            line
           end
+        else
+          line
         end
       end
 

data/lib/cucumber/formatter/ignore_missing_messages.rb

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

data/lib/cucumber/formatter/interceptor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'thread'
 
 module Cucumber

data/lib/cucumber/formatter/io.rb

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

data/lib/cucumber/formatter/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'multi_json'
 require 'base64'
 require 'cucumber/formatter/backtrace_filter'
@@ -11,16 +12,16 @@ module Cucumber
       include Io
 
       def initialize(config)
-        config.on_event :before_test_case, &method(:on_before_test_case)
-        config.on_event :after_test_case, &method(:on_after_test_case)
-        config.on_event :before_test_step, &method(:on_before_test_step)
-        config.on_event :after_test_step, &method(:on_after_test_step)
-        config.on_event :finished_testing, &method(:on_finished_testing)
         @io = ensure_io(config.out_stream)
         @feature_hashes = []
+        config.on_event :test_case_starting, &method(:on_test_case_starting)
+        config.on_event :test_case_finished, &method(:on_test_case_finished)
+        config.on_event :test_step_starting, &method(:on_test_step_starting)
+        config.on_event :test_step_finished, &method(:on_test_step_finished)
+        config.on_event :test_run_finished, &method(:on_test_run_finished)
       end
 
-      def on_before_test_case(event)
+      def on_test_case_starting(event)
         test_case = event.test_case
         builder = Builder.new(test_case)
         unless same_feature_as_previous_test_case?(test_case.feature)
@@ -38,7 +39,7 @@ module Cucumber
         @any_step_failed = false
       end
 
-      def on_before_test_step(event)
+      def on_test_step_starting(event)
         test_step = event.test_step
         return if internal_hook?(test_step)
         hook_query = HookQueryVisitor.new(test_step)
@@ -56,20 +57,21 @@ module Cucumber
         @step_hash = @step_or_hook_hash
       end
 
-      def on_after_test_step(event)
-        test_step = event.test_step
-        result = event.result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
+      def on_test_step_finished(event)
+        test_step, result = *event.attributes
+        result = result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
         return if internal_hook?(test_step)
         add_match_and_result(test_step, result)
         @any_step_failed = true if result.failed?
       end
 
-      def on_after_test_case(event)
-        result = event.result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
+      def on_test_case_finished(event)
+        test_case, result = *event.attributes
+        result = result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
         add_failed_around_hook(result) if result.failed? && !@any_step_failed
       end
 
-      def on_finished_testing(event)
+      def on_test_run_finished(event)
         @io.write(MultiJson.dump(@feature_hashes, pretty: true))
       end
 

data/lib/cucumber/formatter/json_pretty.rb

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

data/lib/cucumber/formatter/junit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'builder'
 require 'cucumber/formatter/backtrace_filter'
 require 'cucumber/formatter/io'
@@ -18,10 +19,10 @@ module Cucumber
       end
 
       def initialize(config)
-        config.on_event :before_test_case, &method(:on_before_test_case)
-        config.on_event :after_test_case, &method(:on_after_test_case)
-        config.on_event :after_test_step, &method(:on_after_test_step)
-        config.on_event :finished_testing, &method(:on_finished_testing)
+        config.on_event :test_case_starting, &method(:on_test_case_starting)
+        config.on_event :test_case_finished, &method(:on_test_case_finished)
+        config.on_event :test_step_finished, &method(:on_test_step_finished)
+        config.on_event :test_run_finished, &method(:on_test_run_finished)
         @reportdir = ensure_dir(config.out_stream, "junit")
         @config = config
         @features_data = Hash.new { |h,k| h[k] = {
@@ -35,7 +36,7 @@ module Cucumber
         }}
       end
 
-      def on_before_test_case(event)
+      def on_test_case_starting(event)
         test_case = event.test_case
         unless same_feature_as_previous_test_case?(test_case.feature)
           start_feature(test_case.feature)
@@ -47,15 +48,16 @@ module Cucumber
         @interceptederr = Interceptor::Pipe.wrap(:stderr)
       end
 
-      def on_after_test_step(event)
+      def on_test_step_finished(event)
+        test_step, result = *event.attributes
         return if @failing_step_source
 
-        @failing_step_source = event.test_step.source.last unless event.result.ok?(@config.strict?)
+        @failing_step_source = test_step.source.last unless result.ok?(@config.strict?)
       end
 
-      def on_after_test_case(event)
-        test_case = event.test_case
-        result = event.result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
+      def on_test_case_finished(event)
+        test_case, result = *event.attributes
+        result = result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
         test_case_name = NameBuilder.new(test_case)
         scenario = test_case_name.scenario_name
         scenario_designation = "#{scenario}#{test_case_name.name_suffix}"
@@ -66,7 +68,7 @@ module Cucumber
         Interceptor::Pipe.unwrap! :stderr
       end
 
-      def on_finished_testing(event)
+      def on_test_run_finished(event)
         @features_data.each { |file, data| end_feature(data) }
       end
 

data/lib/cucumber/formatter/legacy_api/adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'forwardable'
 require 'delegate'
 require 'cucumber/errors'
@@ -15,44 +16,38 @@ module Cucumber
         def initialize(*)
           super
           @matches = collect_matches
+          config.on_event(:test_case_starting) do |event|
+            formatter.before_test_case(event.test_case)
+            printer.before_test_case(event.test_case)
+          end
+          config.on_event(:test_step_starting) do |event|
+            formatter.before_test_step(event.test_step)
+            printer.before_test_step(event.test_step)
+          end
+          config.on_event(:test_step_finished) do |event|
+            test_step, result = *event.attributes
+            printer.after_test_step(test_step, result)
+            formatter.after_test_step(test_step, result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter))
+          end
+          config.on_event(:test_case_finished) do |event|
+            test_case, result = *event.attributes
+            record_test_case_result(test_case, result)
+            printer.after_test_case(test_case, result)
+            formatter.after_test_case(test_case, result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter))
+          end
+          config.on_event(:test_run_finished) do
+            printer.after
+            formatter.done
+          end
         end
 
-        def_delegators :formatter,
-          :ask
-
-        def_delegators :printer,
-          :embed
-
-        def before_test_case(test_case)
-          formatter.before_test_case(test_case)
-          printer.before_test_case(test_case)
-        end
-
-        def before_test_step(test_step)
-          formatter.before_test_step(test_step)
-          printer.before_test_step(test_step)
-        end
-
-        def after_test_step(test_step, result)
-          printer.after_test_step(test_step, result)
-          formatter.after_test_step(test_step, result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter))
-        end
-
-        def after_test_case(test_case, result)
-          record_test_case_result(test_case, result)
-          printer.after_test_case(test_case, result)
-          formatter.after_test_case(test_case, result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter))
-        end
+        def_delegators :formatter, :ask
+        def_delegators :printer, :embed
 
         def puts(*messages)
           printer.puts(messages)
         end
 
-        def done
-          printer.after
-          formatter.done
-        end
-
         private
 
         def printer
@@ -67,7 +62,8 @@ module Cucumber
         def collect_matches
           result = {}
           config.on_event(:step_match) do |event|
-            result[event.test_step.source.last] = event.step_match
+            test_step, step_match = *event.attributes
+            result[test_step.source.last] = step_match
           end
           result
         end

data/lib/cucumber/formatter/legacy_api/ast.rb

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

data/lib/cucumber/formatter/legacy_api/results.rb

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

data/lib/cucumber/formatter/legacy_api/runtime_facade.rb

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

data/lib/cucumber/formatter/pretty.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
 require 'fileutils'
 require 'cucumber/formatter/console'
 require 'cucumber/formatter/io'
 require 'cucumber/gherkin/formatter/escaping'
+require 'cucumber/formatter/console_counts'
+require 'cucumber/formatter/console_issues'
 
 module Cucumber
   module Formatter
@@ -22,12 +25,15 @@ module Cucumber
 
       def initialize(runtime, path_or_io, options)
         @runtime, @io, @options = runtime, ensure_io(path_or_io), options
+        @config = runtime.configuration
         @exceptions = []
         @indent = 0
         @prefixes = options[:prefixes] || {}
         @delayed_messages = []
         @previous_step_keyword = nil
         @snippets_input = []
+        @counts = ConsoleCounts.new(runtime.configuration)
+        @issues = ConsoleIssues.new(runtime.configuration)
       end
 
       def before_features(features)
@@ -238,7 +244,7 @@ module Cucumber
       end
 
       def print_summary(features)
-        print_stats(features, @options)
+        print_statistics(features.duration, @config, @counts, @issues)
         print_snippets(@options)
         print_passing_wip(@options)
       end