cucumber 2.3.3 → 2.4.0

data/lib/cucumber/formatter/event_bus_report.rb

@@ -29,6 +29,7 @@ module Cucumber
       end
 
       def done
+        @config.notify Events::FinishedTesting.new
       end
     end
 

data/lib/cucumber/formatter/json.rb

@@ -1,5 +1,6 @@
 require 'multi_json'
 require 'base64'
+require 'cucumber/formatter/backtrace_filter'
 require 'cucumber/formatter/io'
 require 'cucumber/formatter/hook_query_visitor'
 
@@ -9,13 +10,18 @@ module Cucumber
     class Json
       include Io
 
-      def initialize(runtime, io, _options)
-        @runtime = runtime
-        @io = ensure_io(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 = []
       end
 
-      def before_test_case(test_case)
+      def on_before_test_case(event)
+        test_case = event.test_case
         builder = Builder.new(test_case)
         unless same_feature_as_previous_test_case?(test_case.feature)
           @feature_hash = builder.feature_hash
@@ -32,7 +38,8 @@ module Cucumber
         @any_step_failed = false
       end
 
-      def before_test_step(test_step)
+      def on_before_test_step(event)
+        test_step = event.test_step
         return if internal_hook?(test_step)
         hook_query = HookQueryVisitor.new(test_step)
         if hook_query.hook?
@@ -49,17 +56,20 @@ module Cucumber
         @step_hash = @step_or_hook_hash
       end
 
-      def after_test_step(test_step, result)
+      def on_after_test_step(event)
+        test_step = event.test_step
+        result = event.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 after_test_case(test_case, result)
+      def on_after_test_case(event)
+        result = event.result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
         add_failed_around_hook(result) if result.failed? && !@any_step_failed
       end
 
-      def done
+      def on_finished_testing(event)
         @io.write(MultiJson.dump(@feature_hashes, pretty: true))
       end
 

data/lib/cucumber/formatter/junit.rb

@@ -1,4 +1,5 @@
 require 'builder'
+require 'cucumber/formatter/backtrace_filter'
 require 'cucumber/formatter/io'
 require 'cucumber/formatter/interceptor'
 require 'fileutils'
@@ -16,14 +17,27 @@ module Cucumber
         end
       end
 
-      def initialize(_runtime, io, options)
-        @reportdir = ensure_dir(io, "junit")
-        @options = options
-      end
-
-      def before_test_case(test_case)
+      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)
+        @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)
+        }}
+      end
+
+      def on_before_test_case(event)
+        test_case = event.test_case
         unless same_feature_as_previous_test_case?(test_case.feature)
-          end_feature if @current_feature
           start_feature(test_case.feature)
         end
         @failing_step_source = nil
@@ -33,13 +47,15 @@ module Cucumber
         @interceptederr = Interceptor::Pipe.wrap(:stderr)
       end
 
-      def after_test_step(test_step, result)
+      def on_after_test_step(event)
         return if @failing_step_source
 
-        @failing_step_source = test_step.source.last unless result.ok?(@options[:strict])
+        @failing_step_source = event.test_step.source.last unless event.result.ok?(@config.strict?)
       end
 
-      def after_test_case(test_case, result)
+      def on_after_test_case(event)
+        test_case = event.test_case
+        result = event.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}"
@@ -50,43 +66,41 @@ module Cucumber
         Interceptor::Pipe.unwrap! :stderr
       end
 
-      def done
-        end_feature if @current_feature
+      def on_finished_testing(event)
+        @features_data.each { |file, data| end_feature(data) }
       end
 
       private
 
       def same_feature_as_previous_test_case?(feature)
-        @current_feature && @current_feature.file == feature.file && @current_feature.location == feature.location
+        @current_feature_data && @current_feature_data[:feature].file == feature.file && @current_feature_data[:feature].location == feature.location
       end
 
       def start_feature(feature)
         raise UnNamedFeatureError.new(feature.file) if feature.name.empty?
-        @current_feature = feature
-        @failures = @errors = @tests = @skipped = 0
-        @builder = Builder::XmlMarkup.new(:indent => 2)
-        @time = 0
+        @current_feature_data = @features_data[feature.file]
+        @current_feature_data[:feature] = feature unless @current_feature_data[:feature]
       end
 
-      def end_feature
+      def end_feature(feature_data)
         @testsuite = Builder::XmlMarkup.new(:indent => 2)
         @testsuite.instruct!
         @testsuite.testsuite(
-          :failures => @failures,
-          :errors => @errors,
-          :skipped => @skipped,
-          :tests => @tests,
-          :time => "%.6f" % @time,
-          :name => @current_feature.name ) do
-          @testsuite << @builder.target!
+          :failures => feature_data[:failures],
+          :errors => feature_data[:errors],
+          :skipped => feature_data[:skipped],
+          :tests => feature_data[:tests],
+          :time => "%.6f" % feature_data[:time],
+          :name => feature_data[:feature].name ) do
+          @testsuite << feature_data[:builder].target!
         end
 
-        write_file(feature_result_filename(@current_feature.file), @testsuite.target!)
+        write_file(feature_result_filename(feature_data[:feature].file), @testsuite.target!)
       end
 
       def create_output_string(test_case, scenario, result, row_name)
         output = "#{test_case.keyword}: #{scenario}\n\n"
-        return output if result.ok?(@options[:strict])
+        return output if result.ok?(@config.strict?)
         if test_case.keyword == "Scenario"
           output += "#{@failing_step_source.keyword}" unless hook?(@failing_step_source)
           output += "#{@failing_step_source.name}\n"
@@ -102,31 +116,31 @@ module Cucumber
 
       def build_testcase(result, scenario_designation, output)
         duration = ResultBuilder.new(result).test_case_duration
-        @time += duration
-        classname = @current_feature.name
+        @current_feature_data[:time] += duration
+        classname = @current_feature_data[:feature].name
         name = scenario_designation
 
-        @builder.testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
-          if !result.passed? && result.ok?(@options[:strict])
-            @builder.skipped
-            @skipped += 1
+        @current_feature_data[:builder].testcase(:classname => classname, :name => name, :time => "%.6f" % duration) do
+          if !result.passed? && result.ok?(@config.strict?)
+            @current_feature_data[:builder].skipped
+            @current_feature_data[:skipped] += 1
           elsif !result.passed?
             status = result.to_sym
             exception = get_backtrace_object(result)
-            @builder.failure(:message => "#{status} #{name}", :type => status) do
-              @builder.cdata! output
-              @builder.cdata!(format_exception(exception)) if exception
+            @current_feature_data[:builder].failure(:message => "#{status} #{name}", :type => status) do
+              @current_feature_data[:builder].cdata! output
+              @current_feature_data[:builder].cdata!(format_exception(exception)) if exception
             end
-            @failures += 1
+            @current_feature_data[:failures] += 1
           end
-          @builder.tag!('system-out') do
-            @builder.cdata! strip_control_chars(@interceptedout.buffer.join)
+          @current_feature_data[:builder].tag!('system-out') do
+            @current_feature_data[:builder].cdata! strip_control_chars(@interceptedout.buffer.join)
           end
-          @builder.tag!('system-err') do
-            @builder.cdata! strip_control_chars(@interceptederr.buffer.join)
+          @current_feature_data[:builder].tag!('system-err') do
+            @current_feature_data[:builder].cdata! strip_control_chars(@interceptederr.buffer.join)
           end
         end
-        @tests += 1
+        @current_feature_data[:tests] += 1
       end
 
       def get_backtrace_object(result)

data/lib/cucumber/gherkin/data_table_parser.rb

@@ -1,5 +1,6 @@
 require 'gherkin/token_scanner'
-require 'gherkin/token_matcher'
+require 'gherkin/parser'
+require 'gherkin/dialect'
 
 module Cucumber
   module Gherkin
@@ -7,17 +8,24 @@ module Cucumber
       def initialize(builder)
         @builder = builder
       end
+
       def parse(text)
-        scanner = ::Gherkin::TokenScanner.new(text)
-        matcher = ::Gherkin::TokenMatcher.new
-        token = scanner.read
-        until matcher.match_EOF(token) do
-          if matcher.match_TableRow(token)
-            @builder.row(token.matched_items.map { |cell_item| cell_item.text })
-          end
-          token = scanner.read
+        token_scanner = ::Gherkin::TokenScanner.new(feature_header + text)
+        parser = ::Gherkin::Parser.new
+        gherkin_document = parser.parse(token_scanner)
+
+        gherkin_document[:feature][:children][0][:steps][0][:argument][:rows].each do |row|
+          @builder.row(row[:cells].map { |cell| cell[:value] })
         end
       end
+
+      def feature_header
+        dialect = ::Gherkin::Dialect.for('en')
+        %(#{dialect.feature_keywords[0]}:
+            #{dialect.scenario_keywords[0]}:
+              #{dialect.given_keywords[0]} x
+         )
+      end
     end
   end
 end

data/lib/cucumber/gherkin/steps_parser.rb

@@ -1,7 +1,7 @@
 require 'gherkin/token_scanner'
 require 'gherkin/token_matcher'
-require 'gherkin/ast_builder'
 require 'gherkin/parser'
+require 'gherkin/dialect'
 
 module Cucumber
   module Gherkin
@@ -10,29 +10,21 @@ module Cucumber
         @builder = builder
         @language = language
       end
-      def parse(text)
-        ast_builder = ::Gherkin::AstBuilder.new
-        context = ::Gherkin::ParserContext.new(
-          ::Gherkin::TokenScanner.new(text),
-          ::Gherkin::TokenMatcher.new(@language),
-          [],
-          []
-          )
-        parser = ::Gherkin::Parser.new(ast_builder)
 
-        parser.start_rule(context, :ScenarioDefinition)
-        parser.start_rule(context, :Scenario)
-        scenario = ast_builder.current_node
-        state = 12
-        token = nil
-        begin
-          token = parser.read_token(context)
-          state = parser.match_token(state, token, context)
-        end until(token.eof?)
+      def parse(text)
+        dialect = ::Gherkin::Dialect.for(@language)
+        token_matcher = ::Gherkin::TokenMatcher.new(@language)
+        token_scanner = ::Gherkin::TokenScanner.new(feature_header(dialect) + text)
+        parser = ::Gherkin::Parser.new
+        gherkin_document = parser.parse(token_scanner, token_matcher)
 
-        raise CompositeParserException.new(context.errors) if context.errors.any?
+        @builder.steps(gherkin_document[:feature][:children][0][:steps])
+      end
 
-        @builder.steps(ast_builder.get_steps(scenario))
+      def feature_header(dialect)
+        %(#{dialect.feature_keywords[0]}:
+            #{dialect.scenario_keywords[0]}:
+         )
       end
     end
   end

data/lib/cucumber/platform.rb

@@ -12,6 +12,7 @@ module Cucumber
     RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
     RUBY_2_2      = RUBY_VERSION =~ /^2\.2/
     RUBY_2_1      = RUBY_VERSION =~ /^2\.1/
+    RUBY_2_3      = RUBY_VERSION =~ /^2\.3/
 
     class << self
       attr_accessor :use_full_backtrace

data/lib/cucumber/rake/task.rb

@@ -153,7 +153,7 @@ module Cucumber
       end
 
       def cucumber_opts_with_profile #:nodoc:
-        @profile ? [cucumber_opts, '--profile', @profile] : cucumber_opts
+        Array(cucumber_opts).concat Array(@profile).flat_map {|p| ["--profile", p] }
       end
 
       def feature_files #:nodoc:

data/lib/cucumber/rb_support/rb_hook.rb

@@ -12,7 +12,7 @@ module Cucumber
       end
 
       def invoke(pseudo_method, arguments, &block)
-        @rb_language.current_world.cucumber_instance_exec(false, pseudo_method, *[arguments, block].compact, &@proc)
+        @rb_language.current_world.cucumber_instance_exec(false, pseudo_method, *[arguments, block].flatten.compact, &@proc)
       end
     end
   end

data/lib/cucumber/rb_support/snippet.rb

@@ -153,7 +153,7 @@ module Cucumber
           end
 
           def append_comment_to(string)
-            string << "  # table is a #{@table.class.to_s}\n"
+            string << "  # table is a #{Cucumber::MultilineArgument::DataTable.to_s}\n"
           end
         end
 

data/lib/cucumber/runtime.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'fileutils'
 require 'multi_json'
-require 'multi_test'
 require 'cucumber/configuration'
 require 'cucumber/load_path'
 require 'cucumber/formatter/duration'
@@ -32,7 +31,7 @@ module Cucumber
   end
 
   class FeatureFolderNotFoundException < FileException
-    include FixRuby21Bug9285 if Cucumber::RUBY_2_1 || Cucumber::RUBY_2_2
+    include FixRuby21Bug9285 if Cucumber::RUBY_2_1 || Cucumber::RUBY_2_2 || Cucumber::RUBY_2_3
   end
 
   require 'cucumber/core'
@@ -195,8 +194,8 @@ module Cucumber
 
     def create_formatter(factory, path_or_io, options)
       if !legacy_formatter?(factory)
-        out_stream = Cucumber::Formatter::Io.ensure_io(path_or_io)
-        return factory.new(@configuration.with_options(out_stream: out_stream))
+        return factory.new(@configuration) if path_or_io.nil?
+        return factory.new(@configuration.with_options(out_stream: path_or_io))
       end
       results = Formatter::LegacyApi::Results.new
       runtime_facade = Formatter::LegacyApi::RuntimeFacade.new(results, @support_code, @configuration)
@@ -226,11 +225,11 @@ module Cucumber
       name_regexps = @configuration.name_regexps
       tag_limits = @configuration.tag_limits
       [].tap do |filters|
-        filters << Filters::Randomizer.new(@configuration.seed) if @configuration.randomize?
         filters << Filters::TagLimits.new(tag_limits) if tag_limits.any?
         filters << Cucumber::Core::Test::TagFilter.new(tag_expressions)
         filters << Cucumber::Core::Test::NameFilter.new(name_regexps)
         filters << Cucumber::Core::Test::LocationsFilter.new(filespecs.locations)
+        filters << Filters::Randomizer.new(@configuration.seed) if @configuration.randomize?
         filters << Filters::Quit.new
         # TODO: can we just use RbLanguages's step definitions directly?
         step_match_search = StepMatchSearch.new(@support_code.ruby.method(:step_matches), @configuration)

data/lib/cucumber/runtime/for_programming_languages.rb

@@ -11,6 +11,8 @@ module Cucumber
     class ForProgrammingLanguages
       extend Forwardable
 
+      attr_reader :support_code
+
       def initialize(support_code, user_interface)
         @support_code, @user_interface = support_code, user_interface
       end

data/lib/cucumber/runtime/step_hooks.rb

@@ -14,7 +14,7 @@ module Cucumber
       private
       def after_step_hooks(test_step)
         @hooks.map do |hook|
-          action = ->(*args) { hook.invoke('AfterStep', args) }
+          action = ->(*args) { hook.invoke('AfterStep', [args, test_step]) }
           Hooks.after_step_hook(test_step.source, hook.location, &action)
         end
       end

data/lib/cucumber/step_match.rb

@@ -2,7 +2,7 @@ require 'cucumber/multiline_argument'
 
 module Cucumber
 
-  # Represents the match found between a Test Step and it's activation
+  # Represents the match found between a Test Step and its activation
   class StepMatch #:nodoc:
     attr_reader :step_definition, :step_arguments
 

data/lib/cucumber/version

@@ -1 +1 @@
-2.3.3
+2.4.0

data/spec/cucumber/cli/configuration_spec.rb

@@ -423,6 +423,13 @@ END_OF_MESSAGE
         expect(config.snippet_type).to eq :regexp
       end
     end
+
+    describe "#retry_attempts" do 
+      it "returns the specified number of retries" do 
+        config.parse!(['--retry=3'])
+        expect(config.retry_attempts).to eql 3
+      end
+    end
   end
 end
 end