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
51ed5c99
Commit
51ed5c99
authored
Feb 03, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec/features/merge_requests/approvals_spec.rb spec failures
parent
dddda49f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+3
-3
No files found.
spec/features/merge_requests/approvals_spec.rb
View file @
51ed5c99
...
...
@@ -37,7 +37,7 @@ feature 'Merge request approvals', js: true, feature: true do
project
.
team
<<
[
other_user
,
:developer
]
login_as
(
user
)
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_branch:
'feature'
})
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'feature'
})
find
(
'#s2id_merge_request_approver_ids .select2-input'
).
click
end
...
...
@@ -66,7 +66,7 @@ feature 'Merge request approvals', js: true, feature: true do
group
=
create
:group
group
.
add_developer
(
other_user
)
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_branch:
'feature'
})
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'feature'
})
find
(
'#s2id_merge_request_approver_group_ids .select2-input'
).
click
wait_for_ajax
...
...
@@ -87,7 +87,7 @@ feature 'Merge request approvals', js: true, feature: true do
create
:approver_group
,
group:
group
,
target:
project
create
:approver
,
user:
approver
,
target:
project
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
source_branch:
'feature'
})
visit
new_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'feature'
})
within
(
'.approver-list li.approver-group'
)
do
click_on
"Remove"
...
...
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