Added scenario around the preference for ruby hooks

Author: ess

features/hook/running-a-deploy-hook.feature

@@ -88,12 +88,28 @@ Feature: Running A Deploy Hook
       | before_restart        |
       | after_restart         |
       | after_deploy          |
-  #Scenario Outline: Running a callback with an Executable deploy hook
-    #Given the george app has a <Callback Name> executable hook
-    #When I run `engineyard-serverside hook <Callback Name>`
 
-  #Scenario: Running a callback with both Ruby and Executable deploy hooks
+  Scenario Outline: Running a callback with both Ruby and Executable deploy hooks
+    Given my app has a <Callback Name> executable deploy hook
+    Given my app has a <Callback Name> ruby deploy hook
+    When I run the <Callback Name> callback
+    Then the <Callback Name> ruby deploy hook is executed
+    But the <Callback Name> executable deploy hook is not executed
 
+    Examples:
+      | Callback Name         |
+      | before_deploy         |
+      | before_bundle         |
+      | after_bundle          |
+      | before_compile_assets |
+      | after_compile_assets  |
+      | before_migrate        |
+      | after_migrate         |
+      | before_symlink        |
+      | after_symlink         |
+      | before_restart        |
+      | after_restart         |
+      | after_deploy          |
   #Scenario: Running a callback with a Ruby service hook
 
   #Scenario: Running a callback with an Executable service hook

features/hook/step_definitions/running-a-deploy-hook-steps.rb

@@ -77,13 +77,11 @@ def framework_env
 end
 
 Then %r{^the (.+) executable deploy hook is executed$} do |callback_name|
-  found = ExecutedCommands.
-    executed.
-    select {|x|
-      x.match(/engineyard-serverside-execute-hook #{callback_name}/)
-    }.length > 0
+  expect(ExecutedCommands.deploy_hook_executed?(callback_name)).to eql(true)
+end
 
-    expect(found).to eql(true)
+Then %r{^the (.+) executable deploy hook is not executed$} do |callback_name|
+  expect(ExecutedCommands.deploy_hook_executed?(callback_name)).to eql(false)
 end
 
 Then %{I see the output} do

features/support/runner.rb

@@ -16,9 +16,13 @@ def self.reset
     @executed = nil
   end
 
-  def self.hook_executed?(path)
-    executed.select {|x| x.match(/#{Regexp.escape(path)}/)}.length > 0
+  def self.deploy_hook_executed?(callback_name)
+    executed.
+      select {|x|
+        x.match(%r{engineyard-serverside-execute-hook #{callback_name}})
+      }.length > 0
   end
+
 end
 
 module Runner