Replace all wait_for_vue_resource to wait_for_ajax throughout feature tests

app/assets/javascripts/vue_shared/vue_resource_interceptor.js

@@ -4,7 +4,7 @@ import VueResource from 'vue-resource';
 Vue.use(VueResource);
 // Maintain a global counter for active requests
-// see: spec/support/wait_for_vue_resource.rb
+// see: spec/support/wait_for_ajax.rb
 Vue.http.interceptors.push((request, next) => {
   window.activeVueResources = window.activeVueResources || 0;
   window.activeVueResources += 1;

features/steps/project/ff_merge_requests.rb

@@ -8,7 +8,6 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
   include SharedDiffNote
   include SharedUser
   include WaitForAjax
-  include WaitForVueResource
   step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
     create(:merge_request_with_diffs,
@@ -40,7 +39,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
   step 'I should see merged request' do
     page.within '.status-box' do
       expect(page).to have_content "Merged"
-      wait_for_vue_resource
+      wait_for_ajax
     end
   end

features/steps/project/forked_merge_requests.rb

@@ -4,7 +4,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   include SharedNote
   include SharedPaths
   include Select2Helper
-  include WaitForVueResource
+  include WaitForAjax
   step 'I am a member of project "Shop"' do
     @project = ::Project.find_by(name: "Shop")
@@ -33,7 +33,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
     expect(page).to have_content @merge_request.source_branch
     expect(page).to have_content @merge_request.target_branch
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I fill out a "Merge Request On Forked Project" merge request' do

features/steps/project/merge_requests.rb

@@ -8,7 +8,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   include SharedDiffNote
   include SharedUser
   include WaitForAjax
-  include WaitForVueResource
   after do
     wait_for_ajax if javascript_test?
@@ -46,23 +45,23 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     page.within '.merge-request' do
       expect(page).to have_content "Wiki Feature"
     end
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see closed merge request "Bug NS-04"' do
     expect(page).to have_content "Bug NS-04"
     expect(page).to have_content "Closed by"
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see merge request "Bug NS-04"' do
     expect(page).to have_content "Bug NS-04"
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see merge request "Feature NS-05"' do
     expect(page).to have_content "Feature NS-05"
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should not see "master" branch' do
@@ -363,12 +362,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see a badge of "1" next to the discussion link' do
     expect_discussion_badge_to_have_counter("1")
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see a badge of "0" next to the discussion link' do
     expect_discussion_badge_to_have_counter("0")
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see a discussion has started on commit diff' do
@@ -376,7 +375,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion on commit"
       page.should have_content sample_commit.line_code_path
       page.should have_content "Line is wrong"
-      wait_for_vue_resource
+      wait_for_ajax
     end
   end
@@ -384,7 +383,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     page.within(".notes .discussion") do
       page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion on commit"
       page.should have_content "One comment to rule them all"
-      wait_for_vue_resource
+      wait_for_ajax
     end
   end
@@ -410,7 +409,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see merged request' do
     page.within '.status-box' do
       expect(page).to have_content "Merged"
-      wait_for_vue_resource
+      wait_for_ajax
     end
   end
@@ -422,7 +421,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     page.within '.status-box' do
       expect(page).to have_content "Open"
     end
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I click link "Hide inline discussion" of the third file' do
@@ -446,7 +445,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see a comment like "Line is wrong" in the third file' do
     page.within '.files>div:nth-child(3) .note-body > .note-text' do
       expect(page).to have_visible_content "Line is wrong"
-      wait_for_vue_resource
+      wait_for_ajax
     end
   end
@@ -534,7 +533,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see comments on the side-by-side diff page' do
     page.within '.files>div:nth-child(2) .parallel .note-body > .note-text' do
       expect(page).to have_visible_content "Line is correct"
-      wait_for_vue_resource
+      wait_for_ajax
     end
   end
@@ -648,7 +647,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       expect(page).not_to have_button("Approve")
     end
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see approved merge request "Bug NS-04"' do
@@ -656,7 +655,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       expect(page).to have_button('Merge', disabled: false)
     end
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see message that merge request can be merged' do
@@ -674,7 +673,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see message that MR require an approval' do
     page.within '.mr-state-widget' do
       expect(page).to have_content("Requires 1 more approval")
-      wait_for_vue_resource
+      wait_for_ajax
     end
   end
@@ -718,16 +717,16 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       expect(page).to have_content /([0-9]+ commits behind)/
     end
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should not see the diverged commits count' do
     page.within ".mr-source-target" do
       expect(page).not_to have_content /([0-9]+ commit[s]? behind)/
-      wait_for_vue_resource
+      wait_for_ajax
     end
-    wait_for_vue_resource
+    wait_for_ajax
   end
   def merge_request

features/steps/project/merge_requests/acceptance.rb

 class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
   include LoginHelpers
   include GitlabRoutingHelper
-  include WaitForVueResource
+  include WaitForAjax
   step 'I am on the Merge Request detail page' do
     visit merge_request_path(@merge_request)
@@ -24,7 +24,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
     # Wait for View Resource requests to complete so they don't blow up if they are
     # only handled after `DatabaseCleaner` has already run
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should not see the Remove Source Branch button' do
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
     # Wait for View Resource requests to complete so they don't blow up if they are
     # only handled after `DatabaseCleaner` has already run
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'There is an open Merge Request' do

features/steps/project/merge_requests/revert.rb

 class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
   include LoginHelpers
   include GitlabRoutingHelper
-  include WaitForVueResource
+  include WaitForAjax
   step 'I click on the revert button' do
     find("a[href='#modal-revert-commit']").click
@@ -16,7 +16,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
   step 'I should see the revert merge request notice' do
     page.should have_content('The merge request has been successfully reverted.')
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should not see the revert button' do

features/steps/shared/issuable.rb

 module SharedIssuable
   include Spinach::DSL
-  include WaitForVueResource
+  include WaitForAjax
   def edit_issuable
     find('.issuable-edit', visible: true).click
@@ -58,7 +58,7 @@ module SharedIssuable
   step 'I visit merge request page "Enterprise fix"' do
     mr = MergeRequest.find_by(title: 'Enterprise fix')
     visit namespace_project_merge_request_path(mr.target_project.namespace, mr.target_project, mr)
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I visit issue page "Community issue"' do
@@ -93,7 +93,7 @@ module SharedIssuable
       from_project_name: 'Community',
       user_name: 'Mary Jane'
     )
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I should see a note linking to "Enterprise issue" issue' do

features/steps/shared/paths.rb

@@ -2,7 +2,7 @@ module SharedPaths
   include Spinach::DSL
   include RepoHelpers
   include DashboardHelper
-  include WaitForVueResource
+  include WaitForAjax
   step 'I visit new project page' do
     visit new_project_path
@@ -402,28 +402,28 @@ module SharedPaths
   step 'I visit merge request page "Bug NS-04"' do
     visit merge_request_path("Bug NS-04")
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I visit merge request page "Bug NS-05"' do
     visit merge_request_path("Bug NS-05")
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I visit merge request page "Bug NS-07"' do
     visit merge_request_path("Bug NS-07")
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I visit merge request page "Bug NS-08"' do
     visit merge_request_path("Bug NS-08")
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I visit merge request page "Bug CO-01"' do
     mr = MergeRequest.find_by(title: "Bug CO-01")
     visit namespace_project_merge_request_path(mr.target_project.namespace, mr.target_project, mr)
-    wait_for_vue_resource
+    wait_for_ajax
   end
   step 'I visit project "Shop" merge requests page' do

spec/features/boards/add_issues_modal_spec.rb

 require 'rails_helper'
 describe 'Issue Boards add issue modal', :feature, :js do
-  include WaitForVueResource
-
   let(:project) { create(:empty_project, :public) }
   let(:board) { create(:board, project: project) }
   let(:user) { create(:user) }
@@ -19,13 +17,13 @@ describe 'Issue Boards add issue modal', :feature, :js do
     login_as(user)
     visit namespace_project_board_path(project.namespace, project, board)
-    wait_for_vue_resource
+    wait_for_ajax
   end
   it 'resets filtered search state' do
     visit namespace_project_board_path(project.namespace, project, board, search: 'testing')
-    wait_for_vue_resource
+    wait_for_ajax
     click_button('Add issues')
@@ -74,7 +72,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
     before do
       click_button('Add issues')
-      wait_for_vue_resource
+      wait_for_ajax
     end
     it 'loads issues' do
@@ -107,7 +105,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
         click_button('Add issues')
-        wait_for_vue_resource
+        wait_for_ajax
         page.within('.add-issues-modal') do
           expect(find('.add-issues-footer')).not_to have_button(planning.title)
@@ -122,7 +120,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
           find('.form-control').native.send_keys(issue.title)
           find('.form-control').native.send_keys(:enter)
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).to have_selector('.card', count: 1)
         end
@@ -133,7 +131,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
           find('.form-control').native.send_keys('testing search')
           find('.form-control').native.send_keys(:enter)
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).not_to have_selector('.card')
           expect(page).not_to have_content("You haven't added any issues to your project yet")

spec/features/boards/boards_spec.rb

 require 'rails_helper'
 describe 'Issue Boards', feature: true, js: true do
-  include WaitForVueResource
   include DragTo
   let(:project) { create(:empty_project, :public) }
@@ -19,7 +18,7 @@ describe 'Issue Boards', feature: true, js: true do
   context 'no lists' do
     before do
       visit namespace_project_boards_path(project.namespace, project)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 2)
     end
@@ -46,7 +45,7 @@ describe 'Issue Boards', feature: true, js: true do
       page.within(find('.board-blank-state')) do
         click_button('Add default lists')
       end
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 3)
@@ -84,7 +83,7 @@ describe 'Issue Boards', feature: true, js: true do
     before do
       visit namespace_project_boards_path(project.namespace, project)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 3)
       expect(find('.board:nth-child(1)')).to have_selector('.card')
@@ -117,7 +116,7 @@ describe 'Issue Boards', feature: true, js: true do
       find('.filtered-search').set(issue8.title)
       find('.filtered-search').native.send_keys(:enter)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(find('.board:nth-child(1)')).to have_selector('.card', count: 0)
       expect(find('.board:nth-child(2)')).to have_selector('.card', count: 0)
@@ -128,7 +127,7 @@ describe 'Issue Boards', feature: true, js: true do
       find('.filtered-search').set(issue5.title)
       find('.filtered-search').native.send_keys(:enter)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(find('.board:nth-child(1)')).to have_selector('.card', count: 1)
       expect(find('.board:nth-child(2)')).to have_selector('.card', count: 0)
@@ -140,7 +139,7 @@ describe 'Issue Boards', feature: true, js: true do
         find('.board-delete').click
       end
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 2)
     end
@@ -153,7 +152,7 @@ describe 'Issue Boards', feature: true, js: true do
         find('.board-delete').click
       end
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 2)
     end
@@ -164,7 +163,7 @@ describe 'Issue Boards', feature: true, js: true do
       end
       visit namespace_project_boards_path(project.namespace, project)
-      wait_for_vue_resource
+      wait_for_ajax
       page.within(find('.board', match: :first)) do
         expect(page.find('.board-header')).to have_content('58')
@@ -172,13 +171,13 @@ describe 'Issue Boards', feature: true, js: true do
         expect(page).to have_content('Showing 20 of 58 issues')
         evaluate_script("document.querySelectorAll('.board .board-list')[0].scrollTop = document.querySelectorAll('.board .board-list')[0].scrollHeight")
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.card', count: 40)
         expect(page).to have_content('Showing 40 of 58 issues')
         evaluate_script("document.querySelectorAll('.board .board-list')[0].scrollTop = document.querySelectorAll('.board .board-list')[0].scrollHeight")
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.card', count: 58)
         expect(page).to have_content('Showing all issues')
@@ -289,7 +288,7 @@ describe 'Issue Boards', feature: true, js: true do
             click_link testing.title
           end
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).to have_selector('.board', count: 4)
         end
@@ -302,7 +301,7 @@ describe 'Issue Boards', feature: true, js: true do
             click_link backlog.title
           end
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).to have_selector('.board', count: 4)
         end
@@ -315,7 +314,7 @@ describe 'Issue Boards', feature: true, js: true do
             click_link closed.title
           end
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).to have_selector('.board', count: 4)
         end
@@ -328,7 +327,7 @@ describe 'Issue Boards', feature: true, js: true do
             click_link closed.title
           end
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).to have_css('#js-add-list.open')
         end
@@ -347,7 +346,7 @@ describe 'Issue Boards', feature: true, js: true do
           click_button 'Create'
           wait_for_ajax
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).to have_selector('.board', count: 4)
         end
@@ -360,7 +359,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_filter_link(user2.username)
         submit_filter
-        wait_for_vue_resource
+        wait_for_ajax
         wait_for_board_cards(1, 1)
         wait_for_empty_boards((2..3))
       end
@@ -370,7 +369,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_filter_link(user.username)
         submit_filter
-        wait_for_vue_resource
+        wait_for_ajax
         wait_for_board_cards(1, 1)
         wait_for_empty_boards((2..3))
@@ -381,7 +380,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_filter_link(milestone.title)
         submit_filter
-        wait_for_vue_resource
+        wait_for_ajax
         wait_for_board_cards(1, 1)
         wait_for_board_cards(2, 0)
         wait_for_board_cards(3, 0)
@@ -392,7 +391,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_filter_link(testing.title)
         submit_filter
-        wait_for_vue_resource
+        wait_for_ajax
         wait_for_board_cards(1, 1)
         wait_for_empty_boards((2..3))
       end
@@ -407,7 +406,7 @@ describe 'Issue Boards', feature: true, js: true do
         wait_for_board_cards(1, 1)
         wait_for_empty_boards((2..3))
-        wait_for_vue_resource
+        wait_for_ajax
         page.within(find('.board', match: :first)) do
           expect(page.find('.board-header')).to have_content('1')
@@ -442,7 +441,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_filter_link(testing.title)
         submit_filter
-        wait_for_vue_resource
+        wait_for_ajax
         page.within(find('.board', match: :first)) do
           expect(page.find('.board-header')).to have_content('51')
@@ -470,7 +469,7 @@ describe 'Issue Boards', feature: true, js: true do
         submit_filter
-        wait_for_vue_resource
+        wait_for_ajax
         wait_for_board_cards(1, 1)
         wait_for_empty_boards((2..3))
@@ -481,14 +480,14 @@ describe 'Issue Boards', feature: true, js: true do
           expect(page).to have_selector('.card', count: 8)
           expect(find('.card', match: :first)).to have_content(bug.title)
           click_button(bug.title)
-          wait_for_vue_resource
+          wait_for_ajax
         end
         page.within('.tokens-container') do
           expect(page).to have_content(bug.title)
         end
-        wait_for_vue_resource
+        wait_for_ajax
         wait_for_board_cards(1, 1)
         wait_for_empty_boards((2..3))
@@ -500,12 +499,12 @@ describe 'Issue Boards', feature: true, js: true do
             click_button(bug.title)
           end
-          wait_for_vue_resource
+          wait_for_ajax
           expect(page).to have_selector('.card', count: 1)
         end
-        wait_for_vue_resource
+        wait_for_ajax
       end
     end
   end
@@ -513,7 +512,7 @@ describe 'Issue Boards', feature: true, js: true do
   context 'keyboard shortcuts' do
     before do
       visit namespace_project_boards_path(project.namespace, project)
-      wait_for_vue_resource
+      wait_for_ajax
     end
     it 'allows user to use keyboard shortcuts' do
@@ -526,7 +525,7 @@ describe 'Issue Boards', feature: true, js: true do
     before do
       logout
       visit namespace_project_boards_path(project.namespace, project)
-      wait_for_vue_resource
+      wait_for_ajax
     end
     it 'displays lists' do
@@ -550,7 +549,7 @@ describe 'Issue Boards', feature: true, js: true do
       logout
       login_as(user_guest)
       visit namespace_project_boards_path(project.namespace, project)
-      wait_for_vue_resource
+      wait_for_ajax
     end
     it 'does not show create new list' do

spec/features/boards/issue_ordering_spec.rb

 require 'rails_helper'
 describe 'Issue Boards', :feature, :js do
-  include WaitForVueResource
   include DragTo
   let(:project) { create(:empty_project, :public) }
@@ -24,7 +23,7 @@ describe 'Issue Boards', :feature, :js do
     before do
       visit namespace_project_board_path(project.namespace, project, board)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 2)
     end
@@ -38,7 +37,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves un-ordered issue to top of list' do
       drag(from_index: 3, to_index: 0)
-      wait_for_vue_resource
+      wait_for_ajax
       page.within(first('.board')) do
         expect(first('.card')).to have_content(issue4.title)
@@ -49,7 +48,7 @@ describe 'Issue Boards', :feature, :js do
   context 'ordering in list' do
     before do
       visit namespace_project_board_path(project.namespace, project, board)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 2)
     end
@@ -57,7 +56,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves from middle to top' do
       drag(from_index: 1, to_index: 0)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(first('.card')).to have_content(issue2.title)
     end
@@ -65,7 +64,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves from middle to bottom' do
       drag(from_index: 1, to_index: 2)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(all('.card').last).to have_content(issue2.title)
     end
@@ -73,7 +72,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves from top to bottom' do
       drag(from_index: 0, to_index: 2)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(all('.card').last).to have_content(issue3.title)
     end
@@ -81,7 +80,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves from bottom to top' do
       drag(from_index: 2, to_index: 0)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(first('.card')).to have_content(issue1.title)
     end
@@ -89,7 +88,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves from top to middle' do
       drag(from_index: 0, to_index: 1)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(first('.card')).to have_content(issue2.title)
     end
@@ -97,7 +96,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves from bottom to middle' do
       drag(from_index: 2, to_index: 1)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(all('.card').last).to have_content(issue2.title)
     end
@@ -112,7 +111,7 @@ describe 'Issue Boards', :feature, :js do
     before do
       visit namespace_project_board_path(project.namespace, project, board)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 3)
     end
@@ -120,7 +119,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves to top of another list' do
       drag(list_from_index: 0, list_to_index: 1)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(first('.board')).to have_selector('.card', count: 2)
       expect(all('.board')[1]).to have_selector('.card', count: 4)
@@ -133,7 +132,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves to bottom of another list' do
       drag(list_from_index: 0, list_to_index: 1, to_index: 2)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(first('.board')).to have_selector('.card', count: 2)
       expect(all('.board')[1]).to have_selector('.card', count: 4)
@@ -146,7 +145,7 @@ describe 'Issue Boards', :feature, :js do
     it 'moves to index of another list' do
       drag(list_from_index: 0, list_to_index: 1, to_index: 1)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(first('.board')).to have_selector('.card', count: 2)
       expect(all('.board')[1]).to have_selector('.card', count: 4)

spec/features/boards/keyboard_shortcut_spec.rb

 require 'rails_helper'
 describe 'Issue Boards shortcut', feature: true, js: true do
-  include WaitForVueResource
-
   let(:project) { create(:empty_project) }
   before do
@@ -17,6 +15,6 @@ describe 'Issue Boards shortcut', feature: true, js: true do
     find('body').native.send_keys('gb')
     expect(page).to have_selector('.boards-list')
-    wait_for_vue_resource
+    wait_for_ajax
   end
 end

spec/features/boards/modal_filter_spec.rb

 require 'rails_helper'
 describe 'Issue Boards add issue modal filtering', :feature, :js do
-  include WaitForVueResource
-
   let(:project) { create(:empty_project, :public) }
   let(:board) { create(:board, project: project) }
   let(:planning) { create(:label, project: project, name: 'Planning') }
@@ -24,7 +22,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       find('.form-control').native.send_keys('testing empty state')
       find('.form-control').native.send_keys(:enter)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_content('There are no issues to show.')
     end
@@ -38,7 +36,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
     submit_filter
     page.within('.add-issues-modal') do
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.card', count: 0)
@@ -48,7 +46,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
     click_button('Add issues')
     page.within('.add-issues-modal') do
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.card', count: 1)
     end
@@ -62,13 +60,13 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
     submit_filter
     page.within('.add-issues-modal') do
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.card', count: 0)
       find('.clear-search').click
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.card', count: 1)
     end
@@ -89,7 +87,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       submit_filter
       page.within('.add-issues-modal') do
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.js-visual-token', text: user2.username)
         expect(page).to have_selector('.card', count: 1)
@@ -112,7 +110,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       submit_filter
       page.within('.add-issues-modal') do
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.js-visual-token', text: 'none')
         expect(page).to have_selector('.card', count: 1)
@@ -125,7 +123,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       submit_filter
       page.within('.add-issues-modal') do
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.js-visual-token', text: user2.username)
         expect(page).to have_selector('.card', count: 1)
@@ -147,7 +145,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       submit_filter
       page.within('.add-issues-modal') do
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.js-visual-token', text: 'upcoming')
         expect(page).to have_selector('.card', count: 0)
@@ -160,7 +158,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       submit_filter
       page.within('.add-issues-modal') do
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.js-visual-token', text: milestone.name)
         expect(page).to have_selector('.card', count: 1)
@@ -182,7 +180,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       submit_filter
       page.within('.add-issues-modal') do
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.js-visual-token', text: 'none')
         expect(page).to have_selector('.card', count: 1)
@@ -195,7 +193,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
       submit_filter
       page.within('.add-issues-modal') do
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_selector('.js-visual-token', text: label.title)
         expect(page).to have_selector('.card', count: 1)
@@ -205,7 +203,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
   def visit_board
     visit namespace_project_board_path(project.namespace, project, board)
-    wait_for_vue_resource
+    wait_for_ajax
     click_button('Add issues')
   end

spec/features/boards/new_issue_spec.rb

 require 'rails_helper'
 describe 'Issue Boards new issue', feature: true, js: true do
-  include WaitForVueResource
-
   let(:project) { create(:empty_project, :public) }
   let(:board)   { create(:board, project: project) }
   let!(:list)   { create(:list, board: board, position: 0) }
@@ -15,7 +13,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
       login_as(user)
       visit namespace_project_board_path(project.namespace, project, board)
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.board', count: 2)
     end
@@ -60,7 +58,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
         click_button 'Submit issue'
       end
-      wait_for_vue_resource
+      wait_for_ajax
       page.within(first('.board .board-issue-count')) do
         expect(page).to have_content('1')
@@ -77,7 +75,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
         click_button 'Submit issue'
       end
-      wait_for_vue_resource
+      wait_for_ajax
       expect(page).to have_selector('.issue-boards-sidebar')
     end
@@ -86,7 +84,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
   context 'unauthorized user' do
     before do
       visit namespace_project_board_path(project.namespace, project, board)
-      wait_for_vue_resource
+      wait_for_ajax
     end
     it 'does not display new issue button' do

spec/features/boards/sidebar_spec.rb

 require 'rails_helper'
 describe 'Issue Boards', feature: true, js: true do
-  include WaitForVueResource
-
   let(:user)         { create(:user) }
   let(:user2)        { create(:user) }
   let(:project)      { create(:empty_project, :public) }
@@ -26,7 +24,7 @@ describe 'Issue Boards', feature: true, js: true do
     login_as(user)
     visit namespace_project_board_path(project.namespace, project, board)
-    wait_for_vue_resource
+    wait_for_ajax
   end
   after do
@@ -75,7 +73,7 @@ describe 'Issue Boards', feature: true, js: true do
       click_button 'Remove from board'
     end
-    wait_for_vue_resource
+    wait_for_ajax
     page.within(first('.board')) do
       expect(page).to have_selector('.card', count: 1)
@@ -94,7 +92,7 @@ describe 'Issue Boards', feature: true, js: true do
         page.within('.dropdown-menu-user') do
           click_link user.name
-          wait_for_vue_resource
+          wait_for_ajax
         end
         expect(page).to have_content(user.name)
@@ -137,7 +135,7 @@ describe 'Issue Boards', feature: true, js: true do
         end
         find('.dropdown-menu-toggle').click
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_content('No assignee')
       end
@@ -153,7 +151,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_button 'assign yourself'
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_content(user.name)
       end
@@ -172,7 +170,7 @@ describe 'Issue Boards', feature: true, js: true do
         page.within('.dropdown-menu-user') do
           click_link user.name
-          wait_for_vue_resource
+          wait_for_ajax
         end
         expect(page).to have_content(user.name)
@@ -201,7 +199,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_link milestone.title
-        wait_for_vue_resource
+        wait_for_ajax
         page.within('.value') do
           expect(page).to have_content(milestone.title)
@@ -219,7 +217,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_link "No Milestone"
-        wait_for_vue_resource
+        wait_for_ajax
         page.within('.value') do
           expect(page).not_to have_content(milestone.title)
@@ -237,7 +235,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_button Date.today.day
-        wait_for_vue_resource
+        wait_for_ajax
         expect(page).to have_content(Date.today.to_s(:medium))
       end
@@ -255,7 +253,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_link bug.title
-        wait_for_vue_resource
+        wait_for_ajax
         find('.dropdown-menu-close-icon').click
@@ -280,7 +278,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_link bug.title
         click_link regression.title
-        wait_for_vue_resource
+        wait_for_ajax
         find('.dropdown-menu-close-icon').click
@@ -306,7 +304,7 @@ describe 'Issue Boards', feature: true, js: true do
         click_link stretch.title
-        wait_for_vue_resource
+        wait_for_ajax
         find('.dropdown-menu-close-icon').click

spec/features/boards/sub_group_project_spec.rb

+require 'rails_helper'
+
+describe 'Sub-group project issue boards', :feature, :js do
+  let(:group) { create(:group) }
+  let(:nested_group_1) { create(:group, parent: group) }
+  let(:project) { create(:empty_project, group: nested_group_1) }
+  let(:board) { create(:board, project: project) }
+  let(:label) { create(:label, project: project) }
+  let(:user) { create(:user) }
+  let!(:list1) { create(:list, board: board, label: label, position: 0) }
+  let!(:issue) { create(:labeled_issue, project: project, labels: [label]) }
+
+  before do
+    project.add_master(user)
+
+    login_as(user)
+
+    visit namespace_project_board_path(project.namespace, project, board)
+    wait_for_ajax
+  end
+
+  it 'creates new label from sidebar' do
+    find('.card').click
+
+    page.within '.labels' do
+      click_link 'Edit'
+      click_link 'Create new label'
+    end
+
+    page.within '.dropdown-new-label' do
+      fill_in 'new_label_name', with: 'test label'
+      first('.suggest-colors-dropdown a').click
+
+      click_button 'Create'
+
+      wait_for_ajax
+    end
+
+    page.within '.labels' do
+      expect(page).to have_link 'test label'
+    end
+  end
+end

spec/features/dashboard/milestone_filter_spec.rb

+require 'spec_helper'
+
+describe 'Dashboard > milestone filter', :feature, :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, name: 'test', namespace: user.namespace) }
+  let(:milestone) { create(:milestone, title: "v1.0", project: project) }
+  let(:milestone2) { create(:milestone, title: "v2.0", project: project) }
+  let!(:issue) { create :issue, author: user, project: project, milestone: milestone }
+  let!(:issue2) { create :issue, author: user, project: project, milestone: milestone2 }
+
+  before do
+    login_as(user)
+    visit issues_dashboard_path(author_id: user.id)
+  end
+
+  context 'default state' do
+    it 'shows issues with Any Milestone' do
+      page.all('.issue-info').each do |issue_info|
+        expect(issue_info.text).to match(/v\d.0/)
+      end
+    end
+  end
+
+  context 'filtering by milestone' do
+    milestone_select = '.js-milestone-select'
+
+    before do
+      find(milestone_select).click
+      wait_for_ajax
+
+      page.within('.dropdown-content') do
+        click_link 'v1.0'
+      end
+
+      find(milestone_select).click
+      wait_for_ajax
+    end
+
+    it 'shows issues with Milestone v1.0' do
+      expect(find('.issues-list')).to have_selector('.issue', count: 1)
+      expect(find('.dropdown-content')).to have_selector('a.is-active', count: 1)
+    end
+
+    it 'should not change active Milestone unless clicked' do
+      expect(find('.dropdown-content')).to have_selector('a.is-active', count: 1)
+
+      # open & close dropdown
+      find('.dropdown-menu-close').click
+
+      expect(find('.milestone-filter')).not_to have_selector('.dropdown.open')
+
+      find(milestone_select).click
+
+      expect(find('.dropdown-content')).to have_selector('a.is-active', count: 1)
+      expect(find('.dropdown-content a.is-active')).to have_content('v1.0')
+    end
+  end
+end

spec/features/gitlab_flavored_markdown_spec.rb

@@ -49,8 +49,6 @@ describe "GitLab Flavored Markdown", feature: true do
   end
   describe "for issues", feature: true, js: true do
-    include WaitForVueResource
-
     before do
       @other_issue = create(:issue,
                             author: @user,

spec/features/issues/award_emoji_spec.rb

 require 'rails_helper'
 describe 'Awards Emoji', feature: true do
-  include WaitForVueResource
-
   let!(:project)   { create(:project, :public) }
   let!(:user)      { create(:user) }
   let(:issue) do
@@ -22,7 +20,7 @@ describe 'Awards Emoji', feature: true do
         # The `heart_tip` emoji is not valid anymore so we need to skip validation
         issue.award_emoji.build(user: user, name: 'heart_tip').save!(validate: false)
         visit namespace_project_issue_path(project.namespace, project, issue)
-        wait_for_vue_resource
+        wait_for_ajax
       end
       # Regression test: https://gitlab.com/gitlab-org/gitlab-ce/issues/29529
@@ -36,7 +34,7 @@ describe 'Awards Emoji', feature: true do
       before do
         visit namespace_project_issue_path(project.namespace, project, issue)
-        wait_for_vue_resource
+        wait_for_ajax
       end
       it 'increments the thumbsdown emoji', js: true do

spec/features/issues/award_spec.rb

@@ -6,12 +6,10 @@ feature 'Issue awards', js: true, feature: true do
   let(:issue)     { create(:issue, project: project) }
   describe 'logged in' do
-    include WaitForVueResource
-
     before do
       login_as(user)
       visit namespace_project_issue_path(project.namespace, project, issue)
-      wait_for_vue_resource
+      wait_for_ajax
     end
     it 'adds award to issue' do
@@ -41,11 +39,9 @@ feature 'Issue awards', js: true, feature: true do
   end
   describe 'logged out' do
-    include WaitForVueResource
-    
     before do
       visit namespace_project_issue_path(project.namespace, project, issue)
-      wait_for_vue_resource
+      wait_for_ajax
     end
     it 'does not see award menu button' do