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
5bd8ed4a
Commit
5bd8ed4a
authored
May 08, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add wait_for_vue_resource after clicking Approve
parent
46906ac3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+4
-0
No files found.
features/steps/project/merge_requests.rb
View file @
5bd8ed4a
...
@@ -638,12 +638,16 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -638,12 +638,16 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
page
.
within
'.mr-state-widget'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
not_to
have_button
(
"Approve"
)
expect
(
page
).
not_to
have_button
(
"Approve"
)
end
end
wait_for_vue_resource
end
end
step
'I should see approved merge request "Bug NS-04"'
do
step
'I should see approved merge request "Bug NS-04"'
do
page
.
within
'.mr-state-widget'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
to
have_button
(
'Merge'
,
disabled:
false
)
expect
(
page
).
to
have_button
(
'Merge'
,
disabled:
false
)
end
end
wait_for_vue_resource
end
end
step
'I should see message that merge request can be merged'
do
step
'I should see message that merge request can be merged'
do
...
...
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