cucumber 2.0.0.rc.4 → 2.0.0.rc.5

data/lib/cucumber/runtime.rb

@@ -102,6 +102,10 @@ module Cucumber
       @support_code.fire_hook(:begin_scenario, scenario)
     end
 
+    def end_scenario(scenario)
+      @support_code.fire_hook(:end_scenario)
+    end
+
     def unknown_programming_language?
       @support_code.unknown_programming_language?
     end
@@ -201,7 +205,7 @@ module Cucumber
         summary_report.test_cases.total_passed > 0
       else
         summary_report.test_cases.total_failed > 0 || summary_report.test_steps.total_failed > 0 ||
-          (@configuration.strict? && (summary_report.test_steps.total_undefined > 0 || summary_report.test_steps.total_skipped > 0))
+          (@configuration.strict? && (summary_report.test_steps.total_undefined > 0 || summary_report.test_steps.total_pending > 0))
       end
     end
     public :failure?

data/lib/cucumber/runtime/for_programming_languages.rb

@@ -23,8 +23,8 @@ module Cucumber
         :step_match
 
       def_delegators :@support_code,
-        :invoke_steps,
-        :invoke,
+        :invoke_dynamic_steps,
+        :invoke_dynamic_step,
         :load_programming_language
 
       # Returns a Cucumber::MultilineArgument::DataTable for +text_or_table+, which can either

data/lib/cucumber/runtime/support_code.rb

@@ -23,7 +23,7 @@ module Cucumber
 
         def step(step)
           location = Core::Ast::Location.of_caller
-          @support_code.invoke(step.name, multiline_arg(step, location))
+          @support_code.invoke_dynamic_step(step.name, multiline_arg(step, location))
         end
 
         def eof
@@ -58,14 +58,24 @@ module Cucumber
       #     Given I have 8 cukes in my belly
       #     Then I should not be thirsty
       #   })
-      def invoke_steps(steps_text, i18n, file_colon_line)
+      def invoke_dynamic_steps(steps_text, i18n, file_colon_line)
         file, line = file_colon_line.split(':')
         parser = Gherkin::Parser::Parser.new(StepInvoker.new(self), true, 'steps', false, i18n.iso_code)
         parser.parse(steps_text, file, line.to_i)
       end
 
-      def invoke(step_name, multiline_argument, location=nil)
-        step_match(step_name).invoke(multiline_argument)
+      # @api private
+      # This allows users to attempt to find, match and execute steps
+      # from code as the features are running, as opposed to regular
+      # steps which are compiled into test steps before execution.
+      #
+      # These are commonly called nested steps.
+      def invoke_dynamic_step(step_name, multiline_argument, location=nil)
+        begin
+          step_match(step_name).invoke(multiline_argument)
+        rescue Undefined => exception
+          raise UndefinedDynamicStep, step_name
+        end
       end
 
       # Loads and registers programming language implementation.
@@ -137,7 +147,7 @@ module Cucumber
 
       def find_after_step_hooks(test_case)
         ruby = load_programming_language('rb')
-        scenario = Ast::Facade.new(test_case).build_scenario
+        scenario = RunningTestCase.new(test_case)
 
         action_blocks = ruby.hooks_for(:after_step, scenario).map do |hook|
           ->(*args) { hook.invoke('AfterStep', args) }
@@ -147,7 +157,7 @@ module Cucumber
 
       def apply_before_hooks(test_case)
         ruby = load_programming_language('rb')
-        scenario = Ast::Facade.new(test_case).build_scenario
+        scenario = RunningTestCase.new(test_case)
 
         action_blocks = ruby.hooks_for(:before, scenario).map do |hook|
           ->(result) { hook.invoke('Before', scenario.with_result(result)) }
@@ -157,7 +167,7 @@ module Cucumber
 
       def apply_after_hooks(test_case)
         ruby = load_programming_language('rb')
-        scenario = Ast::Facade.new(test_case).build_scenario
+        scenario = RunningTestCase.new(test_case)
 
         action_blocks = ruby.hooks_for(:after, scenario).map do |hook|
           ->(result) { hook.invoke('After', scenario.with_result(result)) }
@@ -167,7 +177,7 @@ module Cucumber
 
       def find_around_hooks(test_case)
         ruby = load_programming_language('rb')
-        scenario = Ast::Facade.new(test_case).build_scenario
+        scenario = RunningTestCase.new(test_case)
 
         ruby.hooks_for(:around, scenario).map do |hook|
           Hooks.around_hook(test_case.source) do |run_scenario|

data/spec/cucumber/formatter/junit_spec.rb

@@ -4,192 +4,248 @@ require 'cucumber/formatter/spec_helper'
 require 'cucumber/formatter/junit'
 require 'nokogiri'
 
-module Cucumber::Formatter
-  describe Junit do
-    extend SpecHelperDsl
-    include SpecHelper
-
-    class TestDoubleJunitFormatter < Junit
-      attr_reader :written_files
-
-      def write_file(feature_filename, data)
-        @written_files ||= {}
-        @written_files[feature_filename] = data
+module Cucumber
+  module Formatter
+    describe Junit do
+      extend SpecHelperDsl
+      include SpecHelper
+
+      class TestDoubleJunitFormatter < Junit
+        attr_reader :written_files
+
+        def write_file(feature_filename, data)
+          @written_files ||= {}
+          @written_files[feature_filename] = data
+        end
       end
-    end
 
-    before(:each) do
-      allow(File).to receive(:directory?) { true }
-      @formatter = TestDoubleJunitFormatter.new(runtime, '', {})
-    end
+      context "With no options" do
+        before(:each) do
+          allow(File).to receive(:directory?) { true }
+          @formatter = TestDoubleJunitFormatter.new(runtime, '', {})
+        end
 
-    after(:each) do
-      $stdout = STDOUT
-    end
+        after(:each) do
+          $stdout = STDOUT
+        end
 
-    describe "is able to strip control chars from cdata" do
-      before(:each) do
-        run_defined_feature
-        @doc = Nokogiri.XML(@formatter.written_files.values.first)
-      end
-      define_feature "
-          Feature: One passing scenario, one failing scenario
-
-            Scenario: Passing
-              Given a passing ctrl scenario
-        "
-      class Junit
-        def before_step(step)
-          if step.name.match("a passing ctrl scenario")
-            Interceptor::Pipe.unwrap! :stdout
-            @fake_io = $stdout = StringIO.new
-            $stdout.sync = true
-            @interceptedout = Interceptor::Pipe.wrap(:stdout)
+        describe "is able to strip control chars from cdata" do
+          before(:each) do
+            run_defined_feature
+            @doc = Nokogiri.XML(@formatter.written_files.values.first)
+          end
+          define_feature "
+              Feature: One passing scenario, one failing scenario
+
+                Scenario: Passing
+                  Given a passing ctrl scenario
+            "
+          class Junit
+            def before_step(step)
+              if step.name.match("a passing ctrl scenario")
+                Interceptor::Pipe.unwrap! :stdout
+                @fake_io = $stdout = StringIO.new
+                $stdout.sync = true
+                @interceptedout = Interceptor::Pipe.wrap(:stdout)
+              end
+            end
+
+            def after_step(step)
+              if step.name.match("a passing ctrl scenario")
+                @interceptedout.write("boo\b\cx\e\a\f boo ")
+                $stdout = STDOUT
+                @fake_io.close
+              end
+            end
           end
+
+          it { expect(@doc.xpath('//testsuite/system-out').first.content).to match(/\s+boo boo\s+/) }
         end
 
-        def after_step(step)
-          if step.name.match("a passing ctrl scenario")
-            @interceptedout.write("boo\b\cx\e\a\f boo ")
-            $stdout = STDOUT
-            @fake_io.close
+        describe "a feature with no name" do
+          define_feature <<-FEATURE
+            Feature:
+              Scenario: Passing
+                Given a passing scenario
+          FEATURE
+
+          it "raises an exception" do
+            expect(-> {
+              run_defined_feature
+            }).to raise_error(Junit::UnNamedFeatureError)
           end
         end
-      end
 
-      it { expect(@doc.xpath('//testsuite/system-out').first.content).to match(/\s+boo boo\s+/) }
-    end
-
-    describe "a feature with no name" do
-      define_feature <<-FEATURE
-        Feature:
-          Scenario: Passing
-            Given a passing scenario
-      FEATURE
-
-      it "raises an exception" do
-        expect(-> {
-          run_defined_feature
-        }).to raise_error(Junit::UnNamedFeatureError)
-      end
-    end
-
-    describe "given a single feature" do
-      before(:each) do
-        run_defined_feature
-        @doc = Nokogiri.XML(@formatter.written_files.values.first)
-      end
+        describe "given a single feature" do
+          before(:each) do
+            run_defined_feature
+            @doc = Nokogiri.XML(@formatter.written_files.values.first)
+          end
 
-      describe "with a single scenario" do
-        define_feature <<-FEATURE
-          Feature: One passing scenario, one failing scenario
+          describe "with a single scenario" do
+            define_feature <<-FEATURE
+              Feature: One passing scenario, one failing scenario
 
-            Scenario: Passing
-              Given a passing scenario
-        FEATURE
+                Scenario: Passing
+                  Given a passing scenario
+            FEATURE
 
-        it { expect(@doc.to_s).to match /One passing scenario, one failing scenario/ }
+            it { expect(@doc.to_s).to match /One passing scenario, one failing scenario/ }
 
-        it 'has a root system-out node' do
-          expect(@doc.xpath('//testsuite/system-out').size).to eq 1
-        end
+            it 'has a root system-out node' do
+              expect(@doc.xpath('//testsuite/system-out').size).to eq 1
+            end
 
-        it 'has a root system-err node' do
-          expect(@doc.xpath('//testsuite/system-err').size).to eq 1
-        end
+            it 'has a root system-err node' do
+              expect(@doc.xpath('//testsuite/system-err').size).to eq 1
+            end
 
-        it 'has a system-out node under <testcase/>' do
-          expect(@doc.xpath('//testcase/system-out').size).to eq 1
-        end
+            it 'has a system-out node under <testcase/>' do
+              expect(@doc.xpath('//testcase/system-out').size).to eq 1
+            end
 
-        it 'has a system-err node under <testcase/>' do
-          expect(@doc.xpath('//testcase/system-err').size).to eq 1
-        end
-      end
+            it 'has a system-err node under <testcase/>' do
+              expect(@doc.xpath('//testcase/system-err').size).to eq 1
+            end
+          end
 
-      describe "with a scenario in a subdirectory" do
-        define_feature %{
-          Feature: One passing scenario, one failing scenario
+          describe "with a scenario in a subdirectory" do
+            define_feature %{
+              Feature: One passing scenario, one failing scenario
 
-            Scenario: Passing
-              Given a passing scenario
-        }, File.join('features', 'some', 'path', 'spec.feature')
+                Scenario: Passing
+                  Given a passing scenario
+            }, File.join('features', 'some', 'path', 'spec.feature')
 
-        it 'writes the filename including the subdirectory' do
-          expect(@formatter.written_files.keys.first).to eq File.join('', 'TEST-features-some-path-spec.xml')
-        end
-      end
+            it 'writes the filename including the subdirectory' do
+              expect(@formatter.written_files.keys.first).to eq File.join('', 'TEST-features-some-path-spec.xml')
+            end
+          end
 
-      describe "with a scenario outline table" do
-        define_steps do
-          Given(/.*/) {  }
-        end
+          describe "with a scenario outline table" do
+            define_steps do
+              Given(/.*/) {  }
+            end
+
+            define_feature <<-FEATURE
+              Feature: Eat things when hungry
+
+                Scenario Outline: Eat things
+                  Given <Things>
+                  And stuff:
+                    | foo |
+                    | bar |
+
+                Examples: Good
+                  | Things   |
+                  | Cucumber |
+                  | Whisky   |
+                Examples: Evil
+                  | Things   |
+                  | Big Mac  |
+            FEATURE
+
+            it { expect(@doc.to_s).to match /Eat things when hungry/ }
+            it { expect(@doc.to_s).to match /Cucumber/ }
+            it { expect(@doc.to_s).to match /Whisky/ }
+            it { expect(@doc.to_s).to match /Big Mac/ }
+            it { expect(@doc.to_s).not_to match /Things/ }
+            it { expect(@doc.to_s).not_to match /Good|Evil/ }
+            it { expect(@doc.to_s).not_to match /type="skipped"/}
+          end
 
-        define_feature <<-FEATURE
-          Feature: Eat things when hungry
-
-            Scenario Outline: Eat things
-              Given <Things>
-              And stuff:
-                | foo |
-                | bar |
-
-            Examples: Good
-              | Things   |
-              | Cucumber |
-              | Whisky   |
-            Examples: Evil
-              | Things   |
-              | Big Mac  |
-        FEATURE
-
-        it { expect(@doc.to_s).to match /Eat things when hungry/ }
-        it { expect(@doc.to_s).to match /Cucumber/ }
-        it { expect(@doc.to_s).to match /Whisky/ }
-        it { expect(@doc.to_s).to match /Big Mac/ }
-        it { expect(@doc.to_s).not_to match /Things/ }
-        it { expect(@doc.to_s).not_to match /Good|Evil/ }
-        it { expect(@doc.to_s).not_to match /type="skipped"/}
-      end
+          describe "scenario with skipped test in junit report" do
+            define_feature <<-FEATURE
+              Feature: junit report with skipped test
 
-      describe "scenario with skipped test in junit report" do
-        define_feature <<-FEATURE
-          Feature: junit report with skipped test
+                Scenario Outline: skip a test and junit report of the same
+                  Given a <skip> scenario
 
-            Scenario Outline: skip a test and junit report of the same
-              Given a <skip> scenario
+                Examples:
+                  | skip   |
+                  | undefined |
+                  | still undefined  |
+            FEATURE
 
-            Examples:
-              | skip   |
-              | undefined |
-              | still undefined  |
-        FEATURE
+            it { expect(@doc.to_s).to match /skipped="2"/}
+          end
 
-        it { expect(@doc.to_s).to match /skipped="2"/}
+          describe "with a regular data table scenario" do
+            define_steps do
+              Given(/the following items on a shortlist/) { |table| }
+              When(/I go.*/) {  }
+              Then(/I should have visited at least/) { |table| }
+            end
+
+            define_feature <<-FEATURE
+              Feature: Shortlist
+
+                Scenario: Procure items
+                  Given the following items on a shortlist:
+                    | item    |
+                    | milk    |
+                    | cookies |
+                  When I get some..
+                  Then I'll eat 'em
+
+            FEATURE
+            # these type of tables shouldn't crash (or generate test cases)
+            it { expect(@doc.to_s).not_to match /milk/ }
+            it { expect(@doc.to_s).not_to match /cookies/ }
+          end
+        end
       end
+      
+      context "In --expand mode" do
+        let(:runtime)   { Runtime.new({:expand => true}) }
+        before(:each) do
+          allow(File).to receive(:directory?) { true }
+          @formatter = TestDoubleJunitFormatter.new(runtime, '', {:expand => true})
+        end
 
-      describe "with a regular data table scenario" do
-        define_steps do
-          Given(/the following items on a shortlist/) { |table| }
-          When(/I go.*/) {  }
-          Then(/I should have visited at least/) { |table| }
+        after(:each) do
+          $stdout = STDOUT
         end
 
-        define_feature <<-FEATURE
-          Feature: Shortlist
-
-            Scenario: Procure items
-              Given the following items on a shortlist:
-                | item    |
-                | milk    |
-                | cookies |
-              When I get some..
-              Then I'll eat 'em
-
-        FEATURE
-        # these type of tables shouldn't crash (or generate test cases)
-        it { expect(@doc.to_s).not_to match /milk/ }
-        it { expect(@doc.to_s).not_to match /cookies/ }
+        describe "given a single feature" do
+          before(:each) do
+            run_defined_feature
+            @doc = Nokogiri.XML(@formatter.written_files.values.first)
+          end
+          
+          describe "with a scenario outline table" do
+            define_steps do
+              Given(/.*/) {  }
+            end
+
+            define_feature <<-FEATURE
+              Feature: Eat things when hungry
+
+                Scenario Outline: Eat things
+                  Given <Things>
+                  And stuff:
+                    | foo |
+                    | bar |
+
+                Examples: Good
+                  | Things   |
+                  | Cucumber |
+                  | Whisky   |
+                Examples: Evil
+                  | Things   |
+                  | Big Mac  |
+            FEATURE
+
+            it { expect(@doc.to_s).to match /Eat things when hungry/ }
+            it { expect(@doc.to_s).to match /Cucumber/ }
+            it { expect(@doc.to_s).to match /Whisky/ }
+            it { expect(@doc.to_s).to match /Big Mac/ }
+            it { expect(@doc.to_s).not_to match /Things/ }
+            it { expect(@doc.to_s).not_to match /Good|Evil/ }
+            it { expect(@doc.to_s).not_to match /type="skipped"/}
+          end
+        end
+        
       end
     end
   end