Commit 59efa358 authored by Dan Davison's avatar Dan Davison

Merge branch '196234-fix-merge-train-qa-test' into 'master'

Skip intermediate steps in QA merge train test

See merge request gitlab-org/gitlab!22848
parents 5a411b6e ad1d24ea
......@@ -104,26 +104,24 @@ module QA
end.visit!
Page::MergeRequest::Show.perform do |show|
pipeline_passed = Support::Retrier.retry_until(max_attempts: 5, sleep_interval: 5) do
pipeline_passed = show.retry_until(max_attempts: 5, sleep_interval: 5) do
show.has_pipeline_status?(/Merged result pipeline #\d+ passed/)
end
expect(pipeline_passed).to be_truthy, "Expected the merged result pipeline to pass."
show.merge_via_merge_train
end
expect(page).to have_content('Added to the merge train', wait: 60)
expect(page).to have_content('The changes will be merged into master')
# It's faster to refresh the page than to wait for the UI to
# automatically refresh, so we reload if the merge status
# doesn't update quickly.
merged = show.retry_until(max_attempts: 5, reload: true, sleep_interval: 5) do
show.merged?
end
# It's faster to refresh the page than to wait for the UI to
# automatically refresh, so we reload if the merge status
# doesn't update quickly.
merged = Support::Retrier.retry_until(reload_page: page) do
Page::MergeRequest::Show.perform(&:merged?)
expect(merged).to be_truthy, "Expected content 'The changes were merged' but it did not appear."
expect(show).to have_pipeline_status(/Merge train pipeline #\d+ passed/)
end
expect(merged).to be_truthy, "Expected content 'The changes were merged' but it did not appear."
end
end
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