cucumber 3.0.1 → 3.2.0

data/lib/cucumber/formatter/json.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'multi_json'
 require 'base64'
 require 'cucumber/formatter/backtrace_filter'
@@ -81,8 +82,14 @@ module Cucumber
       end
 
       def embed(src, mime_type, _label)
-        if File.file?(src)
-          content = File.open(src, 'rb') { |f| f.read }
+        begin
+          is_file = File.file?(src)
+        rescue ArgumentError
+          is_file = false
+        end
+
+        if is_file
+          content = File.open(src, 'rb', &:read)
           data = encode64(content)
         else
           if mime_type =~ /;base64$/
@@ -162,7 +169,7 @@ module Cucumber
         step_hash = {
           keyword: step_source.keyword,
           name: step_source.to_s,
-          line: step_source.location.line
+          line: step_source.original_location.line
         }
         step_hash[:comments] = Formatter.create_comments_array(step_source.comments) unless step_source.comments.empty?
         step_hash[:doc_string] = create_doc_string_hash(step_source.multiline_arg) if step_source.multiline_arg.doc_string?
@@ -297,7 +304,7 @@ module Cucumber
           comments += Formatter.create_comments_array(scenario.comments) unless scenario.comments.empty?
           comments += @examples_table_comments if @examples_table_comments
           comments += @row_comments if @row_comments
-          @test_case_hash[:comments] =  comments unless comments.empty?
+          @test_case_hash[:comments] = comments unless comments.empty?
         end
 
         def examples_table(examples_table)

data/lib/cucumber/formatter/json_pretty.rb

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

data/lib/cucumber/formatter/junit.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'builder'
 require 'cucumber/formatter/backtrace_filter'
 require 'cucumber/formatter/io'
@@ -9,7 +10,6 @@ module Cucumber
   module Formatter
     # The formatter used for <tt>--format junit</tt>
     class Junit
-
       include Io
 
       class UnNamedFeatureError < StandardError
@@ -25,15 +25,17 @@ module Cucumber
         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] = {
-          feature: nil,
-          failures: 0,
-          errors: 0,
-          tests: 0,
-          skipped: 0,
-          time: 0,
-          builder: Builder::XmlMarkup.new(:indent => 2)
-        }}
+        @features_data = Hash.new do |h, k|
+          h[k] = {
+            feature: nil,
+            failures: 0,
+            errors: 0,
+            tests: 0,
+            skipped: 0,
+            time: 0,
+            builder: Builder::XmlMarkup.new(:indent => 2)
+          }
+        end
       end
 
       def on_test_case_started(event)
@@ -93,7 +95,8 @@ module Cucumber
           :skipped => feature_data[:skipped],
           :tests => feature_data[:tests],
           :time => format('%.6f', feature_data[:time]),
-          :name => feature_data[:feature].name ) do
+          :name => feature_data[:feature].name
+        ) do
           @testsuite << feature_data[:builder].target!
         end
 
@@ -104,8 +107,12 @@ module Cucumber
         output = "#{test_case.keyword}: #{scenario}\n\n"
         return output if result.ok?(@config.strict)
         if test_case.keyword == 'Scenario'
-          output += @failing_step_source.keyword.to_s unless hook?(@failing_step_source)
-          output += "#{@failing_step_source}\n"
+          if @failing_step_source
+            output += @failing_step_source.keyword.to_s unless hook?(@failing_step_source)
+            output += "#{@failing_step_source}\n"
+          else # An Around hook has failed
+            output += "Around hook\n"
+          end
         else
           output += "Example row: #{row_name}\n"
         end
@@ -136,10 +143,10 @@ module Cucumber
             @current_feature_data[:failures] += 1
           end
           @current_feature_data[:builder].tag!('system-out') do
-            @current_feature_data[:builder].cdata! strip_control_chars(@interceptedout.buffer.join)
+            @current_feature_data[:builder].cdata! strip_control_chars(@interceptedout.buffer_string)
           end
           @current_feature_data[:builder].tag!('system-err') do
-            @current_feature_data[:builder].cdata! strip_control_chars(@interceptederr.buffer.join)
+            @current_feature_data[:builder].cdata! strip_control_chars(@interceptederr.buffer_string)
           end
         end
         @current_feature_data[:tests] += 1
@@ -175,7 +182,6 @@ module Cucumber
       def strip_control_chars(cdata)
         cdata.scan(/[[:print:]\t\n\r]/).join
       end
-
     end
 
     class NameBuilder
@@ -235,6 +241,5 @@ module Cucumber
         duration.tap { |duration| @test_case_duration = duration.nanoseconds / 10**9.0 }
       end
     end
-
   end
 end

data/lib/cucumber/formatter/pretty.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'fileutils'
 require 'cucumber/formatter/console'
 require 'cucumber/formatter/io'
@@ -163,7 +164,7 @@ module Cucumber
       def doc_string(string)
         return if @options[:no_multiline] || @hide_this_step
         s = %{"""\n#{string}\n"""}.indent(@indent)
-        s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
+        s = s.split("\n").map { |l| l =~ /^\s+$/ ? '' : l }.join("\n")
         @io.puts(format_string(s, @current_step.status))
         @io.flush
       end
@@ -187,7 +188,7 @@ module Cucumber
       def before_table_row(_table_row)
         return if !@table || @hide_this_step
         @col_index = 0
-        @io.print '  |'.indent(@indent-2)
+        @io.print '  |'.indent(@indent - 2)
       end
 
       def after_table_row(table_row)
@@ -235,7 +236,7 @@ module Cucumber
           @io.print(format_string(line_comment, :comment))
         end
         @io.puts
-        names[1..-1].each {|s| @io.puts s.to_s}
+        names[1..-1].each { |s| @io.puts s.to_s }
         @io.flush
       end
 

data/lib/cucumber/formatter/progress.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/core/report/summary'
 require 'cucumber/formatter/backtrace_filter'
 require 'cucumber/formatter/console'
@@ -80,9 +81,9 @@ module Cucumber
         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_proc = lambda do |step_keyword, step_name, multiline_arg|
           snippet_text(step_keyword, step_name, multiline_arg)
-        }
+        end
         do_print_snippets(snippet_text_proc) if config.snippets? && summary.test_steps.total(:undefined) > 0
         return unless config.wip?
         messages = @passed_test_cases.map do |test_case|

data/lib/cucumber/formatter/rerun.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/formatter/io'
 
 module Cucumber
@@ -18,7 +19,7 @@ module Cucumber
         end
         config.on_event :test_run_finished do
           next if @failures.empty?
-          @io.print file_failures.join('\n')
+          @io.print file_failures.join("\n")
         end
       end
 

data/lib/cucumber/formatter/stepdefs.rb

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

data/lib/cucumber/formatter/steps.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format steps</tt>
     class Steps
-
       def initialize(runtime, path_or_io, options)
         @io = ensure_io(path_or_io)
         @options = options
@@ -37,7 +37,7 @@ module Cucumber
       def collect_steps(runtime)
         runtime.step_definitions.inject({}) do |step_definitions, step_definition|
           step_definitions[step_definition.file] ||= []
-          step_definitions[step_definition.file] << [ step_definition.file_colon_line, step_definition.regexp_source ]
+          step_definitions[step_definition.file] << [step_definition.file_colon_line, step_definition.regexp_source]
           step_definitions
         end
       end

data/lib/cucumber/formatter/summary.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/formatter/io'
 require 'cucumber/formatter/console'
 require 'cucumber/formatter/console_counts'
@@ -7,7 +8,6 @@ require 'cucumber/core/test/result'
 
 module Cucumber
   module Formatter
-
     # Summary formatter, outputting only feature / scenario titles
     class Summary
       include Io
@@ -55,4 +55,3 @@ module Cucumber
     end
   end
 end
-

data/lib/cucumber/formatter/unicode.rb

@@ -1,4 +1,5 @@
 # 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'
@@ -24,10 +25,9 @@ if Cucumber::WINDOWS
     module WindowsOutput
       def self.extended(o)
         o.instance_eval do
-
           def cucumber_preprocess_output(*a)
             begin
-              a.map{|arg| arg.to_s.encode(Encoding.default_external)}
+              a.map { |arg| arg.to_s.encode(Encoding.default_external) }
             rescue Encoding::UndefinedConversionError => e
               STDERR.cucumber_puts("WARNING: #{e.message}")
               a

data/lib/cucumber/formatter/usage.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 require 'cucumber/formatter/progress'
 require 'cucumber/step_definition_light'
 
 module Cucumber
   module Formatter
     class Usage < Progress
-
       class StepDefKey < StepDefinitionLight
         attr_accessor :mean_duration, :status
       end
@@ -38,19 +38,23 @@ module Cucumber
         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.expression.to_s, step_definition.location)
-        unless @stepdef_to_match[stepdef_key].map { |key| key[:location] }.include? test_step.location
-          duration = DurationExtractor.new(result).result_duration
-
-          @stepdef_to_match[stepdef_key] << {
-            keyword: test_step.source.last.keyword,
-            step_match: step_match,
-            status: result.to_sym,
-            location: test_step.location,
-            duration: duration
-          }
+
+        unless step_match.nil?
+          step_definition = step_match.step_definition
+          stepdef_key = StepDefKey.new(step_definition.expression.to_s, step_definition.location)
+          unless @stepdef_to_match[stepdef_key].map { |key| key[:location] }.include? test_step.location
+            duration = DurationExtractor.new(result).result_duration
+
+            @stepdef_to_match[stepdef_key] << {
+              keyword: test_step.source.last.keyword,
+              step_match: step_match,
+              status: result.to_sym,
+              location: test_step.location,
+              duration: duration
+            }
+          end
         end
+
         super
       end
 
@@ -60,9 +64,9 @@ module Cucumber
         aggregate_info
 
         keys = if config.dry_run?
-                 @stepdef_to_match.keys.sort {|a,b| a.regexp_source <=> b.regexp_source}
+                 @stepdef_to_match.keys.sort { |a, b| a.regexp_source <=> b.regexp_source }
                else
-                 @stepdef_to_match.keys.sort {|a,b| a.mean_duration <=> b.mean_duration}.reverse
+                 @stepdef_to_match.keys.sort { |a, b| a.mean_duration <=> b.mean_duration }.reverse
                end
 
         keys.each do |stepdef_key|
@@ -108,7 +112,7 @@ module Cucumber
       end
 
       def max_stepdef_length
-        @stepdef_to_match.keys.flatten.map{|key| key.regexp_source.unpack('U*').length}.max
+        @stepdef_to_match.keys.flatten.map { |key| key.regexp_source.unpack('U*').length }.max
       end
 
       def max_step_length
@@ -123,8 +127,8 @@ module Cucumber
             key.status = :skipped
             key.mean_duration = 0
           else
-            key.status = worst_status(steps.map{ |step| step[:status] })
-            total_duration = steps.inject(0) {|sum, step| step[:duration] + sum}
+            key.status = worst_status(steps.map { |step| step[:status] })
+            total_duration = steps.inject(0) { |sum, step| step[:duration] + sum }
             key.mean_duration = total_duration / steps.length
           end
         end
@@ -135,7 +139,6 @@ module Cucumber
           statuses.include?(status)
         end
       end
-
     end
   end
 end

data/lib/cucumber/gherkin/data_table_parser.rb

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

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

@@ -1,100 +1,101 @@
 # frozen_string_literal: true
+
 module Cucumber
-module Gherkin
-  module Formatter
-    # Defines aliases for ANSI coloured output. Default colours can be overridden by defining
-    # a <tt>GHERKIN_COLORS</tt> variable in your shell, very much like how you can
-    # tweak the familiar POSIX command <tt>ls</tt> with
-    # $LSCOLORS: http://linux-sxs.org/housekeeping/lscolors.html
-    #
-    # The colours that you can change are:
-    #
-    # <tt>undefined</tt>::     defaults to <tt>yellow</tt>
-    # <tt>pending</tt>::       defaults to <tt>yellow</tt>
-    # <tt>pending_arg</tt>::   defaults to <tt>yellow,bold</tt>
-    # <tt>executing</tt>::     defaults to <tt>grey</tt>
-    # <tt>executing_arg</tt>:: defaults to <tt>grey,bold</tt>
-    # <tt>failed</tt>::        defaults to <tt>red</tt>
-    # <tt>failed_arg</tt>::    defaults to <tt>red,bold</tt>
-    # <tt>passed</tt>::        defaults to <tt>green</tt>
-    # <tt>passed_arg</tt>::    defaults to <tt>green,bold</tt>
-    # <tt>outline</tt>::       defaults to <tt>cyan</tt>
-    # <tt>outline_arg</tt>::   defaults to <tt>cyan,bold</tt>
-    # <tt>skipped</tt>::       defaults to <tt>cyan</tt>
-    # <tt>skipped_arg</tt>::   defaults to <tt>cyan,bold</tt>
-    # <tt>comment</tt>::       defaults to <tt>grey</tt>
-    # <tt>tag</tt>::           defaults to <tt>cyan</tt>
-    #
-    # For instance, if your shell has a black background and a green font (like the
-    # "Homebrew" settings for OS X' Terminal.app), you may want to override passed
-    # steps to be white instead of green. Examples:
-    #
-    #   export GHERKIN_COLORS="passed=white"
-    #   export GHERKIN_COLORS="passed=white,bold:passed_arg=white,bold,underline"
-    #
-    # (If you're on Windows, use SET instead of export).
-    # To see what colours and effects are available, just run this in your shell:
-    #
-    #   ruby -e "require 'rubygems'; require 'term/ansicolor'; puts Term::ANSIColor.attributes"
-    #
-    # Although not listed, you can also use <tt>grey</tt>
-    module AnsiEscapes
-      COLORS = {
-        'black'   => "\e[30m",
-        'red'     => "\e[31m",
-        'green'   => "\e[32m",
-        'yellow'  => "\e[33m",
-        'blue'    => "\e[34m",
-        'magenta' => "\e[35m",
-        'cyan'    => "\e[36m",
-        'white'   => "\e[37m",
-        'grey'    => "\e[90m",
-        'bold'    => "\e[1m"
-      }
+  module Gherkin
+    module Formatter
+      # Defines aliases for ANSI coloured output. Default colours can be overridden by defining
+      # a <tt>GHERKIN_COLORS</tt> variable in your shell, very much like how you can
+      # tweak the familiar POSIX command <tt>ls</tt> with
+      # $LSCOLORS: http://linux-sxs.org/housekeeping/lscolors.html
+      #
+      # The colours that you can change are:
+      #
+      # <tt>undefined</tt>::     defaults to <tt>yellow</tt>
+      # <tt>pending</tt>::       defaults to <tt>yellow</tt>
+      # <tt>pending_arg</tt>::   defaults to <tt>yellow,bold</tt>
+      # <tt>executing</tt>::     defaults to <tt>grey</tt>
+      # <tt>executing_arg</tt>:: defaults to <tt>grey,bold</tt>
+      # <tt>failed</tt>::        defaults to <tt>red</tt>
+      # <tt>failed_arg</tt>::    defaults to <tt>red,bold</tt>
+      # <tt>passed</tt>::        defaults to <tt>green</tt>
+      # <tt>passed_arg</tt>::    defaults to <tt>green,bold</tt>
+      # <tt>outline</tt>::       defaults to <tt>cyan</tt>
+      # <tt>outline_arg</tt>::   defaults to <tt>cyan,bold</tt>
+      # <tt>skipped</tt>::       defaults to <tt>cyan</tt>
+      # <tt>skipped_arg</tt>::   defaults to <tt>cyan,bold</tt>
+      # <tt>comment</tt>::       defaults to <tt>grey</tt>
+      # <tt>tag</tt>::           defaults to <tt>cyan</tt>
+      #
+      # For instance, if your shell has a black background and a green font (like the
+      # "Homebrew" settings for OS X' Terminal.app), you may want to override passed
+      # steps to be white instead of green. Examples:
+      #
+      #   export GHERKIN_COLORS="passed=white"
+      #   export GHERKIN_COLORS="passed=white,bold:passed_arg=white,bold,underline"
+      #
+      # (If you're on Windows, use SET instead of export).
+      # To see what colours and effects are available, just run this in your shell:
+      #
+      #   ruby -e "require 'rubygems'; require 'term/ansicolor'; puts Term::ANSIColor.attributes"
+      #
+      # Although not listed, you can also use <tt>grey</tt>
+      module AnsiEscapes
+        COLORS = {
+          'black'   => "\e[30m",
+          'red'     => "\e[31m",
+          'green'   => "\e[32m",
+          'yellow'  => "\e[33m",
+          'blue'    => "\e[34m",
+          'magenta' => "\e[35m",
+          'cyan'    => "\e[36m",
+          'white'   => "\e[37m",
+          'grey'    => "\e[90m",
+          'bold'    => "\e[1m"
+        }
 
-      ALIASES = Hash.new do |h,k|
-        if k.to_s =~ /(.*)_arg/
-          h[$1] + ',bold'
-        end
-      end.merge({
-        'undefined' => 'yellow',
-        'pending'   => 'yellow',
-        'executing' => 'grey',
-        'failed'    => 'red',
-        'passed'    => 'green',
-        'outline'   => 'cyan',
-        'skipped'   => 'cyan',
-        'comments'  => 'grey',
-        'tag'       => 'cyan'
-      })
+        ALIASES = Hash.new do |h, k|
+          if k.to_s =~ /(.*)_arg/
+            h[$1] + ',bold'
+          end
+        end.merge({
+                    'undefined' => 'yellow',
+                    'pending'   => 'yellow',
+                    'executing' => 'grey',
+                    'failed'    => 'red',
+                    'passed'    => 'green',
+                    'outline'   => 'cyan',
+                    'skipped'   => 'cyan',
+                    'comments'  => 'grey',
+                    'tag'       => 'cyan'
+                  })
 
-      if ENV['GHERKIN_COLORS'] # Example: export GHERKIN_COLORS="passed=red:failed=yellow"
-        ENV['GHERKIN_COLORS'].split(':').each do |pair|
-          a = pair.split('=')
-          ALIASES[a[0]] = a[1]
+        if ENV['GHERKIN_COLORS'] # Example: export GHERKIN_COLORS="passed=red:failed=yellow"
+          ENV['GHERKIN_COLORS'].split(':').each do |pair|
+            a = pair.split('=')
+            ALIASES[a[0]] = a[1]
+          end
         end
-      end
 
-      ALIASES.keys.each do |key|
-        define_method(key) do
-          ALIASES[key].split(',').map{|color| COLORS[color]}.join('')
+        ALIASES.keys.each do |key|
+          define_method(key) do
+            ALIASES[key].split(',').map { |color| COLORS[color] }.join('')
+          end
+
+          define_method("#{key}_arg") do
+            ALIASES["#{key}_arg"].split(',').map { |color| COLORS[color] }.join('')
+          end
         end
 
-        define_method("#{key}_arg") do
-          ALIASES["#{key}_arg"].split(',').map{|color| COLORS[color]}.join('')
+        def reset
+          "\e[0m"
         end
-      end
 
-      def reset
-        "\e[0m"
-      end
+        def up(n)
+          "\e[#{n}A"
+        end
 
-      def up(n)
-        "\e[#{n}A"
+        extend self
       end
-
-      extend self
     end
   end
 end
-end