Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
30d299035e88
Commit
ff1e3a47
authored
Oct 30, 2017
by
Mark Fletcher
Browse files
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
parent
7babb21c7bcb
Changes
3
Hide whitespace changes
Inline
Side-by-side
changelogs/unreleased/39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails.yml
0 → 100644
View file @
30d29903
---
title
:
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
merge_request
:
author
:
type
:
fixed
lib/api/merge_requests.rb
View file @
30d29903
...
...
@@ -295,7 +295,7 @@ def handle_merge_request_errors!(errors)
unauthorized!
unless
merge_request
.
can_cancel_merge_when_pipeline_succeeds?
(
current_user
)
::
MergeRequest
::
MergeWhenPipelineSucceedsService
::
MergeRequest
s
::
MergeWhenPipelineSucceedsService
.
new
(
merge_request
.
target_project
,
current_user
)
.
cancel
(
merge_request
)
end
...
...
spec/requests/api/merge_requests_spec.rb
View file @
30d29903
...
...
@@ -1061,6 +1061,30 @@
end
end
describe
'POST :id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds'
do
before
do
::
MergeRequests
::
MergeWhenPipelineSucceedsService
.
new
(
merge_request
.
target_project
,
user
).
execute
(
merge_request
)
end
it
'removes the merge_when_pipeline_succeeds status'
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/cancel_merge_when_pipeline_succeeds"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
201
)
end
it
'returns 404 if the merge request is not found'
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/123/merge_when_pipeline_succeeds"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
it
'returns 404 if the merge request id is used instead of iid'
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/merge_when_pipeline_succeeds"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
describe
'Time tracking'
do
let
(
:issuable
)
{
merge_request
}
...
...
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