summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-11 22:34:25 +0200
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-11 22:34:25 +0200
commit2f0d89ecff652418a8323990248b681a91f8e05b (patch)
tree678dd598c288b28d562818bf0118a7ee935cd6b5 /features
parentd8c27e4e2b332cb9ece780bfb06155c3d1739d92 (diff)
parent459af7ff655d731c4a0f9de0a6202d64468042cb (diff)
downloadgitlab-ce-2f0d89ecff652418a8323990248b681a91f8e05b.tar.gz
Merge branch 'master' into awardables
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