Commit b815e6f6 authored by Sean McGivern's avatar Sean McGivern

Merge branch '208123-fix-a-flaky-test' into 'master'

Fix two flaky specs that didn't wait for the MR widget to load

Closes #208123

See merge request gitlab-org/gitlab!27078
parents 5f6b887a e5b38d27
...@@ -12,6 +12,9 @@ describe 'Thread Comments Merge Request', :js do ...@@ -12,6 +12,9 @@ describe 'Thread Comments Merge Request', :js do
sign_in(user) sign_in(user)
visit project_merge_request_path(project, merge_request) visit project_merge_request_path(project, merge_request)
# Wait for MR widget to load
wait_for_requests
end end
it_behaves_like 'thread comments', 'merge request' it_behaves_like 'thread comments', 'merge request'
......
...@@ -568,5 +568,8 @@ describe 'Merge request > User resolves diff notes and threads', :js do ...@@ -568,5 +568,8 @@ describe 'Merge request > User resolves diff notes and threads', :js do
def visit_merge_request(mr = nil) def visit_merge_request(mr = nil)
mr ||= merge_request mr ||= merge_request
visit project_merge_request_path(mr.project, mr) visit project_merge_request_path(mr.project, mr)
# Wait for MR widget to load
wait_for_requests
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