cucumber 2.0.0 → 2.0.1

data/lib/cucumber/runtime/after_hooks.rb

@@ -1,8 +1,9 @@
 module Cucumber
   class Runtime
     class AfterHooks
-      def initialize(action_blocks)
-        @action_blocks = action_blocks
+      def initialize(hooks, scenario)
+        @hooks = hooks
+        @scenario = scenario
       end
 
       def apply_to(test_case)
@@ -14,11 +15,11 @@ module Cucumber
       private
 
       def after_hooks(source)
-        @action_blocks.map do |action_block|
-          Hooks.after_hook(source, &action_block)
-        end
+        @hooks.map do |hook|
+          action = ->(result) { hook.invoke('After', @scenario.with_result(result)) }
+          Hooks.after_hook(source, Hooks.location(hook), &action)
+        end          
       end
     end
   end
 end
-

data/lib/cucumber/runtime/before_hooks.rb

@@ -1,8 +1,11 @@
+require 'cucumber/hooks'
+
 module Cucumber
   class Runtime
     class BeforeHooks
-      def initialize(action_blocks)
-        @action_blocks = action_blocks
+      def initialize(hooks, scenario)
+        @hooks = hooks
+        @scenario = scenario
       end
 
       def apply_to(test_case)
@@ -14,8 +17,9 @@ module Cucumber
       private
 
       def before_hooks(source)
-        @action_blocks.map do |action_block|
-          Hooks.before_hook(source, &action_block)
+        @hooks.map do |hook|
+          action_block = ->(result) { hook.invoke('Before', @scenario.with_result(result)) }
+          Hooks.before_hook(source, Hooks.location(hook), &action_block)
         end
       end
     end

data/lib/cucumber/runtime/step_hooks.rb

@@ -1,8 +1,8 @@
 module Cucumber
   class Runtime
     class StepHooks
-      def initialize(after)
-        @after = after
+      def initialize(hooks)
+        @hooks = hooks
       end
 
       def apply(test_steps)
@@ -13,8 +13,9 @@ module Cucumber
 
       private
       def after_step_hooks(test_step)
-        @after.map do |action_block|
-          Hooks.after_step_hook(test_step.source, &action_block)
+        @hooks.map do |hook|
+          action = ->(*args) { hook.invoke('AfterStep', args) }
+          Hooks.after_step_hook(test_step.source, Hooks.location(hook), &action)
         end
       end
     end

data/lib/cucumber/runtime/support_code.rb

@@ -148,31 +148,22 @@ module Cucumber
       def find_after_step_hooks(test_case)
         ruby = load_programming_language('rb')
         scenario = RunningTestCase.new(test_case)
-
-        action_blocks = ruby.hooks_for(:after_step, scenario).map do |hook|
-          ->(*args) { hook.invoke('AfterStep', args) }
-        end
-        StepHooks.new action_blocks
+        hooks = ruby.hooks_for(:after_step, scenario)
+        StepHooks.new hooks
       end
 
       def apply_before_hooks(test_case)
         ruby = load_programming_language('rb')
         scenario = RunningTestCase.new(test_case)
-
-        action_blocks = ruby.hooks_for(:before, scenario).map do |hook|
-          ->(result) { hook.invoke('Before', scenario.with_result(result)) }
-        end
-        BeforeHooks.new(action_blocks).apply_to(test_case)
+        hooks = ruby.hooks_for(:before, scenario)
+        BeforeHooks.new(hooks, scenario).apply_to(test_case)
       end
 
       def apply_after_hooks(test_case)
         ruby = load_programming_language('rb')
         scenario = RunningTestCase.new(test_case)
-
-        action_blocks = ruby.hooks_for(:after, scenario).map do |hook|
-          ->(result) { hook.invoke('After', scenario.with_result(result)) }
-        end
-        AfterHooks.new(action_blocks).apply_to(test_case)
+        hooks = ruby.hooks_for(:after, scenario)
+        AfterHooks.new(hooks, scenario).apply_to(test_case)
       end
 
       def find_around_hooks(test_case)

data/lib/cucumber/step_match.rb

@@ -22,7 +22,7 @@ module Cucumber
     end
 
     def activate(test_step)
-      test_step.with_action do
+      test_step.with_action(@step_definition.file_colon_line) do
         invoke(MultilineArgument.from_core(test_step.source.last.multiline_arg))
       end
     end

data/spec/cucumber/cli/configuration_spec.rb

@@ -252,6 +252,12 @@ END_OF_MESSAGE
 
       expect(config.options[:dry_run]).to be true
     end
+    
+    it "implies --no-duration with --dry-run option" do
+      config.parse!(%w{--dry-run})
+      
+      expect(config.options[:duration]).to be false
+    end
 
     it "accepts --no-source option" do
       config.parse!(%w{--no-source})
@@ -265,11 +271,18 @@ END_OF_MESSAGE
       expect(config.options[:snippets]).to be false
     end
 
-    it "sets snippets and source to false with --quiet option" do
+    it "sets snippets and source and duration to false with --quiet option" do
       config.parse!(%w{--quiet})
 
       expect(config.options[:snippets]).to be false
       expect(config.options[:source]).to be false
+      expect(config.options[:duration]).to be false
+    end
+    
+    it "sets duration to false with --no-duration" do
+      config.parse!(%w{--no-duration})
+      
+      expect(config.options[:duration]).to be false
     end
 
     it "accepts --verbose option" do
@@ -300,6 +313,11 @@ END_OF_MESSAGE
       expect(-> { config.parse!(%w{--format pretty --format progress}) }).to raise_error("All but one formatter must use --out, only one can print to each stream (or STDOUT)")
     end
 
+    it "does not accept multiple --format options when both use implicit STDOUT (using profile with no formatters)" do
+      given_cucumber_yml_defined_as({'default' => ['-q']})
+      expect(-> { config.parse!(%w{--format pretty --format progress}) }).to raise_error("All but one formatter must use --out, only one can print to each stream (or STDOUT)")
+    end
+
     it "accepts same --format options with implicit STDOUT, and keep only one" do
       config.parse!(%w{--format pretty --format pretty})
 
@@ -310,6 +328,11 @@ END_OF_MESSAGE
       expect(-> { config.parse!(%w{--format pretty --out file1 --format progress --out file1}) }).to raise_error("All but one formatter must use --out, only one can print to each stream (or STDOUT)")
     end
 
+    it "does not accept multiple --out streams pointing to the same place (one from profile, one from command line)" do
+      given_cucumber_yml_defined_as({'default' => ['-f','progress', '--out', 'file1']})
+      expect(-> { config.parse!(%w{--format pretty --out file1}) }).to raise_error("All but one formatter must use --out, only one can print to each stream (or STDOUT)")
+    end
+
     it "associates --out to previous --format" do
       config.parse!(%w{--format progress --out file1 --format profile --out file2})
 
@@ -402,15 +425,19 @@ END_OF_MESSAGE
       allow(File).to receive(:directory?).and_return(false)
       allow(File).to receive(:file?).and_return(true)
       allow(IO).to receive(:read).and_return(
-        "cucumber.feature:1:3 cucumber space.feature:134 domain folder/cuke.feature:1 domain folder/different cuke:4:5" )
-
+        "cucumber.feature:1:3\ncucumber.feature:5 cucumber.feature:10\n"\
+        "domain folder/different cuke.feature:134 domain folder/cuke.feature:1\n"\
+        "domain folder/different cuke.feature:4:5 bar.feature")
       config.parse!(%w{@rerun.txt})
 
       expect(config.feature_files).to eq [
         "cucumber.feature:1:3",
-        "cucumber space.feature:134",
+        "cucumber.feature:5",
+        "cucumber.feature:10",
+        "domain folder/different cuke.feature:134",
         "domain folder/cuke.feature:1",
-        "domain folder/different cuke:4:5"]
+        "domain folder/different cuke.feature:4:5",
+        "bar.feature"]
     end
 
     it "should allow specifying environment variables on the command line" do

data/spec/cucumber/cli/main_spec.rb

@@ -51,7 +51,7 @@ module Cucumber
             Cucumber.wants_to_quit = false
           end
 
-          it "registers as a failure" do
+          it "exits with error code" do
             results = double('results', :failure? => false)
 
             allow_any_instance_of(Runtime).to receive(:run!)
@@ -59,7 +59,7 @@ module Cucumber
 
             Cucumber.wants_to_quit = true
 
-            expect(kernel).to receive(:exit).with(1)
+            expect(kernel).to receive(:exit).with(2)
 
             subject.execute!
           end
@@ -93,7 +93,7 @@ module Cucumber
 
           allow(Configuration).to receive(:new) { configuration }
           allow(configuration).to receive(:parse!).and_raise(exception_klass.new("error message"))
-          allow(kernel).to receive(:exit).with(1)
+          allow(kernel).to receive(:exit).with(2)
 
           subject.execute!
 

data/spec/cucumber/cli/options_spec.rb

@@ -59,7 +59,7 @@ module Cucumber
           context "with LANG specified as 'help'" do
             include RSpec::WorkInProgress
 
-            it "lists all known langues" do
+            it "lists all known languages" do
               when_parsing '--i18n help' do
                 expect(Kernel).to receive(:exit)
               end
@@ -69,6 +69,28 @@ module Cucumber
               when_parsing('--i18n help') { expect(Kernel).to receive(:exit) }
             end
           end
+
+          context "with invalid LANG" do 
+            include RSpec::WorkInProgress
+
+            it "exits" do 
+              when_parsing '--i18n foo' do 
+                expect(Kernel).to receive(:exit)
+              end
+            end
+
+            it "says the language was invalid" do 
+              after_parsing '--i18n foo' do 
+                expect(@output_stream.string).to include("Invalid language 'foo'. Available languages are:")
+              end
+            end
+
+            it "displays the language table" do 
+              after_parsing '--i18n foo' do 
+                expect(@output_stream.string).to include(Gherkin::I18n.language_table);
+              end
+            end
+          end
         end
 
         context '-f FORMAT or --format FORMAT' do
@@ -88,6 +110,35 @@ module Cucumber
           end
         end
 
+        context 'handling multiple formatters' do
+          it "catches multiple command line formatters using the same stream" do
+            expect{ options.parse!(prepare_args('-f pretty -f progress')) }.to raise_error("All but one formatter must use --out, only one can print to each stream (or STDOUT)")
+          end
+
+          it "catches multiple profile formatters using the same stream" do
+            given_cucumber_yml_defined_as({'default' => '-f progress -f pretty'})
+            options = Options.new(output_stream, error_stream, :default_profile => 'default')
+
+            expect{ options.parse!(%w{}) }.to raise_error("All but one formatter must use --out, only one can print to each stream (or STDOUT)")
+          end
+
+          it "profiles does not affect the catching of multiple command line formatters using the same stream" do
+            given_cucumber_yml_defined_as({'default' => '-q'})
+            options = Options.new(output_stream, error_stream, :default_profile => 'default')
+
+            expect{ options.parse!(%w{-f progress -f pretty}) }.to raise_error("All but one formatter must use --out, only one can print to each stream (or STDOUT)")
+          end
+
+          it "merges profile formatters and command line formatters" do
+            given_cucumber_yml_defined_as({'default' => '-f junit -o result.xml'})
+            options = Options.new(output_stream, error_stream, :default_profile => 'default')
+
+            options.parse!(%w{-f pretty})
+            
+            expect(options[:formats]).to eq [['pretty', output_stream], ["junit", "result.xml"]]
+          end
+        end
+
         context '-t TAGS --tags TAGS' do
           it "designates tags prefixed with ~ as tags to be excluded" do
             after_parsing('--tags ~@foo,@bar') { expect(options[:tag_expressions]).to eq ['~@foo,@bar'] }
@@ -238,6 +289,14 @@ module Cucumber
 
             expect(options[:snippets]).to be false
             expect(options[:source]).to be false
+            expect(options[:duration]).to be false
+          end
+          
+          it "uses --no-duration when defined in the profile" do
+            given_cucumber_yml_defined_as('foo' => '--no-duration')
+            options.parse!(%w[-p foo])
+
+            expect(options[:duration]).to be false
           end
         end
 

data/spec/cucumber/cli/rerun_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+module Cucumber
+  module Cli
+    describe RerunFile do
+
+      let(:rerun_file) { RerunFile.new('@rerun.txt') }
+
+      it "expects rerun files to have a leading @" do
+        allow(File).to receive(:file?) { true }
+        expect(RerunFile.can_read?('rerun.txt')).to eq false
+        expect(RerunFile.can_read?('@rerun.txt')).to eq true
+      end
+
+      it "does not treat directories as rerun files" do
+        allow(File).to receive(:file?) { false }
+        expect(RerunFile.can_read?('@rerun.txt')).to eq false
+      end
+
+      it "removes leading @ character from filename" do
+        expect(rerun_file.path).to eq 'rerun.txt'
+      end
+
+      context "rerun file containing single feature" do
+        before(:each) do
+          allow(IO).to receive(:read).and_return("cucumber.feature")
+        end
+
+        it "produces an array containing a single feature file path" do
+          expect(rerun_file.features).to eq %w(cucumber.feature)
+        end
+      end
+
+      context "contains multiple features on multiple lines" do
+        before(:each) do
+          allow(IO).to receive(:read).and_return("cucumber.feature\nfoo.feature")
+        end
+
+        it "produces an array containing multiple feature file paths" do
+          expect(rerun_file.features).to eq %w(cucumber.feature foo.feature)
+        end
+      end
+
+      context "contains multiple features on same line" do
+        before(:each) do
+          allow(IO).to receive(:read).and_return("cucumber.feature foo.feature")
+        end
+
+        it "produces an array containing multiple feature file paths" do
+          expect(rerun_file.features).to eq %w(cucumber.feature foo.feature)
+        end
+      end
+
+      context "contains multiple scenarios on same line" do
+        before(:each) do
+          allow(IO).to receive(:read).and_return("cucumber.feature:8 foo.feature:8:16")
+        end
+
+        it "produces an array containing multiple feature file paths with scenario lines" do
+          expect(rerun_file.features).to eq %w(cucumber.feature:8 foo.feature:8:16)
+        end
+      end
+
+      context "contains features with spaces in file names" do
+        before(:each) do
+          allow(IO).to receive(:read).and_return("cucumber test.feature:8 foo.feature:8:16")
+        end
+
+        it "produces an array containing multiple feature file paths with scenario lines" do
+          expect(rerun_file.features).to eq ['cucumber test.feature:8', 'foo.feature:8:16']
+        end
+      end
+
+      context "contains features and scenarios with and without spaces same line and across lines" do
+        before(:each) do
+          allow(IO).to receive(:read).and_return(
+            "cucumber.feature:1:3\ncucumber.feature:5 cucumber.feature:10\n"\
+            "cucumber space.feature:134 domain folder/cuke.feature\n")
+        end
+
+        it "produces an array containing multiple feature file paths with scenario lines" do
+          feature_files = ['cucumber.feature:1:3', 'cucumber.feature:5', 'cucumber.feature:10',
+                           'cucumber space.feature:134', 'domain folder/cuke.feature']
+          expect(rerun_file.features).to eq feature_files
+        end
+      end
+    end
+  end
+end

data/spec/cucumber/formatter/html_spec.rb

@@ -40,7 +40,7 @@ module Cucumber
 
         describe "with a step that embeds a snapshot" do
           define_steps do
-            Given(/snap/) { 
+            Given(/snap/) {
               RSpec::Mocks.allow_message(File, :file?) { true }
               embed('out/snapshot.jpeg', 'image/jpeg')
             }
@@ -87,7 +87,25 @@ module Cucumber
 
           it { expect(@out.string).to match(/^\<!DOCTYPE/) }
           it { expect(@out.string).to match(/\<\/html\>$/) }
-          it { expect(@doc).to have_css_node('.feature .comment', /Healthy/) }
+
+          it "nests the comment within the feature" do
+            expect(@doc).to have_css_node('.feature .comment', /Healthy/)
+          end
+
+          it "properly closes the comment" do
+            expect(@out.string).to match(%r{<pre class="comment"># Healthy<br/></pre>})
+          end
+        end
+
+        describe "with a comment at scenario level" do
+          define_feature <<-FEATURE
+            Feature: Foo
+              # Healthy Scenario
+              Scenario:
+                Given passing
+          FEATURE
+
+          it { expect(@doc).to have_css_node('.scenario .comment', /Healthy Scenario/) }
         end
 
         describe "with a tag" do
@@ -273,9 +291,49 @@ module Cucumber
           it { expect(@doc).not_to have_css_node('.feature .scenario .backtrace', //) }
         end
 
+        context "with a before hook that fails" do
+          describe "in a scenario" do
+            define_steps do
+              Before { raise 'eek' }
+              Given(/yay/) {}
+            end
+
+            define_feature(<<-FEATURE)
+            Feature: shouting
+              Scenario:
+                Given yay
+              FEATURE
+
+            it { expect(@out.string).to include('makeRed(\'scenario_1\')') }
+            it { expect(@doc).not_to have_css_node('.feature .scenario .step.failed', //) }
+            it { expect(@doc).to have_css_node('.feature .scenario .step.skipped', /yay/) }
+          end
+
+          describe "in a scenario outline" do
+            define_steps do
+              Before { raise 'eek' }
+              Given(/yay/) {}
+            end
+
+            define_feature(<<-FEATURE)
+            Feature: shouting
+              Scenario Outline:
+                Given <step>
+                Examples:
+                | step |
+                | yay  |
+              FEATURE
+
+            it { expect(@out.string).to include('makeRed(\'scenario_1\')') }
+            it { expect(@doc).not_to have_css_node('.feature .scenario .step.failed', //) }
+            it { expect(@doc).to have_css_node('.feature .scenario .step.skipped', /yay/) }
+          end
+
+        end
+
         describe "with a step that embeds a snapshot" do
           define_steps do
-            Given(/snap/) { 
+            Given(/snap/) {
               RSpec::Mocks.allow_message(File, :file?) { true }
               embed('snapshot.jpeg', 'image/jpeg')
             }
@@ -289,7 +347,7 @@ module Cucumber
 
           it { expect(@doc.css('.embed img').first.attributes['src'].to_s).to eq "snapshot.jpeg" }
         end
-        
+
         describe "with a step that embeds a text" do
           define_steps do
             Given(/log/) { embed('log.txt', 'text/plain') }
@@ -431,7 +489,7 @@ module Cucumber
         let(:runtime)   { Runtime.new({:expand => true})}
         before(:each) do
           @out = StringIO.new
-          @formatter = Html.new(runtime, @out, {})
+          @formatter = Html.new(runtime, @out, {:expand => true})
           run_defined_feature
           @doc = Nokogiri.HTML(@out.string)
         end
@@ -453,6 +511,27 @@ module Cucumber
 
           it { expect(@doc.css('pre').map { |pre| /^(Given|Then|When)/.match(pre.text)[1] }).to eq ["Given", "Given"] }
         end
+
+        describe "with a scenario outline and a before hook that fails" do
+          define_steps do
+            Before { raise 'eek' }
+            Given(/yay/) {}
+          end
+
+          define_feature(<<-FEATURE)
+          Feature: shouting
+            Scenario Outline:
+              Given <step>
+              Examples:
+              | step |
+              | yay  |
+            FEATURE
+
+          it { expect(@out.string).to include('makeRed(\'scenario_1\')') }
+          it { expect(@out.string).to include('makeRed(\'scenario_1_1\')') }
+          it { expect(@doc).not_to have_css_node('.feature .scenario .step.failed', //) }
+          it { expect(@doc).to have_css_node('.feature .scenario .step.skipped', /yay/) }
+        end
       end
     end
   end