Merge #1311 'Do not apply Hooks to Test Cases with no Test Steps'

Also update Changelog.md.

CHANGELOG.md

@@ -18,6 +18,9 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
 
 ### Changed
 
+* Do not apply Before and After Hooks to Test Cases with no Test Steps.
+  ([#1311](https://github.com/cucumber/cucumber-ruby/pull/1311)
+   [brasmusson](https://github.com/brasmusson))
 * Pass the registry to the Wire plugin.
   ([#1309](https://github.com/cucumber/cucumber-ruby/pull/1309)
    [brasmusson](https://github.com/brasmusson))

cucumber.yml

@@ -1,6 +1,7 @@
 <%
 cucumber_pro_opts = ENV['ENABLE_CUCUMBER_PRO'] ? "--format Cucumber::Pro --out /dev/null" : ""
 std_opts = "--format progress features -r features --strict #{cucumber_pro_opts}".dup
+std_opts << " --tags 'not @wip'"
 std_opts << " --tags 'not @wip-jruby'" if defined?(JRUBY_VERSION)
 
 wip_opts = "--color -r features".dup

features/docs/iso-8859-1.feature

@@ -1,5 +1,6 @@
 # language: no
 # encoding: iso-8859-1
+@wip
 Egenskap: Alle bruker ikke UTF-8
   Scenario: Dette bør gå bra
     Når jeg drikker en "øl"

lib/cucumber/runtime/support_code.rb

@@ -112,12 +112,14 @@ def find_after_step_hooks(test_case)
       end
 
       def apply_before_hooks(test_case)
+        return test_case if test_case.test_steps.empty?
         scenario = RunningTestCase.new(test_case)
         hooks = registry.hooks_for(:before, scenario)
         BeforeHooks.new(hooks, scenario).apply_to(test_case)
       end
 
       def apply_after_hooks(test_case)
+        return test_case if test_case.test_steps.empty?
         scenario = RunningTestCase.new(test_case)
         hooks = registry.hooks_for(:after, scenario)
         AfterHooks.new(hooks, scenario).apply_to(test_case)

spec/cucumber/runtime/support_code_spec.rb

@@ -12,5 +12,41 @@ module Cucumber
       @rb = subject.ruby
       Object.new.extend(RbSupport::RbDsl)
     end
+
+    describe '#apply_before_hooks' do
+      let(:test_case) { double }
+      let(:test_step) { double }
+
+      it 'applies before hooks to test cases with steps' do
+        allow(test_case).to receive(:test_steps).and_return([test_step])
+        allow(test_case).to receive(:with_steps).and_return(double)
+
+        expect(subject.apply_before_hooks(test_case)).not_to equal(test_case)
+      end
+
+      it 'does not apply before hooks to test cases with no steps' do
+        allow(test_case).to receive(:test_steps).and_return([])
+
+        expect(subject.apply_before_hooks(test_case)).to equal(test_case)
+      end
+    end
+
+    describe '#apply_after_hooks' do
+      let(:test_case) { double }
+      let(:test_step) { double }
+
+      it 'applies after hooks to test cases with steps' do
+        allow(test_case).to receive(:test_steps).and_return([test_step])
+        allow(test_case).to receive(:with_steps).and_return(double)
+
+        expect(subject.apply_after_hooks(test_case)).not_to equal(test_case)
+      end
+
+      it 'does not apply after hooks to test cases with no steps' do
+        allow(test_case).to receive(:test_steps).and_return([])
+
+        expect(subject.apply_after_hooks(test_case)).to equal(test_case)
+      end
+    end
   end
 end