Skip to content

Make rebase MR e2e test more reliable

Jay McCure requested to merge jmc-fix-rebase-e2e-test into master

What does this MR do and why?

Closes #383366 (closed)

Implicitly waits 20 seconds rather than the default 10, for the merge widget to be updated to "Merge blocked".

Looking at the test case gitlab-org/quality/testcases#1800 (closed), it seems this test has failed a few times over the past 10 months because of this reason. The error message in these failures indicate that the merge widget is still loading, and checking the actual MR after the test has failed it looks like the MR did actually become blocked as expected.

Note: the merge status in the widget is updated dynamically and doesn't require a page refresh

How to set up and validate locally

bundle exec rspec qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Jay McCure

Merge request reports