summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-04-07 22:33:03 +0000
committerStan Hu <stanhu@gmail.com>2017-04-07 22:33:03 +0000
commite2129c91386f04eafb059ced02dec49c4465d22a (patch)
tree6c3e2e1a7741a1dc5433b0fd6942063e8fc6b61d /features
parent68a839c24c97370a25c5c233fef974e29a4ed480 (diff)
parentae65817b92edb396e95faccd3e4bd21b70b4f5df (diff)
downloadgitlab-ce-e2129c91386f04eafb059ced02dec49c4465d22a.tar.gz
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
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests/acceptance.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb
index bdc7a616ba9..d7167352e02 100644
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
@@ -1,6 +1,7 @@
class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
include LoginHelpers
include GitlabRoutingHelper
+ include WaitForAjax
step 'I am on the Merge Request detail page' do
visit merge_request_path(@merge_request)
@@ -20,10 +21,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