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
fbdf9775
Commit
fbdf9775
authored
Aug 20, 2019
by
Patrick Bajao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement update API endpoint
parent
04a0dc71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
156 additions
and
0 deletions
+156
-0
ee/lib/api/merge_request_approval_rules.rb
ee/lib/api/merge_request_approval_rules.rb
+26
-0
ee/spec/requests/api/merge_request_approval_rules_spec.rb
ee/spec/requests/api/merge_request_approval_rules_spec.rb
+130
-0
No files found.
ee/lib/api/merge_request_approval_rules.rb
View file @
fbdf9775
...
...
@@ -42,6 +42,32 @@ module API
render_api_error!
(
result
[
:message
],
400
)
end
end
segment
':approval_rule_id'
do
desc
'Update merge request approval rule'
do
success
EE
::
API
::
Entities
::
MergeRequestApprovalRule
end
params
do
requires
:approval_rule_id
,
type:
Integer
,
desc:
'The ID of an approval rule'
optional
:name
,
type:
String
,
desc:
'The name of the approval rule'
optional
:approvals_required
,
type:
Integer
,
desc:
'The number of required approvals for this rule'
optional
:users
,
as: :user_ids
,
type:
Array
,
coerce_with:
ARRAY_COERCION_LAMBDA
,
desc:
'The user ids for this rule'
optional
:groups
,
as: :group_ids
,
type:
Array
,
coerce_with:
ARRAY_COERCION_LAMBDA
,
desc:
'The group ids for this rule'
optional
:remove_hidden_groups
,
type:
Boolean
,
desc:
'Whether hidden groups should be removed'
end
put
do
merge_request
=
find_merge_request_with_access
(
params
[
:merge_request_iid
],
:update_approvers
)
params
=
declared_params
(
include_missing:
false
)
approval_rule
=
merge_request
.
approval_rules
.
find
(
params
.
delete
(
:approval_rule_id
))
result
=
::
ApprovalRules
::
UpdateService
.
new
(
approval_rule
,
current_user
,
params
).
execute
if
result
[
:status
]
==
:success
present
result
[
:rule
],
with:
EE
::
API
::
Entities
::
MergeRequestApprovalRule
,
current_user:
current_user
else
render_api_error!
(
result
[
:message
],
400
)
end
end
end
end
end
end
...
...
ee/spec/requests/api/merge_request_approval_rules_spec.rb
View file @
fbdf9775
...
...
@@ -193,4 +193,134 @@ describe API::MergeRequestApprovalRules do
end
end
end
describe
'PUT /projects/:id/merge_requests/:merge_request_iid/approval_rules/:approval_rule_id'
do
let
(
:existing_approver
)
{
create
(
:user
)
}
let
(
:existing_group
)
{
create
(
:group
)
}
let
(
:approval_rule
)
do
create
(
:approval_merge_request_rule
,
merge_request:
merge_request
,
name:
'Old Name'
,
approvals_required:
2
,
users:
[
existing_approver
],
groups:
[
existing_group
]
)
end
let
(
:url
)
{
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/approval_rules/
#{
approval_rule
.
id
}
"
}
let
(
:new_approver
)
{
create
(
:user
)
}
let
(
:new_group
)
{
create
(
:group
)
}
let
(
:users
)
{
[]
}
let
(
:groups
)
{
[]
}
let
(
:remove_hidden_groups
)
{
nil
}
let
(
:params
)
do
{
name:
'Test'
,
approvals_required:
1
,
users:
users
,
groups:
groups
,
remove_hidden_groups:
remove_hidden_groups
}
end
before
do
project
.
add_developer
(
existing_approver
)
project
.
add_developer
(
new_approver
)
existing_group
.
add_developer
(
existing_approver
)
new_group
.
add_developer
(
new_approver
)
end
context
'disable_overriding_approvers_per_merge_request is set to true'
do
before
do
project
.
update!
(
disable_overriding_approvers_per_merge_request:
true
)
put
api
(
url
,
user
),
params:
params
end
it
'responds with 403'
do
expect
(
response
).
to
have_gitlab_http_status
(
403
)
end
end
context
'disable_overriding_approvers_per_merge_request is set to false'
do
before
do
project
.
update!
(
disable_overriding_approvers_per_merge_request:
false
)
put
api
(
url
,
current_user
),
params:
params
end
context
'user cannot update merge request'
do
let
(
:current_user
)
{
other_user
}
it
'responds with 403'
do
expect
(
response
).
to
have_gitlab_http_status
(
403
)
end
end
context
'user can update merge request'
do
let
(
:current_user
)
{
user
}
it
'matches the response schema'
do
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
match_response_schema
(
'public_api/v4/merge_request_approval_rule'
,
dir:
'ee'
)
rule
=
json_response
expect
(
rule
[
'name'
]).
to
eq
(
params
[
:name
])
expect
(
rule
[
'approvals_required'
]).
to
eq
(
params
[
:approvals_required
])
expect
(
rule
[
'rule_type'
]).
to
eq
(
approval_rule
.
rule_type
)
expect
(
rule
[
'contains_hidden_groups'
]).
to
eq
(
false
)
expect
(
rule
[
'source_rule'
]).
to
be_nil
expect
(
rule
[
'eligible_approvers'
]).
to
be_empty
expect
(
rule
[
'users'
]).
to
be_empty
expect
(
rule
[
'groups'
]).
to
be_empty
end
context
'users are passed'
do
let
(
:users
)
{
[
new_approver
.
id
]
}
it
'changes users'
do
rule
=
json_response
expect
(
rule
[
'eligible_approvers'
]).
to
match
([
hash_including
(
'id'
=>
new_approver
.
id
)])
expect
(
rule
[
'users'
]).
to
match
([
hash_including
(
'id'
=>
new_approver
.
id
)])
end
end
context
'groups are passed'
do
let
(
:groups
)
{
[
new_group
.
id
]
}
it
'changes groups'
do
rule
=
json_response
expect
(
rule
[
'eligible_approvers'
]).
to
match
([
hash_including
(
'id'
=>
new_approver
.
id
)])
expect
(
rule
[
'groups'
]).
to
match
([
hash_including
(
'id'
=>
new_group
.
id
)])
end
end
context
'remove_hidden_groups is passed'
do
let
(
:existing_group
)
{
create
(
:group
,
:private
)
}
context
'when set to true'
do
let
(
:remove_hidden_groups
)
{
true
}
it
'removes the existing private group'
do
expect
(
approval_rule
.
reload
.
groups
).
not_to
include
(
existing_group
)
end
end
context
'when set to false'
do
let
(
:remove_hidden_groups
)
{
false
}
it
'does not remove the existing private group'
do
expect
(
approval_rule
.
reload
.
groups
).
to
include
(
existing_group
)
end
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