Commit 41f79250 authored by Douwe Maan's avatar Douwe Maan

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

Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run
parent d37f1f1c
...@@ -20,10 +20,18 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps ...@@ -20,10 +20,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