summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-25 14:43:48 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-25 14:48:57 -0500
commit16a79253c3d41e467f64e7e163ea30486ad066a2 (patch)
treee6d32abc23a1f616c3299850fd496441b461fa87
parent678c1f8ed9d7bb08fcabb9e34e1249485c377570 (diff)
downloadgitlab-ce-16988-subscription-toggle.tar.gz
Wait for requests16988-subscription-toggle
-rw-r--r--features/steps/project/merge_requests.rb2
-rw-r--r--spec/features/boards/sidebar_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 9feae594993..1d2b9fd5e9f 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -98,7 +98,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I click button "Unsubscribe"' do
page.find('.issuable-subscribe-button').click
- wait_for_ajax
+ wait_for_requests
end
step 'I click link "Close"' do
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index db0c186f3a5..230aa222bab 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -303,7 +303,7 @@ describe 'Issue Boards', feature: true, js: true do
page.within('.subscription') do
page.find('.issuable-subscribe-button').click
- wait_for_ajax
+ wait_for_requests
expect(page).to have_selector('.is-subscribed')
end
end