Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9fb308d4
Commit
9fb308d4
authored
Dec 10, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix specs
parent
296e0e77
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
app/controllers/groups/hooks_controller.rb
app/controllers/groups/hooks_controller.rb
+1
-2
features/steps/group_hooks.rb
features/steps/group_hooks.rb
+1
-3
No files found.
app/controllers/groups/hooks_controller.rb
View file @
9fb308d4
...
...
@@ -31,8 +31,7 @@ class Groups::HooksController < Groups::ApplicationController
if
status
flash
[
:notice
]
=
'Hook successfully executed.'
else
flash
[
:alert
]
=
'Hook execution failed. '
\
'Ensure hook URL is correct and service is up.'
flash
[
:alert
]
=
"Hook execution failed:
#{
message
}
"
end
else
flash
[
:alert
]
=
'Hook execution failed. Ensure the group has a project with commits.'
...
...
features/steps/group_hooks.rb
View file @
9fb308d4
...
...
@@ -65,8 +65,6 @@ class Spinach::Features::GroupHooks < Spinach::FeatureSteps
step
'I should see hook service down error message'
do
expect
(
page
).
to
have_selector
'.flash-alert'
,
text:
'Hook execution failed. '
\
'Ensure hook URL is correct and '
\
'service is up.'
text:
'Hook execution failed: Exception from'
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment