summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-11 16:34:00 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-11 16:34:00 +0000
commitd8415389de859a0dab6e9efa7d8651577631aa7e (patch)
treedd3952c1d45ae738f673b705d672ff21199496ca /features
parent51a8619a71cd8416db5a66cfbe2a5aa118bbef36 (diff)
parentebf80db3abcaf4a0e08273bf180aa33368610b8a (diff)
downloadgitlab-ce-d8415389de859a0dab6e9efa7d8651577631aa7e.tar.gz
Merge branch 'hook-docs-behavior' into 'master'
Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/hooks.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
index b1ffe7f7b4c..13c0713669a 100644
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
@@ -59,7 +59,7 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
step 'hook should be triggered' do
expect(current_path).to eq namespace_project_hooks_path(current_project.namespace, current_project)
expect(page).to have_selector '.flash-notice',
- text: 'Hook successfully executed.'
+ text: 'Hook executed successfully: HTTP 200'
end
step 'I should see hook error message' do