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
a9dd2edf
Commit
a9dd2edf
authored
Feb 21, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added test
parent
c95ec812
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
0 deletions
+22
-0
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+22
-0
No files found.
spec/features/merge_requests/approvals_spec.rb
View file @
a9dd2edf
...
@@ -283,6 +283,28 @@ feature 'Merge request approvals', js: true, feature: true do
...
@@ -283,6 +283,28 @@ feature 'Merge request approvals', js: true, feature: true do
end
end
end
end
end
end
context
'when merge when discussions resolved is active'
,
:js
do
let
(
:project
)
do
create
(
:project
,
approvals_before_merge:
1
,
only_allow_merge_if_all_discussions_are_resolved:
true
)
end
before
do
project
.
team
<<
[
user
,
:developer
]
login_as
(
user
)
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'feature'
})
click_button
'Submit merge request'
end
it
'does not show checking ability text'
do
expect
(
find
(
'.mr-widget-body'
)).
not_to
have_text
(
'Checking ability to merge automatically'
)
expect
(
find
(
'.mr-widget-body'
)).
to
have_selector
(
'.accept-action'
)
end
end
end
end
def
approve_merge_request
def
approve_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