summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-07 15:58:56 -0500
committerDouwe Maan <douwe@selenight.nl>2017-04-07 15:58:56 -0500
commit41f79250b2fea336ae13e55a07ed96aa7d36a229 (patch)
tree1dbeccd77250778a377113db9feb8f3965f45d28 /features
parentd37f1f1cd013a8b7a307e1004e020df086cba9d5 (diff)
downloadgitlab-ce-41f79250b2fea336ae13e55a07ed96aa7d36a229.tar.gz
Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests/acceptance.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb
index bdc7a616ba9..6d9565df211 100644
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
@@ -20,10 +20,18 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
step 'I should see the Remove Source Branch button' do
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
step 'I should not see the Remove Source Branch button' do
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
step 'There is an open Merge Request' do