From 41f79250b2fea336ae13e55a07ed96aa7d36a229 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 15:58:56 -0500 Subject: Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run --- features/steps/project/merge_requests/acceptance.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'features') 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 -- cgit v1.2.3