Merge remote-tracking branch 'upstream/master' into rename-builds-controller

* upstream/master: (307 commits)
  Address feedback
  Add small update for the i18n guide.
  update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error
  update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin
  name all webpack chunks to improve long term cacheability
  add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin
  upgrade to latest webpack version
  Only use DROP INDEX CONCURRENTLY on postgreql 9.2+
  Provide default for calculating label text color (!11681)
  Add failing test for #32728
  Bugfix: Always use the default language when generating emails.
  Remove unecessary commit pattern check
  Add regexp_for_value helper method
  Remove shared example and improve sub_group_issuables_spec.rb
  Remove 'should' from scenario in has_subgroup_title_spec.rb
  Cartfile git and binary methods cannot take a GitHub repo
  Fix terminals support for Kubernetes service
  Add review comments to compare_spec.rb
  Fix transient error clicking dropdown items in compare_spec.rb
  Use non-global jQuery reference within raven bundle
  ...

23 files changed, 95 insertions, 203 deletions

diff --git a/features/project/hooks.feature b/features/project/hooks.feature
deleted file mode 100644
index 627738004c4..00000000000
--- a/features/project/hooks.feature
+++ /dev/null
@@ -1,37 +0,0 @@
-Feature: Project Hooks
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-
-  Scenario: I should see hook list
-    Given project has hook
-    When I visit project hooks page
-    Then I should see project hook
-
-  Scenario: I add new hook
-    Given I visit project hooks page
-    When I submit new hook
-    Then I should see newly created hook
-
-  Scenario: I add new hook with SSL verification enabled
-    Given I visit project hooks page
-    When I submit new hook with SSL verification enabled
-    Then I should see newly created hook with SSL verification enabled
-
-  Scenario: I test hook
-    Given project has hook
-    And I visit project hooks page
-    When I click test hook button
-    Then hook should be triggered
-
-  Scenario: I test a hook on empty project
-    Given I own empty project with hook
-    And I visit project hooks page
-    When I click test hook button
-    Then I should see hook error message
-
-  Scenario: I test a hook on down URL
-    Given project has hook
-    And I visit project hooks page
-    When I click test hook button with invalid URL
-    Then I should see hook service down error message
diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb
index ca3cd0ecc4e..a745254cc31 100644
--- a/features/steps/dashboard/event_filters.rb
+++ b/features/steps/dashboard/event_filters.rb
@@ -1,5 +1,5 @@
 class Spinach::Features::EventFilters < Spinach::FeatureSteps
-  include WaitForAjax
+  include WaitForRequests
   include SharedAuthentication
   include SharedPaths
   include SharedProject
@@ -73,20 +73,20 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
   end
 
   When 'I click "push" event filter' do
-    wait_for_ajax
+    wait_for_requests
     click_link("Push events")
-    wait_for_ajax
+    wait_for_requests
   end
 
   When 'I click "team" event filter' do
-    wait_for_ajax
+    wait_for_requests
     click_link("Team")
-    wait_for_ajax
+    wait_for_requests
   end
 
   When 'I click "merge" event filter' do
-    wait_for_ajax
+    wait_for_requests
     click_link("Merge events")
-    wait_for_ajax
+    wait_for_requests
   end
 end
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index 14c13c4818a..4a33babe3bd 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -3,7 +3,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
   include SharedPaths
   include SharedProject
   include SharedUser
-  include WaitForAjax
+  include WaitForRequests
 
   step '"John Doe" is a developer of project "Shop"' do
     project.team << [john_doe, :developer]
@@ -138,9 +138,9 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
   end
 
   step 'I should be directed to the corresponding page' do
-    page.should have_css('.identifier', text: 'Merge Request !1')
+    page.should have_css('.identifier', text: 'Merge request !1')
     # Merge request page loads and issues a number of Ajax requests
-    wait_for_ajax
+    wait_for_requests
   end
 
   def should_see_todo(position, title, body, state: :pending)
diff --git a/features/steps/group/members.rb b/features/steps/group/members.rb
index b04a7015d4e..0ab1012660c 100644
--- a/features/steps/group/members.rb
+++ b/features/steps/group/members.rb
@@ -1,5 +1,5 @@
 class Spinach::Features::GroupMembers < Spinach::FeatureSteps
-  include WaitForAjax
+  include WaitForRequests
   include SharedAuthentication
   include SharedPaths
   include SharedGroup
@@ -58,7 +58,7 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps
         click_link 'Developer'
       end
 
-      wait_for_ajax
+      wait_for_requests
     end
   end
 
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index 0b0983f0d06..0542b06c0ab 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -1,5 +1,5 @@
 class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
-  include WaitForAjax
+  include WaitForRequests
   include SharedAuthentication
   include SharedPaths
   include SharedGroup
@@ -91,7 +91,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
   end
 
   step 'I should see the list of labels' do
-    wait_for_ajax
+    wait_for_requests
 
     page.within('#tab-labels') do
       expect(page).to have_content 'bug'
diff --git a/features/steps/project/builds/artifacts.rb b/features/steps/project/builds/artifacts.rb
index 89132ff068f..4b72355b125 100644
--- a/features/steps/project/builds/artifacts.rb
+++ b/features/steps/project/builds/artifacts.rb
@@ -3,7 +3,7 @@ class Spinach::Features::ProjectBuildsArtifacts < Spinach::FeatureSteps
   include SharedProject
   include SharedBuilds
   include RepoHelpers
-  include WaitForAjax
+  include WaitForRequests
 
   step 'I click artifacts download button' do
     click_link 'Download'
@@ -79,7 +79,7 @@ class Spinach::Features::ProjectBuildsArtifacts < Spinach::FeatureSteps
 
   step 'I click a link to file within build artifacts' do
     page.within('.tree-table') { find_link('ci_artifacts.txt').click }
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I see a download link' do
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index 29055373a57..25514eb9ef2 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -4,8 +4,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   include SharedNote
   include SharedPaths
   include Select2Helper
-  include WaitForVueResource
-  include WaitForAjax
+  include WaitForRequests
 
   step 'I am a member of project "Shop"' do
     @project = ::Project.find_by(name: "Shop")
@@ -34,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_requests
   end
 
   step 'I fill out a "Merge Request On Forked Project" merge request' do
@@ -48,7 +47,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
     first('.dropdown-target-project a', text: @project.path_with_namespace)
 
     first('.js-source-branch').click
-    wait_for_ajax
+    wait_for_requests
     first('.dropdown-source-branch .dropdown-content a', text: 'fix').click
 
     click_button "Compare branches and continue"
diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
deleted file mode 100644
index 945d58a6458..00000000000
--- a/features/steps/project/hooks.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'webmock'
-
-class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedPaths
-  include RSpec::Matchers
-  include RSpec::Mocks::ExampleMethods
-  include WebMock::API
-
-  step 'project has hook' do
-    @hook = create(:project_hook, project: current_project)
-  end
-
-  step 'I own empty project with hook' do
-    @project = create(:empty_project,
-                      name: 'Empty Project', namespace: @user.namespace)
-    @hook = create(:project_hook, project: current_project)
-  end
-
-  step 'I should see project hook' do
-    expect(page).to have_content @hook.url
-  end
-
-  step 'I submit new hook' do
-    @url = 'http://example.org/1'
-    fill_in "hook_url", with: @url
-    expect { click_button "Add webhook" }.to change(ProjectHook, :count).by(1)
-  end
-
-  step 'I submit new hook with SSL verification enabled' do
-    @url = 'http://example.org/2'
-    fill_in "hook_url", with: @url
-    check "hook_enable_ssl_verification"
-    expect { click_button "Add webhook" }.to change(ProjectHook, :count).by(1)
-  end
-
-  step 'I should see newly created hook' do
-    expect(current_path).to eq namespace_project_settings_integrations_path(current_project.namespace, current_project)
-    expect(page).to have_content(@url)
-  end
-
-  step 'I should see newly created hook with SSL verification enabled' do
-    expect(current_path).to eq namespace_project_settings_integrations_path(current_project.namespace, current_project)
-    expect(page).to have_content(@url)
-    expect(page).to have_content("SSL Verification: enabled")
-  end
-
-  step 'I click test hook button' do
-    stub_request(:post, @hook.url).to_return(status: 200)
-    click_link 'Test'
-  end
-
-  step 'I click test hook button with invalid URL' do
-    stub_request(:post, @hook.url).to_raise(SocketError)
-    click_link 'Test'
-  end
-
-  step 'hook should be triggered' do
-    expect(current_path).to eq namespace_project_settings_integrations_path(current_project.namespace, current_project)
-    expect(page).to have_selector '.flash-notice',
-                              text: 'Hook executed successfully: HTTP 200'
-  end
-
-  step 'I should see hook error message' do
-    expect(page).to have_selector '.flash-alert',
-                              text: 'Hook execution failed. '\
-                              'Ensure the project has commits.'
-  end
-
-  step 'I should see hook service down error message' do
-    expect(page).to have_selector '.flash-alert',
-                              text: 'Hook execution failed: Exception from'
-  end
-end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 8133760e619..54b6352c952 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -7,11 +7,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   include SharedMarkdown
   include SharedDiffNote
   include SharedUser
-  include WaitForAjax
-  include WaitForVueResource
+  include WaitForRequests
 
   after do
-    wait_for_ajax if javascript_test?
+    wait_for_requests if javascript_test?
   end
 
   step 'I click link "New Merge Request"' do
@@ -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_requests
   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_requests
   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_requests
   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_requests
   end
 
   step 'I should not see "master" branch' do
@@ -99,7 +98,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I click button "Unsubscribe"' do
     click_on "Unsubscribe"
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I click link "Close"' do
@@ -353,7 +352,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see a discussion by user "John Doe" has started on diff' do
     # Trigger a refresh of notes
     execute_script("$(document).trigger('visibilitychange');")
-    wait_for_ajax
+    wait_for_requests
     page.within(".notes .discussion") do
       page.should have_content "#{user_exists("John Doe").name} #{user_exists("John Doe").to_reference} started a discussion"
       page.should have_content sample_commit.line_code_path
@@ -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_requests
   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_requests
   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_requests
     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_requests
     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_requests
     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_requests
   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_requests
     end
   end
 
@@ -470,7 +469,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       click_button "Comment"
     end
 
-    wait_for_ajax
+    wait_for_requests
 
     page.within ".files>div:nth-child(2) .note-body > .note-text" do
       expect(page).to have_content "Line is correct"
@@ -485,7 +484,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       click_button "Comment"
     end
 
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I should still see a comment like "Line is correct" in the second file' do
@@ -514,7 +513,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_requests
     end
   end
 
@@ -538,7 +537,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see new target branch changes' do
     expect(page).to have_content 'Request to merge fix into feature'
     expect(page).to have_content 'changed target branch from merge-test to feature'
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I click on "Email Patches"' do
@@ -556,8 +555,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step '"Bug NS-05" has CI status' do
     project = merge_request.source_project
     project.enable_ci
-    pipeline = create :ci_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch
-    merge_request.update(head_pipeline: pipeline)
+
+    pipeline =
+      create(:ci_pipeline,
+             project: project,
+             sha: merge_request.diff_head_sha,
+             ref: merge_request.source_branch,
+             head_pipeline_of: merge_request)
+
     create :ci_build, pipeline: pipeline
   end
 
@@ -572,7 +577,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       expect(page).to have_content /([0-9]+ commits behind)/
     end
 
-    wait_for_vue_resource
+    wait_for_requests
   end
 
   step 'I should not see the diverged commits count' do
@@ -580,7 +585,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       expect(page).not_to have_content /([0-9]+ commit[s]? behind)/
     end
 
-    wait_for_vue_resource
+    wait_for_requests
   end
 
   def merge_request
@@ -597,7 +602,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
       click_button "Comment"
     end
 
-    wait_for_ajax
+    wait_for_requests
 
     page.within(".notes_holder", visible: true) do
       expect(page).to have_content message
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb
index 3c976f675a2..023f9bef8e5 100644
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
@@ -1,7 +1,7 @@
 class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
   include LoginHelpers
   include GitlabRoutingHelper
-  include WaitForVueResource
+  include WaitForRequests
 
   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_requests
   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_requests
   end
 
   step 'There is an open Merge Request' do
diff --git a/features/steps/project/merge_requests/revert.rb b/features/steps/project/merge_requests/revert.rb
index aa76d6f8c48..98d990f112f 100644
--- a/features/steps/project/merge_requests/revert.rb
+++ b/features/steps/project/merge_requests/revert.rb
@@ -1,7 +1,7 @@
 class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
   include LoginHelpers
   include GitlabRoutingHelper
-  include WaitForVueResource
+  include WaitForRequests
 
   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_requests
   end
 
   step 'I should not see the revert button' do
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index 9c2196a8ef7..de32c9afcca 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -2,7 +2,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
-  include WaitForAjax
+  include WaitForRequests
 
   step 'change project settings' do
     fill_in 'project_name_edit', with: 'NewName'
@@ -87,7 +87,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   end
 
   step 'I should see project "Shop" README' do
-    wait_for_ajax
+    wait_for_requests
     page.within('.readme-holder') do
       expect(page).to have_content 'testme'
     end
diff --git a/features/steps/project/project_milestone.rb b/features/steps/project/project_milestone.rb
index dc1190b7eea..a7d3352b8c4 100644
--- a/features/steps/project/project_milestone.rb
+++ b/features/steps/project/project_milestone.rb
@@ -2,7 +2,7 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
-  include WaitForAjax
+  include WaitForRequests
 
   step 'milestone has issue "Bugfix1" with labels: "bug", "feature"' do
     project = Project.find_by(name: "Shop")
@@ -35,7 +35,7 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps
   end
 
   step 'I should see the labels "bug", "enhancement" and "feature"' do
-    wait_for_ajax
+    wait_for_requests
 
     page.within('#tab-issues') do
       expect(page).to have_content 'bug'
diff --git a/features/steps/project/services.rb b/features/steps/project/services.rb
index 772b07d0ad8..3c0d987e403 100644
--- a/features/steps/project/services.rb
+++ b/features/steps/project/services.rb
@@ -211,7 +211,7 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
   end
 
   step 'I should see empty field Change Password' do
-    expect(find_field('Change Password').value).to be_nil
+    expect(find_field('Enter new password').value).to be_nil
   end
 
   step 'I click JetBrains TeamCity CI service link' do
diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb
index 60febd20104..e3f5e9e3ef3 100644
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
@@ -3,7 +3,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
   include SharedProject
   include SharedNote
   include SharedPaths
-  include WaitForAjax
+  include WaitForRequests
 
   step 'project "Shop" have "Snippet one" snippet' do
     create(:project_snippet,
@@ -59,7 +59,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
       find('.ace_editor').native.send_keys 'Content of snippet three'
     end
     click_button "Create snippet"
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I should see snippet "Snippet three"' do
@@ -81,7 +81,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
       fill_in "note_note", with: "Good snippet!"
       click_button "Comment"
     end
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I should see comment "Good snippet!"' do
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index ef09bddddd8..6efd4374b32 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -4,7 +4,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   include SharedProject
   include SharedPaths
   include RepoHelpers
-  include WaitForAjax
+  include WaitForRequests
 
   step "I don't have write access" do
     @project = create(:project, :repository, name: "Other Project", path: "other-project")
@@ -37,12 +37,12 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I should see its content' do
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content old_gitignore_content
   end
 
   step 'I should see its new content' do
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content new_gitignore_content
   end
 
diff --git a/features/steps/project/source/markdown_render.rb b/features/steps/project/source/markdown_render.rb
index ada0ff20585..0fee158d590 100644
--- a/features/steps/project/source/markdown_render.rb
+++ b/features/steps/project/source/markdown_render.rb
@@ -5,7 +5,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedMarkdown
-  include WaitForAjax
+  include WaitForRequests
 
   step 'I own project "Delta"' do
     @project = ::Project.find_by(name: "Delta")
@@ -35,7 +35,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   step 'I should see correct document rendered' do
     expect(current_path).to eq namespace_project_blob_path(@project.namespace, @project, "markdown/doc/api/README.md")
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content "All API requests require authentication"
   end
 
@@ -65,7 +65,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   step 'I should see correct maintenance file rendered' do
     expect(current_path).to eq namespace_project_blob_path(@project.namespace, @project, "markdown/doc/raketasks/maintenance.md")
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content "bundle exec rake gitlab:env:info RAILS_ENV=production"
   end
 
@@ -97,7 +97,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   step 'I see correct file rendered' do
     expect(current_path).to eq namespace_project_blob_path(@project.namespace, @project, "markdown/doc/api/README.md")
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content "Contents"
     expect(page).to have_link "Users"
     expect(page).to have_link "Rake tasks"
@@ -120,7 +120,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   When 'I visit markdown branch' do
     visit namespace_project_tree_path(@project.namespace, @project, "markdown")
-    wait_for_ajax
+    wait_for_requests
   end
 
   When 'I visit markdown branch "README.md" blob' do
@@ -143,7 +143,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   step 'I see correct file rendered in markdown branch' do
     expect(current_path).to eq namespace_project_blob_path(@project.namespace, @project, "markdown/doc/api/README.md")
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content "Contents"
     expect(page).to have_link "Users"
     expect(page).to have_link "Rake tasks"
@@ -151,7 +151,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   step 'I should see correct document rendered for markdown branch' do
     expect(current_path).to eq namespace_project_blob_path(@project.namespace, @project, "markdown/doc/api/README.md")
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content "All API requests require authentication"
   end
 
@@ -169,7 +169,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
   # Expected link contents
 
   step 'The link with text "empty" should have url "tree/markdown"' do
-    wait_for_ajax
+    wait_for_requests
     find('a', text: /^empty$/)['href'] == current_host + namespace_project_tree_path(@project.namespace, @project, "markdown")
   end
 
@@ -205,7 +205,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
   end
 
   step 'The link with text "ID" should have url "blob/markdown/README.mdID"' do
-    wait_for_ajax
+    wait_for_requests
     find('a', text: /^#id$/)['href'] == current_host + namespace_project_blob_path(@project.namespace, @project, "markdown/README.md") + '#id'
   end
 
@@ -300,12 +300,12 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
 
   step 'I should see the correct markdown' do
     expect(current_path).to eq namespace_project_blob_path(@project.namespace, @project, "markdown/doc/api/users.md")
-    wait_for_ajax
+    wait_for_requests
     expect(page).to have_content "List users"
   end
 
   step 'Header "Application details" should have correct id and link' do
-    wait_for_ajax
+    wait_for_requests
     header_should_have_correct_id_and_link(2, 'Application details', 'application-details')
   end
 
diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb
index 8bae80a8707..af5db05e9e8 100644
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
@@ -1,9 +1,9 @@
 module SharedActiveTab
   include Spinach::DSL
-  include WaitForAjax
+  include WaitForRequests
 
   after do
-    wait_for_ajax if javascript_test?
+    wait_for_requests if javascript_test?
   end
 
   def ensure_active_main_tab(content)
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 071aa2e3eff..36fc315599e 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -1,10 +1,10 @@
 module SharedDiffNote
   include Spinach::DSL
   include RepoHelpers
-  include WaitForAjax
+  include WaitForRequests
 
   after do
-    wait_for_ajax if javascript_test?
+    wait_for_requests if javascript_test?
   end
 
   step 'I cancel the diff comment' do
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 7d260025052..44eb8f321dd 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -1,9 +1,9 @@
 module SharedNote
   include Spinach::DSL
-  include WaitForAjax
+  include WaitForRequests
 
   after do
-    wait_for_ajax if javascript_test?
+    wait_for_requests if javascript_test?
   end
 
   step 'I delete a comment' do
@@ -25,7 +25,7 @@ module SharedNote
       click_button "Comment"
     end
 
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I preview a comment text like "Bug fixed :smile:"' do
@@ -40,7 +40,7 @@ module SharedNote
       click_button "Comment"
     end
 
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I write a comment like ":+1: Nice"' do
@@ -127,7 +127,7 @@ module SharedNote
       click_button "Comment"
     end
 
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'The comment with the header should not have an ID' do
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index bef3eac4d26..f0e751b820a 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -2,7 +2,7 @@ module SharedPaths
   include Spinach::DSL
   include RepoHelpers
   include DashboardHelper
-  include WaitForVueResource
+  include WaitForRequests
 
   step 'I visit new project page' do
     visit new_project_path
@@ -378,28 +378,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_requests
   end
 
   step 'I visit merge request page "Bug NS-05"' do
     visit merge_request_path("Bug NS-05")
-    wait_for_vue_resource
+    wait_for_requests
   end
 
   step 'I visit merge request page "Bug NS-07"' do
     visit merge_request_path("Bug NS-07")
-    wait_for_vue_resource
+    wait_for_requests
   end
 
   step 'I visit merge request page "Bug NS-08"' do
     visit merge_request_path("Bug NS-08")
-    wait_for_vue_resource
+    wait_for_requests
   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_requests
   end
 
   step 'I visit project "Shop" merge requests page' do
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
index 0b3e942a4fd..a4fc77746ee 100644
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
@@ -3,7 +3,7 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
   include SharedPaths
   include SharedProject
   include SharedSnippet
-  include WaitForAjax
+  include WaitForRequests
 
   step 'I click link "Personal snippet one"' do
     click_link "Personal snippet one"
@@ -30,7 +30,7 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
       find('.ace_editor').native.send_keys 'Content of snippet three'
     end
     click_button "Create snippet"
-    wait_for_ajax
+    wait_for_requests
   end
 
   step 'I submit new internal snippet' do
diff --git a/features/support/env.rb b/features/support/env.rb
index 23a1f702068..1690465d9b2 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -10,7 +10,7 @@ if ENV['CI']
   Knapsack::Adapters::SpinachAdapter.bind
 end
 
-%w(select2_helper test_env repo_helpers wait_for_ajax wait_for_requests sidekiq wait_for_vue_resource).each do |f|
+%w(select2_helper test_env repo_helpers wait_for_requests sidekiq).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
 
@@ -33,7 +33,7 @@ end
 Spinach.hooks.after_scenario do |scenario_data, step_definitions|
   if scenario_data.tags.include?('javascript')
     include WaitForRequests
-    wait_for_requests_complete
+    block_and_wait_for_requests_complete
   end
 end