cucumber 4.1.0 → 9.2.0

data/lib/cucumber/glue/step_definition.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'cucumber/step_match'
-require 'cucumber/core_ext/string'
 require 'cucumber/glue/invoke_in_world'
 
 module Cucumber
@@ -26,6 +25,7 @@ module Cucumber
       class << self
         def new(id, registry, string_or_regexp, proc_or_sym, options)
           raise MissingProc if proc_or_sym.nil?
+
           super id, registry, registry.create_expression(string_or_regexp), create_proc(proc_or_sym, options)
         end
 
@@ -34,6 +34,7 @@ module Cucumber
         def create_proc(proc_or_sym, options)
           return proc_or_sym if proc_or_sym.is_a?(Proc)
           raise ArgumentError unless proc_or_sym.is_a?(Symbol)
+
           message = proc_or_sym
           target_proc = parse_target_proc_from(options)
           patch_location_onto lambda { |*args|
@@ -50,6 +51,7 @@ module Cucumber
 
         def parse_target_proc_from(options)
           return -> { self } unless options.key?(:on)
+
           target = options[:on]
           case target
           when Proc
@@ -66,6 +68,7 @@ module Cucumber
 
       def initialize(id, registry, expression, proc)
         raise 'No regexp' if expression.is_a?(Regexp)
+
         @id = id
         @registry = registry
         @expression = expression
@@ -77,7 +80,7 @@ module Cucumber
         Cucumber::Messages::Envelope.new(
           step_definition: Cucumber::Messages::StepDefinition.new(
             id: id,
-            pattern: Cucumber::Messages::StepDefinition::StepDefinitionPattern.new(
+            pattern: Cucumber::Messages::StepDefinitionPattern.new(
               source: expression.source.to_s,
               type: expression_type
             ),
@@ -92,8 +95,9 @@ module Cucumber
       end
 
       def expression_type
-        return Cucumber::Messages::StepDefinition::StepDefinitionPattern::StepDefinitionPatternType::CUCUMBER_EXPRESSION if expression.is_a?(CucumberExpressions::CucumberExpression)
-        Cucumber::Messages::StepDefinition::StepDefinitionPattern::StepDefinitionPatternType::REGULAR_EXPRESSION
+        return Cucumber::Messages::StepDefinitionPatternType::CUCUMBER_EXPRESSION if expression.is_a?(CucumberExpressions::CucumberExpression)
+
+        Cucumber::Messages::StepDefinitionPatternType::REGULAR_EXPRESSION
       end
 
       # @api private
@@ -123,9 +127,7 @@ module Cucumber
 
       # @api private
       def arguments_from(step_name)
-        args = @expression.match(step_name)
-        # @registry.invoked_step_definition(regexp_source, location) if args
-        args
+        @expression.match(step_name)
       end
 
       # @api private

data/lib/cucumber/glue/world_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cucumber
   module Glue
     class WorldFactory

data/lib/cucumber/hooks.rb

@@ -19,6 +19,7 @@ module Cucumber
 
       def after_step_hook(id, test_step, location, &block)
         raise ArgumentError if test_step.hook?
+
         build_hook_step(id, location, block, AfterStepHook, Core::Test::Action)
       end
 

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Cucumber
   module MultilineArgument
     class DataTable
-      class DiffMatrices #:nodoc:
+      class DiffMatrices # :nodoc:
         attr_accessor :cell_matrix, :other_table_cell_matrix, :options
 
         def initialize(cell_matrix, other_table_cell_matrix, options)
@@ -95,7 +97,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)
@@ -113,6 +115,7 @@ module Cucumber
             row_index = row_indices.index(i)
             row = cell_matrix[row_index] if row_index
             next unless row
+
             (original_width..padded_width).each do |col_index|
               surplus_cell = other_row[col_index]
               row[col_index].value = surplus_cell.value if row[col_index]

data/lib/cucumber/multiline_argument/data_table.rb

@@ -27,7 +27,7 @@ module Cucumber
     # This will store <tt>[['a', 'b'], ['c', 'd']]</tt> in the <tt>data</tt> variable.
     #
     class DataTable
-      def self.default_arg_name #:nodoc:
+      def self.default_arg_name
         'table'
       end
 
@@ -78,11 +78,12 @@ module Cucumber
       NULL_CONVERSIONS = Hash.new(strict: false, proc: ->(cell_value) { cell_value }).freeze
 
       # @param data [Core::Test::DataTable] the data for the table
-      # @param conversion_procs [Hash] see map_columns!
-      # @param header_mappings [Hash] see map_headers!
-      # @param header_conversion_proc [Proc] see map_headers!
+      # @param conversion_procs [Hash] see map_column
+      # @param header_mappings [Hash] see map_headers
+      # @param header_conversion_proc [Proc] see map_headers
       def initialize(data, conversion_procs = NULL_CONVERSIONS.dup, header_mappings = {}, header_conversion_proc = nil)
         raise ArgumentError, 'data must be a Core::Test::DataTable' unless data.is_a? Core::Test::DataTable
+
         ast_table = data
         # Verify that it's square
         ast_table.transpose
@@ -107,13 +108,6 @@ module Cucumber
         @ast_table.location
       end
 
-      # Creates a copy of this table, inheriting any column and header mappings
-      # registered with #map_column! and #map_headers!.
-      #
-      def dup
-        self.class.new(Core::Test::DataTable.new(raw), @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
-      end
-
       # Returns a new, transposed table. Example:
       #
       #   | a | 7 | 4 |
@@ -141,7 +135,7 @@ module Cucumber
       #
       #   [{'a' => '2', 'b' => '3', 'sum' => '5'}, {'a' => '7', 'b' => '9', 'sum' => '16'}]
       #
-      # Use #map_column! to specify how values in a column are converted.
+      # Use #map_column to specify how values in a column are converted.
       #
       def hashes
         @hashes ||= build_hashes
@@ -161,7 +155,7 @@ module Cucumber
       def symbolic_hashes
         @symbolic_hashes ||=
           hashes.map do |string_hash|
-            Hash[string_hash.map { |a, b| [symbolize_key(a), b] }]
+            string_hash.transform_keys { |a| symbolize_key(a) }
           end
       end
 
@@ -179,6 +173,7 @@ module Cucumber
       #
       def rows_hash
         return @rows_hash if @rows_hash
+
         verify_table_width(2)
         @rows_hash = transpose.hashes[0]
       end
@@ -199,17 +194,17 @@ module Cucumber
         end
       end
 
-      def column_names #:nodoc:
+      def column_names
         @column_names ||= cell_matrix[0].map(&:value)
       end
 
       def rows
         hashes.map do |hash|
-          hash.values_at *headers
+          hash.values_at(*headers)
         end
       end
 
-      def each_cells_row(&proc) #:nodoc:
+      def each_cells_row(&proc)
         cells_rows.each(&proc)
       end
 
@@ -228,7 +223,8 @@ module Cucumber
         pattern.match(header_to_match)
       end
 
-      # Redefines the table headers. This makes it possible to use
+      # Returns a new Table where the headers are redefined.
+      # This makes it possible to use
       # prettier and more flexible header names in the features.  The
       # keys of +mappings+ are Strings or regular expressions
       # (anything that responds to #=== will work) that may match
@@ -244,54 +240,41 @@ module Cucumber
       # A StepDefinition receiving this table can then map the columns
       # with both Regexp and String:
       #
-      #   table.map_headers!(/phone( number)?/i => :phone, 'Address' => :address)
+      #   table.map_headers(/phone( number)?/i => :phone, 'Address' => :address)
       #   table.hashes
       #   # => [{:phone => '123456', :address => 'xyz'}, {:phone => '345678', :address => 'abc'}]
       #
       # You may also pass in a block if you wish to convert all of the headers:
       #
-      #   table.map_headers! { |header| header.downcase }
+      #   table.map_headers { |header| header.downcase }
       #   table.hashes.keys
       #   # => ['phone number', 'address']
       #
       # When a block is passed in along with a hash then the mappings in the hash take precendence:
       #
-      #   table.map_headers!('Address' => 'ADDRESS') { |header| header.downcase }
+      #   table.map_headers('Address' => 'ADDRESS') { |header| header.downcase }
       #   table.hashes.keys
       #   # => ['phone number', 'ADDRESS']
       #
-      def map_headers!(mappings = {}, &block)
-        # TODO: Remove this method for 2.0
-        clear_cache!
-        @header_mappings = mappings
-        @header_conversion_proc = block
-      end
-
-      # Returns a new Table where the headers are redefined. See #map_headers!
       def map_headers(mappings = {}, &block)
         self.class.new(Core::Test::DataTable.new(raw), @conversion_procs.dup, mappings, block)
       end
 
+      # Returns a new Table with an additional column mapping.
+      #
       # Change how #hashes converts column values. The +column_name+ argument identifies the column
       # and +conversion_proc+ performs the conversion for each cell in that column. If +strict+ is
       # true, an error will be raised if the column named +column_name+ is not found. If +strict+
       # is false, no error will be raised. Example:
       #
       #   Given /^an expense report for (.*) with the following posts:$/ do |table|
-      #     posts_table.map_column!('amount') { |a| a.to_i }
+      #     posts_table = posts_table.map_column('amount') { |a| a.to_i }
       #     posts_table.hashes.each do |post|
       #       # post['amount'] is a Fixnum, rather than a String
       #     end
       #   end
       #
-      def map_column!(column_name, strict = true, &conversion_proc)
-        # TODO: Remove this method for 2.0
-        @conversion_procs[column_name.to_s] = { strict: strict, proc: conversion_proc }
-        self
-      end
-
-      # Returns a new Table with an additional column mapping. See #map_column!
-      def map_column(column_name, strict = true, &conversion_proc)
+      def map_column(column_name, strict: true, &conversion_proc)
         conversion_procs = @conversion_procs.dup
         conversion_procs[column_name.to_s] = { strict: strict, proc: conversion_proc }
         self.class.new(Core::Test::DataTable.new(raw), conversion_procs, @header_mappings.dup, @header_conversion_proc)
@@ -312,8 +295,8 @@ module Cucumber
       # where the difference actually is.
       #
       # Since all tables that are passed to StepDefinitions always have String
-      # objects in their cells, you may want to use #map_column! before calling
-      # #diff!. You can use #map_column! on either of the tables.
+      # objects in their cells, you may want to use #map_column before calling
+      # #diff!. You can use #map_column on either of the tables.
       #
       # A Different error is raised if there are missing rows or columns, or
       # surplus rows. An error is <em>not</em> raised for surplus columns. An
@@ -346,6 +329,7 @@ module Cucumber
 
       class Different < StandardError
         attr_reader :table
+
         def initialize(table)
           @table = table
           super("Tables were not identical:\n#{table}")
@@ -356,7 +340,7 @@ module Cucumber
         cells_rows.map { |cells| cells.map(&:value) }
       end
 
-      def cells_to_hash(cells) #:nodoc:
+      def cells_to_hash(cells)
         hash = Hash.new do |hash_inner, key|
           hash_inner[key.to_s] if key.is_a?(Symbol)
         end
@@ -366,51 +350,51 @@ module Cucumber
         hash
       end
 
-      def index(cells) #:nodoc:
+      def index(cells)
         cells_rows.index(cells)
       end
 
-      def verify_column(column_name) #:nodoc:
+      def verify_column(column_name)
         raise %(The column named "#{column_name}" does not exist) unless raw[0].include?(column_name)
       end
 
-      def verify_table_width(width) #:nodoc:
+      def verify_table_width(width)
         raise %(The table must have exactly #{width} columns) unless raw[0].size == width
       end
 
       # TODO: remove the below function if it's not actually being used.
       # Nothing else in this repo calls it.
-      def text?(text) #:nodoc:
+      def text?(text)
         raw.flatten.compact.detect { |cell_value| cell_value.index(text) }
       end
 
-      def cells_rows #:nodoc:
-        @rows ||= cell_matrix.map do |cell_row| # rubocop:disable Naming/MemoizedInstanceVariableName
+      def cells_rows
+        @rows ||= cell_matrix.map do |cell_row|
           Cells.new(self, cell_row)
         end
       end
 
-      def headers #:nodoc:
+      def headers
         raw.first
       end
 
-      def header_cell(col) #:nodoc:
+      def header_cell(col)
         cells_rows[0][col]
       end
 
       attr_reader :cell_matrix
 
-      def col_width(col) #:nodoc:
+      def col_width(col)
         columns[col].__send__(:width)
       end
 
-      def to_s(options = {}) #:nodoc:
+      def to_s(options = {})
         indentation = options.key?(:indent) ? options[:indent] : 2
         prefixes = options.key?(:prefixes) ? options[:prefixes] : TO_S_PREFIXES
         DataTablePrinter.new(self, indentation, prefixes).to_s
       end
 
-      class DataTablePrinter #:nodoc:
+      class DataTablePrinter
         include Cucumber::Gherkin::Formatter::Escaping
         attr_reader :data_table, :indentation, :prefixes
         private :data_table, :indentation, :prefixes
@@ -424,7 +408,7 @@ module Cucumber
         def to_s
           leading_row = "\n"
           end_indentation = indentation - 2
-          trailing_row = "\n" + (' ' * end_indentation)
+          trailing_row = "\n#{' ' * end_indentation}"
           table_rows = data_table.cell_matrix.map { |row| format_row(row) }
           leading_row + table_rows.join("\n") + trailing_row
         end
@@ -432,7 +416,7 @@ module Cucumber
         private
 
         def format_row(row)
-          row_start = (' ' * indentation) + '| '
+          row_start = "#{' ' * indentation}| "
           row_end = '|'
           cells = row.map.with_index do |cell, i|
             format_cell(cell, data_table.col_width(i))
@@ -449,7 +433,7 @@ module Cucumber
         end
       end
 
-      def columns #:nodoc:
+      def columns
         @columns ||= cell_matrix.transpose.map do |cell_row|
           Cells.new(self, cell_row)
         end
@@ -469,23 +453,23 @@ module Cucumber
       def build_hashes
         convert_headers!
         convert_columns!
-        cells_rows[1..-1].map(&:to_hash)
+        cells_rows[1..].map(&:to_hash)
       end
 
-      def create_cell_matrix(ast_table) #:nodoc:
+      def create_cell_matrix(ast_table)
         ast_table.raw.map do |raw_row|
           line = begin
-                   raw_row.line
-                 rescue StandardError
-                   -1
-                 end
+            raw_row.line
+          rescue StandardError
+            -1
+          end
           raw_row.map do |raw_cell|
             Cell.new(raw_cell, self, line)
           end
         end
       end
 
-      def convert_columns! #:nodoc:
+      def convert_columns!
         @conversion_procs.each do |column_name, conversion_proc|
           verify_column(column_name) if conversion_proc[:strict]
         end
@@ -493,13 +477,13 @@ module Cucumber
         cell_matrix.transpose.each do |col|
           column_name = col[0].value
           conversion_proc = @conversion_procs[column_name][:proc]
-          col[1..-1].each do |cell|
+          col[1..].each do |cell|
             cell.value = conversion_proc.call(cell.value)
           end
         end
       end
 
-      def convert_headers! #:nodoc:
+      def convert_headers!
         header_cells = cell_matrix[0]
 
         if @header_conversion_proc
@@ -508,20 +492,22 @@ module Cucumber
         end
 
         @header_mappings.each_pair do |pre, post|
-          mapped_cells = header_cells.reject { |cell| cell.value.match(pre).nil? }
+          mapped_cells = header_cells.select { |cell| pre.is_a?(Regexp) ? cell.value.match?(pre) : cell.value == pre }
           raise "No headers matched #{pre.inspect}" if mapped_cells.empty?
           raise "#{mapped_cells.length} headers matched #{pre.inspect}: #{mapped_cells.map(&:value).inspect}" if mapped_cells.length > 1
+
           mapped_cells[0].value = post
           @conversion_procs[post] = @conversion_procs.delete(pre) if @conversion_procs.key?(pre)
         end
       end
 
-      def clear_cache! #:nodoc:
+      def clear_cache!
         @hashes = @rows_hash = @column_names = @rows = @columns = nil
       end
 
-      def ensure_table(table_or_array) #:nodoc:
-        return table_or_array if DataTable == table_or_array.class
+      def ensure_table(table_or_array)
+        return table_or_array if table_or_array.instance_of?(DataTable)
+
         DataTable.from(table_or_array)
       end
 
@@ -530,7 +516,7 @@ module Cucumber
       end
 
       # Represents a row of cells or columns of cells
-      class Cells #:nodoc:
+      class Cells
         include Enumerable
         include Cucumber::Gherkin::Formatter::Escaping
 
@@ -543,27 +529,27 @@ module Cucumber
 
         def accept(visitor)
           return if Cucumber.wants_to_quit
+
           each do |cell|
             visitor.visit_table_cell(cell)
           end
           nil
         end
 
-        # For testing only
-        def to_sexp #:nodoc:
+        def to_sexp
           [:row, line, *@cells.map(&:to_sexp)]
         end
 
-        def to_hash #:nodoc:
+        def to_hash
           @to_hash ||= @table.cells_to_hash(self)
         end
 
-        def value(n) #:nodoc:
-          self[n].value
+        def value(index)
+          self[index].value
         end
 
-        def [](n)
-          @cells[n]
+        def [](index)
+          @cells[index]
         end
 
         def line
@@ -589,7 +575,7 @@ module Cucumber
         end
       end
 
-      class Cell #:nodoc:
+      class Cell
         attr_reader :line, :table
         attr_accessor :status, :value
 
@@ -604,7 +590,7 @@ module Cucumber
         end
 
         def ==(other)
-          SurplusCell == other.class || value == other.value
+          other.class == SurplusCell || value == other.value
         end
 
         def eql?(other)
@@ -616,12 +602,12 @@ module Cucumber
         end
 
         # For testing only
-        def to_sexp #:nodoc:
+        def to_sexp
           [:cell, @value]
         end
       end
 
-      class SurplusCell < Cell #:nodoc:
+      class SurplusCell < Cell
         def status
           :comment
         end

data/lib/cucumber/platform.rb

@@ -1,27 +1,22 @@
 # frozen_string_literal: true
 
-# Detect the platform we're running on so we can tweak behaviour
-# in various places.
+# Detect the platform we're running on so we can tweak behaviour in various places.
 require 'rbconfig'
 require 'cucumber/core/platform'
 
 module Cucumber
-  unless defined?(Cucumber::VERSION)
-    VERSION       = File.read(File.expand_path('version', __dir__)).strip
-    BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
-    LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-    RAILS         = defined?(Rails)
-    RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-    RUBY          = defined? RUBY_VERSION
+  VERSION       = File.read(File.expand_path('../../VERSION', __dir__)).strip
+  BINARY        = File.expand_path("#{File.dirname(__FILE__)}/../../bin/cucumber")
+  LIBDIR        = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
+  RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 
-    class << self
-      attr_accessor :use_full_backtrace
+  class << self
+    attr_accessor :use_full_backtrace
 
-      # @private
-      def file_mode(mode, encoding = 'UTF-8')
-        "#{mode}:#{encoding}"
-      end
+    # @private
+    def file_mode(mode, encoding = 'UTF-8')
+      "#{mode}:#{encoding}"
     end
-    self.use_full_backtrace = false
   end
+  self.use_full_backtrace = false
 end

data/lib/cucumber/rake/task.rb

@@ -2,13 +2,7 @@
 
 require 'cucumber/platform'
 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
+require 'rake/dsl_definition'
 
 module Cucumber
   module Rake
@@ -32,13 +26,14 @@ module Cucumber
       include Cucumber::Gherkin::Formatter::AnsiEscapes
       include ::Rake::DSL if defined?(::Rake::DSL)
 
-      class InProcessCucumberRunner #:nodoc:
+      class InProcessCucumberRunner # :nodoc:
         include ::Rake::DSL if defined?(::Rake::DSL)
 
         attr_reader :args
 
         def initialize(libs, cucumber_opts, feature_files)
-          raise 'libs must be an Array when running in-process' unless Array == libs.class
+          raise 'libs must be an Array when running in-process' unless libs.instance_of? Array
+
           libs.reverse_each { |lib| $LOAD_PATH.unshift(lib) }
           @args = (
             cucumber_opts +
@@ -53,7 +48,7 @@ module Cucumber
         end
       end
 
-      class ForkedCucumberRunner #:nodoc:
+      class ForkedCucumberRunner # :nodoc:
         include ::Rake::DSL if defined?(::Rake::DSL)
 
         def initialize(libs, cucumber_bin, cucumber_opts, bundler, feature_files)
@@ -112,8 +107,17 @@ module Cucumber
       # Extra options to pass to the cucumber binary. Can be overridden by the CUCUMBER_OPTS environment variable.
       # It's recommended to pass an Array, but if it's a String it will be #split by ' '.
       attr_reader :cucumber_opts
-      def cucumber_opts=(opts) #:nodoc:
-        @cucumber_opts = String == opts.class ? opts.split(' ') : opts
+
+      def cucumber_opts=(opts) # :nodoc:
+        unless opts.instance_of? String
+          @cucumber_opts = opts
+          return
+        end
+
+        @cucumber_opts = opts.split(' ')
+        return if @cucumber_opts.length <= 1
+
+        $stderr.puts 'WARNING: consider using an array rather than a space-delimited string with cucumber_opts to avoid undesired behavior.'
       end
 
       # Whether or not to fork a new ruby interpreter. Defaults to true. You may gain
@@ -147,24 +151,25 @@ module Cucumber
         define_task
       end
 
-      def define_task #:nodoc:
+      def define_task # :nodoc:
         desc @desc
         task @task_name do
           runner.run
         end
       end
 
-      def runner(_task_args = nil) #:nodoc:
-        cucumber_opts = [(ENV['CUCUMBER_OPTS'] ? ENV['CUCUMBER_OPTS'].split(/\s+/) : nil) || cucumber_opts_with_profile]
+      def runner(_task_args = nil) # :nodoc:
+        cucumber_opts = [ENV['CUCUMBER_OPTS']&.split(/\s+/) || cucumber_opts_with_profile]
         return ForkedCucumberRunner.new(libs, binary, cucumber_opts, bundler, feature_files) if fork
+
         InProcessCucumberRunner.new(libs, cucumber_opts, feature_files)
       end
 
-      def cucumber_opts_with_profile #:nodoc:
+      def cucumber_opts_with_profile # :nodoc:
         Array(cucumber_opts).concat(Array(@profile).flat_map { |p| ['--profile', p] })
       end
 
-      def feature_files #:nodoc:
+      def feature_files # :nodoc:
         make_command_line_safe(FileList[ENV['FEATURE'] || []])
       end