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
62a6201f
Commit
62a6201f
authored
Dec 20, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure integration specs wait for approvals load.
parent
b424f035
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+14
-2
No files found.
spec/features/merge_requests/approvals_spec.rb
View file @
62a6201f
...
...
@@ -75,6 +75,8 @@ feature 'Merge request approvals', js: true, feature: true do
find
(
'.select2-results'
).
click
click_on
(
"Submit merge request"
)
find
(
'.approvals-components'
)
expect
(
page
).
to
have_content
(
"Requires 1 more approval (from
#{
other_user
.
name
}
)"
)
end
...
...
@@ -94,6 +96,9 @@ feature 'Merge request approvals', js: true, feature: true do
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
click_on
(
"Submit merge request"
)
wait_for_ajax
find
(
'.approvals-components'
)
expect
(
page
).
not_to
have_content
(
"Requires 1 more approval (from
#{
other_user
.
name
}
)"
)
end
end
...
...
@@ -123,6 +128,9 @@ feature 'Merge request approvals', js: true, feature: true do
find
(
'.select2-results'
).
click
click_on
(
"Save changes"
)
wait_for_ajax
find
(
'.approvals-components'
)
expect
(
page
).
to
have_content
(
"Requires 1 more approval"
)
end
...
...
@@ -142,6 +150,8 @@ feature 'Merge request approvals', js: true, feature: true do
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
click_on
(
"Save changes"
)
find
(
'.approvals-components'
)
expect
(
page
).
to
have_content
(
"Requires 1 more approval (from
#{
approver
.
name
}
)"
)
end
end
...
...
@@ -170,12 +180,13 @@ feature 'Merge request approvals', js: true, feature: true do
it
'I am able to approve'
do
approve_merge_request
expect
(
page
).
to
have_content
(
'Approved by'
)
expect
(
page
).
to
have_css
(
'.approver-avatar'
)
end
it
'I am able to unapprove'
do
approve_merge_request
unapprove_merge_request
expect
(
page
).
not_to
have_content
(
'Approved by
'
)
expect
(
page
).
to
have_no_css
(
'.approver-avatar
'
)
end
end
...
...
@@ -193,12 +204,13 @@ feature 'Merge request approvals', js: true, feature: true do
wait_for_ajax
expect
(
page
).
to
have_content
(
'Approved by'
)
expect
(
page
).
to
have_css
(
'.approver-avatar'
)
end
it
'I am able to unapprove'
do
approve_merge_request
unapprove_merge_request
expect
(
page
).
not_to
have_content
(
'Approved by
'
)
expect
(
page
).
to
have_no_css
(
'.approver-avatar
'
)
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