cucumber-core 0.2.0 → 1.0.0.beta.1

data/spec/cucumber/core_spec.rb

@@ -1,3 +1,4 @@
+require 'report_api_spy'
 require 'cucumber/core'
 require 'cucumber/core/gherkin/writer'
 require 'cucumber/core/platform'
@@ -28,11 +29,9 @@ module Cucumber
     end
 
     describe "compiling features to a test suite" do
+
       it "compiles two scenarios into two test cases" do
-        visitor = double
-        expect( visitor ).to receive(:test_case).exactly(2).times.and_yield.ordered
-        expect( visitor ).to receive(:test_step).exactly(5).times.ordered
-        expect( visitor ).to receive(:done).once.ordered
+        visitor = ReportAPISpy.new
 
         compile([
           gherkin do
@@ -50,6 +49,17 @@ module Cucumber
             end
           end
         ], visitor)
+
+        expect( visitor.messages ).to eq [
+          :test_case,
+          :test_step,
+          :test_step,
+          :test_case,
+          :test_step,
+          :test_step,
+          :test_step,
+          :done,
+        ]
       end
 
       it "filters out test cases based on a tag expression" do
@@ -214,6 +224,10 @@ module Cucumber
           @test_steps = Core::Test::Result::Summary.new
         end
 
+        def before_test_case(*)
+          yield if block_given?
+        end
+
         def after_test_case(test_case, result)
           result.describe_to test_cases
         end
@@ -275,25 +289,61 @@ module Cucumber
       context "with hooks" do
         class HookTestMappings
           Failure = Class.new(StandardError)
+          attr_reader :logger
+
+          def initialize
+            @logger = []
+          end
 
           def test_case(test_case, mapper)
+            mapper.before { @logger << ['--'] }
+            failing_before = -> do
+              @logger << [:failing_before, test_case.name]
+              raise Failure
+            end
+            passing_after = -> do
+              @logger << [:passing_after, test_case.name]
+            end
+            passing_before = -> do 
+              @logger << [:passing_before, test_case.name]
+            end
+            failing_after = -> do
+              @logger << [:failing_after, test_case.name]
+              raise Failure
+            end
+
             case test_case.name
+
             when /fail before/
-              mapper.before { raise Failure }
-              mapper.after  { 'This hook will be skipped' }
+              mapper.before( &failing_before )
+              mapper.after( &passing_after )
+
             when /fail after/
-              mapper.after { raise Failure }
+              mapper.before( &passing_before )
+              mapper.after( &failing_after )
+
+            else
+              mapper.before( &passing_before )
+              mapper.after( &passing_after )
+
             end
+
             self
           end
 
-          def test_step(step, mapper)
-            mapper.map {} # all steps pass
+          def test_step(test_step, mapper)
+            mapper.map { @logger << [:step, test_step.name] } # all steps pass
+            if test_step.name == 'fail after'
+              mapper.after do
+                @logger << :failing_after_step
+                raise Failure 
+              end
+            end
             self
           end
         end
 
-        it "executes the test cases in the suite" do
+        it "executes the steps and hooks in the right order" do
           gherkin = gherkin do
             feature do
               scenario 'fail before' do
@@ -304,6 +354,10 @@ module Cucumber
                 step 'passing'
               end
 
+              scenario 'fail step' do
+                step 'fail after'
+              end
+
               scenario 'passing' do
                 step 'passing'
               end
@@ -314,11 +368,29 @@ module Cucumber
 
           execute [gherkin], mappings, report
 
-          expect( report.test_steps.total        ).to eq(6)
-          expect( report.test_steps.total_failed ).to eq(2)
-          expect( report.test_cases.total        ).to eq(3)
+          expect( report.test_steps.total        ).to eq(17)
+          expect( report.test_steps.total_failed ).to eq(3)
+          expect( report.test_cases.total        ).to eq(4)
           expect( report.test_cases.total_passed ).to eq(1)
-          expect( report.test_cases.total_failed ).to eq(2)
+          expect( report.test_cases.total_failed ).to eq(3)
+          expect( mappings.logger ).to eq [
+            ["--"], 
+            [:failing_before, "Scenario: fail before"], 
+            [:passing_after, "Scenario: fail before"],
+            ["--"], 
+            [:passing_before, "Scenario: fail after"], 
+            [:step, "passing"],
+            [:failing_after, "Scenario: fail after"],
+            ["--"],
+            [:passing_before, "Scenario: fail step"],
+            [:step, "fail after"],
+            :failing_after_step,
+            [:passing_after, "Scenario: fail step"],
+            ["--"],
+            [:passing_before, "Scenario: passing"],
+            [:step, "passing"],
+            [:passing_after, "Scenario: passing"]
+          ]
         end
       end
 
@@ -333,10 +405,16 @@ module Cucumber
           def test_case(test_case, mapper)
             logger = @logger
             mapper.around do |run_scenario|
-              logger << :before
+              logger << :before_all
               run_scenario.call
               logger << :middle
               run_scenario.call
+              logger << :after_all
+            end
+            mapper.before do
+              logger << :before
+            end
+            mapper.after do
               logger << :after
             end
             self
@@ -347,6 +425,9 @@ module Cucumber
             mapper.map do
               logger << :during
             end
+            mapper.after do
+              logger << :after_step
+            end
             self
           end
         end
@@ -367,7 +448,19 @@ module Cucumber
           expect( report.test_cases.total        ).to eq 1
           expect( report.test_cases.total_passed ).to eq 1
           expect( report.test_cases.total_failed ).to eq 0
-          expect( mappings.logger ).to eq [:before, :during, :middle, :during, :after]
+          expect( mappings.logger ).to eq [
+            :before_all, 
+              :before, 
+                :during, 
+                :after_step, 
+              :after, 
+            :middle, 
+              :before,
+                :during, 
+                :after_step, 
+              :after,
+            :after_all
+          ]
         end
       end
 

data/spec/report_api_spy.rb

@@ -0,0 +1,24 @@
+class ReportAPISpy
+  def initialize
+    @result = []
+  end
+
+  def test_case(*args)
+    @result << [:test_case, *args]
+    yield self if block_given?
+  end
+
+  def test_step(*args)
+    @result << [:test_step, *args]
+    yield self if block_given?
+  end
+
+  def done(*args)
+    @result << [:done, *args]
+    yield self if block_given?
+  end
+
+  def messages
+    @result.map(&:first)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0.beta.1
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,90 +12,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: unindent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Core library for the Cucumber BDD app
@@ -104,10 +104,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .rspec
-- .ruby-gemset
-- .travis.yml
+- ".coveralls.yml"
+- ".rspec"
+- ".ruby-gemset"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -141,8 +141,9 @@ files:
 - lib/cucumber/core/platform.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/hook_compiler.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
@@ -163,7 +164,7 @@ files:
 - spec/cucumber/core/gherkin/parser_spec.rb
 - spec/cucumber/core/gherkin/writer_spec.rb
 - spec/cucumber/core/test/case_spec.rb
-- spec/cucumber/core/test/hook_compiler_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
@@ -172,31 +173,32 @@ files:
 - spec/cucumber/core/test/timer_spec.rb
 - spec/cucumber/core_spec.rb
 - spec/cucumber/initializer_spec.rb
+- spec/report_api_spy.rb
 homepage: http://cukes.info
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: cucumber-core-0.2.0
+summary: cucumber-core-1.0.0.beta.1
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb
@@ -210,7 +212,7 @@ test_files:
 - spec/cucumber/core/gherkin/parser_spec.rb
 - spec/cucumber/core/gherkin/writer_spec.rb
 - spec/cucumber/core/test/case_spec.rb
-- spec/cucumber/core/test/hook_compiler_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
@@ -219,3 +221,5 @@ test_files:
 - spec/cucumber/core/test/timer_spec.rb
 - spec/cucumber/core_spec.rb
 - spec/cucumber/initializer_spec.rb
+- spec/report_api_spy.rb
+has_rdoc: 

data/lib/cucumber/core/test/hook_compiler.rb

@@ -1,109 +0,0 @@
-require 'cucumber/initializer'
-
-module Cucumber
-  module Core
-    module Test
-      class HookStep
-        def initialize(source, &block)
-          @mapping = Test::Mapping.new(&block)
-          @source = source
-        end
-
-        def describe_to(visitor, *args)
-          visitor.test_step(self, *args)
-        end
-
-        def describe_source_to(visitor, *args)
-          visitor.hook(*args)
-        end
-
-        def execute
-          @mapping.execute
-        end
-
-        def skip
-          execute
-        end
-
-        def map
-          self
-        end
-
-        def match_locations?(locations)
-          false
-        end
-
-        def inspect
-          "#{self.class}"
-        end
-      end
-
-      class HookCompiler
-        include Cucumber.initializer(:mappings, :receiver)
-
-        def done
-          receiver.done
-          self
-        end
-
-        def test_case(test_case, &descend)
-          @before_hooks, @after_hooks, @around_hooks, @steps = [], [], [], []
-          mapper = HookMapper.new(self, test_case.source)
-          test_case.describe_to mappings, mapper
-          descend.call
-          test_case.
-            with_steps(@before_hooks + @steps + @after_hooks).
-            with_around_hooks(@around_hooks).
-            describe_to(receiver)
-        end
-
-        def before_hook(hook)
-          @before_hooks << hook
-        end
-
-        def after_hook(hook)
-          @after_hooks << hook
-        end
-
-        def around_hook(hook)
-          @around_hooks << hook
-        end
-
-        def test_step(step)
-          @steps << step
-        end
-
-        class HookMapper
-          include Cucumber.initializer(:compiler, :source)
-
-          def before(&block)
-            compiler.before_hook HookStep.new(source, &block)
-          end
-
-          def after(&block)
-            compiler.after_hook HookStep.new(source, &block)
-          end
-
-          def around(&block)
-            compiler.around_hook AroundHook.new(source, &block)
-          end
-
-          class AroundHook
-            def initialize(source, &block)
-              @source = source
-              @block = block
-            end
-
-            def call(continue)
-              @block.call(continue)
-            end
-
-            def describe_to(visitor, *args, &continue)
-              visitor.around_hook(self, *args, &continue)
-            end
-          end
-        end
-      end
-    end
-  end
-end