Commit 86d4fa2e authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch '254963-increase-wait-until-merge' into 'master'

Increase wait time on pipeline and merge status

Closes #254963

See merge request gitlab-org/gitlab!43451
parents b7220d76 799e5e9e
...@@ -164,7 +164,7 @@ module QA ...@@ -164,7 +164,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
has_element?(:merge_request_pipeline_info_content, text: text, wait: 30) has_element?(:merge_request_pipeline_info_content, text: text, wait: 60)
end end
def has_title?(title) def has_title?(title)
...@@ -198,7 +198,7 @@ module QA ...@@ -198,7 +198,7 @@ module QA
end end
def merged? def merged?
has_element?(:merged_status_content, text: 'The changes were merged into', wait: 30) has_element?(:merged_status_content, text: 'The changes were merged into', wait: 60)
end end
# Check if the MR is able to be merged # Check if the MR is able to be merged
......
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