Commit bf017481 authored by Tiffany Rea's avatar Tiffany Rea

Update pipeline st config and status wait condition

parent 795d3b34
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment