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

data/lib/cucumber/core/platform.rb

@@ -4,27 +4,12 @@ require 'rbconfig'
 
 module Cucumber
   unless defined?(Cucumber::VERSION)
-    VERSION       = '2.0'
-    BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
-    LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
     JRUBY         = defined?(JRUBY_VERSION)
     IRONRUBY      = defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
     WINDOWS       = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     OS_X          = RbConfig::CONFIG['host_os'] =~ /darwin/
     WINDOWS_MRI   = WINDOWS && !JRUBY && !IRONRUBY
-    RAILS         = defined?(Rails)
-    RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
     RUBY_2_0      = RUBY_VERSION =~ /^2\.0/
     RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
-
-    class << self
-      attr_accessor :use_full_backtrace
-
-      # @private
-      def file_mode(m, encoding="UTF-8")
-        "#{m}:#{encoding}"
-      end
-    end
-    self.use_full_backtrace = false
   end
 end

data/lib/cucumber/core/report/summary.rb

@@ -0,0 +1,26 @@
+module Cucumber
+  module Core
+    module Report
+      class Summary
+        attr_reader :test_cases, :test_steps
+
+        def initialize
+          @test_cases = Test::Result::Summary.new
+          @test_steps = Test::Result::Summary.new
+        end
+
+        def after_test_case(test_case, result)
+          result.describe_to test_cases
+        end
+
+        def after_test_step(test_step, result)
+          result.describe_to test_steps
+        end
+
+        def method_missing(*)
+        end
+
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Cucumber
     module Test
       class Case
         include Cucumber.initializer(:test_steps, :source, :around_hooks)
-        attr_reader :source
+        attr_reader :source, :test_steps
 
         def initialize(test_steps, source, around_hooks = [])
           super(test_steps, source, around_hooks)

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

@@ -1,48 +1,3 @@
+require 'cucumber/core/test/filters/locations_filter'
+require 'cucumber/core/test/filters/name_filter'
 require 'cucumber/core/test/filters/tag_filter'
-module Cucumber
-  module Core
-    module Test
-
-      class LocationsFilter
-        def initialize(locations, receiver)
-          @receiver = receiver
-          @locations = locations
-        end
-
-        def test_case(test_case)
-          if test_case.match_locations?(@locations)
-            test_case.describe_to @receiver
-          end
-          self
-        end
-
-        def done
-          @receiver.done
-          self
-        end
-      end
-
-      class NameFilter
-        include Cucumber.initializer(:name_regexps, :receiver)
-
-        def test_case(test_case)
-          if accept?(test_case)
-            test_case.describe_to(receiver)
-          end
-          self
-        end
-
-        def done
-          @receiver.done
-          self
-        end
-
-        private
-
-        def accept?(test_case)
-          name_regexps.empty? || name_regexps.any? { |name_regexp| test_case.match_name?(name_regexp) }
-        end
-      end
-    end
-  end
-end

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

@@ -0,0 +1,21 @@
+module Cucumber
+  module Core
+    module Test
+      class LocationsFilter
+        include Cucumber.initializer(:locations, :receiver)
+
+        def test_case(test_case)
+          if test_case.match_locations?(@locations)
+            test_case.describe_to @receiver
+          end
+          self
+        end
+
+        def done
+          @receiver.done
+          self
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Cucumber
+  module Core
+    module Test
+      class NameFilter
+        include Cucumber.initializer(:name_regexps, :receiver)
+
+        def test_case(test_case)
+          if accept?(test_case)
+            test_case.describe_to(receiver)
+          end
+          self
+        end
+
+        def done
+          @receiver.done
+          self
+        end
+
+        private
+
+        def accept?(test_case)
+          name_regexps.empty? || name_regexps.any? { |name_regexp| test_case.match_name?(name_regexp) }
+        end
+      end
+    end
+  end
+end

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

@@ -53,6 +53,23 @@ module Cucumber
           end
         end
 
+        class BeforeStepHook
+          include Cucumber.initializer(:location)
+          public :location
+
+          def name
+            "BeforeStep hook"
+          end
+
+          def match_locations?(queried_locations)
+            queried_locations.any? { |other_location| other_location.match?(location) }
+          end
+
+          def describe_to(visitor, *args)
+            visitor.before_step_hook(self, *args)
+          end
+        end
+
         class AfterStepHook
           include Cucumber.initializer(:location)
           public :location

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

@@ -33,7 +33,7 @@ module Cucumber
             hook_factory = HookFactory.new(test_step.source)
             mapper = StepMapper.new(test_step)
             test_step.describe_to mapping_definition, StepMapper::DSL.new(mapper, hook_factory)
-            test_steps.push(*[mapper.test_step] + mapper.after_step_hooks)
+            test_steps.push(*(mapper.before_step_hooks + [mapper.test_step] + mapper.after_step_hooks))
             self
           end
 
@@ -65,7 +65,7 @@ module Cucumber
 
             # Run this block of code after the scenario
             def after(&block)
-              mapper.after_hooks << hook_factory.after(block)
+              mapper.after_hooks.unshift(hook_factory.after(block))
               self
             end
 
@@ -83,6 +83,10 @@ module Cucumber
 
           attr_accessor :test_step
 
+          def before_step_hooks
+            @before_step_hooks ||= []
+          end
+
           def after_step_hooks
             @after_step_hooks ||= []
           end
@@ -91,6 +95,10 @@ module Cucumber
           class DSL
             include Cucumber.initializer(:mapper, :hook_factory)
 
+            def before(&block)
+              mapper.before_step_hooks << hook_factory.before_step(block)
+            end
+
             # Define the step with a block of code to be executed
             def map(&block)
               mapper.test_step = mapper.test_step.with_mapping(&block)
@@ -117,6 +125,10 @@ module Cucumber
             build_hook_step(block, Hooks::BeforeHook, Test::UnskippableAction)
           end
 
+          def before_step(block)
+            build_hook_step(block, Hooks::BeforeStepHook, Test::UnskippableAction)
+          end
+
           def after_step(block)
             build_hook_step(block, Hooks::AfterStepHook, Test::Action)
           end

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

@@ -81,7 +81,7 @@ module Cucumber
         class Raisable < StandardError
           attr_reader :message, :duration
 
-          def initialize(message = "", duration = :unknown, backtrace = nil)
+          def initialize(message = "", duration = UnknownDuration.new, backtrace = nil)
             @message, @duration = message, duration
             super(message)
             set_backtrace(backtrace) if backtrace
@@ -101,7 +101,7 @@ module Cucumber
 
           def describe_to(visitor, *args)
             visitor.undefined(*args)
-            visitor.duration(duration, *args) unless duration == :unknown
+            visitor.duration(duration, *args)
             self
           end
 
@@ -116,7 +116,7 @@ module Cucumber
 
           def describe_to(visitor, *args)
             visitor.skipped(*args)
-            visitor.duration(duration, *args) unless duration == :unknown
+            visitor.duration(duration, *args)
             self
           end
 
@@ -131,7 +131,7 @@ module Cucumber
 
           def describe_to(visitor, *args)
             visitor.pending(self, *args)
-            visitor.duration(duration, *args) unless duration == :unknown
+            visitor.duration(duration, *args)
             self
           end
 
@@ -151,54 +151,64 @@ module Cucumber
         #     => 1
         #
         class Summary
-          attr_reader :total_failed,
-            :total_passed,
-            :total_skipped,
-            :total_undefined,
-            :exceptions,
-            :durations
+          attr_reader :exceptions, :durations
 
           def initialize
-            @total_failed =
-              @total_passed =
-              @total_skipped =
-              @total_undefined = 0
+            @totals = Hash.new { 0 }
             @exceptions = []
             @durations = []
           end
 
-          def failed(*args)
-            @total_failed += 1
-            self
+          def method_missing(name, *args)
+            if name =~ /^total_/
+              get_total(name)
+            else
+              increment_total(name)
+            end
           end
 
-          def passed(*args)
-            @total_passed += 1
+          def exception(exception)
+            @exceptions << exception
             self
           end
 
-          def skipped(*args)
-            @total_skipped +=1
+          def duration(duration)
+            @durations << duration
             self
           end
 
-          def undefined(*args)
-            @total_undefined += 1
-            self
+          def total
+            @totals.reduce(0) { |total, status| total += status[1] }
           end
 
-          def exception(exception)
-            @exceptions << exception
+          private
+
+          def get_total(method_name)
+            status = method_name.to_s.gsub('total_', '').to_sym
+            return @totals.fetch(status) { 0 }
+          end
+
+          def increment_total(status)
+            @totals[status] += 1
             self
           end
+        end
 
-          def duration(duration)
-            @durations << duration
+        class Duration
+          attr_reader :nanoseconds
+
+          def initialize(nanoseconds)
+            @nanoseconds = nanoseconds
+          end
+        end
+
+        class UnknownDuration
+          def tap(&block)
             self
           end
 
-          def total
-            total_passed + total_failed + total_skipped + total_undefined
+          def nanoseconds
+            raise "#nanoseconds only allowed to be used in #tap block"
           end
         end
       end

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

@@ -1,3 +1,5 @@
+require 'cucumber/core/test/result'
+
 module Cucumber
   module Core
     module Test
@@ -8,7 +10,7 @@ module Cucumber
         end
 
         def duration
-          nsec
+          Result::Duration.new(nsec)
         end
 
         def nsec

data/lib/cucumber/core/version.rb

@@ -2,7 +2,7 @@ module Cucumber
   module Core
     class Version
       def self.to_s
-        "1.0.0.beta.3"
+        "1.0.0.beta.4"
       end
     end
   end

data/spec/cucumber/core/ast/examples_table_spec.rb

@@ -3,6 +3,7 @@ require 'cucumber/core/ast/examples_table'
 module Cucumber::Core::Ast
   describe ExamplesTable do
     let(:location) { double(:to_s => 'file.feature:8') }
+    let(:language) { double }
 
     describe ExamplesTable::Header do
       let(:header) { ExamplesTable::Header.new(%w{foo bar baz}, location) }
@@ -15,7 +16,7 @@ module Cucumber::Core::Ast
 
       context 'building a row' do
         it 'includes the header values as keys' do
-          expect( header.build_row(%w{1 2 3}, 1, location) ).to eq ExamplesTable::Row.new({'foo' => '1', 'bar' => '2', 'baz' => '3'}, 1, location)
+          expect( header.build_row(%w{1 2 3}, 1, location, language) ).to eq ExamplesTable::Row.new({'foo' => '1', 'bar' => '2', 'baz' => '3'}, 1, location, language)
         end
       end
     end
@@ -23,15 +24,21 @@ module Cucumber::Core::Ast
 
       describe 'location' do
         it 'knows the file and line number' do
-          row = ExamplesTable::Row.new({}, 1, location)
+          row = ExamplesTable::Row.new({}, 1, location, language)
           expect( row.file_colon_line ).to eq 'file.feature:8'
         end
       end
 
+      describe 'language' do
+        it "has a language" do
+          expect( ExamplesTable::Row.new({}, 1, location, language) ).to respond_to(:language)
+        end
+      end
+
       describe "expanding a string" do
         context "when an argument matches" do
           it "replaces the argument with the value from the row" do
-            row = ExamplesTable::Row.new({'arg' => 'replacement'}, 1, location)
+            row = ExamplesTable::Row.new({'arg' => 'replacement'}, 1, location, language)
             text = 'this <arg> a test'
             expect( row.expand(text) ).to eq 'this replacement a test'
           end
@@ -39,7 +46,7 @@ module Cucumber::Core::Ast
 
         context "when the replacement value is nil" do
           it "uses an empty string for the replacement" do
-            row = ExamplesTable::Row.new({'color' => nil}, 1, location)
+            row = ExamplesTable::Row.new({'color' => nil}, 1, location, language)
             text = 'a <color> cucumber'
             expect( row.expand(text) ).to eq 'a  cucumber'
           end
@@ -47,7 +54,7 @@ module Cucumber::Core::Ast
 
         context "when an argument does not match" do
           it "ignores the arguments that do not match" do
-            row = ExamplesTable::Row.new({'x' => '1', 'y' => '2'}, 1, location)
+            row = ExamplesTable::Row.new({'x' => '1', 'y' => '2'}, 1, location, language)
             text = 'foo <x> bar <z>'
             expect( row.expand(text) ).to eq 'foo 1 bar <z>'
           end
@@ -56,7 +63,7 @@ module Cucumber::Core::Ast
 
       describe 'accesing the values' do
         it 'returns the actual row values' do
-          row = ExamplesTable::Row.new({'x' => '1', 'y' => '2'}, 1, location)
+          row = ExamplesTable::Row.new({'x' => '1', 'y' => '2'}, 1, location, language)
           expect( row.values ).to eq ['1', '2']
         end
       end
@@ -65,20 +72,20 @@ module Cucumber::Core::Ast
         let(:data) { {} }
         let(:number) { double }
         let(:location) { double }
-        let(:original) { ExamplesTable::Row.new(data, number, location) }
+        let(:original) { ExamplesTable::Row.new(data, number, location, language) }
 
         it 'is equal to another instance with the same data, number and location' do
-          expect( original ).to eq ExamplesTable::Row.new(data, number, location)
+          expect( original ).to eq ExamplesTable::Row.new(data, number, location, language)
         end
 
         it 'is not equal to another instance with different data, number or location' do
-          expect( original ).not_to eq ExamplesTable::Row.new({'x' => 'y'}, number, location)
-          expect( original ).not_to eq ExamplesTable::Row.new(data, double, location)
-          expect( original ).not_to eq ExamplesTable::Row.new(data, number, double)
+          expect( original ).not_to eq ExamplesTable::Row.new({'x' => 'y'}, number, location, language)
+          expect( original ).not_to eq ExamplesTable::Row.new(data, double, location, language)
+          expect( original ).not_to eq ExamplesTable::Row.new(data, number, double, double)
         end
 
         it 'is not equal to another type of object' do
-          expect( original ).not_to eq double(data: data, number: number, location: location)
+          expect( original ).not_to eq double(data: data, number: number, location: location, language: language)
         end
 
       end