cucumber-core 1.0.0.beta.2 → 1.0.0.beta.3

data/spec/cucumber/core/test/{mapping_spec.rb → action_spec.rb}

@@ -1,58 +1,66 @@
-require 'cucumber/core/test/mapping'
+require 'cucumber/core/test/action'
 
 module Cucumber
   module Core
     module Test
 
-      describe Mapping do
+      describe Action do
+        let(:last_result) { double('last_result') }
 
         context "constructed without a block" do
           it "raises an error" do
-            expect { Mapping.new }.to raise_error(ArgumentError)
+            expect { Action.new }.to raise_error(ArgumentError)
           end
         end
 
         context "executing" do
           it "executes the block passed to the constructor" do
             executed = false
-            mapping = Mapping.new { executed = true }
-            mapping.execute
+            mapping = Action.new { executed = true }
+            mapping.execute(last_result)
             expect( executed ).to be_truthy
           end
 
           it "returns a passed result if the block doesn't fail" do
-            mapping = Mapping.new {}
-            expect( mapping.execute ).to be_passed
+            mapping = Action.new {}
+            expect( mapping.execute(last_result) ).to be_passed
           end
 
           it "returns a failed result when the block raises an error" do
             exception = StandardError.new
-            mapping = Mapping.new { raise exception }
-            result = mapping.execute
+            mapping = Action.new { raise exception }
+            result = mapping.execute(last_result)
             expect( result ).to be_failed
             expect( result.exception ).to eq exception
           end
 
+          it "yields the last_result to the block" do
+            last_result_spy = nil
+            mapping = Action.new { |last_result| last_result_spy = last_result }
+            mapping.execute(last_result)
+            expect(last_result_spy).to eq last_result
+          end
+
           it "returns a pending result if a Result::Pending error is raised" do
             exception = Result::Pending.new("TODO")
-            mapping = Mapping.new { raise exception }
-            result = mapping.execute
+            mapping = Action.new { raise exception }
+            result = mapping.execute(last_result)
             expect( result ).to be_pending
             expect( result.message ).to eq "TODO"
           end
 
           it "returns a skipped result if a Result::Skipped error is raised" do
             exception = Result::Skipped.new("Not working right now")
-            mapping = Mapping.new { raise exception }
-            result = mapping.execute
+            mapping = Action.new { raise exception }
+            result = mapping.execute(last_result)
             expect( result ).to be_skipped
             expect( result.message ).to eq "Not working right now"
           end
 
           it "returns an undefined result if a Result::Undefined error is raised" do
             exception = Result::Undefined.new("new step")
-            mapping = Mapping.new { raise exception }
-            result = mapping.execute
+            mapping = Action.new { raise exception }
+            result = mapping.execute(last_result)
             expect( result ).to be_undefined
             expect( result.message ).to eq "new step"
           end
@@ -66,14 +74,14 @@ module Cucumber
             end
 
             it "records the nanoseconds duration of the execution on the result" do
-              mapping = Mapping.new { }
-              duration = mapping.execute.duration
+              mapping = Action.new { }
+              duration = mapping.execute(last_result).duration
               expect( duration ).to eq 1
             end
 
             it "records the duration of a failed execution" do
-              mapping = Mapping.new { raise StandardError }
-              duration = mapping.execute.duration
+              mapping = Action.new { raise StandardError }
+              duration = mapping.execute(last_result).duration
               expect( duration ).to eq 1
             end
           end
@@ -83,31 +91,32 @@ module Cucumber
         context "skipping" do
           it "does not execute the block" do
             executed = false
-            mapping = Mapping.new { executed = true }
-            mapping.skip
+            mapping = Action.new { executed = true }
+            mapping.skip(last_result)
             expect( executed ).to be_falsey
           end
 
           it "returns a skipped result" do
-            mapping = Mapping.new {}
-            expect( mapping.skip ).to be_skipped
+            mapping = Action.new {}
+            expect( mapping.skip(last_result) ).to be_skipped
           end
         end
       end
 
-      describe UndefinedMapping do
-        let(:mapping) { UndefinedMapping.new }
+      describe UndefinedAction do
+        let(:mapping) { UndefinedAction.new }
         let(:test_step) { double }
+        let(:last_result) { double('last_result') }
 
         context "executing" do
           it "returns an undefined result" do
-            expect( mapping.execute ).to be_undefined
+            expect( mapping.execute(last_result) ).to be_undefined
           end
         end
 
         context "skipping" do
           it "returns an undefined result" do
-            expect( mapping.skip ).to be_undefined
+            expect( mapping.skip(last_result) ).to be_undefined
           end
         end
 

data/spec/cucumber/core/test/mapper_spec.rb

@@ -17,11 +17,12 @@ module Cucumber
           end
         end
 
-        let(:mapper)   { Mapper.new(mappings, receiver) }
-        let(:receiver) { double('receiver') }
-        before         { allow(receiver).to receive(:test_case).and_yield(receiver) }
-        let(:mappings) { ExampleMappings.new(app) }
-        let(:app)      { double('app') }
+        let(:mapper)      { Mapper.new(mappings, receiver) }
+        let(:receiver)    { double('receiver') }
+        before            { allow(receiver).to receive(:test_case).and_yield(receiver) }
+        let(:mappings)    { ExampleMappings.new(app) }
+        let(:app)         { double('app') }
+        let(:last_result) { double('last_result') }
 
         context "an unmapped step" do
           let(:test_step) { Test::Step.new([double(name: 'unmapped')]) }
@@ -30,7 +31,7 @@ module Cucumber
           it "maps to a step that executes to an undefined result" do
             expect( receiver ).to receive(:test_step) do |test_step|
               expect( test_step.name ).to eq 'unmapped'
-              expect( test_step.execute ).to be_undefined
+              expect( test_step.execute(last_result) ).to be_undefined
             end.once.ordered
             test_case.describe_to mapper
           end
@@ -44,7 +45,7 @@ module Cucumber
             expect( receiver ).to receive(:test_step) do |test_step|
               expect( test_step.name ).to eq 'mapped'
               expect( app ).to receive(:do_something)
-              test_step.execute
+              test_step.execute(last_result)
             end.once.ordered
             test_case.describe_to mapper
           end
@@ -68,7 +69,7 @@ module Cucumber
 
         context "mapping hooks" do
           let(:test_case)  { Case.new([test_step], source) }
-          let(:test_step)  { Step.new([Ast::Step.new(:language, :location, :keyword, :name, :multiline_arg)]) }
+          let(:test_step)  { Step.new([Ast::Step.new(:node, :language, :location, :keyword, :name, :multiline_arg)]) }
           let(:source)     { [feature, scenario] }
           let(:feature)    { double('feature') }
           let(:scenario)   { double('scenario', location: 'test') }
@@ -108,7 +109,7 @@ module Cucumber
 
             allow(receiver).to receive(:test_case).and_yield(receiver)
             allow(receiver).to receive(:test_step) do |test_step|
-              test_step.execute
+              test_step.execute(last_result)
             end
 
             test_case.describe_to mapper
@@ -127,7 +128,7 @@ module Cucumber
               expect( scenario ).to receive(:describe_to)
               expect( visitor ).to receive(:before_hook) do |hook, hook_args|
                 expect( args ).to eq(hook_args)
-                expect( hook.location.to_s ).to eq("#{__FILE__}:120")
+                expect( hook.location.to_s ).to eq("#{__FILE__}:121")
               end
               test_step.describe_source_to(visitor, args)
             end
@@ -147,7 +148,7 @@ module Cucumber
               expect( scenario ).to receive(:describe_to)
               expect( visitor ).to receive(:after_hook) do |hook, hook_args|
                 expect( args ).to eq(hook_args)
-                expect( hook.location.to_s ).to eq("#{__FILE__}:140")
+                expect( hook.location.to_s ).to eq("#{__FILE__}:141")
               end
               test_step.describe_source_to(visitor, args)
             end
@@ -167,7 +168,7 @@ module Cucumber
             expect( visitor ).to receive(:step).ordered
             expect( visitor ).to receive(:after_step_hook) do |hook, hook_args|
               expect( args ).to eq(hook_args)
-              expect( hook.location.to_s ).to eq("#{__FILE__}:159")
+              expect( hook.location.to_s ).to eq("#{__FILE__}:160")
             end.once.ordered
             expect( visitor ).to receive(:step).ordered
             test_case.describe_to mapper

data/spec/cucumber/core/test/runner_spec.rb

@@ -195,5 +195,19 @@ module Cucumber::Core::Test
       end
     end
 
+    context "passing latest result to a mapping" do
+      it "passes a Failed result when the scenario is failing" do
+        result_spy = nil
+        hook_mapping = UnskippableAction.new do |last_result|
+          result_spy = last_result
+        end
+        after_hook = Step.new([double], hook_mapping)
+        failing_step = Step.new([double]).with_mapping { fail }
+        test_case = Case.new([failing_step, after_hook], source)
+        test_case.describe_to runner
+        expect(result_spy).to be_failed
+      end
+    end
+
   end
 end

data/spec/cucumber/core/test/step_spec.rb

@@ -2,6 +2,7 @@ require 'cucumber/core/test/step'
 
 module Cucumber::Core::Test
   describe Step do
+    let(:last_result) { double('last_result') }
 
     describe "describing itself" do
       it "describes itself to a visitor" do
@@ -30,7 +31,7 @@ module Cucumber::Core::Test
       context "when a passing mapping exists" do
         it "returns a passing result" do
           test_step = Step.new([ast_step]).with_mapping {}
-          expect( test_step.execute ).to be_passed
+          expect( test_step.execute(last_result) ).to be_passed
         end
       end
 
@@ -39,7 +40,7 @@ module Cucumber::Core::Test
 
         it "returns a failing result" do
           test_step = Step.new([ast_step]).with_mapping { raise exception }
-          result = test_step.execute
+          result = test_step.execute(last_result)
           expect( result           ).to be_failed
           expect( result.exception ).to eq exception
         end
@@ -48,7 +49,7 @@ module Cucumber::Core::Test
       context "with no mapping" do
         it "returns an Undefined result" do
           test_step = Step.new([ast_step])
-          result = test_step.execute
+          result = test_step.execute(last_result)
           expect( result           ).to be_undefined
         end
       end

data/spec/cucumber/core_spec.rb

@@ -297,17 +297,17 @@ module Cucumber
 
           def test_case(test_case, mapper)
             mapper.before { @logger << ['--'] }
-            failing_before = -> do
+            failing_before = proc do
               @logger << [:failing_before, test_case.name]
               raise Failure
             end
-            passing_after = -> do
+            passing_after = proc do
               @logger << [:passing_after, test_case.name]
             end
-            passing_before = -> do 
+            passing_before = proc do 
               @logger << [:passing_before, test_case.name]
             end
-            failing_after = -> do
+            failing_after = proc do
               @logger << [:failing_after, test_case.name]
               raise Failure
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -125,7 +125,6 @@ files:
 - lib/cucumber/core/ast/examples_table.rb
 - lib/cucumber/core/ast/feature.rb
 - lib/cucumber/core/ast/location.rb
-- lib/cucumber/core/ast/multiline_argument.rb
 - lib/cucumber/core/ast/names.rb
 - lib/cucumber/core/ast/outline_step.rb
 - lib/cucumber/core/ast/scenario.rb
@@ -139,13 +138,12 @@ files:
 - lib/cucumber/core/gherkin/writer.rb
 - lib/cucumber/core/gherkin/writer/helpers.rb
 - lib/cucumber/core/platform.rb
+- lib/cucumber/core/test/action.rb
 - lib/cucumber/core/test/case.rb
 - lib/cucumber/core/test/filters.rb
-- lib/cucumber/core/test/filters/debug_filter.rb
 - lib/cucumber/core/test/filters/tag_filter.rb
 - lib/cucumber/core/test/hooks.rb
 - lib/cucumber/core/test/mapper.rb
-- lib/cucumber/core/test/mapping.rb
 - lib/cucumber/core/test/result.rb
 - lib/cucumber/core/test/runner.rb
 - lib/cucumber/core/test/step.rb
@@ -163,10 +161,10 @@ files:
 - spec/cucumber/core/compiler_spec.rb
 - spec/cucumber/core/gherkin/parser_spec.rb
 - spec/cucumber/core/gherkin/writer_spec.rb
+- spec/cucumber/core/test/action_spec.rb
 - spec/cucumber/core/test/case_spec.rb
 - spec/cucumber/core/test/hooks_spec.rb
 - spec/cucumber/core/test/mapper_spec.rb
-- spec/cucumber/core/test/mapping_spec.rb
 - spec/cucumber/core/test/result_spec.rb
 - spec/cucumber/core/test/runner_spec.rb
 - spec/cucumber/core/test/step_spec.rb
@@ -198,7 +196,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: cucumber-core-1.0.0.beta.2
+summary: cucumber-core-1.0.0.beta.3
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb
@@ -211,10 +209,10 @@ test_files:
 - spec/cucumber/core/compiler_spec.rb
 - spec/cucumber/core/gherkin/parser_spec.rb
 - spec/cucumber/core/gherkin/writer_spec.rb
+- spec/cucumber/core/test/action_spec.rb
 - spec/cucumber/core/test/case_spec.rb
 - spec/cucumber/core/test/hooks_spec.rb
 - spec/cucumber/core/test/mapper_spec.rb
-- spec/cucumber/core/test/mapping_spec.rb
 - spec/cucumber/core/test/result_spec.rb
 - spec/cucumber/core/test/runner_spec.rb
 - spec/cucumber/core/test/step_spec.rb

data/lib/cucumber/core/ast/multiline_argument.rb

@@ -1,34 +0,0 @@
-require 'gherkin/rubify'
-
-module Cucumber
-  module Core
-    module Ast
-      module MultilineArgument
-
-        class << self
-          include Gherkin::Rubify
-
-          # TODO: move this up to the front-end
-          def from(argument, parent_location)
-            return EmptyMultilineArgument.new unless argument
-            return argument if argument.respond_to?(:to_step_definition_arg)
-
-            argument = rubify(argument)
-            case argument
-            when String
-              Ast::DocString.new(argument, 'text/plain', parent_location)
-            when ::Gherkin::Formatter::Model::DocString
-              Ast::DocString.new(argument.value, argument.content_type, parent_location.on_line(argument.line_range))
-            when Array
-              location = parent_location.on_line(argument.first.line..argument.last.line)
-              Ast::DataTable.new(argument.map{|row| row.cells}, location)
-            else
-              raise ArgumentError, "Don't know how to convert #{argument.inspect} into a MultilineArgument"
-            end
-          end
-
-        end
-      end
-    end
-  end
-end

data/lib/cucumber/core/test/filters/debug_filter.rb

@@ -1,28 +0,0 @@
-module Cucumber
-  module Core
-    module Test
-      class DebugFilter
-        def initialize(receiver)
-          @receiver = receiver
-        end
-
-        def test_case(test_case, &descend)
-          p [:test_case, test_case.source.last.class, test_case.location.to_s]
-          descend.call(self)
-          test_case.describe_to @receiver
-          self
-        end
-
-        def test_step(test_step)
-          p [:test_step, test_step.source.last.class, test_step.location.to_s]
-          self
-        end
-
-        def done
-          @receiver.done
-        end
-      end
-    end
-  end
-end
-