From f875a6f96c3460b7b81964579a57269f01ca2e68 Mon Sep 17 00:00:00 2001 From: Mark Lapierre Date: Fri, 26 Oct 2018 15:47:30 -0400 Subject: Wait for push before checking for new commit Wait for the push to be completed before checking that the merge request shows the change --- .../browser_ui/3_create/merge_request/squash_merge_request_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb index 46e1005829d..724c48cd125 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb @@ -25,6 +25,7 @@ module QA push.file_content = "Test with unicode characters ❤✓€❄" end + Page::Project::Show.perform(&:wait_for_push) merge_request.visit! expect(page).to have_text('to be squashed') -- cgit v1.2.1