diff options
Diffstat (limited to 'qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb')
| -rw-r--r-- | qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb index c5d73d2fd7d..01aada2d6dd 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb @@ -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 |