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
296e0e77
Commit
296e0e77
authored
Dec 10, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix specs
parent
c3254358
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/groups/hooks_controller.rb
app/controllers/groups/hooks_controller.rb
+1
-1
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-1
No files found.
app/controllers/groups/hooks_controller.rb
View file @
296e0e77
...
@@ -26,7 +26,7 @@ class Groups::HooksController < Groups::ApplicationController
...
@@ -26,7 +26,7 @@ class Groups::HooksController < Groups::ApplicationController
def
test
def
test
if
@group
.
first_non_empty_project
if
@group
.
first_non_empty_project
status
=
TestHookService
.
new
.
execute
(
hook
,
current_user
)
status
,
message
=
TestHookService
.
new
.
execute
(
hook
,
current_user
)
if
status
if
status
flash
[
:notice
]
=
'Hook successfully executed.'
flash
[
:notice
]
=
'Hook successfully executed.'
...
...
spec/models/merge_request_spec.rb
View file @
296e0e77
...
@@ -152,7 +152,7 @@ describe MergeRequest do
...
@@ -152,7 +152,7 @@ describe MergeRequest do
it
'returns sorted JiraIssues'
do
it
'returns sorted JiraIssues'
do
allow
(
subject
.
project
).
to
receive_messages
(
default_branch:
subject
.
target_branch
)
allow
(
subject
.
project
).
to
receive_messages
(
default_branch:
subject
.
target_branch
)
expect
(
subject
.
closes_issues
).
to
eq
([
issue
1
,
issue0
])
expect
(
subject
.
closes_issues
).
to
eq
([
issue
0
,
issue1
])
end
end
end
end
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