cucumber 2.0.0 → 2.0.1

data/features/docs/formatters/rerun_formatter.feature

@@ -2,7 +2,7 @@ Feature: Rerun formatter
 
   The rerun formatter writes an output that's perfect for
   passing to Cucumber when you want to rerun only the 
-  scenarios that have failed.
+  scenarios that prevented the exit code to be zero.
 
   You can save off the rerun output to a file by using it like this:
 
@@ -18,7 +18,28 @@ Feature: Rerun formatter
   Background:
     Given the standard step definitions
 
-  Scenario: Regular scenarios
+  Scenario: Exit code is zero
+    Given a file named "features/mixed.feature" with:
+      """
+      Feature: Mixed
+
+        Scenario:
+          Given this step is undefined
+
+        Scenario:
+          Given this step is pending
+
+        Scenario:
+          Given this step passes
+
+      """
+
+    When I run `cucumber -f rerun`
+    Then it should pass with exactly:
+      """
+      """
+
+  Scenario: Exit code is zero in the dry-run mode
     Given a file named "features/mixed.feature" with:
       """
       Feature: Mixed
@@ -44,13 +65,44 @@ Feature: Rerun formatter
           Given this step passes
       """
 
-    When I run `cucumber -f rerun`
-    Then it should fail with:
+    When I run `cucumber -f rerun --dry-run`
+    Then it should pass with exactly:
+      """
+      """
+
+  Scenario: Exit code is not zero, regular scenario
+    Given a file named "features/mixed.feature" with:
+      """
+      Feature: Mixed
+
+        Scenario:
+          Given this step fails
+
+        Scenario:
+          Given this step is undefined
+
+        Scenario:
+          Given this step is pending
+
+        Scenario:
+          Given this step passes
+
+      """
+    And a file named "features/all_good.feature" with:
+      """
+      Feature: All good
+
+        Scenario:
+          Given this step passes
+      """
+
+    When I run `cucumber -f rerun --strict`
+    Then it should fail with exactly:
       """
       features/mixed.feature:3:6:9
       """
 
-  Scenario: Scenario outlines
+  Scenario: Exit code is not zero, scenario outlines
     For details see https://github.com/cucumber/cucumber/issues/57
     Given a file named "features/one_passing_one_failing.feature" with:
       """
@@ -71,7 +123,7 @@ Feature: Rerun formatter
     features/one_passing_one_failing.feature:9
     """
 
-  Scenario: Failing background
+  Scenario: Exit code is not zero, failing background
     Given a file named "features/failing_background.feature" with:
       """
       Feature: Failing background sample
@@ -91,7 +143,7 @@ Feature: Rerun formatter
     features/failing_background.feature:6:9
     """
 
-  Scenario: Failing background with scenario outline
+  Scenario: Exit code is not zero, failing background with scenario outline
     Given a file named "features/failing_background_outline.feature" with:
       """
       Feature: Failing background sample with scenario outline
@@ -113,7 +165,7 @@ Feature: Rerun formatter
     features/failing_background_outline.feature:11:12
     """
 
-  Scenario: Scenario outlines with expand
+  Scenario: Exit code is not zero, scenario outlines with expand
     For details see https://github.com/cucumber/cucumber/issues/503
 
     Given a file named "features/one_passing_one_failing.feature" with:

data/features/docs/formatters/usage_formatter.feature

@@ -30,12 +30,11 @@ Feature: Usage formatter
       Given(/D/) { }
       """
 
-  @wip-new-core
   Scenario: Run with --format usage
     When I run `cucumber -f usage --dry-run`
     Then it should pass with exactly:
       """
-      --------
+      -----------
       
       /A/       # features/step_definitions/steps.rb:1
         Given A # features/f.feature:3
@@ -53,7 +52,6 @@ Feature: Usage formatter
       
       4 scenarios (4 skipped)
       11 steps (11 skipped)
-      0m0.012s
 
       """
 
@@ -61,7 +59,7 @@ Feature: Usage formatter
     When I run `cucumber -x -f usage --dry-run`
     Then it should pass with exactly:
       """
-      ----------
+      -----------
       
       /A/       # features/step_definitions/steps.rb:1
         Given A # features/f.feature:3
@@ -79,7 +77,6 @@ Feature: Usage formatter
       
       4 scenarios (4 skipped)
       11 steps (11 skipped)
-      0m0.012s
 
       """
 
@@ -87,7 +84,7 @@ Feature: Usage formatter
       When I run `cucumber -f stepdefs --dry-run`
       Then it should pass with exactly:
         """
-        --------
+        -----------
         
         /A/   # features/step_definitions/steps.rb:1
         /B/   # features/step_definitions/steps.rb:2
@@ -97,6 +94,5 @@ Feature: Usage formatter
         
         4 scenarios (4 skipped)
         11 steps (11 skipped)
-        0m0.012s
 
         """

data/features/docs/getting_started.feature

@@ -19,7 +19,7 @@ Feature: Getting started
       puts 'this will not be shown'
       """
     When I run `cucumber`
-    Then the exit status should be 1
+    Then the exit status should be 2
     And the output should not contain:
       """
       this will not be shown

data/features/docs/gherkin/background.feature

@@ -222,7 +222,6 @@ Feature: Background
 
     1 scenario (1 passed)
     2 steps (2 passed)
-    0m0.012s
 
     """
   
@@ -243,7 +242,6 @@ Feature: Background
 
     2 scenarios (2 passed)
     4 steps (4 passed)
-    0m0.012s
 
     """
 
@@ -272,7 +270,6 @@ Feature: Background
 
     2 scenarios (2 passed)
     4 steps (4 passed)
-    0m0.012s
 
     """
 
@@ -295,7 +292,6 @@ Feature: Background
 
     1 scenario (1 passed)
     2 steps (2 passed)
-    0m0.012s
 
     """
 
@@ -325,7 +321,6 @@ Feature: Background
     
     2 scenarios (2 failed)
     6 steps (2 failed, 4 skipped)
-    0m0.012s
     
     """
 
@@ -362,7 +357,6 @@ Feature: Background
 
     2 scenarios (2 failed)
     4 steps (2 failed, 2 skipped)
-    0m0.012s
     
     """
 
@@ -386,7 +380,6 @@ Feature: Background
 
     2 scenarios (2 pending)
     4 steps (2 skipped, 2 pending)
-    0m0.012s
     
     """
 
@@ -416,7 +409,6 @@ Feature: Background
 
     2 scenarios (1 failed, 1 passed)
     6 steps (1 failed, 1 skipped, 4 passed)
-    0m0.012s
     
     """
 
@@ -453,7 +445,6 @@ Feature: Background
 
     2 scenarios (1 failed, 1 passed)
     6 steps (1 failed, 1 skipped, 4 passed)
-    0m0.012s
     
     """
 
@@ -493,7 +484,6 @@ Feature: Background
 
     2 scenarios (1 failed, 1 passed)
     6 steps (1 failed, 1 skipped, 4 passed)
-    0m0.012s
     
     """
 
@@ -553,7 +543,6 @@ Feature: Background
 
       2 scenarios (2 passed)
       8 steps (8 passed)
-      0m0.012s
     
       """
 

data/features/docs/gherkin/language_help.feature

@@ -35,3 +35,8 @@ Feature: Language help
   Scenario: List languages
     When I run `cucumber --i18n help`
     Then cucumber lists all the supported languages
+
+  Scenario: Seek help for invalid language
+    When I run `cucumber --i18n foo`
+    Then the output includes the message "Invalid language 'foo'"
+    And cucumber lists all the supported languages

data/features/docs/gherkin/outlines.feature

@@ -138,7 +138,7 @@ Feature: Scenario outlines
     When I run `cucumber -q --format progress features/outline_sample.feature`
     Then it should fail with exactly:
       """
-      --UU..FF..
+      U-..F-..
 
       (::) failed steps (::)
 
@@ -152,7 +152,5 @@ Feature: Scenario outlines
 
       5 scenarios (1 failed, 1 undefined, 3 passed)
       8 steps (1 failed, 2 skipped, 1 undefined, 4 passed)
-      0m0.012s
 
       """
-

data/features/docs/gherkin/using_descriptions.feature

@@ -83,6 +83,5 @@ Feature: Using descriptions to give features context
 
     2 scenarios (2 passed)
     4 steps (4 passed)
-    0m0.012s
 
     """

data/features/docs/raketask.feature

@@ -40,5 +40,5 @@ Feature: Raketask
 
   Scenario: Failing feature
     When I run `bundle exec rake fail`
-    Then the exit status should not be 0
+    Then the exit status should be 1
     But the output should not contain "rake aborted!"

data/features/docs/writing_support_code/after_hooks.feature

@@ -11,6 +11,28 @@ Feature: After Hooks
   Background:
     Given the standard step definitions
 
+  Scenario Outline: Retrieve the status of a scenario as a symbol
+    Given a file named "features/support/debug_hook.rb" with:
+      """
+      After do |scenario|
+        puts scenario.status.inspect
+      end
+      """
+    And a file named "features/result.feature" with:
+      """
+      Feature:
+        Scenario:
+          Given this step <result>
+      """
+    When I run `cucumber -f progress`
+    Then the output should contain "<status symbol>"
+
+    Examples:
+      | result     | status symbol |
+      | passes     | :passed       |
+      | fails      | :failed       |
+      | is pending | :pending      |
+
   Scenario: Check the failed status of a scenario in a hook
     Given a file named "features/support/debug_hook.rb" with:
       """

data/features/lib/step_definitions/aruba_steps.rb

@@ -20,3 +20,7 @@ Then /^it fails before running features with:$/ do |expected|
   assert_matching_output("\\A#{expected}", all_output)
   assert_success(false)
 end
+
+Then(/^the output includes the message "(.*)"$/) do |message|
+  expect(all_output).to include(message)
+end

data/features/lib/step_definitions/junit_steps.rb

@@ -1,7 +1,7 @@
 Then(/^the junit output file "(.*?)" should contain:$/) do |actual_file, text|
   actual = IO.read(current_dir + '/' + actual_file)
   actual = replace_junit_time(actual)
-  expect(actual).to eq text.to_s
+  expect(actual).to eq text
 end
 
 module JUnitHelper

data/features/lib/support/normalise_output.rb

@@ -19,15 +19,32 @@ module NormaliseArubaOutput
       elements = feature.fetch('elements') { [] }
       elements.each do |scenario|
         scenario['steps'].each do |step|
-          if step['result']
-            expect(step['result']['duration']).to be >= 0
-            step['result']['duration'] = 1
+          ['steps', 'before', 'after'].each do |type|
+            if scenario[type]
+              scenario[type].each do |step_or_hook|
+                normalise_json_step_or_hook(step_or_hook)
+                if step_or_hook['after']
+                  step_or_hook['after'].each do |hook|
+                    normalise_json_step_or_hook(hook)
+                  end
+                end
+              end
+            end
           end
         end
       end
     end
   end
+
+  def normalise_json_step_or_hook(step_or_hook)
+    if step_or_hook['result']
+      if step_or_hook['result']['duration']
+        expect(step_or_hook['result']['duration']).to be >= 0
+        step_or_hook['result']['duration'] = 1
+      end
+    end
+  end
+
 end
 
 World(NormaliseArubaOutput)
-

data/lib/cucumber/cli/configuration.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'cucumber/cli/options'
+require 'cucumber/cli/rerun_file'
 require 'cucumber/constantize'
 require 'gherkin/tag_expression'
 
@@ -75,8 +76,7 @@ module Cucumber
       end
 
       def all_files_to_load
-        requires = @options[:require].empty? ? require_dirs : @options[:require]
-        files = requires.map do |path|
+        files = require_dirs.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.gsub(/\/$/, '') # Strip trailing slash.
           File.directory?(path) ? Dir["#{path}/**/*"] : path
@@ -105,9 +105,8 @@ module Cucumber
           path = path.chomp('/')
           if File.directory?(path)
             Dir["#{path}/**/*.feature"].sort
-          elsif path[0..0] == '@' and # @listfile.txt
-              File.file?(path[1..-1]) # listfile.txt is a file
-            IO.read(path[1..-1]).split(/(.*?\.feature.*?) /).collect(&:strip).reject(&:empty?)
+          elsif RerunFile.can_read?(path)
+            RerunFile.new(path).features
           else
             path
           end
@@ -116,6 +115,7 @@ module Cucumber
         potential_feature_files
       end
 
+
       def feature_dirs
         dirs = paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
         dirs.delete('.') unless paths.include?('.')
@@ -180,8 +180,12 @@ module Cucumber
 
       private
 
+      def default_features_paths
+        ["features"]
+      end
+
       def with_default_features_path(paths)
-        return ['features'] if paths.empty?
+        return default_features_paths if paths.empty?
         paths
       end
 
@@ -201,10 +205,7 @@ module Cucumber
         @options[:formats] << ['pretty', @out_stream] if @options[:formats].empty?
         @options[:formats] = @options[:formats].sort_by{|f| f[1] == @out_stream ? -1 : 1}
         @options[:formats].uniq!
-        streams = @options[:formats].map { |(_, stream)| stream }
-        if streams != streams.uniq
-          raise "All but one formatter must use --out, only one can print to each stream (or STDOUT)"
-        end
+        @options.check_formatter_stream_conflicts()
       end
 
       def remove_excluded_files_from(files)
@@ -212,10 +213,12 @@ module Cucumber
       end
 
       def require_dirs
-        feature_dirs + Dir['vendor/{gems,plugins}/*/cucumber']
+        if @options[:require].empty?
+          default_features_paths + Dir['vendor/{gems,plugins}/*/cucumber']
+        else
+          @options[:require]
+        end
       end
-
     end
-
   end
 end