Commit 116ae45e authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'g340763-add-reload-mr-widget' into 'master'

Adds 3 attempts and a sleep interval of 3s to allow for widget to update

See merge request gitlab-org/gitlab!70438
parents 2be27fdb d9d8e5c4
...@@ -63,26 +63,30 @@ module QA ...@@ -63,26 +63,30 @@ module QA
it 'creates a pipeline with merged results', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1517' do it 'creates a pipeline with merged results', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1517' do
merge_request.visit! merge_request.visit!
Page::MergeRequest::Show.perform do |show| Support::Retrier.retry_until(max_attempts: 3, sleep_interval: 3) do
expect(show).to have_pipeline_status('passed'), 'Expected the merge request pipeline to pass.' Page::MergeRequest::Show.perform do |show|
expect(show).to have_pipeline_status('passed'), 'Expected the merge request pipeline to pass.'
# The default option is to merge via merge train, # The default option is to merge via merge train,
# but that is covered by the 'merges via a merge train' test # but that is covered by the 'merges via a merge train' test
show.skip_merge_train_and_merge_immediately show.skip_merge_train_and_merge_immediately
expect(show).to be_merged, "Expected content 'The changes were merged' but it did not appear." expect(show).to be_merged, "Expected content 'The changes were merged' but it did not appear."
end
end end
end end
it 'merges via a merge train', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1518' do it 'merges via a merge train', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1518' do
merge_request.visit! merge_request.visit!
Page::MergeRequest::Show.perform do |show| Support::Retrier.retry_until(max_attempts: 3, sleep_interval: 3) do
expect(show).to have_pipeline_status('passed'), 'Expected the merge request pipeline to pass.' Page::MergeRequest::Show.perform do |show|
expect(show).to have_pipeline_status('passed'), 'Expected the merge request pipeline to pass.'
show.merge_via_merge_train show.merge_via_merge_train
expect(show).to be_merged, "Expected content 'The changes were merged' but it did not appear." expect(show).to be_merged, "Expected content 'The changes were merged' but it did not appear."
end
end end
end 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