cucumber 2.0.0.beta.5 → 2.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cccc98f30278bb2823b614b4e18a48080939590e
-  data.tar.gz: bdd36afae314060924ac2524ac9d19858b06fcaf
+  metadata.gz: 8832bd36266bffbfaa4d3fd708361d72485d0f70
+  data.tar.gz: 1f310aac04ddfedf7e2e7ddd7a53f6adb88aaa8a
 SHA512:
-  metadata.gz: e54ac267be6eb15ea9035721d911ae8751aeb7a6d9cca46db1130f78e3374b19a002c5409a682e68ba9a345425b7e6a73db48b565af05220bbdc991a6bd1d21c
-  data.tar.gz: 3a5812f5e4c91c8fed143980501338d6351921a14ef16e03fe420c1011a15a0dd3a74df3ba11b482a8688cf2ac0066e1df946bf1de4fe71acc251ac57eb63fae
+  metadata.gz: fd8670734a46685cde551f37ec2f2d9a35f19d0b280c48ee6c86aa4fca9c7144dc538229add49ec8a48b5169b09e387a134960d3984f39c93ec467c4b147e7ce
+  data.tar.gz: f672204acf7aaa53c92ef59699d9d8b37fb24ad4f5e423fea79de82a9e002184218e45d3a228cb1032341893a1f1d7f4da6e7527aa155a8c318c6d567ea09f7f

data/History.md

@@ -1,4 +1,23 @@
-## [In Git](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.4...master)
+## [In Git](https://github.com/cucumber/cucumber/compare/v2.0.0.rc.1...master)
+
+## [v2.0.0.rc.1](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.5...v2.0.0.rc.1)
+
+### Removed Features
+  
+  * Removed support for IronRuby (@tooky @mattwynne)
+
+### New Features
+
+  * Let the HTML formatter store the relative path to files in the report ([697](https://github.com/cucumber/cucumber/pull/697) @idstein, @brasmusson)
+  * Allow cucumber.yml to parse % erb code lines ([755](https://github.com/cucumber/cucumber/pull/755) @snowe2010)
+  * Give each step definition a unique copy of argument objects ([760](https://github.com/cucumber/cucumber/pull/760) @tooky)
+
+### Bugfixes
+
+  * Add old Scenario#skip_invoke! method back (@mattwynne)
+  * No links to lines in backtrace under TextMate ([548](https://github.com/cucumber/cucumber/pull/548) @bilus)
+  * Using file:line CLI to select scenarios was running same scenario multiple times ([786](https://github.com/cucumber/cucumber/pull/786) @jdks)
+  * Allow spaces in filenames for rerun formatter ([793](https://github.com/cucumber/cucumber/pull/793) @callahat)
 
 ## [v2.0.0.beta.5](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.4...v2.0.0.beta.5)
 

data/Rakefile

@@ -6,8 +6,6 @@ Bundler::GemHelper.install_tasks
 $:.unshift(File.dirname(__FILE__) + '/lib')
 Dir['gem_tasks/**/*.rake'].each { |rake| load rake }
 
-task :release => 'api:doc'
-
 task :default => [:spec, :cucumber]
 
 if ENV['TRAVIS']

data/cucumber.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_dependency 'cucumber-core', '~> 1.0.0.beta.4'
+  s.add_dependency 'cucumber-core', '~> 1.0.0'
   s.add_dependency 'builder', '>= 2.1.2'
   s.add_dependency 'diff-lcs', '>= 1.1.3'
   s.add_dependency 'gherkin', '~> 2.12'

data/features/docs/defining_steps/skip_scenario.feature

@@ -1,7 +1,6 @@
 Feature: Skip Scenario
-  - 
 
-  Scenario: With a failing step
+  Scenario: With a passing step
     Given a file named "features/test.feature" with:
       """
       Feature: test
@@ -31,3 +30,33 @@ Feature: Skip Scenario
 
       """
 
+  Scenario: Use legacy API from a hook
+    Given a file named "features/test.feature" with:
+      """
+      Feature: test
+        Scenario: test
+          Given this step passes
+          And this step passes
+      """
+    And the standard step definitions
+    And a file named "features/support/hook.rb" with:
+      """
+      Before do |scenario|
+        scenario.skip_invoke!
+      end
+      """
+    When I run `cucumber -q`
+    Then it should pass with:
+      """
+      Feature: test
+
+        Scenario: test
+          Given this step passes
+          And this step passes
+
+      1 scenario (1 skipped)
+      2 steps (2 skipped)
+      0m0.012s
+
+      """
+

data/lib/cucumber.rb

@@ -22,5 +22,11 @@ module Cucumber
     def logger=(logger)
       @log = logger
     end
+
+    def deprecate(class_name, method, message)
+      return self # deprecation warnings will come in v2.1
+      called_by = caller[1]
+      warn("Deprecated: #{class_name}##{method} #{message}. Caller: #{called_by}")
+    end
   end
 end

data/lib/cucumber/ast/facade.rb

@@ -0,0 +1,117 @@
+require 'cucumber/runtime'
+require 'cucumber'
+require 'cucumber/multiline_argument'
+require 'cucumber/core/test/result'
+
+module Cucumber
+  # Decorates the `Cucumber::Core::Test::Case` to look like the 
+  # Cucumber 1.3's `Cucumber::Ast::Scenario`.
+  #
+  # This is for backwards compatability in before / after hooks.
+  module Ast
+    class Facade
+      def initialize(test_case)
+        @test_case = test_case
+        test_case.describe_source_to(self)
+      end
+
+      def feature(feature)
+        @feature = feature
+      end
+
+      def scenario(scenario)
+        @factory = Scenario
+      end
+
+      def scenario_outline(scenario)
+        @factory = ScenarioOutlineExample
+      end
+
+      def examples_table(examples_table)
+      end
+
+      def examples_table_row(row)
+      end
+
+      def build_scenario
+        @factory.new(@test_case, Feature.new(@feature.legacy_conflated_name_and_description))
+      end
+
+      class Scenario
+        def initialize(test_case, feature, result = Core::Test::Result::Unknown.new)
+          @test_case = test_case
+          @feature = feature
+          @result = result
+        end
+
+        def accept_hook?(hook)
+          hook.tag_expressions.all? { |expression| @test_case.match_tags?(expression) }
+        end
+
+        def failed?
+          @result.failed?
+        end
+
+        def passed?
+          !failed?
+        end
+
+        def language
+          @test_case.language
+        end
+
+        def feature
+          @feature
+        end
+
+        def name
+          @test_case.name
+        end
+
+        def title
+          warn("deprecated: call #name instead")
+          name
+        end
+
+        def source_tags
+          #warn('deprecated: call #tags instead')
+          tags
+        end
+
+        def source_tag_names
+          tags.map &:name
+        end
+
+        def skip_invoke!
+          Cucumber.deprecate(self.class.name, __method__, "Call #skip_this_scenario on the World directly")
+          raise Cucumber::Core::Test::Result::Skipped
+        end
+
+        def tags
+          @test_case.tags
+        end
+
+        def outline?
+          false
+        end
+
+        def with_result(result)
+          self.class.new(@test_case, @feature, result)
+        end
+      end
+
+      class ScenarioOutlineExample < Scenario
+        def outline?
+          true
+        end
+
+        def scenario_outline
+          self
+        end
+      end
+
+      Feature = Struct.new(:name)
+
+    end
+  end
+end

data/lib/cucumber/cli/configuration.rb

@@ -107,7 +107,7 @@ module Cucumber
             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
+            IO.read(path[1..-1]).split(/(.*?\.feature.*?) /).collect(&:strip).reject(&:empty?)
           else
             path
           end

data/lib/cucumber/cli/profile_loader.rb

@@ -60,7 +60,7 @@ Defined profiles in cucumber.yml:
         require 'erb'
         require 'yaml'
         begin
-          @cucumber_erb = ERB.new(IO.read(cucumber_file)).result(binding)
+          @cucumber_erb = ERB.new(IO.read(cucumber_file), nil, '%').result(binding)
         rescue Exception => e
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed with ERB.  Please refer to cucumber's documentation on correct profile usage.\n#{$!.inspect}")
         end

data/lib/cucumber/file_specs.rb

@@ -14,7 +14,7 @@ module Cucumber
     end
 
     def files
-      @file_specs.map(&:file)
+      @file_specs.map(&:file).uniq
     end
 
     class FileSpec

data/lib/cucumber/filters.rb

@@ -0,0 +1,9 @@
+require 'cucumber/filters/activate_steps'
+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/prepare_world'
+require 'cucumber/filters/quit'
+require 'cucumber/filters/randomizer'
+require 'cucumber/filters/tag_limits'

data/lib/cucumber/filters/activate_steps.rb

@@ -0,0 +1,34 @@
+require 'cucumber/multiline_argument'
+require 'cucumber/core/filter'
+
+module Cucumber
+  module Filters
+    class ActivateSteps < Core::Filter.new(:step_definitions)
+
+      def test_case(test_case)
+        CaseFilter.new(test_case, step_definitions).test_case.describe_to receiver
+      end
+
+      class CaseFilter
+        def initialize(test_case, step_definitions)
+          @original_test_case = test_case
+          @step_definitions = step_definitions
+        end
+
+        def test_case
+          @original_test_case.with_steps(new_test_steps)
+        end
+
+        private
+
+        def new_test_steps
+          @original_test_case.test_steps.map(&self.method(:attempt_to_activate))
+        end
+
+        def attempt_to_activate(test_step)
+          @step_definitions.find_match(test_step).activate(test_step)
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_after_hooks.rb

@@ -0,0 +1,9 @@
+module Cucumber
+  module Filters
+    class ApplyAfterHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        hooks.apply_after_hooks(test_case).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_after_step_hooks.rb

@@ -0,0 +1,12 @@
+require 'cucumber/core/filter'
+
+module Cucumber
+  module Filters
+    class ApplyAfterStepHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        test_steps = hooks.find_after_step_hooks(test_case).apply(test_case.test_steps)
+        test_case.with_steps(test_steps).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_around_hooks.rb

@@ -0,0 +1,12 @@
+require 'cucumber/core/filter'
+
+module Cucumber
+  module Filters
+    class ApplyAroundHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        around_hooks = hooks.find_around_hooks(test_case)
+        test_case.with_around_hooks(around_hooks).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_before_hooks.rb

@@ -0,0 +1,9 @@
+module Cucumber
+  module Filters
+    class ApplyBeforeHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        hooks.apply_before_hooks(test_case).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/filters/prepare_world.rb

@@ -0,0 +1,37 @@
+require 'cucumber/core/filter'
+require 'cucumber/ast/facade'
+require 'cucumber/hooks'
+
+module Cucumber
+  module Filters
+
+    class PrepareWorld < Core::Filter.new(:runtime)
+
+      def test_case(test_case)
+        CaseFilter.new(runtime, test_case).test_case.describe_to receiver
+      end
+
+      class CaseFilter
+        def initialize(runtime, original_test_case)
+          @runtime, @original_test_case = runtime, original_test_case
+        end
+
+        def test_case
+          init_scenario = Cucumber::Hooks.before_hook(@original_test_case.source) do
+            @runtime.begin_scenario(scenario)
+          end
+          steps = [init_scenario] + @original_test_case.test_steps
+          @original_test_case.with_steps(steps)
+        end
+
+        private
+
+        def scenario
+          @scenario ||= Ast::Facade.new(test_case).build_scenario
+        end
+      end
+
+    end
+
+  end
+end

data/lib/cucumber/filters/quit.rb

@@ -2,7 +2,7 @@ module Cucumber
   module Filters
 
     class Quit
-      def initialize(receiver)
+      def initialize(receiver=nil)
         @receiver = receiver
       end
 
@@ -17,6 +17,10 @@ module Cucumber
         @receiver.done
         self
       end
+
+      def with_receiver(receiver)
+        self.class.new(receiver)
+      end
     end
 
   end

data/lib/cucumber/filters/randomizer.rb

@@ -3,7 +3,7 @@ module Cucumber
 
     # Batches up all test cases, randomizes them, and then sends them on
     class Randomizer
-      def initialize(seed, receiver)
+      def initialize(seed, receiver=nil)
         @receiver = receiver
         @test_cases = []
         @seed = seed
@@ -22,6 +22,10 @@ module Cucumber
         self
       end
 
+      def with_receiver(receiver)
+        self.class.new(@seed, receiver)
+      end
+
       private
 
       def shuffled_test_cases

data/lib/cucumber/filters/tag_limits.rb

@@ -11,10 +11,11 @@ module Cucumber
     end
 
     class TagLimits
-      def initialize(tag_limits, receiver)
+      def initialize(tag_limits, receiver=nil)
+        @tag_limits = tag_limits
         @gated_receiver = GatedReceiver.new(receiver)
         @test_case_index = TestCaseIndex.new
-        @verifier = Verifier.new(tag_limits)
+        @verifier = Verifier.new(@tag_limits)
       end
 
       def test_case(test_case)
@@ -29,6 +30,10 @@ module Cucumber
         self
       end
 
+      def with_receiver(receiver)
+        self.class.new(@tag_limits, receiver)
+      end
+
       private
 
       attr_reader :gated_receiver