Prevent 500 if hook url is down, fixes #7376

2 files changed, 18 insertions, 0 deletions

diff --git a/features/project/hooks.feature b/features/project/hooks.feature
index 52e02a890dd..1a60846a23e 100644
--- a/features/project/hooks.feature
+++ b/features/project/hooks.feature
@@ -24,3 +24,9 @@ Feature: Project Hooks
     And I visit project hooks page
     When I click test hook button
     Then I should see hook error message
+
+  Scenario: I test a hook on down URL
+    Given project has hook
+    And I visit project hooks page
+    When I click test hook button with invalid URL
+    Then I should see hook service down error message
diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
index 30da589260d..2bd383676e7 100644
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
@@ -38,6 +38,11 @@ class ProjectHooks < Spinach::FeatureSteps
     click_link 'Test Hook'
   end
 
+  step 'I click test hook button with invalid URL' do
+    stub_request(:post, @hook.url).to_raise(SocketError)
+    click_link 'Test Hook'
+  end
+
   step 'hook should be triggered' do
     page.current_path.should == project_hooks_path(current_project)
     page.should have_selector '.flash-notice',
@@ -49,4 +54,11 @@ class ProjectHooks < Spinach::FeatureSteps
                               text: 'Hook execution failed. '\
                               'Ensure the project has commits.'
   end
+
+  step 'I should see hook service down error message' do
+    page.should have_selector '.flash-alert',
+                              text: 'Hook execution failed. '\
+                                    'Ensure hook URL is correct and '\
+                                    'service is up.'
+  end
 end