cucumber 2.0.0.beta.3 → 2.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b115e5b0a7ae23e6b0372462a320314ee144811
-  data.tar.gz: 3143905ef42ea795c85cc6163dedf95bd670f582
+  metadata.gz: 4eb48e6463061c8e32ec4f37449eaf5d11d36071
+  data.tar.gz: 2eda62607c7d63399d30630949a593c8d7c943c0
 SHA512:
-  metadata.gz: 1144b0d0bdf707e16db0b4d389aa7242f870df050db0da4ffe6c749e26309dfbd0bec80eb3db5995c27456e8cddd610bcb242d4a407a3a5887a0933c510e2744
-  data.tar.gz: dcfa6d1ca0b6af5abb794495a6872509976519c40af52075f78056593dfde8d397e10ae7d67ae3f2aa710ac2a6401aaca6c481747033d38d8d35c911f20acb08
+  metadata.gz: 03dfce34351bcf81c2093668854a166f9679c3d59dfb5cc4535034ad008f64a2aae140ecfed9dabfe2207b4b305f2831b9208797c9f929ed5defaadc8dff8c49
+  data.tar.gz: ee606fff52a8ceecb2802e4feff9f64043746a7741317a4de32cf04fc22420d6425bf033c46961daeb4d42e12dfba722628e9e82752b7dd2857ce2074cedbe3b

data/History.md

@@ -1,4 +1,21 @@
-## [In Git](https://github.com/cucumber/cucumber/compare/v.2.0.0.beta.2...master)
+## [In Git](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.4...master)
+
+## [v2.0.0.beta.4](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.3...v2.0.0.beta.4)
+### New Features
+
+  * Support both new and legacy formatter APIs simultaneously (@mattwynne and @tooky)
+
+### Bugfixes
+
+  * Localize the Scenario keyword with the --expand option ([766](https://github.com/cucumber/cucumber/pull/766) @brasmusson)
+  * Handle hook output appropriately in the HTML formatter ([746](https://github.com/cucumber/cucumber/pull/746), [731](https://github.com/cucumber/cucumber/issues/731), [298](https://github.com/cucumber/cucumber/pull/298) @brasmusson)
+  * Handle hook output appropriately in the Pretty formatter ([738](https://github.com/cucumber/cucumber/pull/738) @brasmusson)
+
+### Internal changes
+
+  * Re-write rerun formatter against new formatter API
+
+## [v2.0.0.beta.3](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.2...v2.0.0.beta.3)
 
 ### Removed Features
 
@@ -18,14 +35,14 @@
   * Add back support for the DataTable API ([729](https://github.com/cucumber/cucumber/pull/729) @mattwynne and @tooky)
   * Fix Windows support loading files properly ([739](https://github.com/cucumber/cucumber/issues/739) @os97673)
 
-## [v2.0.0.beta.2](https://github.com/cucumber/cucumber/compare/v.2.0.0.beta.1...v.2.0.0.beta.2)
+## [v2.0.0.beta.2](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.1...v2.0.0.beta.2)
 
 ### Bugfixes
 
   * Better reporting of exceptions in Before / After hooks ([723](https://github.com/cucumber/cucumber/pull/723) @mattwynne)
   * Add `#source_tag_names` method to `TestCase` object passed to hooks (@mattwynne)
 
-## [v2.0.0.beta.1 ](https://github.com/cucumber/cucumber/compare/v1.3.8...v.2.0.0.beta.1)
+## [v2.0.0.beta.1 ](https://github.com/cucumber/cucumber/compare/v1.3.8...v2.0.0.beta.1)
 
 Version 2.0 contains a major internal redesign, extracting the core logic of
 parsing and executing tests into a [separate gem](https://github.com/cucumber/cucumber-ruby-core).

data/cucumber.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json', '>= 1.7.5', '< 2.0'
   s.add_dependency 'multi_test', '>= 0.1.1'
 
-  s.add_development_dependency 'aruba', '~> 0.5.3'
+  s.add_development_dependency 'aruba', '~> 0.6.1'
   s.add_development_dependency 'json', '~> 1.7'
   s.add_development_dependency 'nokogiri', '~> 1.5'
   s.add_development_dependency 'rake', '>= 0.9.2'
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '>= 0.6.2'
   s.add_development_dependency 'coveralls', '~> 0.7'
   s.add_development_dependency 'syntax', '>= 1.0.0'
+  s.add_development_dependency 'pry'
 
   # For Documentation:
   s.add_development_dependency 'bcat', '~> 0.6.2'

data/examples/tcl/features/step_definitions/fib_steps.rb

@@ -3,5 +3,5 @@ When /^I ask Tcl to calculate fibonacci for (\d+)$/ do |n|
 end
 
 Then /^it should give me (\d+)$/ do |expected|
-  @fib_result.should == expected.to_i
+  expect(@fib_result).to eq expected.to_i
 end

data/features/docs/extending_cucumber/custom_formatter.feature

@@ -1,18 +1,45 @@
 Feature: Custom Formatter
 
-  Scenario: my own formatter
+  Background:
     Given a file named "features/f.feature" with:
       """
       Feature: I'll use my own
-        because I'm worth it
-        Scenario: just print me
+        Scenario: Just print me
           Given this step passes
       """
     And the standard step definitions
-    And a file named "features/support/ze/formator.rb" with:
+
+  Scenario: Use the new API
+    Given a file named "features/support/custom_formatter.rb" with:
       """
-      module Ze
-        class Formator
+      module MyCustom
+        class Formatter
+          def initialize(runtime, io, options)
+            @io = io
+          end
+
+          def before_test_case(test_case)
+            feature = test_case.source.first
+            scenario = test_case.source.last
+            @io.puts feature.short_name.upcase
+            @io.puts "  #{scenario.name.upcase}"
+          end
+        end
+      end
+      """
+    When I run `cucumber features/f.feature --format MyCustom::Formatter`
+    Then it should pass with exactly:
+      """
+      I'LL USE MY OWN
+        JUST PRINT ME
+
+      """
+
+  Scenario: Use the legacy API
+    Given a file named "features/support/custom_legacy_formatter.rb" with:
+      """
+      module MyCustom
+        class LegacyFormatter
           def initialize(runtime, io, options)
             @io = io
           end
@@ -27,7 +54,38 @@ Feature: Custom Formatter
         end
       end
       """
-    When I run `cucumber features/f.feature --format Ze::Formator`
+    When I run `cucumber features/f.feature --format MyCustom::LegacyFormatter`
+    Then it should pass with exactly:
+      """
+      I'LL USE MY OWN
+        JUST PRINT ME
+
+      """
+
+  Scenario: Use both
+    You can use a specific shim to opt-in to both APIs at once.
+
+    Given a file named "features/support/custom_mixed_formatter.rb" with:
+      """
+      module MyCustom
+        class MixedFormatter
+
+          def initialize(runtime, io, options)
+            @io = io
+          end
+
+          def before_test_case(test_case)
+            feature = test_case.source.first
+            @io.puts feature.short_name.upcase
+          end
+
+          def scenario_name(keyword, name, file_colon_line, source_indent)
+            @io.puts "  #{name.upcase}"
+          end
+        end
+      end
+      """
+    When I run `cucumber features/f.feature --format MyCustom::MixedFormatter`
     Then it should pass with exactly:
       """
       I'LL USE MY OWN

data/features/docs/formatters/debug_formatter.feature

@@ -18,23 +18,30 @@ Feature: Debug formatter
     Then the stderr should not contain anything
     Then it should pass with:
       """
+      before_test_case
       before_features
-        before_feature
-          before_tags
-          after_tags
-          feature_name
-          before_feature_element
-            before_tags
-            after_tags
-            scenario_name
-            before_steps
-              before_step
-                before_step_result
-                  step_name
-                after_step_result
-              after_step
-            after_steps
-          after_feature_element
-        after_feature
+      before_feature
+      before_tags
+      after_tags
+      feature_name
+      before_test_step
+      after_test_step
+      before_test_step
+      before_feature_element
+      before_tags
+      after_tags
+      scenario_name
+      before_steps
+      before_step
+      before_step_result
+      step_name
+      after_step_result
+      after_step
+      after_test_step
+      after_steps
+      after_feature_element
+      after_test_case
+      after_feature
       after_features
+      done
       """

data/features/docs/formatters/pretty_formatter.feature

@@ -28,4 +28,46 @@ Feature: Pretty output formatter
     """
     Using the default profile...
     """
+  Scenario: Hook output should be printed before hook exception
+    Given the standard step definitions
+    And a file named "features/test.feature" with:
+      """
+      Feature:
+        Scenario:
+          Given this step passes
+      """
+    And a file named "features/step_definitions/output_steps.rb" with:
+      """
+      Before do
+        puts "Before hook"
+       end
 
+      AfterStep do
+        puts "AfterStep hook"
+      end
+
+      After do
+        puts "After hook"
+	raise "error"
+      end
+      """
+    When I run `cucumber -q -f pretty features/test.feature`
+    Then the stderr should not contain anything
+    Then it should fail with:
+      """
+      Feature: 
+ 
+        Scenario: 
+            Before hook
+          Given this step passes
+            AfterStep hook
+            After hook
+            error (RuntimeError)
+            ./features/step_definitions/output_steps.rb:11:in `After'
+      
+      Failing Scenarios:
+      cucumber features/test.feature:2
+      
+      1 scenario (1 failed)
+      1 step (1 passed)
+      """

data/features/docs/formatters/rerun_formatter.feature

@@ -113,8 +113,9 @@ Feature: Rerun formatter
     features/failing_background_outline.feature:11:12
     """
 
-Scenario: Scenario outlines with expand
-  For details see https://github.com/cucumber/cucumber/issues/503
+  Scenario: 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:
     """
       Feature: One passing example, one failing example

data/lib/cucumber/cli/configuration.rb

@@ -66,10 +66,6 @@ module Cucumber
         @options[:snippet_type] || :regexp
       end
 
-      def build_tree_walker(runtime)
-        Ast::TreeWalker.new(runtime, formatters(runtime), self)
-      end
-
       def formatter_class(format)
         if(builtin = Options::BUILTIN_FORMATS[format])
           constantize(builtin[0])
@@ -169,13 +165,13 @@ module Cucumber
         @options[:paths]
       end
 
-      def formatters(runtime)
+      def formatter_factories
         @options[:formats].map do |format_and_out|
           format = format_and_out[0]
           path_or_io = format_and_out[1]
           begin
-            formatter_class = formatter_class(format)
-            formatter_class.new(runtime, path_or_io, @options)
+            factory = formatter_class(format)
+            yield factory, path_or_io, @options
           rescue Exception => e
             e.message << "\nError creating formatter: #{format}"
             raise e

data/lib/cucumber/cli/main.rb

@@ -36,7 +36,7 @@ module Cucumber
         end
 
         runtime.run!
-        failure = runtime.results.failure? || Cucumber.wants_to_quit
+        failure = runtime.failure? || Cucumber.wants_to_quit
         @kernel.exit(failure ? 1 : 0)
       rescue FileNotFoundException => e
         @err.puts(e.message)

data/lib/cucumber/{runtime → filters}/gated_receiver.rb

@@ -1,5 +1,6 @@
 module Cucumber
-  class Runtime
+  module Filters
+
     class GatedReceiver
       def initialize(receiver)
         @receiver = receiver
@@ -8,6 +9,7 @@ module Cucumber
 
       def test_case(test_case)
         @test_cases << test_case
+        self
       end
 
       def done
@@ -15,7 +17,9 @@ module Cucumber
           test_case.describe_to(@receiver)
         end
         @receiver.done
+        self
       end
     end
+
   end
 end

data/lib/cucumber/filters/quit.rb

@@ -0,0 +1,24 @@
+module Cucumber
+  module Filters
+
+    class Quit
+      def initialize(receiver)
+        @receiver = receiver
+      end
+
+      def test_case(test_case)
+        unless Cucumber.wants_to_quit
+          test_case.describe_to @receiver
+        end
+        self
+      end
+
+      def done
+        @receiver.done
+        self
+      end
+    end
+
+  end
+end
+

data/lib/cucumber/filters/randomizer.rb

@@ -0,0 +1,36 @@
+module Cucumber
+  module Filters
+
+    # Batches up all test cases, randomizes them, and then sends them on
+    class Randomizer
+      def initialize(seed, receiver)
+        @receiver = receiver
+        @test_cases = []
+        @seed = seed
+      end
+
+      def test_case(test_case)
+        @test_cases << test_case
+        self
+      end
+
+      def done
+        shuffled_test_cases.each do |test_case|
+          test_case.describe_to(@receiver)
+        end
+        @receiver.done
+        self
+      end
+
+      private
+
+      def shuffled_test_cases
+        @test_cases.shuffle(random: Random.new(seed))
+      end
+
+      attr_reader :seed
+      private :seed
+    end
+
+  end
+end

data/lib/cucumber/filters/tag_limits.rb

@@ -0,0 +1,40 @@
+require "cucumber/filters/gated_receiver"
+require "cucumber/filters/tag_limits/test_case_index"
+require "cucumber/filters/tag_limits/verifier"
+
+module Cucumber
+  module Filters
+    class TagLimitExceededError < StandardError
+      def initialize(*limit_breaches)
+        super(limit_breaches.map(&:to_s).join("\n"))
+      end
+    end
+
+    class TagLimits
+      def initialize(tag_limits, receiver)
+        @gated_receiver = GatedReceiver.new(receiver)
+        @test_case_index = TestCaseIndex.new
+        @verifier = Verifier.new(tag_limits)
+      end
+
+      def test_case(test_case)
+        gated_receiver.test_case(test_case)
+        test_case_index.add(test_case)
+        self
+      end
+
+      def done
+        verifier.verify!(test_case_index)
+        gated_receiver.done
+        self
+      end
+
+      private
+
+      attr_reader :gated_receiver
+      attr_reader :test_case_index
+      attr_reader :verifier
+    end
+
+  end
+end