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
f12f69ce
Commit
f12f69ce
authored
Dec 12, 2016
by
http://jneen.net/
Committed by
Bryce Johnson
Dec 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add tests
parent
73841d55
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
56 additions
and
5 deletions
+56
-5
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+56
-5
No files found.
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
f12f69ce
...
...
@@ -126,23 +126,74 @@ describe Projects::MergeRequestsController do
end
context
'approvals'
do
def
json_response
JSON
.
load
(
response
.
body
)
end
let
(
:approver
)
{
create
(
:user
)
}
before
do
merge_request
.
update_attribute
:approvals_before_merge
,
2
project
.
team
<<
[
approver
,
:developer
]
end
describe
'approve'
do
before
do
project
.
team
<<
[
user
,
:developer
]
post
:approve
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
id:
merge_request
.
iid
id:
merge_request
.
iid
,
format: :json
end
it
'
thing
'
do
it
'
approves the merge request
'
do
expect
(
response
).
to
be_success
binding
.
pry
expect
(
true
).
to
be_true
expect
(
json_response
[
'approvals_left'
]).
to
eq
1
expect
(
json_response
[
'approved_by'
].
size
).
to
eq
1
expect
(
json_response
[
'approved_by'
][
0
][
'user'
][
'username'
]).
to
eq
user
.
username
expect
(
json_response
[
'user_has_approved'
]).
to
be
true
expect
(
json_response
[
'user_can_approve'
]).
to
be
false
end
end
describe
'approvals'
do
before
do
merge_request
.
approvals
.
create
(
user:
approver
)
get
:approvals
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
id:
merge_request
.
iid
,
format: :json
end
it
'shows approval information'
do
expect
(
response
).
to
be_success
expect
(
json_response
[
'approvals_left'
]).
to
eq
1
expect
(
json_response
[
'approved_by'
].
size
).
to
eq
1
expect
(
json_response
[
'approved_by'
][
0
][
'user'
][
'username'
]).
to
eq
approver
.
username
expect
(
json_response
[
'user_has_approved'
]).
to
be
false
expect
(
json_response
[
'user_can_approve'
]).
to
be
true
end
end
describe
'unapprove'
do
before
do
merge_request
.
approvals
.
create
(
user:
user
)
delete
:unapprove
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
id:
merge_request
.
iid
,
format: :json
end
it
'unapproves the merge request'
do
expect
(
response
).
to
be_success
expect
(
json_response
[
'approvals_left'
]).
to
eq
2
expect
(
json_response
[
'approved_by'
]).
to
be_empty
expect
(
json_response
[
'user_has_approved'
]).
to
be
false
expect
(
json_response
[
'user_can_approve'
]).
to
be
true
end
end
end
shared_examples
"loads labels"
do
|
action
|
...
...
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