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
1093e6e8
Commit
1093e6e8
authored
Feb 03, 2022
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wait for pipeline before checking status
parent
c3a57def
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
...create/merge_request/merge_when_pipeline_succeeds_spec.rb
+1
-1
No files found.
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
View file @
1093e6e8
...
...
@@ -91,7 +91,7 @@ module QA
merge_request
=
merge_request
.
reload!
# Don't try to click MWPS if the MR is merged or the pipeline is complete
break
if
merge_request
.
state
==
'merged'
||
project
.
pipelines
.
last
[
:status
]
==
'success'
break
if
merge_request
.
state
==
'merged'
||
mr
.
wait_until
{
project
.
pipelines
.
last
}
[
:status
]
==
'success'
# Try to click MWPS if this is a transient test, or if the MWPS button is visible,
# otherwise reload the page and retry
...
...
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