summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-06-12 14:26:09 -0500
committerClement Ho <ClemMakesApps@gmail.com>2017-06-12 14:26:09 -0500
commitaf97988ab51b4c5f2f4a4e6303cffdd4b56c19ef (patch)
tree6e667f288d7793c2546f91370763cc309e6f1ff7
parent4ba257b9a81e412220b813eb1d3a66cb81bb9a99 (diff)
downloadgitlab-ce-fix-9-2-stable-conflicts-for-mr-11744.tar.gz
Use wait_for_ajax instead of wait_for_requestsfix-9-2-stable-conflicts-for-mr-11744
-rw-r--r--spec/features/issues/form_spec.rb2
-rw-r--r--spec/features/issues/issue_sidebar_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index e2a9928ec40..153bbbc207e 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -63,7 +63,7 @@ describe 'New/edit issue', feature: true, js: true do
click_button 'Unassigned'
- wait_for_requests
+ wait_for_ajax
end
it 'should display selected users even if they are not part of the original API call' do
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index d1f110c13ae..da110f1de05 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -61,7 +61,7 @@ feature 'Issue Sidebar', feature: true do
it 'keeps your filtered term after filtering and dismissing the dropdown' do
find('.dropdown-input-field').native.send_keys user2.name
- wait_for_requests
+ wait_for_ajax
page.within '.dropdown-menu-user' do
expect(page).not_to have_content 'Unassigned'