Tagged hooks for JRuby. Fixes #467.

Author: aslakhellesoy

History.md

@@ -1,5 +1,6 @@
 ## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.1.3...master) (not released)
 
+* [JRuby] Tagged hooks for JRuby ([#467](https://github.com/cucumber/cucumber-jvm/issues/467) Aslak Hellesøy)
 * [Spring] Implementation based on SpringJunit4ClassRunner. ([#448](https://github.com/cucumber/cucumber-jvm/issues/448), [#489](https://github.com/cucumber/cucumber-jvm/pull/489) Pedro Antonio Souza Viegas)
 * [Core] Bugfix: Generated regex for ? character is incorrect. ([#494](https://github.com/cucumber/cucumber-jvm/issues/494) Aslak Hellesøy)
 * [Core] Improve readability with unanchored regular expressions ([#485](https://github.com/cucumber/cucumber-jvm/pull/485), [#466](https://github.com/cucumber/cucumber-jvm/issues/466) Anton)

jruby/src/main/java/cucumber/runtime/jruby/JRubyBackend.java

@@ -123,12 +123,12 @@ public void registerStepdef(RubyObject stepdefRunner) {
         glue.addStepDefinition(new JRubyStepDefinition(this, stepdefRunner));
     }
 
-    public void registerBeforeHook(RubyObject procRunner) {
-        glue.addBeforeHook(new JRubyHookDefinition(this, new String[0], procRunner));
+    public void registerBeforeHook(RubyObject procRunner, String[] tagExpressions) {
+        glue.addBeforeHook(new JRubyHookDefinition(this, tagExpressions, procRunner));
     }
 
-    public void registerAfterHook(RubyObject procRunner) {
-        glue.addAfterHook(new JRubyHookDefinition(this, new String[0], procRunner));
+    public void registerAfterHook(RubyObject procRunner, String[] tagExpressions) {
+        glue.addAfterHook(new JRubyHookDefinition(this, tagExpressions, procRunner));
     }
 
     public void registerWorldBlock(RubyObject procRunner) {

jruby/src/main/resources/cucumber/runtime/jruby/dsl.rb

@@ -93,12 +93,12 @@ def pattern
       end
 
       module Dsl
-        def Before(&proc)
-          $backend.registerBeforeHook(HookRunner.new(proc))
+        def Before(*tag_expressions, &proc)
+          $backend.registerBeforeHook(HookRunner.new(proc), tag_expressions)
         end
 
-        def After(&proc)
-          $backend.registerAfterHook(HookRunner.new(proc))
+        def After(*tag_expressions, &proc)
+          $backend.registerAfterHook(HookRunner.new(proc), tag_expressions)
         end
 
         def World(*modules_or_proc)

jruby/src/test/resources/cucumber/runtime/jruby/test/cukes.feature

@@ -1,5 +1,12 @@
 Feature: Cukes
 
+  @tag
+  Scenario: running tagged hook
+    Then tagged hook ran
+
+  Scenario: not running tagged hook
+    Then tagged hook didn't run
+
   Scenario: in the belly
     Given I have 4 "cukes" in my belly
     Then I am "happy"

jruby/src/test/resources/cucumber/runtime/jruby/test/hooks.rb

@@ -0,0 +1,13 @@
+require 'cucumber/api/jruby/en'
+
+Before('@tag') do
+  @tagged_hook_ran = true
+end
+
+Then /^tagged hook ran$/ do
+  raise "Tagged hook didn't run when it should" unless @tagged_hook_ran
+end
+
+Then /^tagged hook didn't run$/ do
+  raise "Tagged hook ran when it shouldn't" if @tagged_hook_ran
+end