cucumber 3.0.1 → 3.2.0

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

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
+
 module Cucumber
-module Gherkin
-  module Formatter
-    module Escaping
-      # Escapes a pipes and backslashes:
-      #
-      # * | becomes \|
-      # * \ becomes \\
-      #
-      # This is used in the pretty formatter.
-      def escape_cell(s)
-        s.gsub(/\\(?!\|)/, '\\\\\\\\').gsub(/\n/, '\\n').gsub(/\|/, '\\|')
+  module Gherkin
+    module Formatter
+      module Escaping
+        # Escapes a pipes and backslashes:
+        #
+        # * | becomes \|
+        # * \ becomes \\
+        #
+        # This is used in the pretty formatter.
+        def escape_cell(s)
+          s.gsub(/\\(?!\|)/, '\\\\\\\\').gsub(/\n/, '\\n').gsub(/\|/, '\\|')
+        end
       end
     end
   end
 end
-end

data/lib/cucumber/gherkin/i18n.rb

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

data/lib/cucumber/gherkin/steps_parser.rb

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

data/lib/cucumber/glue/dsl.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/cucumber_expressions/parameter_type'
 require 'cucumber/deprecate'
 

data/lib/cucumber/glue/hook.rb

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

data/lib/cucumber/glue/invoke_in_world.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/platform'
 module Cucumber
   module Glue
@@ -17,7 +18,7 @@ module Cucumber
           depth = backtrace.count { |line| line == instance_exec_invocation_line }
           end_pos = depth > 1 ? instance_exec_pos : -1
 
-          backtrace[replacement_line+1..end_pos] = nil
+          backtrace[replacement_line + 1..end_pos] = nil
           backtrace.compact!
         end
       end
@@ -27,7 +28,7 @@ module Cucumber
           if check_arity && !cucumber_compatible_arity?(args, block)
             world.instance_exec do
               ari = block.arity
-              ari = ari < 0 ? (ari.abs-1).to_s+'+' : ari
+              ari = ari < 0 ? (ari.abs - 1).to_s + '+' : ari
               s1 = ari == 1 ? '' : 's'
               s2 = args.length == 1 ? '' : 's'
               raise ArityMismatchError.new(
@@ -65,6 +66,5 @@ module Cucumber
     # is different from the number of Proc arguments.
     class ArityMismatchError < StandardError
     end
-
   end
 end

data/lib/cucumber/glue/proto_world.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/gherkin/formatter/ansi_escapes'
 require 'cucumber/core/ast/data_table'
 
@@ -9,7 +10,6 @@ module Cucumber
     # You can, and probably should, extend this API with your own methods that
     # make sense in your domain. For more on that, see {Cucumber::Glue::Dsl#World}
     module ProtoWorld
-
       # Run a single Gherkin step
       # @example Call another step
       #   step "I am logged in"
@@ -25,7 +25,7 @@ module Cucumber
       #   step "the email should contain:", "Dear sir,\nYou've won a prize!\n"
       # @param [String] name The name of the step
       # @param [String,Cucumber::Ast::DocString,Cucumber::Ast::Table] multiline_argument
-      def step(name, raw_multiline_arg=nil)
+      def step(name, raw_multiline_arg = nil)
         super
       end
 
@@ -67,7 +67,7 @@ module Cucumber
       #     %w{ CUC-101 Peeler      22     }
       #   ])
       #
-      def table(text_or_table, file=nil, line=0)
+      def table(text_or_table, file = nil, line = 0)
         location = !file ? Core::Ast::Location.of_caller : Core::Ast::Location.new(file, line)
         MultilineArgument::DataTable.from(text_or_table, location)
       end
@@ -84,12 +84,12 @@ module Cucumber
       end
 
       # Pause the tests and ask the operator for input
-      def ask(question, timeout_seconds=60)
+      def ask(question, timeout_seconds = 60)
         super
       end
 
       # Embed an image in the output
-      def embed(file, mime_type, label='Screenshot')
+      def embed(file, mime_type, label = 'Screenshot')
         super
       end
 
@@ -138,7 +138,7 @@ module Cucumber
             add_namespaced_modules!(namespaced_world_modules)
           end
 
-          define_method(:step) do |name, raw_multiline_arg=nil|
+          define_method(:step) do |name, raw_multiline_arg = nil|
             location = Core::Ast::Location.of_caller
             runtime.invoke_dynamic_step(name, MultilineArgument.from(raw_multiline_arg, location))
           end
@@ -148,6 +148,7 @@ module Cucumber
             runtime.invoke_dynamic_steps(steps_text, language, location)
           end
 
+          # rubocop:disable UnneededInterpolation
           define_method(:puts) do |*messages|
             # Even though they won't be output until later, converting the messages to
             # strings right away will protect them from modifications to their original
@@ -156,12 +157,13 @@ module Cucumber
 
             runtime.puts(*messages)
           end
+          # rubocop:enable UnneededInterpolation
 
-          define_method(:ask) do |question, timeout_seconds=60|
+          define_method(:ask) do |question, timeout_seconds = 60|
             runtime.ask(question, timeout_seconds)
           end
 
-          define_method(:embed) do |file, mime_type, label='Screenshot'|
+          define_method(:embed) do |file, mime_type, label = 'Screenshot'|
             runtime.embed(file, mime_type, label)
           end
 
@@ -209,7 +211,6 @@ module Cucumber
           def stringify_namespaced_modules
             @__namespaced_modules.map { |k, v| "#{v.join(',')} (as #{k})" }.join('+')
           end
-
         end
       end
 

data/lib/cucumber/glue/registry_and_more.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/cucumber_expressions/parameter_type_registry'
 require 'cucumber/cucumber_expressions/cucumber_expression'
 require 'cucumber/cucumber_expressions/regular_expression'
@@ -62,12 +63,12 @@ module Cucumber
       end
 
       def step_matches(name_to_match)
-        @step_definitions.reduce([]) { |result, step_definition|
+        @step_definitions.reduce([]) do |result, step_definition|
           if (arguments = step_definition.arguments_from(name_to_match))
             result << StepMatch.new(step_definition, name_to_match, arguments)
           end
           result
-        }
+        end
       end
 
       def register_rb_hook(phase, tag_expressions, proc)
@@ -134,7 +135,7 @@ module Cucumber
       end
 
       def hooks_for(phase, scenario) #:nodoc:
-        hooks[phase.to_sym].select{|hook| scenario.accept_hook?(hook)}
+        hooks[phase.to_sym].select { |hook| scenario.accept_hook?(hook) }
       end
 
       def unmatched_step_definitions
@@ -155,6 +156,14 @@ module Cucumber
         raise ArgumentError.new('Expression must be a String or Regexp')
       end
 
+      def self.cli_snippet_type_options
+        registry = CucumberExpressions::ParameterTypeRegistry.new
+        cucumber_expression_generator = CucumberExpressions::CucumberExpressionGenerator.new(registry)
+        Snippet::SNIPPET_TYPES.keys.sort_by(&:to_s).map do |type|
+          Snippet::SNIPPET_TYPES[type].cli_option_string(type, cucumber_expression_generator)
+        end
+      end
+
       private
 
       def available_step_definition_hash
@@ -166,15 +175,7 @@ module Cucumber
       end
 
       def hooks
-        @hooks ||= Hash.new{|h,k| h[k] = []}
-      end
-
-      def self.cli_snippet_type_options
-        registry = CucumberExpressions::ParameterTypeRegistry.new
-        cucumber_expression_generator = CucumberExpressions::CucumberExpressionGenerator.new(registry)
-        Snippet::SNIPPET_TYPES.keys.sort_by(&:to_s).map do |type|
-          Snippet::SNIPPET_TYPES[type].cli_option_string(type, cucumber_expression_generator)
-        end
+        @hooks ||= Hash.new { |h, k| h[k] = [] }
       end
     end
 

data/lib/cucumber/glue/snippet.rb

@@ -3,7 +3,6 @@
 module Cucumber
   module Glue
     module Snippet
-
       ARGUMENT_PATTERNS = ['"([^"]*)"', '(\d+)']
 
       class Generator
@@ -26,7 +25,6 @@ module Cucumber
       end
 
       class BaseSnippet
-
         def initialize(cucumber_expression_generator, code_keyword, step_name, multiline_argument)
           @number_of_arguments = 0
           @code_keyword = code_keyword
@@ -72,7 +70,7 @@ module Cucumber
         end
 
         def parameters
-          block_args = (0...number_of_arguments).map { |n| "arg#{n+1}" }
+          block_args = (0...number_of_arguments).map { |n| "arg#{n + 1}" }
           multiline_argument.append_block_parameter_to(block_args)
           block_args.empty? ? '' : " |#{block_args.join(", ")}|"
         end
@@ -80,7 +78,6 @@ module Cucumber
         def self.example(cucumber_expression_generator)
           new(cucumber_expression_generator, 'Given', 'I have 2 cukes', MultilineArgument::None.new).step
         end
-
       end
 
       class CucumberExpression < BaseSnippet
@@ -151,7 +148,6 @@ module Cucumber
       }
 
       module MultilineArgumentSnippet
-
         def self.new(multiline_argument)
           builder = Builder.new
           multiline_argument.describe_to(builder)

data/lib/cucumber/glue/step_definition.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cucumber/step_match'
 require 'cucumber/step_argument'
 require 'cucumber/core_ext/string'
@@ -17,7 +18,6 @@ module Cucumber
     #   end
     #
     class StepDefinition
-
       class MissingProc < StandardError
         def message
           'Step definitions must always have a proc or symbol'
@@ -63,7 +63,7 @@ module Cucumber
         end
       end
 
-      attr_reader :expression
+      attr_reader :expression, :registry
 
       def initialize(registry, expression, proc)
         raise 'No regexp' if expression.is_a?(Regexp)
@@ -71,7 +71,7 @@ module Cucumber
         # @registry.available_step_definition(regexp_source, location)
       end
 
-      # @api private
+      # @api private
       def to_hash
         type = expression.is_a?(CucumberExpressions::RegularExpression) ? 'regular expression' : 'cucumber expression'
         regexp = expression.regexp
@@ -91,19 +91,19 @@ module Cucumber
         }
       end
 
-      # @api private
+      # @api private
       def ==(step_definition)
         expression.source == step_definition.expression.source
       end
 
-      # @api private
+      # @api private
       def arguments_from(step_name)
         args = @expression.match(step_name)
         # @registry.invoked_step_definition(regexp_source, location) if args
         args
       end
 
-      # @api private
+      # @api private
       # TODO: inline this and step definition just be a value object
       def invoke(args)
         begin
@@ -114,12 +114,12 @@ module Cucumber
         end
       end
 
-      # @api private
+      # @api private
       def backtrace_line
         "#{location}:in `#{@expression}'"
       end
 
-      # @api private
+      # @api private
       def file_colon_line
         case @proc
         when Proc
@@ -129,12 +129,12 @@ module Cucumber
         end
       end
 
-      # The source location where the step defintion can be found
+      # The source location where the step definition can be found
       def location
         @location ||= Cucumber::Core::Ast::Location.from_source_location(*@proc.source_location)
       end
 
-      # @api private
+      # @api private
       def file
         @file ||= location.file
       end

data/lib/cucumber/glue/world_factory.rb

@@ -1,6 +1,5 @@
 module Cucumber
   module Glue
-
     class WorldFactory
       def initialize(proc)
         @proc = proc || -> { Object.new }
@@ -18,6 +17,5 @@ module Cucumber
         raise e
       end
     end
-
   end
-end
+end

data/lib/cucumber/hooks.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
+
 require 'pathname'
 require 'cucumber/core/ast/location'
 require 'cucumber/core/test/around_hook'
 
 module Cucumber
-
   # Hooks quack enough like `Cucumber::Core::Ast` source nodes that we can use them as
   # source for test steps
   module Hooks
-
     class << self
       def before_hook(source, location, &block)
         build_hook_step(source, location, block, BeforeHook, Core::Test::UnskippableAction)
@@ -47,6 +46,10 @@ module Cucumber
         'After hook'
       end
 
+      def to_s
+        "#{text} at #{location}"
+      end
+
       def match_locations?(queried_locations)
         queried_locations.any? { |other_location| other_location.match?(location) }
       end
@@ -67,6 +70,10 @@ module Cucumber
         'Before hook'
       end
 
+      def to_s
+        "#{text} at #{location}"
+      end
+
       def match_locations?(queried_locations)
         queried_locations.any? { |other_location| other_location.match?(location) }
       end
@@ -87,6 +94,10 @@ module Cucumber
         'AfterStep hook'
       end
 
+      def to_s
+        "#{text} at #{location}"
+      end
+
       def match_locations?(queried_locations)
         queried_locations.any? { |other_location| other_location.match?(location) }
       end
@@ -95,6 +106,5 @@ module Cucumber
         visitor.after_step_hook(self, *args)
       end
     end
-
   end
 end

data/lib/cucumber/load_path.rb

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

data/lib/cucumber/multiline_argument.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
+
 require 'delegate'
 require 'cucumber/multiline_argument/data_table'
 require 'cucumber/multiline_argument/doc_string'
 
 module Cucumber
   module MultilineArgument
-
     class << self
       def from_core(node)
         builder.wrap(node)
       end
 
-      def from(argument, location=nil, content_type=nil)
+      def from(argument, location = nil, content_type = nil)
         location ||= Core::Ast::Location.of_caller
         case argument
         when String
           builder.doc_string(Core::Ast::DocString.new(argument, content_type, location))
         when Array
           location = location.on_line(argument.first.line..argument.last.line)
-          builder.data_table(argument.map{ |row| row.cells }, location)
+          builder.data_table(argument.map(&:cells), location)
         when DataTable, DocString, None
           argument
         when nil