cucumber 2.0.0 → 2.0.1

data/spec/cucumber/formatter/junit_spec.rb

@@ -59,7 +59,7 @@ module Cucumber
             end
           end
 
-          it { expect(@doc.xpath('//testsuite/system-out').first.content).to match(/\s+boo boo\s+/) }
+          it { expect(@doc.xpath('//testsuite/testcase/system-out').first.content).to match(/\s+boo boo\s+/) }
         end
 
         describe "a feature with no name" do
@@ -92,12 +92,12 @@ module Cucumber
 
             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
+            it 'has not a root system-out node' do
+              expect(@doc.xpath('//testsuite/system-out').size).to eq 0
             end
 
-            it 'has a root system-err node' do
-              expect(@doc.xpath('//testsuite/system-err').size).to eq 1
+            it 'has not a root system-err node' do
+              expect(@doc.xpath('//testsuite/system-err').size).to eq 0
             end
 
             it 'has a system-out node under <testcase/>' do

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

@@ -42,9 +42,23 @@ module Cucumber
         end
       end
 
+      class HookWrapper
+        def initialize(proc)
+          @proc = proc
+        end
+
+        def source_location
+          @proc.source_location
+        end
+
+        def invoke(pseudo_method, arguments, &block)
+          @proc.call
+        end
+      end
+
       class AddBeforeAndAfterHooks < Core::Filter.new
         def test_case(test_case)
-          steps = before_hooks(test_case.source) + 
+          steps = before_hooks(test_case.source) +
             test_case.test_steps +
             after_hooks(test_case.source)
           test_case.with_steps(steps).describe_to receiver
@@ -55,12 +69,14 @@ module Cucumber
         def before_hooks(source)
           # The adapter is built on the assumption that each test case will have at least one step. This is annoying
           # for tests, but a safe assumption for production use as we always add one hook to initialize the world.
-          [ Hooks.before_hook(source) {} ]
+          hook = proc {}
+          [ Hooks.before_hook(source, Hooks.location(hook), &hook) ]
         end
 
         def after_hooks(source)
           # We add an after hook to make sure the adapter can cope with it
-          [ Hooks.after_hook(source) {} ]
+          hook = proc {}
+          [ Hooks.after_hook(source, Hooks.location(hook), &hook) ]
         end
       end
 
@@ -454,6 +470,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -522,6 +540,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -606,6 +626,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -635,6 +657,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -701,6 +725,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -775,6 +801,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -790,6 +818,8 @@ module Cucumber
                         :after_outline_table,
                       :after_examples,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -936,6 +966,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1003,6 +1035,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1058,6 +1092,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1123,6 +1159,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1184,6 +1222,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1199,6 +1239,8 @@ module Cucumber
                         :after_outline_table,
                       :after_examples,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1258,6 +1300,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1287,6 +1331,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1339,6 +1385,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1456,6 +1504,8 @@ module Cucumber
                       :after_steps,
                       :before_examples_array,
                         :before_examples,
+                          :before_tags,
+                          :after_tags,
                           :examples_name,
                           :before_outline_table,
                             :scenario_name,
@@ -1484,7 +1534,8 @@ module Cucumber
 
           class FailingAfterStepHook
             def find_after_step_hooks(test_case)
-              Runtime::StepHooks.new [-> { raise Failure }]
+              failing_hook = HookWrapper.new(proc { raise Failure })
+              Runtime::StepHooks.new [failing_hook]
             end
           end
 
@@ -1529,7 +1580,8 @@ module Cucumber
         context 'with exception in a single before hook' do
           class FailingBeforeHook
             def apply_before_hooks(test_case)
-              Runtime::BeforeHooks.new([proc { raise Failure }]).apply_to(test_case)
+              failing_hook = HookWrapper.new(proc { raise Failure })
+              Runtime::BeforeHooks.new([failing_hook], RunningTestCase.new(test_case)).apply_to(test_case)
             end
           end
 
@@ -1660,6 +1712,8 @@ module Cucumber
                       :after_steps,
                       :before_examples_array,
                         :before_examples,
+                          :before_tags,
+                          :after_tags,
                           :examples_name,
                           :before_outline_table,
                             :before_table_row,
@@ -1688,7 +1742,9 @@ module Cucumber
           # the result of the first one.
           class FailingAndPassingBeforeHooks
             def apply_before_hooks(test_case)
-              Runtime::BeforeHooks.new([proc { raise Failure }, proc { }]).apply_to(test_case)
+              failing_hook = HookWrapper.new(proc { raise Failure })
+              passing_hook = HookWrapper.new(proc {})
+              Runtime::BeforeHooks.new([failing_hook, passing_hook], RunningTestCase.new(test_case)).apply_to(test_case)
             end
           end
 
@@ -1735,7 +1791,8 @@ module Cucumber
 
           class FailingAfterHook
             def apply_after_hooks(test_case)
-              Runtime::AfterHooks.new([proc { raise Failure }]).apply_to(test_case)
+              failing_hook = HookWrapper.new(proc { raise Failure })
+              Runtime::AfterHooks.new([failing_hook], RunningTestCase.new(test_case)).apply_to(test_case)
             end
           end
 
@@ -1814,6 +1871,8 @@ module Cucumber
                     :after_steps,
                     :before_examples_array,
                       :before_examples,
+                        :before_tags,
+                        :after_tags,
                         :examples_name,
                         :before_outline_table,
                           :before_table_row,
@@ -1840,7 +1899,9 @@ module Cucumber
         context 'with exception in the first of several after hooks' do
           class FailingThenPassingAfterHooks
             def apply_after_hooks(test_case)
-              Runtime::AfterHooks.new([proc { raise Failure }, proc {}]).apply_to(test_case)
+              failing_hook = HookWrapper.new(proc { raise Failure })
+              passing_hook = HookWrapper.new(proc {})
+              Runtime::AfterHooks.new([failing_hook, passing_hook], RunningTestCase.new(test_case)).apply_to(test_case)
             end
           end
 

data/spec/cucumber/formatter/pretty_spec.rb

@@ -366,6 +366,102 @@ Feature:
 
 1 scenario (1 passed)
 2 steps (2 passed)
+OUTPUT
+            end
+          end
+
+          describe "with tags on all levels" do
+            define_feature <<-FEATURE
+          @tag1
+          Feature:
+            @tag2
+            Scenario:
+              Given this step passes
+            @tag3
+            Scenario Outline:
+              Given this step passes
+              @tag4
+              Examples:
+              | dummy |
+              | dummy |
+            FEATURE
+
+
+            it "includes the tags in the output " do
+              expect( @out.string ).to include <<OUTPUT
+@tag1
+Feature: 
+
+  @tag2
+  Scenario: 
+    Given this step passes
+
+  @tag3
+  Scenario Outline: 
+    Given this step passes
+
+    @tag4
+    Examples: 
+      | dummy |
+      | dummy |
+OUTPUT
+            end
+          end
+
+          describe "with comments on all levels" do
+            define_feature <<-FEATURE
+          #comment1
+          Feature:
+            #comment2
+            Background:
+              #comment3
+              Given this step passes
+            #comment4
+            Scenario:
+              #comment5
+              Given this step passes
+              #comment6
+              | dummy |
+            #comment7
+            Scenario Outline:
+              #comment8
+              Given this step passes
+              #comment9
+              Examples:
+                #comment10
+                | dummy |
+                #comment11
+                | dummy |
+            FEATURE
+
+
+            it "includes the all comments except for data table rows in the output " do
+              expect( @out.string ).to include <<OUTPUT
+#comment1
+Feature: 
+
+  #comment2
+  Background: 
+      #comment3
+    Given this step passes
+
+  #comment4
+  Scenario: 
+      #comment5
+    Given this step passes
+      | dummy |
+
+  #comment7
+  Scenario Outline: 
+      #comment8
+    Given this step passes
+
+    #comment9
+    Examples: 
+      #comment10
+      | dummy |
+      #comment11
+      | dummy |
 OUTPUT
             end
           end

data/spec/cucumber/formatter/progress_spec.rb

@@ -12,7 +12,7 @@ module Cucumber
       before(:each) do
         Cucumber::Term::ANSIColor.coloring = false
         @out = StringIO.new
-        @formatter = Progress.new(runtime, @out, {})
+        @formatter = Progress.new(runtime, @out, Cucumber::Cli::Options.new)
       end
 
       describe "given a single feature" do
@@ -79,6 +79,90 @@ module Cucumber
           end
 
         end
+
+        describe "with hooks" do
+
+          describe "all hook passes" do
+            define_feature <<-FEATURE
+          Feature:
+            Scenario:
+              Given this step passes
+          FEATURE
+
+            define_steps do
+              Before do
+              end
+              AfterStep do
+              end
+              After do
+              end
+              Given(/^this step passes$/) {}
+            end
+
+            it "only steps generate output" do
+              lines = <<-OUTPUT
+              .
+              1 scenario (1 passed)
+              1 step (1 passed)
+              OUTPUT
+              lines.split("\n").each do |line|
+                expect(@out.string).to include line.strip
+              end
+            end
+          end
+
+          describe "with a failing before hook" do
+            define_feature <<-FEATURE
+          Feature:
+            Scenario:
+              Given this step passes
+          FEATURE
+
+            define_steps do
+              Before do
+                fail "hook failed" 
+              end
+              Given(/^this step passes$/) {}
+            end
+
+            it "the failing hook generate output" do
+              lines = <<-OUTPUT
+              F-
+              1 scenario (1 failed)
+              1 step (1 skipped)
+              OUTPUT
+              lines.split("\n").each do |line|
+                expect(@out.string).to include line.strip
+              end
+            end
+          end
+
+          describe "with a failing after hook" do
+            define_feature <<-FEATURE
+          Feature:
+            Scenario:
+              Given this step passes
+          FEATURE
+
+            define_steps do
+              After do
+                fail "hook failed" 
+              end
+              Given(/^this step passes$/) {}
+            end
+
+            it "the failing hook generate output" do
+              lines = <<-OUTPUT
+              .F
+              1 scenario (1 failed)
+              1 step (1 passed)
+              OUTPUT
+              lines.split("\n").each do |line|
+                expect(@out.string).to include line.strip
+              end
+            end
+          end
+        end
       end
     end
   end