Commit 2b337353 authored by richard.chong's avatar richard.chong

Doubles the max_duration time to wait for pipeline status widget

parent e0e687a5
...@@ -202,7 +202,7 @@ module QA ...@@ -202,7 +202,7 @@ module QA
def has_pipeline_status?(text) def has_pipeline_status?(text)
# Pipelines can be slow, so we wait a bit longer than the usual 10 seconds # Pipelines can be slow, so we wait a bit longer than the usual 10 seconds
wait_until(sleep_interval: 5, reload: false) do wait_until(max_duration: 120, sleep_interval: 5, reload: true) do
has_element?(:merge_request_pipeline_info_content, text: text, wait: 15 ) has_element?(:merge_request_pipeline_info_content, text: text, wait: 15 )
end end
end end
......
...@@ -53,11 +53,9 @@ module QA ...@@ -53,11 +53,9 @@ module QA
it 'does not drop MR', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1250' do it 'does not drop MR', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1250' do
start_discussion start_discussion
Support::Retrier.retry_until(max_attempts: 3, sleep_interval: 3) do Page::MergeRequest::Show.perform do |show|
Page::MergeRequest::Show.perform do |show| show.has_pipeline_status?('passed')
show.has_pipeline_status?('passed') expect(show).to be_merged
expect(show).to be_merged
end
end end
end end
......
...@@ -63,30 +63,26 @@ module QA ...@@ -63,30 +63,26 @@ 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!
Support::Retrier.retry_until(max_attempts: 3, sleep_interval: 3) do Page::MergeRequest::Show.perform do |show|
Page::MergeRequest::Show.perform do |show| expect(show).to have_pipeline_status('passed'), 'Expected the merge request pipeline to pass.'
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!
Support::Retrier.retry_until(max_attempts: 3, sleep_interval: 3) do Page::MergeRequest::Show.perform do |show|
Page::MergeRequest::Show.perform do |show| expect(show).to have_pipeline_status('passed'), 'Expected the merge request pipeline to pass.'
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