Commit e2129c91 authored by Stan Hu's avatar Stan Hu

Merge branch 'dm-wait-for-pipeline' into 'master'

Wait for AJAX requests to complete so they don't blow up if they are only handle…

Closes #30633

See merge request !10559
parents 68a839c2 ae65817b
class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
include LoginHelpers include LoginHelpers
include GitlabRoutingHelper include GitlabRoutingHelper
include WaitForAjax
step 'I am on the Merge Request detail page' do step 'I am on the Merge Request detail page' do
visit merge_request_path(@merge_request) visit merge_request_path(@merge_request)
...@@ -20,10 +21,18 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps ...@@ -20,10 +21,18 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
step 'I should see the Remove Source Branch button' do step 'I should see the Remove Source Branch button' do
expect(page).to have_link('Remove source branch') expect(page).to have_link('Remove source branch')
# Wait for AJAX requests to complete so they don't blow up if they are
# only handled after `DatabaseCleaner` has already run
wait_for_ajax
end end
step 'I should not see the Remove Source Branch button' do step 'I should not see the Remove Source Branch button' do
expect(page).not_to have_link('Remove source branch') expect(page).not_to have_link('Remove source branch')
# Wait for AJAX requests to complete so they don't blow up if they are
# only handled after `DatabaseCleaner` has already run
wait_for_ajax
end end
step 'There is an open Merge Request' do step 'There is an open Merge Request' do
......
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