cucumber 2.1.0 → 2.2.0

data/lib/cucumber/version

@@ -0,0 +1 @@
+2.2.0

data/spec/cucumber/configuration_spec.rb

@@ -136,8 +136,9 @@ module Cucumber
 
     describe "#with_options" do
       it "returns a copy of the configuration with new options" do
-        new_out_stream = double
-        config = Configuration.new.with_options(out_stream: new_out_stream)
+        old_out_stream = double('Old out_stream')
+        new_out_stream = double('New out_stream')
+        config = Configuration.new(out_stream: old_out_stream).with_options(out_stream: new_out_stream)
         expect(config.out_stream).to eq new_out_stream
       end
     end

data/spec/cucumber/filters/activate_steps_spec.rb

@@ -6,10 +6,12 @@ describe Cucumber::Filters::ActivateSteps do
   include Cucumber::Core::Gherkin::Writer
   include Cucumber::Core
 
-  let(:step_definitions) { double(find_match: step_match) }
   let(:step_match) { double(activate: activated_test_step) }
   let(:activated_test_step) { double }
   let(:receiver) { double.as_null_object }
+  let(:filter) { Cucumber::Filters::ActivateSteps.new(step_match_search, configuration) }
+  let(:step_match_search) { Proc.new { [step_match] } }
+  let(:configuration) { double(dry_run?: false, notify: nil) }
 
   context "a scenario with a single step" do
     let(:doc) do
@@ -26,7 +28,15 @@ describe Cucumber::Filters::ActivateSteps do
       expect(step_match).to receive(:activate) do |test_step|
         expect(test_step.name).to eq 'a passing step'
       end
-      compile [doc], receiver, [Cucumber::Filters::ActivateSteps.new(step_definitions)]
+      compile [doc], receiver, [filter]
+    end
+
+    it "notifies with a StepMatch event" do
+      expect(configuration).to receive(:notify) do |event|
+        expect(event.test_step.name).to eq 'a passing step'
+        expect(event.step_match).to eq step_match
+      end
+      compile [doc], receiver, [filter]
     end
   end
 
@@ -50,7 +60,89 @@ describe Cucumber::Filters::ActivateSteps do
       expect(step_match).to receive(:activate) do |test_step|
         expect(test_step.name).to eq 'a passing step'
       end
-      compile [doc], receiver, [Cucumber::Filters::ActivateSteps.new(step_definitions)]
+      compile [doc], receiver, [filter]
+    end
+  end
+
+  context "undefined step" do
+    let(:step_match_search) { Proc.new { [] } }
+
+    let(:doc) do
+      gherkin do
+        feature do
+          scenario do
+            step 'an undefined step'
+          end
+        end
+      end
+    end
+
+    it "does not activate the step" do
+      expect(receiver).to receive(:test_case) do |test_case|
+        expect(test_case.test_steps[0].execute).to be_undefined
+      end
+      compile [doc], receiver, [filter]
+    end
+
+    it "does not notify" do
+      expect(configuration).not_to receive(:notify)
+      compile [doc], receiver, [filter]
+    end
+  end
+
+  context "dry run" do
+    let(:configuration) { double(dry_run?: true, notify: nil) }
+
+    let(:doc) do
+      gherkin do
+        feature do
+          scenario do
+            step 'a passing step'
+          end
+        end
+      end
+    end
+
+    it "activates each step with a skipping action" do
+      expect(receiver).to receive(:test_case) do |test_case|
+        expect(test_case.test_steps[0].execute).to be_skipped
+      end
+      compile [doc], receiver, [filter]
+    end
+
+    it "notifies with a StepMatch event" do
+      expect(configuration).to receive(:notify) do |event|
+        expect(event.test_step.name).to eq 'a passing step'
+        expect(event.step_match).to eq step_match
+      end
+      compile [doc], receiver, [filter]
+    end
+  end
+
+  context "undefined step in a dry run" do
+    let(:step_match_search) { Proc.new { [] } }
+    let(:configuration) { double(dry_run?: true, notify: nil) }
+
+    let(:doc) do
+      gherkin do
+        feature do
+          scenario do
+            step 'an undefined step'
+          end
+        end
+      end
+    end
+
+    it "does not activate the step" do
+      expect(receiver).to receive(:test_case) do |test_case|
+        expect(test_case.test_steps[0].execute).to be_undefined
+      end
+      compile [doc], receiver, [filter]
+    end
+
+    it "does not notify" do
+      expect(configuration).not_to receive(:notify)
+      compile [doc], receiver, [filter]
     end
   end
 

data/spec/cucumber/formatter/html_spec.rb

@@ -486,7 +486,7 @@ module Cucumber
         end
       end
       context "in --expand mode" do
-        let(:runtime)   { Runtime.new({:expand => true})}
+        let(:options)   { { expand: true } }
         before(:each) do
           @out = StringIO.new
           @formatter = Html.new(runtime, @out, {:expand => true})

data/spec/cucumber/formatter/legacy_api/adapter_spec.rb

@@ -5,6 +5,7 @@ require 'cucumber/runtime/step_hooks'
 require 'cucumber/runtime/before_hooks'
 require 'cucumber/runtime/after_hooks'
 require 'cucumber/filters'
+require 'spec_helper'
 
 module Cucumber
   module Formatter::LegacyApi
@@ -12,9 +13,10 @@ module Cucumber
       include Core::Gherkin::Writer
       include Core
 
-      let(:report)    { Adapter.new(formatter, runtime.results, runtime.support_code, runtime.configuration) }
+      let(:report)    { Adapter.new(formatter, runtime.results, runtime.configuration) }
       let(:formatter) { double('formatter').as_null_object }
       let(:runtime)   { Runtime.new }
+      let(:step_match_search) { SimpleStepDefinitionSearch.new }
 
       Failure = Class.new(StandardError)
 
@@ -28,17 +30,17 @@ module Cucumber
         end
       end
 
-      class SimpleStepDefinitions
-        def find_match(test_step)
-          if test_step.name =~ /pass/
-            return SimpleStepMatch.new {}
+      class SimpleStepDefinitionSearch
+        def call(name)
+          if name =~ /pass/
+            return [SimpleStepMatch.new {}]
           end
 
-          if test_step.name =~ /fail/
-            return SimpleStepMatch.new { raise Failure }
+          if name =~ /fail/
+            return [SimpleStepMatch.new { raise Failure }]
           end
 
-          NoStepMatch.new test_step.source.last, test_step.name
+          []
         end
       end
 
@@ -1545,7 +1547,7 @@ module Cucumber
 
           it 'prints the exception within the step' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyAfterStepHooks.new(FailingAfterStepHook.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1591,7 +1593,7 @@ module Cucumber
 
           it 'prints the exception after the scenario name' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyBeforeHooks.new(FailingBeforeHook.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1629,7 +1631,7 @@ module Cucumber
 
           it 'prints the exception after the background name' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyBeforeHooks.new(FailingBeforeHook.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1681,7 +1683,7 @@ module Cucumber
 
           it 'prints the exception before the examples table row' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyBeforeHooks.new(FailingBeforeHook.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1754,7 +1756,7 @@ module Cucumber
 
           it 'prints the exception after the scenario name' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyBeforeHooks.new(FailingAndPassingBeforeHooks.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1802,7 +1804,7 @@ module Cucumber
 
           it 'prints the exception after the steps' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyAfterHooks.new(FailingAfterHook.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1840,7 +1842,7 @@ module Cucumber
 
           it 'prints the exception after the examples table row' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyAfterHooks.new(FailingAfterHook.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1911,7 +1913,7 @@ module Cucumber
 
           it 'prints the exception after the steps' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyAfterHooks.new(FailingThenPassingAfterHooks.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1951,7 +1953,7 @@ module Cucumber
         context 'with an exception in an after hook but no steps' do
           it 'prints the exception after the scenario name' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyAfterHooks.new(FailingAfterHook.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -1991,7 +1993,7 @@ module Cucumber
 
           it 'prints the exception after the scenario name' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyAroundHooks.new(FailingAroundHookBeforeRunningTestCase.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -2031,7 +2033,7 @@ module Cucumber
 
           it 'prints the exception after the scenario name' do
             filters = [
-              Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+              Filters::ActivateSteps.new(step_match_search, runtime.configuration),
               Filters::ApplyAroundHooks.new(FailingAroundHookAfterRunningTestCase.new),
               AddBeforeAndAfterHooks.new
             ]
@@ -2069,6 +2071,28 @@ module Cucumber
         end
       end
 
+      describe 'before_step_result message' do
+        context 'when the step matches' do
+          it "sends the step match to the formatter" do
+            expect(formatter).to receive(:before_step_result) do |_, step_match, *|
+              expect(step_match).to be_a SimpleStepMatch
+            end
+            execute_gherkin do
+              feature do
+                scenario do
+                  step 'passing'
+                end
+              end
+            end
+          end
+        end
+
+        context "when the step doesn't match" do
+          it "sends a null object to the formatter" do
+          end
+        end
+      end
+
       it 'passes nil as the multiline arg when there is none' do
         expect(formatter).to receive(:after_step_result) do |keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line|
           expect(multiline_arg).to be_nil
@@ -2082,14 +2106,17 @@ module Cucumber
         end
       end
 
-      it 'passes an object responding to failed? with the after_feature_element message' do
-        expect( formatter ).to receive(:after_feature_element) do |scenario|
-          expect( scenario ).to be_failed
-        end
-        execute_gherkin do
-          feature do
-            scenario do
-              step 'failing'
+      context "after_feature_element callback" do
+        it 'passes an object reflecting the status of the scenario' do
+          expect( formatter ).to receive(:after_feature_element).once do |scenario|
+            expect( scenario ).to be_failed
+          end
+          execute_gherkin do
+            feature do
+              scenario do
+                step 'failing'
+                step 'this will be skipped'
+              end
             end
           end
         end
@@ -2145,7 +2172,7 @@ module Cucumber
 
       def default_filters
         [
-          Filters::ActivateSteps.new(SimpleStepDefinitions.new),
+          Filters::ActivateSteps.new(step_match_search, runtime.configuration),
           AddBeforeAndAfterHooks.new
         ]
       end

data/spec/cucumber/formatter/pretty_spec.rb

@@ -642,7 +642,7 @@ OUTPUT
       end
 
       context "In --expand mode" do
-        let(:runtime)   { Runtime.new({:expand => true})}
+        let(:options) { { expand: true } }
         before(:each) do
           Cucumber::Term::ANSIColor.coloring = false
           @out = StringIO.new
@@ -731,7 +731,7 @@ OUTPUT
       end
 
       context "In --expand mode with --source as an option" do
-        let(:runtime)   { Runtime.new({:expand => true})}
+        let(:options) { { expand: true } }
         before(:each) do
           Cucumber::Term::ANSIColor.coloring = false
           @out = StringIO.new

data/spec/cucumber/formatter/spec_helper.rb

@@ -19,16 +19,19 @@ module Cucumber
 
       def run_defined_feature
         define_steps
-        runtime.visitor = report
+        actual_runtime.visitor = report
 
         receiver = Test::Runner.new(report)
         filters = [
-          Filters::ActivateSteps.new(runtime.support_code),
-          Filters::ApplyAfterStepHooks.new(runtime.support_code),
-          Filters::ApplyBeforeHooks.new(runtime.support_code),
-          Filters::ApplyAfterHooks.new(runtime.support_code),
-          Filters::ApplyAroundHooks.new(runtime.support_code),
-          Filters::PrepareWorld.new(runtime)
+          Filters::ActivateSteps.new(
+            StepMatchSearch.new(actual_runtime.support_code.ruby.method(:step_matches), actual_runtime.configuration),
+            actual_runtime.configuration
+          ),
+          Filters::ApplyAfterStepHooks.new(actual_runtime.support_code),
+          Filters::ApplyBeforeHooks.new(actual_runtime.support_code),
+          Filters::ApplyAfterHooks.new(actual_runtime.support_code),
+          Filters::ApplyAroundHooks.new(actual_runtime.support_code),
+          Filters::PrepareWorld.new(actual_runtime)
         ]
         compile [gherkin_doc], receiver, filters
       end
@@ -37,9 +40,8 @@ module Cucumber
       def report
         @report ||= LegacyApi::Adapter.new(
           Fanout.new([@formatter]),
-          runtime.results,
-          runtime.support_code,
-          runtime.configuration)
+          actual_runtime.results,
+          actual_runtime.configuration)
       end
 
       require 'cucumber/core/gherkin/document'
@@ -52,16 +54,24 @@ module Cucumber
       end
 
       def runtime
-        @runtime ||= Runtime.new
+        @runtime_facade ||= LegacyApi::RuntimeFacade.new(actual_runtime.results, actual_runtime.support_code, actual_runtime.configuration)
+      end
+
+      def actual_runtime
+        @runtime ||= Runtime.new(options)
       end
 
       def define_steps
         return unless step_defs = self.class.step_defs
-        rb = runtime.load_programming_language('rb')
+        rb = runtime.support_code.ruby
         dsl = Object.new
         dsl.extend RbSupport::RbDsl
         dsl.instance_exec &step_defs
       end
+
+      def options
+        {}
+      end
     end
   end
 end

data/spec/cucumber/rb_support/rb_language_spec.rb

@@ -5,58 +5,15 @@ module Cucumber
   module RbSupport
     describe RbStepDefinition do
       let(:user_interface) { double('user interface') }
-      let(:rb)             { support_code.load_programming_language('rb')}
+      let(:rb)             { support_code.ruby }
       let(:support_code) do
-        Cucumber::Runtime::SupportCode.new(user_interface, {})
+        Cucumber::Runtime::SupportCode.new(user_interface)
       end
       let(:dsl) do
         rb
         Object.new.extend(RbSupport::RbDsl)
       end
 
-      describe "snippets" do
-        let(:snippet) { double.as_null_object }
-
-        it "creates a regexp Snippet class by default" do
-          expect(Snippet::Regexp).to receive(:new) { snippet }
-
-          rb.snippet_text('Given', 'A "string" with 4 spaces', nil)
-        end
-
-        it "creates a regexp Snippet class explicitly" do
-          expect(Snippet::Regexp).to receive(:new) { snippet }
-
-          rb.snippet_text('Given', 'A "string" with 4 spaces', nil, :regexp)
-        end
-
-        it "creates a classic Snippet class" do
-          expect(Snippet::Classic).to receive(:new) { snippet }
-
-          rb.snippet_text('Given', 'A "string" with 4 spaces', nil, :classic)
-        end
-
-        it "creates a percent Snippet class" do
-          expect(Snippet::Percent).to receive(:new) { snippet }
-
-          rb.snippet_text('Given', 'A "string" with 4 spaces', nil, :percent)
-        end
-
-        it "passes all parameters to Snippet contructor" do
-          code_keyword, pattern, multiline_argument_class = double, double, double
-
-          expect(Snippet::Regexp).to receive(:new).with(code_keyword, pattern, multiline_argument_class)
-
-          rb.snippet_text(code_keyword, pattern, multiline_argument_class)
-        end
-
-        it "renders the snippet" do
-          allow(Snippet::Regexp).to receive(:new) { snippet }
-          expect(snippet).to receive(:to_s)
-
-          rb.snippet_text('Given', 'A "string" with 4 spaces', nil)
-        end
-      end
-
       describe "#load_code_file" do
         after do
           FileUtils.rm_rf('tmp.rb')
@@ -84,6 +41,13 @@ module Cucumber
 
           expect($foo).to eq 2
         end
+
+        it "only loads ruby files" do
+          a_file_called("readme.md") do
+            "yo"
+          end
+          rb.load_code_file('readme.md')
+        end
       end
 
       describe "Handling the World" do