Commit 42aad0c7 authored by Dan Davison's avatar Dan Davison

Merge branch 'g331690-ensure-train-starts-first' into 'master'

Ensures merge train was started before attempting to cancel

See merge request gitlab-org/gitlab!73409
parents 1e87d6d4 887a26f2
......@@ -124,6 +124,10 @@ module QA
it 'does not create a TODO task', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1884' do
# Manually removes merge request from the train
Page::MergeRequest::Show.perform do |show|
show.wait_until(reload: false) do
show.has_content? 'started a merge train'
end
show.cancel_auto_merge!
expect(show).to have_system_note('removed this merge request from the merge train')
......
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