Commit 92f87462 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'qa-shl-fix-merge-request-widget-spec' into 'master'

Fix merge request license widget e2e spec flakiness

Closes #118654

See merge request gitlab-org/gitlab!22335
parents 450eef06 0a830464
...@@ -90,6 +90,12 @@ module QA ...@@ -90,6 +90,12 @@ module QA
end end
end end
def wait_for_license_compliance_report
wait(reload: false) do
has_no_text?('Loading License Compliance report')
end
end
def approvals_required_from def approvals_required_from
approvals_content.match(/approvals? from (.*)/)[1] approvals_content.match(/approvals? from (.*)/)[1]
end end
......
...@@ -123,6 +123,8 @@ module QA ...@@ -123,6 +123,8 @@ module QA
show.approve_license_with_mr(approved_license_name) show.approve_license_with_mr(approved_license_name)
show.blacklist_license_with_mr(blacklisted_license_name) show.blacklist_license_with_mr(blacklisted_license_name)
show.wait_for_license_compliance_report
expect(show).to have_approved_license approved_license_name expect(show).to have_approved_license approved_license_name
expect(show).to have_blacklisted_license blacklisted_license_name expect(show).to have_blacklisted_license blacklisted_license_name
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