cucumber 4.1.0 → 5.3.0

data/lib/cucumber/formatter/json.rb

@@ -19,10 +19,10 @@ module Cucumber
           '--format=json',
           "Please use --format=message and stand-alone json-formatter.\n" \
           'json-formatter homepage: https://github.com/cucumber/cucumber/tree/master/json-formatter#cucumber-json-formatter',
-          '5.0.0'
+          '6.0.0'
         )
 
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @ast_lookup = AstLookup.new(config)
         @feature_hashes = []
         @step_or_hook_hash = {}

data/lib/cucumber/formatter/junit.rb

@@ -106,7 +106,7 @@ module Cucumber
         write_file(feature_result_filename(feature_data[:uri]), @testsuite.target!)
       end
 
-      def create_output_string(test_case, scenario, result, row_name) # rubocop:disable Metrics/PerceivedComplexity
+      def create_output_string(test_case, scenario, result, row_name)
         scenario_source = @ast_lookup.scenario_source(test_case)
         keyword = scenario_source.type == :Scenario ? scenario_source.scenario.keyword : scenario_source.scenario_outline.keyword
         output = "#{keyword}: #{scenario}\n\n"
@@ -132,9 +132,12 @@ module Cucumber
         duration = ResultBuilder.new(result).test_case_duration
         @current_feature_data[:time] += duration
         classname = @current_feature_data[:feature].name
+        filename = @current_feature_data[:uri]
         name = scenario_designation
 
-        @current_feature_data[:builder].testcase(classname: classname, name: name, time: format('%<duration>.6f', duration: duration)) do
+        testcase_attributes = get_testcase_attributes(classname, name, duration, filename)
+
+        @current_feature_data[:builder].testcase(testcase_attributes) do
           if !result.passed? && result.ok?(@config.strict)
             @current_feature_data[:builder].skipped
             @current_feature_data[:skipped] += 1
@@ -157,6 +160,20 @@ module Cucumber
         @current_feature_data[:tests] += 1
       end
 
+      def get_testcase_attributes(classname, name, duration, filename)
+        { classname: classname, name: name, time: format('%<duration>.6f', duration: duration) }.tap do |attributes|
+          attributes[:file] = filename if add_fileattribute?
+        end
+      end
+
+      def add_fileattribute?
+        return false if @config.formats.nil? || @config.formats.empty?
+
+        !!@config.formats.find do |format|
+          format.first == 'junit' && format.dig(1, 'fileattribute') == 'true'
+        end
+      end
+
       def get_backtrace_object(result)
         if result.failed?
           result.exception

data/lib/cucumber/formatter/message.rb

@@ -10,7 +10,7 @@ module Cucumber
       include Io
 
       def initialize(config)
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         super(config)
       end
 

data/lib/cucumber/formatter/pretty.rb

@@ -32,7 +32,7 @@ module Cucumber
       private :in_scenario_outline, :print_background_steps
 
       def initialize(config)
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @config = config
         @options = config.to_hash
         @snippets_input = []

data/lib/cucumber/formatter/progress.rb

@@ -19,7 +19,7 @@ module Cucumber
 
       def initialize(config)
         @config = config
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @snippets_input = []
         @undefined_parameter_types = []
         @total_duration = 0

data/lib/cucumber/formatter/publish_banner_printer.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'cucumber/term/banner'
+
+module Cucumber
+  module Formatter
+    class PublishBannerPrinter
+      include Term::Banner
+
+      def initialize(configuration)
+        return if configuration.publish_enabled?
+
+        configuration.on_event :test_run_finished do |_event|
+          display_publish_ad(configuration.error_stream)
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def display_publish_ad(io)
+        display_banner(
+          [
+            [
+              'Share your Cucumber Report with your team at ',
+              link('https://reports.cucumber.io')
+            ],
+            '',
+            [
+              'Command line option:    ',
+              highlight('--publish')
+            ],
+            [
+              'Environment variable:   ',
+              highlight('CUCUMBER_PUBLISH_ENABLED'),
+              '=',
+              highlight('true')
+            ],
+            [
+              'cucumber.yml:           ',
+              highlight('default: --publish')
+            ],
+            '',
+            [
+              'More information at ',
+              link('https://reports.cucumber.io/docs/cucumber-ruby')
+            ],
+            '',
+            [
+              'To disable this message, specify ',
+              pre('CUCUMBER_PUBLISH_QUIET=true'),
+              ' or use the '
+            ],
+            [
+              pre('--publish-quiet'),
+              ' option. You can also add this to your ',
+              pre('cucumber.yml:')
+            ],
+            [pre('default: --publish-quiet')]
+          ],
+          io
+        )
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def highlight(text)
+        [text, :cyan]
+      end
+
+      def link(text)
+        [text, :cyan, :bold, :underline]
+      end
+
+      def pre(text)
+        [text, :bold]
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/rerun.rb

@@ -7,8 +7,8 @@ module Cucumber
     class Rerun
       include Formatter::Io
 
-      def initialize(config) # rubocop:disable Metrics/PerceivedComplexity
-        @io = ensure_io(config.out_stream)
+      def initialize(config)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @config = config
         @failures = {}
         config.on_event :test_case_finished do |event|

data/lib/cucumber/formatter/steps.rb

@@ -5,7 +5,7 @@ module Cucumber
     # The formatter used for <tt>--format steps</tt>
     class Steps
       def initialize(runtime, path_or_io, options)
-        @io = ensure_io(path_or_io)
+        @io = ensure_io(path_or_io, nil)
         @options = options
         @step_definition_files = collect_steps(runtime)
       end

data/lib/cucumber/formatter/summary.rb

@@ -16,7 +16,7 @@ module Cucumber
 
       def initialize(config)
         @config = config
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @ast_lookup = AstLookup.new(config)
         @counts = ConsoleCounts.new(@config)
         @issues = ConsoleIssues.new(@config, @ast_lookup)

data/lib/cucumber/formatter/url_reporter.rb

@@ -0,0 +1,17 @@
+module Cucumber
+  module Formatter
+    class URLReporter
+      def initialize(io)
+        @io = io
+      end
+
+      def report(banner)
+        @io.puts(banner)
+      end
+    end
+
+    class NoReporter
+      def report(banner); end
+    end
+  end
+end

data/lib/cucumber/glue/dsl.rb

@@ -137,4 +137,4 @@ module Cucumber
 end
 
 # TODO: can we avoid adding methods to the global namespace (Kernel)
-extend(Cucumber::Glue::Dsl) # rubocop:disable Style/MixinUsage
+extend(Cucumber::Glue::Dsl)

data/lib/cucumber/glue/proto_world.rb

@@ -87,7 +87,7 @@ module Cucumber
           'If you simply want it in the console, '\
           'keep using "puts" (or Kernel.puts to avoid this message)',
           'puts(message)',
-          '5.0.0'
+          '6.0.0'
         )
         messages.each { |message| log(message.to_s) }
       end
@@ -102,7 +102,7 @@ module Cucumber
         Cucumber.deprecate(
           'Please use attach(file, media_type) instead',
           'embed(file, mime_type, label)',
-          '5.0.0'
+          '6.0.0'
         )
         attach(file, mime_type)
       end
@@ -143,7 +143,7 @@ module Cucumber
       end
 
       # Dynamially generate the API module, closuring the dependencies
-      def self.for(runtime, language) # rubocop:disable Metrics/MethodLength
+      def self.for(runtime, language) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         Module.new do # rubocop:disable Metrics/BlockLength
           def self.extended(object)
             # wrap the dynamically generated module so that we can document the methods

data/lib/cucumber/multiline_argument/data_table/diff_matrices.rb

@@ -95,7 +95,7 @@ module Cucumber
         def changes
           require 'diff/lcs'
           diffable_cell_matrix = cell_matrix.dup.extend(::Diff::LCS)
-          diffable_cell_matrix.diff(other_table_cell_matrix).flatten
+          diffable_cell_matrix.diff(other_table_cell_matrix).flatten(1)
         end
 
         def inspect_rows(missing_row, inserted_row)

data/lib/cucumber/rake/task.rb

@@ -5,9 +5,7 @@ require 'cucumber/gherkin/formatter/ansi_escapes'
 begin
   # Support Rake > 0.8.7
   require 'rake/dsl_definition'
-  # rubocop:disable Lint/HandleExceptions
 rescue LoadError
-  # rubocop:enable Lint/HandleExceptions
 end
 
 module Cucumber

data/lib/cucumber/rspec/doubles.rb

@@ -13,9 +13,7 @@ Before do
 end
 
 After do
-  begin
-    RSpec::Mocks.verify
-  ensure
-    RSpec::Mocks.teardown
-  end
+  RSpec::Mocks.verify
+ensure
+  RSpec::Mocks.teardown
 end

data/lib/cucumber/runtime.rb

@@ -166,11 +166,14 @@ module Cucumber
 
     require 'cucumber/formatter/ignore_missing_messages'
     require 'cucumber/formatter/fail_fast'
+    require 'cucumber/formatter/publish_banner_printer'
     require 'cucumber/core/report/summary'
+
     def report
       return @report if @report
       reports = [summary_report] + formatters
       reports << fail_fast_report if @configuration.fail_fast?
+      reports << publish_banner_printer unless @configuration.publish_quiet?
       @report ||= Formatter::Fanout.new(reports)
     end
 
@@ -182,6 +185,10 @@ module Cucumber
       @fail_fast_report ||= Formatter::FailFast.new(@configuration)
     end
 
+    def publish_banner_printer
+      @publish_banner_printer ||= Formatter::PublishBannerPrinter.new(@configuration)
+    end
+
     def formatters
       @formatters ||=
         @configuration.formatter_factories do |factory, formatter_options, path_or_io|

data/lib/cucumber/term/banner.rb

@@ -0,0 +1,56 @@
+require 'cucumber/term/ansicolor'
+
+module Cucumber
+  module Term
+    module Banner
+      def display_banner(lines, io, border_modifiers = nil)
+        BannerMaker.new.display_banner(lines, io, border_modifiers || %i[green bold])
+      end
+
+      class BannerMaker
+        include Term::ANSIColor
+
+        def display_banner(lines, io, border_modifiers)
+          lines = lines.split("\n") if lines.is_a? String
+          longest_line_length = lines.map { |line| line_length(line) }.max
+
+          io.puts apply_modifiers("┌#{'─' * (longest_line_length + 2)}┐", border_modifiers)
+          lines.map do |line|
+            padding = ' ' * (longest_line_length - line_length(line))
+            io.puts "#{apply_modifiers('│', border_modifiers)} #{display_line(line)}#{padding} #{apply_modifiers('│', border_modifiers)}"
+          end
+          io.puts apply_modifiers("└#{'─' * (longest_line_length + 2)}┘", border_modifiers)
+        end
+
+        private
+
+        def display_line(line)
+          line.is_a?(Array) ? line.map { |span| display_span(span) }.join : line
+        end
+
+        def display_span(span)
+          return apply_modifiers(span.shift, span) if span.is_a?(Array)
+          span
+        end
+
+        def apply_modifiers(str, modifiers)
+          display = str
+          modifiers.each { |modifier| display = send(modifier, display) }
+          display
+        end
+
+        def line_length(line)
+          if line.is_a?(Array)
+            line.map { |span| span_length(span) }.sum
+          else
+            line.length
+          end
+        end
+
+        def span_length(span)
+          span.is_a?(Array) ? span[0].length : span.length
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/version

@@ -1 +1 @@
-4.1.0
+5.3.0