cucumber 3.0.0.pre.2 → 3.0.0

data/lib/autotest/cucumber_mixin.rb

@@ -80,7 +80,7 @@ module Autotest::CucumberMixin
       begin
         open("| #{cmd}", 'r') do |f|
           until f.eof?
-            c = f.getc or break
+            c = f.getc || break
             if RUBY_VERSION >= '1.9' then
               print c
             else

data/lib/cucumber/cli/configuration.rb

@@ -26,7 +26,7 @@ module Cucumber
         @args = args
         @options.parse!(args)
         arrange_formats
-        raise("You can't use both --strict and --wip") if strict? && wip?
+        raise("You can't use both --strict and --wip") if strict.strict? && wip?
         set_environment_variables
       end
 
@@ -42,7 +42,7 @@ module Cucumber
         Integer(@options[:seed] || rand(0xFFFF))
       end
 
-      def strict?
+      def strict
         @options[:strict]
       end
 

data/lib/cucumber/cli/options.rb

@@ -3,6 +3,7 @@ require 'cucumber/cli/profile_loader'
 require 'cucumber/formatter/ansicolor'
 require 'cucumber/glue/registry_and_more'
 require 'cucumber/project_initializer'
+require 'cucumber/core/test/result'
 
 module Cucumber
   module Cli
@@ -24,20 +25,21 @@ module Cucumber
         'junit'       => ['Cucumber::Formatter::Junit',       'Generates a report similar to Ant+JUnit.'],
         'json'        => ['Cucumber::Formatter::Json',        'Prints the feature as JSON'],
         'json_pretty' => ['Cucumber::Formatter::JsonPretty',  'Prints the feature as prettified JSON'],
-        'summary'       => ['Cucumber::Formatter::Summary',   'Summary output of feature and scenarios']
+        'summary'     => ['Cucumber::Formatter::Summary',     'Summary output of feature and scenarios']
       }
       max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
-      FORMAT_HELP_MSG = ['Use --format rerun --out rerun.txt to write out failing',
-        'features. You can rerun them with cucumber @rerun.txt.',
-        'FORMAT can also be the fully qualified class name of',
-        "your own custom formatter. If the class isn't loaded,",
-        'Cucumber will attempt to require a file with a relative',
-        'file name that is the underscore name of the class name.',
-        'Example: --format Foo::BarZap -> Cucumber will look for',
-        'foo/bar_zap.rb. You can place the file with this relative',
-        'path underneath your features/support directory or anywhere',
-        "on Ruby's LOAD_PATH, for example in a Ruby gem."
-      ]
+      FORMAT_HELP_MSG = [
+                          'Use --format rerun --out rerun.txt to write out failing',
+                          'features. You can rerun them with cucumber @rerun.txt.',
+                          'FORMAT can also be the fully qualified class name of',
+                          "your own custom formatter. If the class isn't loaded,",
+                          'Cucumber will attempt to require a file with a relative',
+                          'file name that is the underscore name of the class name.',
+                          'Example: --format Foo::BarZap -> Cucumber will look for',
+                          'foo/bar_zap.rb. You can place the file with this relative',
+                          'path underneath your features/support directory or anywhere',
+                          "on Ruby's LOAD_PATH, for example in a Ruby gem."
+                        ]
 
       FORMAT_HELP = (BUILTIN_FORMATS.keys.sort.map do |key|
         "  #{key}#{' ' * (max - key.length)} : #{BUILTIN_FORMATS[key][1]}"
@@ -48,11 +50,12 @@ module Cucumber
       NO_PROFILE_LONG_FLAG = '--no-profile'
       FAIL_FAST_FLAG = '--fail-fast'
       RETRY_FLAG = '--retry'
-      OPTIONS_WITH_ARGS = ['-r', '--require', '--i18n-keywords', '-f', '--format', '-o', '--out',
-                                  '-t', '--tags', '-n', '--name', '-e', '--exclude',
-                                  PROFILE_SHORT_FLAG, PROFILE_LONG_FLAG, RETRY_FLAG,
-                                  '-l', '--lines', '--port',
-                                  '-I', '--snippet-type']
+      OPTIONS_WITH_ARGS = [
+                            '-r', '--require', '--i18n-keywords', '-f', '--format', '-o',
+                            '--out', '-t', '--tags', '-n', '--name', '-e', '--exclude',
+                            PROFILE_SHORT_FLAG, PROFILE_LONG_FLAG, RETRY_FLAG, '-l',
+                            '--lines', '--port', '-I', '--snippet-type'
+                          ]
       ORDER_TYPES = %w{defined random}
       TAG_LIMIT_MATCHER = /(?<tag_name>\@\w+):(?<limit>\d+)/x
 
@@ -119,7 +122,10 @@ module Cucumber
           opts.on('-q', '--quiet', 'Alias for --no-snippets --no-source.') { shut_up }
           opts.on('--no-duration', "Don't print the duration at the end of the summary") { set_option :duration, false }
           opts.on('-b', '--backtrace', 'Show full backtrace for all errors.') { Cucumber.use_full_backtrace = true }
-          opts.on('-S', '--strict', 'Fail if there are any undefined or pending steps.') { set_option :strict }
+          opts.on('-S', '--[no-]strict', *strict_msg) { |setting| set_strict(setting) }
+          opts.on('--[no-]strict-undefined', 'Fail if there are any undefined results.') { |setting| set_strict(setting, :undefined) }
+          opts.on('--[no-]strict-pending', 'Fail if there are any pending results.') { |setting| set_strict(setting, :pending) }
+          opts.on('--[no-]strict-flaky', 'Fail if there are any flaky results.') { |setting| set_strict(setting, :flaky) }
           opts.on('-w', '--wip', 'Fail if there are any passing scenarios.') { set_option :wip }
           opts.on('-v', '--verbose', 'Show the files and features loaded.') { set_option :verbose }
           opts.on('-g', '--guess', 'Guess best match for Ambiguous steps.') { set_option :guess }
@@ -254,6 +260,13 @@ TEXT
         ]
       end
 
+      def strict_msg
+        [
+          'Fail if there are any strict affected results ',
+          '(that is undefined, pending or flaky results).'
+        ]
+      end
+
       def parse_formats(v)
         formatter, *formatter_options = v.split(',')
         options_hash = Hash[formatter_options.map { |s| s.split('=') }]
@@ -318,12 +331,13 @@ TEXT
       end
 
       def banner
-        ['Usage: cucumber [options] [ [FILE|DIR|URL][:LINE[:LINE]*] ]+', '',
-          'Examples:',
-          'cucumber examples/i18n/en/features',
-          'cucumber @rerun.txt (See --format rerun)',
-          'cucumber examples/i18n/it/features/somma.feature:6:98:113',
-          'cucumber -s -i http://rubyurl.com/eeCl', '', ''
+        [
+         'Usage: cucumber [options] [ [FILE|DIR|URL][:LINE[:LINE]*] ]+', '',
+         'Examples:',
+         'cucumber examples/i18n/en/features',
+         'cucumber @rerun.txt (See --format rerun)',
+         'cucumber examples/i18n/it/features/somma.feature:6:98:113',
+         'cucumber -s -i http://rubyurl.com/eeCl', '', ''
         ].join("\n")
       end
 
@@ -409,6 +423,10 @@ TEXT
         @options[:duration] = false
       end
 
+      def set_strict(setting, type = nil)
+        @options[:strict].set_strict(setting, type)
+      end
+
       def stdout_formats
         @options[:formats].select { |_, _, output| output == @out_stream }
       end
@@ -477,7 +495,7 @@ TEXT
         @options[:source] &= other_options[:source]
         @options[:snippets] &= other_options[:snippets]
         @options[:duration] &= other_options[:duration]
-        @options[:strict] |= other_options[:strict]
+        @options[:strict] = other_options[:strict].merge!(@options[:strict])
         @options[:dry_run] |= other_options[:dry_run]
 
         @profiles += other_options.profiles
@@ -506,21 +524,24 @@ TEXT
         require 'gherkin/dialect'
         language = ::Gherkin::Dialect.for(lang)
         data = Cucumber::MultilineArgument::DataTable.from(
-          [['feature', to_keywords_string(language.feature_keywords)],
-          ['background', to_keywords_string(language.background_keywords)],
-          ['scenario', to_keywords_string(language.scenario_keywords)],
-          ['scenario_outline', to_keywords_string(language.scenario_outline_keywords)],
-          ['examples', to_keywords_string(language.examples_keywords)],
-          ['given', to_keywords_string(language.given_keywords)],
-          ['when', to_keywords_string(language.when_keywords)],
-          ['then', to_keywords_string(language.then_keywords)],
-          ['and', to_keywords_string(language.and_keywords)],
-          ['but', to_keywords_string(language.but_keywords)],
-          ['given (code)', to_code_keywords_string(language.given_keywords)],
-          ['when (code)', to_code_keywords_string(language.when_keywords)],
-          ['then (code)', to_code_keywords_string(language.then_keywords)],
-          ['and (code)', to_code_keywords_string(language.and_keywords)],
-          ['but (code)', to_code_keywords_string(language.but_keywords)]])
+          [
+            ['feature', to_keywords_string(language.feature_keywords)],
+            ['background', to_keywords_string(language.background_keywords)],
+            ['scenario', to_keywords_string(language.scenario_keywords)],
+            ['scenario_outline', to_keywords_string(language.scenario_outline_keywords)],
+            ['examples', to_keywords_string(language.examples_keywords)],
+            ['given', to_keywords_string(language.given_keywords)],
+            ['when', to_keywords_string(language.when_keywords)],
+            ['then', to_keywords_string(language.then_keywords)],
+            ['and', to_keywords_string(language.and_keywords)],
+            ['but', to_keywords_string(language.but_keywords)],
+            ['given (code)', to_code_keywords_string(language.given_keywords)],
+            ['when (code)', to_code_keywords_string(language.when_keywords)],
+            ['then (code)', to_code_keywords_string(language.then_keywords)],
+            ['and (code)', to_code_keywords_string(language.and_keywords)],
+            ['but (code)', to_code_keywords_string(language.but_keywords)]
+          ]
+        )
         @out_stream.write(data.to_s({ color: false, prefixes: Hash.new('') }))
         Kernel.exit(0)
       end
@@ -545,7 +566,7 @@ TEXT
 
       def default_options
         {
-          :strict       => false,
+          :strict       => Cucumber::Core::Test::Result::StrictConfiguration.new,
           :require      => [],
           :dry_run      => false,
           :formats      => [],

data/lib/cucumber/cli/profile_loader.rb

@@ -72,7 +72,7 @@ Defined profiles in cucumber.yml:
         end
 
         begin
-          @cucumber_yml = YAML::load(@cucumber_erb)
+          @cucumber_yml = YAML.load(@cucumber_erb)
         rescue StandardError
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage.\n")
         end

data/lib/cucumber/configuration.rb

@@ -3,6 +3,7 @@ require 'cucumber/constantize'
 require 'cucumber/cli/rerun_file'
 require 'cucumber/events'
 require 'cucumber/core/event_bus'
+require 'cucumber/core/test/result'
 require 'forwardable'
 require 'cucumber'
 
@@ -71,7 +72,7 @@ module Cucumber
       @options[:guess]
     end
 
-    def strict?
+    def strict
       @options[:strict]
     end
 
@@ -243,7 +244,7 @@ module Cucumber
       {
         :autoload_code_paths => ['features/support', 'features/step_definitions'],
         :filters             => [],
-        :strict              => false,
+        :strict              => Cucumber::Core::Test::Result::StrictConfiguration.new,
         :require             => [],
         :dry_run             => false,
         :fail_fast           => false,

data/lib/cucumber/deprecate.rb

@@ -20,11 +20,11 @@ module Cucumber
       end
     end
 
-    Strategy = $0.match(/rspec$/) ? ForDevelopers : ForUsers
+    STRATEGY = $0.match(/rspec$/) ? ForDevelopers : ForUsers
   end
 
   def self.deprecate(*args)
-    Deprecate::Strategy.call(*args)
+    Deprecate::STRATEGY.call(*args)
   end
 
 end

data/lib/cucumber/events.rb

@@ -24,15 +24,15 @@ module Cucumber
 
     def self.registry
       Core::Events.build_registry(
-        TestCaseStarting,
+        TestCaseStarted,
         TestCaseFinished,
         TestStepFinished,
-        TestStepStarting,
+        TestStepStarted,
         StepDefinitionRegistered,
         StepActivated,
         TestRunFinished,
         GherkinSourceRead,
-        TestRunStarting
+        TestRunStarted
       )
     end
   end

data/lib/cucumber/events/test_case_finished.rb

@@ -9,7 +9,7 @@ module Cucumber
       # @return [Cucumber::Core::Test::Case] that was executed
       attr_reader :test_case
 
-      # @return [Cucumber::Core::Test::Result] the result of running the {Cucumber::Core::Test::Step}
+      # @return [Cucumber::Core::Test::Result] the result of running the {Cucumber::Core::Test::Case}
       attr_reader :result
 
     end

data/lib/cucumber/events/{test_case_starting.rb → test_case_started.rb}

@@ -4,7 +4,7 @@ module Cucumber
   module Events
 
     # Signals that a {Cucumber::Core::Test::Case} is about to be executed
-    class TestCaseStarting < Core::Events::TestCaseStarting
+    class TestCaseStarted < Core::Events::TestCaseStarted
 
       # @return [Cucumber::Core::Test::Case] the test case to be executed
       attr_reader :test_case

data/lib/cucumber/events/{test_run_starting.rb → test_run_started.rb}

@@ -6,7 +6,7 @@ module Cucumber
 
     # Event fired once all test cases have been filtered before
     # the first one is executed.
-    class TestRunStarting < Core::Event.new(:test_cases)
+    class TestRunStarted < Core::Event.new(:test_cases)
 
       # @return [Array<Cucumber::Core::Test::Case>] the test cases to be executed
       attr_reader :test_cases

data/lib/cucumber/events/{test_step_starting.rb → test_step_started.rb}

@@ -4,7 +4,7 @@ module Cucumber
   module Events
 
     # Signals that a {Cucumber::Core::Test::Step} is about to be executed
-    class TestStepStarting < Core::Events::TestStepStarting
+    class TestStepStarted < Core::Events::TestStepStarted
 
       # @return [Cucumber::Core::Test::Step] the test step to be executed
       attr_reader :test_step

data/lib/cucumber/filters.rb

@@ -4,7 +4,7 @@ require 'cucumber/filters/apply_after_step_hooks'
 require 'cucumber/filters/apply_before_hooks'
 require 'cucumber/filters/apply_after_hooks'
 require 'cucumber/filters/apply_around_hooks'
-require 'cucumber/filters/broadcast_test_run_starting_event'
+require 'cucumber/filters/broadcast_test_run_started_event'
 require 'cucumber/filters/prepare_world'
 require 'cucumber/filters/quit'
 require 'cucumber/filters/randomizer'

data/lib/cucumber/filters/activate_steps.rb

@@ -43,7 +43,11 @@ module Cucumber
           end
 
           def result
-            return NoStepMatch.new(test_step.source.last, test_step.name) unless matches.any?
+            begin
+              return NoStepMatch.new(test_step.source.last, test_step.text) unless matches.any?
+            rescue Cucumber::Ambiguous => e
+              return AmbiguousStepMatch.new(e)
+            end
             configuration.notify :step_activated, test_step, match
             return SkippingStepMatch.new if configuration.dry_run?
             match
@@ -59,7 +63,7 @@ module Cucumber
           end
 
           def matches
-            step_match_search.call(test_step.name)
+            step_match_search.call(test_step.text)
           end
         end
       end

data/lib/cucumber/filters/{broadcast_test_run_starting_event.rb → broadcast_test_run_started_event.rb}

@@ -3,7 +3,7 @@ module Cucumber
   module Filters
     # Added at the end of the filter chain to broadcast a list of
     # all of the test cases that have made it through the filters.
-    class BroadcastTestRunStartingEvent < Core::Filter.new(:config)
+    class BroadcastTestRunStartedEvent < Core::Filter.new(:config)
       def initialize(config, receiver=nil)
         super
         @test_cases = []
@@ -15,7 +15,7 @@ module Cucumber
       end
 
       def done
-        config.notify :test_run_starting, @test_cases
+        config.notify :test_run_started, @test_cases
         @test_cases.map do |test_case|
           test_case.describe_to(@receiver)
         end

data/lib/cucumber/formatter/console.rb

@@ -135,7 +135,7 @@ module Cucumber
 
       def do_print_snippets(snippet_text_proc)
         snippets = @snippets_input.map do |data|
-          snippet_text_proc.call(data.actual_keyword, data.step.name, data.step.multiline_arg)
+          snippet_text_proc.call(data.actual_keyword, data.step.text, data.step.multiline_arg)
         end.uniq
 
         text = "\nYou can implement step definitions for undefined steps with these snippets:\n\n"

data/lib/cucumber/formatter/console_issues.rb

@@ -12,9 +12,9 @@ module Cucumber
         @config.on_event(:test_case_finished) do |event|
           if event.test_case != @previous_test_case
             @previous_test_case = event.test_case
-            @issues[event.result.to_sym] << event.test_case unless event.result.ok?(@config.strict?)
+            @issues[event.result.to_sym] << event.test_case unless event.result.ok?(@config.strict)
           elsif event.result.passed?
-            @issues[:flaky] << event.test_case unless Core::Test::Result::Flaky.ok?(@config.strict?)
+            @issues[:flaky] << event.test_case unless Core::Test::Result::Flaky.ok?(@config.strict)
             @issues[:failed].delete(event.test_case)
           end
         end

data/lib/cucumber/formatter/fail_fast.rb

@@ -10,7 +10,7 @@ module Cucumber
       def initialize(configuration)
         configuration.on_event :test_case_finished do |event|
           _test_case, result = *event.attributes
-          Cucumber.wants_to_quit = true unless result.ok?(configuration.strict?)
+          Cucumber.wants_to_quit = true unless result.ok?(configuration.strict)
         end
       end
 

data/lib/cucumber/formatter/html.rb

@@ -42,15 +42,14 @@ module Cucumber
       def embed(src, mime_type, label)
         if image?(mime_type)
           src = src_is_file_or_data?(src) ? src : "data:#{standardize_mime_type(mime_type)},#{src}"
-
-          builder.embed_image(src: set_path(src), label: label, id: next_id(:img))
+          builder.embed(type: :image, src: set_path(src), label: label, id: next_id(:img))
         else
-          builder.embed_text(src: src, label: label, id: next_id(:text))
+          builder.embed(type: :text, src: src, label: label, id: next_id(:text))
         end
       end
 
       def set_path(src)
-        if @io.respond_to?(:path) and File.file?(src)
+        if @io.respond_to?(:path) && File.file?(src)
           out_dir = Pathname.new(File.dirname(File.absolute_path(@io.path)))
           src = Pathname.new(File.absolute_path(src)).relative_path_from(out_dir)
         end
@@ -63,7 +62,7 @@ module Cucumber
       end
 
       def src_is_file_or_data?(src)
-        File.file?(src) or src =~ /^data:image\/(png|gif|jpg|jpeg);base64,/
+        File.file?(src) || src =~ /^data:image\/(png|gif|jpg|jpeg);base64,/
       end
 
       def image?(mime_type)
@@ -222,7 +221,7 @@ module Cucumber
 
       def after_steps(_steps)
         print_messages
-        builder << '</ol>' if @in_background or @in_scenario_outline
+        builder << '</ol>' if @in_background || @in_scenario_outline
       end
 
       def before_step(step)
@@ -366,7 +365,7 @@ module Cucumber
       def print_messages
         return if @delayed_messages.empty?
 
-        #builder.ol do
+          #builder.ol do
           @delayed_messages.each do |ann|
             builder.li(:class => 'step message') do
               builder << ann
@@ -390,7 +389,7 @@ module Cucumber
       end
 
       def after_test_case(_test_case, result)
-        if result.failed? and not @scenario_red
+        if result.failed? && !@scenario_red
           set_scenario_color_failed
         end
       end
@@ -438,7 +437,7 @@ module Cucumber
       end
 
       def set_scenario_color(status)
-        if status.nil? or status == :undefined or status == :pending
+        if status.nil? || status == :undefined || status == :pending
           set_scenario_color_pending
         end
         if status == :failed
@@ -453,7 +452,7 @@ module Cucumber
           scenario_or_background = @in_background ? 'background' : 'scenario'
           builder.text!("makeRed('#{scenario_or_background}_#{@scenario_number}');") unless @scenario_red
           @scenario_red = true
-          if @options[:expand] and @inside_outline
+          if @options[:expand] && @inside_outline
             builder.text!("makeRed('#{scenario_or_background}_#{@scenario_number}_#{@outline_row}');")
           end
         end