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
bf017481
Commit
bf017481
authored
Apr 14, 2021
by
Tiffany Rea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update pipeline st config and status wait condition
parent
795d3b34
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
..._verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
+4
-2
No files found.
qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
View file @
bf017481
...
...
@@ -39,6 +39,7 @@ module QA
needs: [test_blocked_pipeline]
script: echo do not click me
when: manual
allow_failure: false
dummy_job:
stage: deploy
...
...
@@ -71,8 +72,9 @@ module QA
it
'can still merge MR successfully'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/issues/971'
do
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
show
.
wait_until
(
reload:
false
)
{
show
.
has_pipeline_status?
(
'running'
)
}
show
.
merge_immediately!
# waiting for manual action status shows status badge 'blocked' on pipelines page
show
.
wait_until
(
reload:
false
)
{
show
.
has_pipeline_status?
(
'waiting for manual action'
)
}
show
.
merge!
expect
(
show
).
to
be_merged
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