Merge branch 'ee-sh-headless-chrome-support' into 'master'

Port of sh-headless-chrome-support to EE See merge request gitlab-org/gitlab-ee!3245

Merge branch 'ee-sh-headless-chrome-support' into 'master'
Port of sh-headless-chrome-support to EE See merge request gitlab-org/gitlab-ee!3245
807f4b16 · Stan Hu · d0e8e646 · 887ea884 · 807f4b16 · 807f4b16
Commit 807f4b16 authored Nov 03, 2017 by Stan Hu
167 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.13-chrome-62.0-node-8.x-yarn-1.2-postgresql-9.6"

 .default-cache: &default-cache
  key: "ruby-235-with-yarn"
@@ -24,7 +24,6 @@ variables:
  SIMPLECOV: "true"
  GIT_DEPTH: "20"
  GIT_SUBMODULE_STRATEGY: "none"
-  PHANTOMJS_VERSION: "2.1.1"
  GET_SOURCES_ATTEMPTS: "3"
  KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
  KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json
@@ -576,7 +575,6 @@ karma:
  <<: *dedicated-runner
  <<: *except-docs
  <<: *pull-cache
-  image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.5-golang-1.8-git-2.13-chrome-61.0-node-8.x-yarn-1.0-postgresql-9.6"
  stage: test
  variables:
    BABEL_ENV: "coverage"

--- a/Gemfile
+++ b/Gemfile
@@ -336,9 +336,9 @@ group :development, :test do
  # Generate Fake data
  gem 'ffaker', '~> 2.4'

-  gem 'capybara', '~> 2.15.0'
+  gem 'capybara', '~> 2.15'
  gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist', '~> 1.9.0'
+  gem 'selenium-webdriver', '~> 3.5'

  gem 'spring', '~> 2.0.0'
  gem 'spring-commands-rspec', '~> 1.0.4'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,12 +121,13 @@ GEM
      mime-types (>= 1.16)
    cause (0.1)
    charlock_holmes (0.7.5)
+    childprocess (0.7.0)
+      ffi (~> 1.0, >= 1.0.11)
    chronic (0.10.2)
    chronic_duration (0.10.6)
      numerizer (~> 0.1.1)
    chunky_png (1.3.5)
    citrus (3.0.2)
-    cliver (0.3.2)
    coderay (1.1.1)
    coercible (1.0.0)
      descendants_tracker (~> 0.0.1)
@@ -633,11 +634,6 @@ GEM
    pg (0.18.4)
    po_to_json (1.0.1)
      json (>= 1.6.0)
-    poltergeist (1.9.0)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      multi_json (~> 1.0)
-      websocket-driver (>= 0.2.0)
    posix-spawn (0.3.13)
    powerpack (0.1.1)
    premailer (1.10.4)
@@ -847,6 +843,9 @@ GEM
      activesupport (>= 3.1)
    select2-rails (3.5.9.3)
      thor (~> 0.14)
+    selenium-webdriver (3.5.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
    sentry-raven (2.5.3)
      faraday (>= 0.7.6, < 1.0)
    settingslogic (2.0.9)
@@ -979,9 +978,6 @@ GEM
      hashdiff
    webpack-rails (0.9.10)
      railties (>= 3.2.0)
-    websocket-driver (0.6.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
    wikicloth (0.8.1)
      builder
      expression_parser
@@ -1019,7 +1015,7 @@ DEPENDENCIES
  browser (~> 2.2)
  bullet (~> 5.5.0)
  bundler-audit (~> 0.5.0)
-  capybara (~> 2.15.0)
+  capybara (~> 2.15)
  capybara-screenshot (~> 1.0.0)
  carrierwave (~> 1.2)
  charlock_holmes (~> 0.7.5)
@@ -1142,7 +1138,6 @@ DEPENDENCIES
  peek-redis (~> 1.2.0)
  peek-sidekiq (~> 1.0.3)
  pg (~> 0.18.2)
-  poltergeist (~> 1.9.0)
  premailer-rails (~> 1.9.7)
  prometheus-client-mmap (~> 0.7.0.beta18)
  pry-byebug (~> 3.4.1)
@@ -1188,6 +1183,7 @@ DEPENDENCIES
  scss_lint (~> 0.54.0)
  seed-fu (~> 2.3.5)
  select2-rails (~> 3.5.9)
+  selenium-webdriver (~> 3.5)
  sentry-raven (~> 2.5.3)
  settingslogic (~> 2.0.9)
  sham_rack (~> 1.3.6)

--- a/app/assets/javascripts/droplab/plugins/filter.js
+++ b/app/assets/javascripts/droplab/plugins/filter.js
@@ -79,8 +79,6 @@ const Filter = {

    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);
    this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);
-
-    this.debounceKeydown({ detail: { hook: this.hook } });
  },

  destroy: function destroy() {

--- a/app/assets/javascripts/test_utils/index.js
+++ b/app/assets/javascripts/test_utils/index.js
 import 'core-js/es6/map';
 import 'core-js/es6/set';
 import simulateDrag from './simulate_drag';
+import simulateInput from './simulate_input';

 // Export to global space for rspec to use
 window.simulateDrag = simulateDrag;
+window.simulateInput = simulateInput;
--- a/app/assets/javascripts/test_utils/simulate_input.js
+++ b/app/assets/javascripts/test_utils/simulate_input.js
+function triggerEvents(input) {
+  input.dispatchEvent(new Event('keydown'));
+  input.dispatchEvent(new Event('keypress'));
+  input.dispatchEvent(new Event('input'));
+  input.dispatchEvent(new Event('keyup'));
+}
+
+export default function simulateInput(target, text) {
+  const input = document.querySelector(target);
+  if (!input || !input.matches('textarea, input')) {
+    return false;
+  }
+
+  if (text.length > 0) {
+    Array.prototype.forEach.call(text, (char) => {
+      input.value += char;
+      triggerEvents(input);
+    });
+  } else {
+    triggerEvents(input);
+  }
+  return true;
+}
--- a/app/assets/stylesheets/framework/contextual-sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual-sidebar.scss
@@ -484,10 +484,7 @@
  height: calc(100vh - #{$header-height});

  @media (min-width: $screen-sm-min) {
-    height: 475px; // Needed for PhantomJS
-    // scss-lint:disable DuplicateProperty
    height: calc(100vh - 180px);
-    // scss-lint:enable DuplicateProperty
  }
 }


--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -268,12 +268,6 @@
 .filtered-search-box-input-container {
  flex: 1;
  position: relative;
-  // Fix PhantomJS not supporting `flex: 1;` properly.
-  // This is important because it can change the expected `e.target` when clicking things in tests.
-  // See https://gitlab.com/gitlab-org/gitlab-ce/blob/b54acba8b732688c59fe2f38510c469dc86ee499/spec/features/issues/filtered_search/visual_tokens_spec.rb#L61
-  // - With `width: 100%`: `e.target` = `.tokens-container`, https://i.imgur.com/jGq7wbx.png
-  // - Without `width: 100%`: `e.target` = `.filtered-search`, https://i.imgur.com/cNI2CyT.png
-  width: 100%;
  min-width: 0;
 }


--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -117,10 +117,7 @@
  white-space: nowrap;

  @media (min-width: $screen-sm-min) {
-    height: 475px; // Needed for PhantomJS
-    // scss-lint:disable DuplicateProperty
    height: calc(100vh - 222px);
-    // scss-lint:enable DuplicateProperty
    min-height: 475px;
  }
 }

--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -469,8 +469,6 @@ ul.notes {
  flex-shrink: 0;
  display: inline-flex;
  align-items: center;
-  // For PhantomJS that does not support flex
-  float: right;
  margin-left: 10px;
  color: $gray-darkest;

@@ -481,7 +479,6 @@ ul.notes {
 }

 .more-actions {
-  float: right; // phantomjs fallback
  display: flex;
  align-items: flex-end;


--- a/app/assets/stylesheets/test.scss
+++ b/app/assets/stylesheets/test.scss
@@ -4,11 +4,6 @@
  -ms-transition: none !important;
  -webkit-transition: none !important;
  transition: none !important;
-  -o-transform: none !important;
-  -moz-transform: none !important;
-  -ms-transform: none !important;
-  -webkit-transform: none !important;
-  transform: none !important;
  -webkit-animation: none !important;
  -moz-animation: none !important;
  -o-animation: none !important;

--- a/app/views/shared/issuable/_approvals.html.haml
+++ b/app/views/shared/issuable/_approvals.html.haml
@@ -4,6 +4,7 @@
 - return unless issuable.is_a?(MergeRequest)
 - return unless issuable.requires_approve?

+- ineligible_approver = issuable.author || current_user
 - can_update_approvers = can?(current_user, :update_approvers, issuable)

 .form-group
@@ -11,7 +12,7 @@
    Approvers
  .col-sm-10
    - if can_update_approvers
-      = users_select_tag("merge_request[approver_ids]", multiple: true, class: 'input-large', email_user: true, skip_users: issuable.all_approvers_including_groups, project: issuable.target_project)
+      = users_select_tag("merge_request[approver_ids]", multiple: true, class: 'input-large', email_user: true, skip_users: issuable.all_approvers_including_groups << ineligible_approver, project: issuable.target_project)
      .help-block
        This merge request must be approved by these users.
        You can override the project settings by setting your own list of approvers.

--- a/config/environments/test.rb
+++ b/config/environments/test.rb
 Rails.application.configure do
  # Make sure the middleware is inserted first in middleware chain
  config.middleware.insert_before('ActionDispatch::Static', 'Gitlab::Testing::RequestBlockerMiddleware')
+  config.middleware.insert_before('ActionDispatch::Static', 'Gitlab::Testing::RequestInspectorMiddleware')

  # Settings specified here will take precedence over those in config/application.rb


--- a/features/steps/profile/notifications.rb
+++ b/features/steps/profile/notifications.rb
@@ -11,7 +11,7 @@ class Spinach::Features::ProfileNotifications < Spinach::FeatureSteps
  end

  step 'I select Mention setting from dropdown' do
-    first(:link, "On mention").trigger('click')
+    first(:link, "On mention").click
  end

  step 'I should see Notification saved message' do

--- a/features/steps/project/commits/branches.rb
+++ b/features/steps/project/commits/branches.rb
@@ -40,6 +40,7 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps

  step 'I submit new branch form with invalid name' do
    fill_in 'branch_name', with: '1.0 stable'
+    page.find("body").click # defocus the branch_name input
    select_branch('master')
    click_button 'Create branch'
  end
@@ -70,17 +71,16 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps

  step "I click branch 'improve/awesome' delete link" do
    page.within '.js-branch-improve\/awesome' do
-      find('.btn-remove').click
-      sleep 0.05
+      accept_alert { find('.btn-remove').click }
    end
  end

  step "I should not see branch 'improve/awesome'" do
-    expect(page.all(visible: true)).not_to have_content 'improve/awesome'
+    expect(page).to have_css('.js-branch-improve\\/awesome', visible: :hidden)
  end

  def select_branch(branch_name)
-    click_button 'master'
+    find('.git-revision-dropdown-toggle').click

    page.within '#new-branch-form .dropdown-menu' do
      click_link branch_name

--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -16,7 +16,7 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
  step 'I delete all labels' do
    page.within '.labels' do
      page.all('.remove-row').each do
-        first('.remove-row').click
+        accept_confirm { first('.remove-row').click }
      end
    end
  end

--- a/features/steps/project/issues/milestones.rb
+++ b/features/steps/project/issues/milestones.rb
@@ -3,6 +3,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
  include SharedProject
  include SharedPaths
  include SharedMarkdown
+  include CapybaraHelpers

  step 'I should see milestone "v2.2"' do
    milestone = @project.milestones.find_by(title: "v2.2")
@@ -65,7 +66,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
  end

  step 'I click link to remove milestone' do
-    click_link 'Delete'
+    confirm_modal_if_present { click_link 'Delete' }
  end

  step 'I should see no milestones' do

--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -215,7 +215,7 @@ module SharedDiffNote
  end

  step 'I click side-by-side diff button' do
-    find('#parallel-diff-btn').trigger('click')
+    find('#parallel-diff-btn').click
  end

  step 'I see side-by-side diff button' do
@@ -227,12 +227,11 @@ module SharedDiffNote
  end

  def click_diff_line(code)
-    find(".line_holder[id='#{code}'] td:nth-of-type(1)").trigger 'mouseover'
-    find(".line_holder[id='#{code}'] button").trigger 'click'
+    find(".line_holder[id='#{code}'] button").click
  end

  def click_parallel_diff_line(code, line_type)
-    find(".line_holder.parallel td[id='#{code}']").find(:xpath, 'preceding-sibling::*[1][self::td]').trigger 'mouseover'
-    find(".line_holder.parallel button[data-line-code='#{code}']").trigger 'click'
+    find(".line_holder.parallel td[id='#{code}']").find(:xpath, 'preceding-sibling::*[1][self::td]').hover
+    find(".line_holder.parallel button[data-line-code='#{code}']").click
  end
 end
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -14,7 +14,7 @@ module SharedNote
      find('.more-actions').click
      find('.more-actions .dropdown-menu li', match: :first)

-      find(".js-note-delete").click
+      accept_confirm { find(".js-note-delete").click }
    end
  end


--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
-require 'capybara/poltergeist'
 require 'capybara-screenshot/spinach'

 # Give CI some extra time
 timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30

-Capybara.javascript_driver = :poltergeist
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(
-    app,
-    js_errors: true,
-    timeout: timeout,
-    window_size: [1366, 768],
-    url_whitelist: %w[localhost 127.0.0.1],
-    url_blacklist: %w[.mp4 .png .gif .avi .bmp .jpg .jpeg],
-    phantomjs_options: [
-      '--load-images=yes'
-    ]
+Capybara.javascript_driver = :chrome
+Capybara.register_driver :chrome do |app|
+  extra_args = []
+  extra_args << 'headless' unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
+
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    chromeOptions: {
+      'args' => %w[no-sandbox disable-gpu --window-size=1240,1400] + extra_args
+    }
  )
+
+  Capybara::Selenium::Driver
+    .new(app, browser: :chrome, desired_capabilities: capabilities)
 end

 Capybara.default_max_wait_time = timeout
@@ -24,6 +23,10 @@ Capybara.ignore_hidden_elements = false

 # Keep only the screenshots generated from the last failing test suite
 Capybara::Screenshot.prune_strategy = :keep_last_run
+# From https://github.com/mattheworiordan/capybara-screenshot/issues/84#issuecomment-41219326
+Capybara::Screenshot.register_driver(:chrome) do |driver, path|
+  driver.browser.save_screenshot(path)
+end

 Spinach.hooks.before_run do
  TestEnv.eager_load_driver_server

--- a/features/support/capybara_helpers.rb
+++ b/features/support/capybara_helpers.rb
+module CapybaraHelpers
+  def confirm_modal_if_present
+    if Capybara.current_driver == Capybara.javascript_driver
+      accept_confirm { yield }
+      return
+    end
+
+    yield
+  end
+end
--- a/lib/gitlab/testing/request_blocker_middleware.rb
+++ b/lib/gitlab/testing/request_blocker_middleware.rb
@@ -7,6 +7,7 @@ module Gitlab
    class RequestBlockerMiddleware
      @@num_active_requests = Concurrent::AtomicFixnum.new(0)
      @@block_requests = Concurrent::AtomicBoolean.new(false)
+      @@slow_requests = Concurrent::AtomicBoolean.new(false)

      # Returns the number of requests the server is currently processing.
      def self.num_active_requests
@@ -19,9 +20,15 @@ module Gitlab
        @@block_requests.value = true
      end

+      # Slows down incoming requests (useful for race conditions).
+      def self.slow_requests!
+        @@slow_requests.value = true
+      end
+
      # Allows the server to accept requests again.
      def self.allow_requests!
        @@block_requests.value = false
+        @@slow_requests.value = false
      end

      def initialize(app)
@@ -33,6 +40,7 @@ module Gitlab
        if block_requests?
          block_request(env)
        else
+          sleep 0.2 if slow_requests?
          @app.call(env)
        end
      ensure
@@ -45,6 +53,10 @@ module Gitlab
        @@block_requests.true?
      end

+      def slow_requests?
+        @@slow_requests.true?
+      end
+
      def block_request(env)
        [503, {}, []]
      end

--- a/lib/gitlab/testing/request_inspector_middleware.rb
+++ b/lib/gitlab/testing/request_inspector_middleware.rb
+# rubocop:disable Style/ClassVars
+
+module Gitlab
+  module Testing
+    class RequestInspectorMiddleware
+      @@log_requests = Concurrent::AtomicBoolean.new(false)
+      @@logged_requests = Concurrent::Array.new
+      @@inject_headers = Concurrent::Hash.new
+
+      # Resets the current request log and starts logging requests
+      def self.log_requests!(headers = {})
+        @@inject_headers.replace(headers)
+        @@logged_requests.replace([])
+        @@log_requests.value = true
+      end
+
+      # Stops logging requests
+      def self.stop_logging!
+        @@log_requests.value = false
+      end
+
+      def self.requests
+        @@logged_requests
+      end
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        return @app.call(env) unless @@log_requests.true?
+
+        url = env['REQUEST_URI']
+        env.merge! http_headers_env(@@inject_headers) if @@inject_headers.any?
+        request_headers = env_http_headers(env)
+        status, headers, body = @app.call(env)
+
+        request = OpenStruct.new(
+          url: url,
+          status_code: status,
+          request_headers: request_headers,
+          response_headers: headers
+        )
+        log_request request
+
+        [status, headers, body]
+      end
+
+      private
+
+      def env_http_headers(env)
+        Hash[*env.select { |k, v| k.start_with? 'HTTP_' }
+          .collect { |k, v| [k.sub(/^HTTP_/, ''), v] }
+          .collect { |k, v| [k.split('_').collect(&:capitalize).join('-'), v] }
+          .sort
+          .flatten]
+      end
+
+      def http_headers_env(headers)
+        Hash[*headers
+          .collect { |k, v| [k.split('-').collect(&:upcase).join('_'), v] }
+          .collect { |k, v| [k.prepend('HTTP_'), v] }
+          .flatten]
+      end
+
+      def log_request(response)
+        @@logged_requests.push(response)
+      end
+    end
+  end
+end
--- a/spec/ee/spec/features/boards/sidebar_spec.rb
+++ b/spec/ee/spec/features/boards/sidebar_spec.rb
@@ -129,7 +129,7 @@ describe 'Issue Boards', :js do
      end

      page.within(find('.board:nth-child(2)')) do
-        find('.card:nth-child(2)').trigger('click')
+        find('.card:nth-child(2)').click
      end

      page.within('.assignee') do

--- a/spec/ee/spec/features/epics/update_epic_spec.rb
+++ b/spec/ee/spec/features/epics/update_epic_spec.rb
@@ -25,7 +25,7 @@ feature 'Update Epic', :js do
    end

    it 'updates the issue' do
-      find('.btn-edit').trigger('click')
+      find('.btn-edit').click

      fill_in 'issuable-title', with: 'New epic title'
      fill_in 'issue-description', with: 'New epic description'

--- a/spec/ee/spec/features/issues/form_spec.rb
+++ b/spec/ee/spec/features/issues/form_spec.rb
@@ -117,9 +117,9 @@ describe 'New/edit issue', :js do
      page.within '.js-assignee-search' do
        expect(page).to have_content user2.name
      end
-      expect(find('a', text: 'Assign to me')).to be_visible
+      find('.dropdown-menu-user .dropdown-menu-close').click

-      find('a', text: 'Assign to me').trigger('click')
+      find('a', text: 'Assign to me').click
      assignee_ids = page.all('input[name="issue[assignee_ids][]"]', visible: false)

      expect(assignee_ids[0].value).to match(user2.id.to_s)

--- a/spec/ee/spec/features/projects/new_project_spec.rb
+++ b/spec/ee/spec/features/projects/new_project_spec.rb
@@ -15,7 +15,7 @@ feature 'New project' do

      it 'shows mirror repository checkbox enabled', :js do
        visit new_project_path
-        find('#import-project-tab').trigger('click')
+        find('#import-project-tab').click
        first('.import_git').click

        expect(page).to have_unchecked_field('Mirror repository', disabled: false)

--- a/spec/ee/spec/features/projects/settings/merge_requests_settings_spec.rb
+++ b/spec/ee/spec/features/projects/settings/merge_requests_settings_spec.rb
@@ -77,7 +77,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
      expect(find('.js-current-approvers')).to have_content(group.name)

      within('.js-current-approvers') do
-        click_on "Remove"
+        accept_confirm { click_on "Remove" }
      end

      expect(find('.js-current-approvers')).not_to have_content(group.name)

--- a/spec/ee/support/protected_branch_helpers.rb
+++ b/spec/ee/support/protected_branch_helpers.rb
@@ -2,12 +2,12 @@ module EE
  module ProtectedBranchHelpers
    def set_allowed_to(operation, option = 'Masters', form: '.js-new-protected-branch')
      within form do
-        find(".js-allowed-to-#{operation}").trigger('click')
+        find(".js-allowed-to-#{operation}").click
        wait_for_requests

        Array(option).each { |opt| click_on(opt) }

-        find(".js-allowed-to-#{operation}").trigger('click') # needed to submit form in some cases
+        find(".js-allowed-to-#{operation}").click # needed to submit form in some cases
      end
    end
  end

--- a/spec/ee/support/shared_examples/features/protected_branches_access_control.rb
+++ b/spec/ee/support/shared_examples/features/protected_branches_access_control.rb
@@ -96,23 +96,21 @@ shared_examples "protected branches > access control > EE" do

      # Update Protected Branch
      within(".protected-branches-list") do
-        find(".js-allowed-to-#{git_operation}").trigger(:click)
+        find(".js-allowed-to-#{git_operation}").click
        find(".dropdown-input-field").set(users.last.name) # Find a user that is not loaded
        wait_for_requests

-        expect(page).to have_selector('.dropdown-header', count: 3)
-
-        %w{Roles Groups Users}.each_with_index do |header, index|
-          expect(all('.dropdown-header')[index]).to have_content(header)
+        %w{Roles Groups Users}.each do |header|
+          expect(page).to have_selector('.dropdown-header', text: header)
        end

        click_on users.last.name
-        find(".js-allowed-to-#{git_operation}").trigger(:click) # close
+        find(".js-allowed-to-#{git_operation}").click # close
      end
      wait_for_requests

      # Verify the user is appended in the dropdown
-      find(".protected-branches-list .js-allowed-to-#{git_operation}").trigger(:click)
+      find(".protected-branches-list .js-allowed-to-#{git_operation}").click
      wait_for_requests
      expect(page).to have_selector '.dropdown-content .is-active', text: users.last.name


--- a/spec/features/admin/admin_audit_logs_spec.rb
+++ b/spec/features/admin/admin_audit_logs_spec.rb
@@ -15,9 +15,11 @@ describe 'Admin::AuditLogs', :js do
    end

    it 'returns 404' do
-      visit admin_audit_logs_path
+      reqs = inspect_requests do
+        visit admin_audit_logs_path
+      end

-      expect(page.status_code).to eq(404)
+      expect(reqs.first.status_code).to eq(404)
    end
  end


--- a/spec/features/admin/admin_disables_two_factor_spec.rb
+++ b/spec/features/admin/admin_disables_two_factor_spec.rb
@@ -7,7 +7,7 @@ feature 'Admin disables 2FA for a user' do

    edit_user(user)
    page.within('.two-factor-status') do
-      click_link 'Disable'
+      accept_confirm { click_link 'Disable' }
    end

    page.within('.two-factor-status') do

--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -153,7 +153,7 @@ feature 'Admin Groups' do
        expect(page).to have_content('Developer')
      end

-      find(:css, 'li', text: current_user.name).find(:css, 'a.btn-remove').click
+      accept_confirm { find(:css, 'li', text: current_user.name).find(:css, 'a.btn-remove').click }

      visit group_group_members_path(group)


--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -62,14 +62,14 @@ describe 'Admin::Hooks', :js do
      it 'from hooks list page' do
        visit admin_hooks_path

-        expect { click_link 'Remove' }.to change(SystemHook, :count).by(-1)
+        expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
      end

      it 'from hook edit page' do
        visit admin_hooks_path
        click_link 'Edit'

-        expect { click_link 'Remove' }.to change(SystemHook, :count).by(-1)
+        expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
      end
    end
  end

--- a/spec/features/admin/admin_labels_spec.rb
+++ b/spec/features/admin/admin_labels_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'admin issues labels' do
    it 'deletes all labels', :js do
      page.within '.labels' do
        page.all('.btn-remove').each do |remove|
-          remove.click
+          accept_confirm { remove.click }
          wait_for_requests
        end
      end

--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -96,7 +96,7 @@ feature 'Admin updates settings' do

  context 'sign-in restrictions', :js do
    it 'de-activates oauth sign-in source' do
-      find('.btn', text: 'GitLab.com').click
+      find('input#application_setting_enabled_oauth_sign_in_sources_[value=gitlab]').send_keys(:return)

      expect(find('.btn', text: 'GitLab.com')).not_to have_css('.active')
    end

--- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb
+++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
@@ -24,7 +24,7 @@ describe 'Admin > Users > Impersonation Tokens', :js do
      fill_in "Name", with: name

      # Set date to 1st of next month
-      find_field("Expires at").trigger('focus')
+      find_field("Expires at").click
      find(".pika-next").click
      click_on "1"

@@ -60,7 +60,7 @@ describe 'Admin > Users > Impersonation Tokens', :js do
    it "allows revocation of an active impersonation token" do
      visit admin_user_impersonation_tokens_path(user_id: user.username)

-      click_on "Revoke"
+      accept_confirm { click_on "Revoke" }

      expect(page).to have_selector(".settings-message")
      expect(no_personal_access_tokens_message).to have_text("This user has no active Impersonation Tokens.")

--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -369,7 +369,7 @@ describe "Admin::Users" do

    it 'allows group membership to be revoked', :js do
      page.within(first('.group_member')) do
-        find('.btn-remove').click
+        accept_confirm { find('.btn-remove').click }
      end
      wait_for_requests

@@ -398,7 +398,7 @@ describe "Admin::Users" do

      expect(page).to have_content("Secondary email: #{secondary_email.email}")

-      find("#remove_email_#{secondary_email.id}").click
+      accept_confirm { find("#remove_email_#{secondary_email.id}").click }

      expect(page).not_to have_content(secondary_email.email)
    end

--- a/spec/features/admin/admin_uses_repository_checks_spec.rb
+++ b/spec/features/admin/admin_uses_repository_checks_spec.rb
@@ -37,7 +37,7 @@ feature 'Admin uses repository checks' do

    expect(RepositoryCheck::ClearWorker).to receive(:perform_async)

-    click_link 'Clear all repository checks'
+    accept_confirm { find(:link, 'Clear all repository checks').send_keys(:return) }

    expect(page).to have_content('Started asynchronous removal of all repository check states.')
  end

--- a/spec/features/boards/add_issues_modal_spec.rb
+++ b/spec/features/boards/add_issues_modal_spec.rb
@@ -109,7 +109,7 @@ describe 'Issue Boards add issue modal', :js do
          click_button 'Cancel'
        end

-        first('.board-delete').click
+        accept_confirm { first('.board-delete').click }

        click_button('Add issues')


--- a/spec/features/boards/board_with_milestone_spec.rb
+++ b/spec/features/boards/board_with_milestone_spec.rb
@@ -210,9 +210,9 @@ describe 'Board with milestone', :js do

      find('#board-new-name').set 'test'

-      find('button', text: 'Any Milestone').trigger('click')
+      find('button', text: 'Any Milestone').click

-      find('a', text: milestone.title).trigger('click')
+      find('a', text: milestone.title).click

      click_button 'Create'
    end

--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'

 describe 'Issue Boards', :js do
  include DragTo
+  include MobileHelpers

  let(:group) { create(:group, :nested) }
  let(:project) { create(:project, :public, namespace: group) }
@@ -15,7 +16,7 @@ describe 'Issue Boards', :js do
    project.team << [user, :master]
    project.team << [user2, :master]

-    page.driver.set_cookie('sidebar_collapsed', 'true')
+    set_cookie('sidebar_collapsed', 'true')

    sign_in(user)
  end
@@ -137,7 +138,7 @@ describe 'Issue Boards', :js do

    it 'allows user to delete board' do
      page.within(find('.board:nth-child(2)')) do
-        find('.board-delete').click
+        accept_confirm { find('.board-delete').click }
      end

      wait_for_requests
@@ -152,7 +153,7 @@ describe 'Issue Boards', :js do
      find('.dropdown-menu-close').click

      page.within(find('.board:nth-child(2)')) do
-        find('.board-delete').click
+        accept_confirm { find('.board-delete').click }
      end

      wait_for_requests
@@ -381,7 +382,7 @@ describe 'Issue Boards', :js do
      end

      it 'filters by milestone' do
-        set_filter("milestone", "\"#{milestone.title}\"")
+        set_filter("milestone", "\"#{milestone.title}")
        click_filter_link(milestone.title)
        submit_filter

@@ -402,7 +403,7 @@ describe 'Issue Boards', :js do
      end

      it 'filters by label with space after reload' do
-        set_filter("label", "\"#{accepting.title}\"")
+        set_filter("label", "\"#{accepting.title}")
        click_filter_link(accepting.title)
        submit_filter

@@ -539,7 +540,7 @@ describe 'Issue Boards', :js do
    end

    it 'allows user to use keyboard shortcuts' do
-      find('.boards-list').native.send_keys('i')
+      find('body').native.send_keys('i')
      expect(page).to have_content('New Issue')
    end
  end
@@ -581,6 +582,9 @@ describe 'Issue Boards', :js do
  end

  def drag(selector: '.board-list', list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0)
+    # ensure there is enough horizontal space for four boards
+    resize_window(2000, 800)
+
    drag_to(selector: selector,
            scrollable: '#board-app',
            list_from_index: list_from_index,

--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -52,7 +52,7 @@ describe 'Issue Boards', :js do

    expect(page).to have_selector('.issue-boards-sidebar')

-    find('.gutter-toggle').trigger('click')
+    find('.gutter-toggle').click

    expect(page).not_to have_selector('.issue-boards-sidebar')
  end
@@ -172,7 +172,7 @@ describe 'Issue Boards', :js do
      end

      page.within(find('.board:nth-child(2)')) do
-        find('.card:nth-child(2)').trigger('click')
+        find('.card:nth-child(2)').click
      end

      page.within('.assignee') do

--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -63,8 +63,8 @@ feature 'Contributions Calendar', :js do
    Event.create(note_comment_params)
  end

-  def selected_day_activities
-    find('.user-calendar-activities').text
+  def selected_day_activities(visible: true)
+    find('.user-calendar-activities', visible: visible).text
  end

  before do
@@ -112,7 +112,7 @@ feature 'Contributions Calendar', :js do
        end

        it 'hides calendar day activities' do
-          expect(selected_day_activities).to be_empty
+          expect(selected_day_activities(visible: false)).to be_empty
        end
      end
    end

--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -47,7 +47,7 @@ describe "Container Registry", :js do
    scenario 'user removes a specific tag from container repository' do
      visit_container_registry

-      find('.js-toggle-repo').trigger('click')
+      find('.js-toggle-repo').click
      wait_for_requests

      expect_any_instance_of(ContainerRegistry::Tag)

--- a/spec/features/dashboard/group_spec.rb
+++ b/spec/features/dashboard/group_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe 'Dashboard Group' do

  it 'creates new group', :js do
    visit dashboard_groups_path
-    find('.btn-new').trigger('click')
+    find('.btn-new').click
    new_path = 'Samurai'
    new_description = 'Tokugawa Shogunate'


--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -138,7 +138,7 @@ feature 'Dashboard Groups page', :js do
      expect(page).not_to have_selector("#group-#{group.id}")

      # Go to next page
-      find(".gl-pagination .page:not(.active) a").trigger('click')
+      find(".gl-pagination .page:not(.active) a").click

      wait_for_requests


--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Dashboard Issues' do
    end

    it 'shows issues when current user is author', :js do
-      find('#assignee_id', visible: false).set('')
+      execute_script("document.querySelector('#assignee_id').value=''")
      find('.js-author-search', match: :first).click

      expect(find('li[data-user-id="null"] a.is-active')).to be_visible
@@ -71,7 +71,7 @@ RSpec.describe 'Dashboard Issues' do

  describe 'new issue dropdown' do
    it 'shows projects only with issues feature enabled', :js do
-      find('.new-project-item-select-button').trigger('click')
+      find('.new-project-item-select-button').click

      page.within('.select2-results') do
        expect(page).to have_content(project.name_with_namespace)
@@ -80,7 +80,7 @@ RSpec.describe 'Dashboard Issues' do
    end

    it 'shows the new issue page', :js do
-      find('.new-project-item-select-button').trigger('click')
+      find('.new-project-item-select-button').click

      wait_for_requests

@@ -93,7 +93,7 @@ RSpec.describe 'Dashboard Issues' do
      find('#select2-drop-mask', visible: false)
      execute_script("$('#select2-drop-mask').remove();")

-      find('.new-project-item-link').trigger('click')
+      find('.new-project-item-link').click

      expect(page).to have_current_path("#{project_path}/issues/new")


--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -25,7 +25,7 @@ feature 'Dashboard Merge Requests' do
    end

    it 'shows projects only with merge requests feature enabled', :js do
-      find('.new-project-item-select-button').trigger('click')
+      find('.new-project-item-select-button').click

      page.within('.select2-results') do
        expect(page).to have_content(project.name_with_namespace)

--- a/spec/features/dashboard/todos/todos_spec.rb
+++ b/spec/features/dashboard/todos/todos_spec.rb
@@ -252,7 +252,7 @@ feature 'Dashboard Todos' do
    describe 'mark all as done', :js do
      before do
        visit dashboard_todos_path
-        find('.js-todos-mark-all').trigger('click')
+        find('.js-todos-mark-all').click
      end

      it 'shows "All done" message!' do
@@ -309,9 +309,9 @@ feature 'Dashboard Todos' do
      end

      def mark_all_and_undo
-        find('.js-todos-mark-all').trigger('click')
+        find('.js-todos-mark-all').click
        wait_for_requests
-        find('.js-todos-undo-all').trigger('click')
+        find('.js-todos-undo-all').click
        wait_for_requests
      end
    end

--- a/spec/features/discussion_comments/commit_spec.rb
+++ b/spec/features/discussion_comments/commit_spec.rb
 require 'spec_helper'

-describe 'Discussion Comments Merge Request', :js do
+describe 'Discussion Comments Commit', :js do
  include RepoHelpers

  let(:user) { create(:user) }

--- a/spec/features/discussion_comments/snippets_spec.rb
+++ b/spec/features/discussion_comments/snippets_spec.rb
 require 'spec_helper'

-describe 'Discussion Comments Issue', :js do
+describe 'Discussion Comments Snippet', :js do
  let(:user) { create(:user) }
  let(:project) { create(:project) }
  let(:snippet) { create(:project_snippet, :private, project: project, author: user) }

--- a/spec/features/es_group_search_spec.rb
+++ b/spec/features/es_group_search_spec.rb
@@ -6,7 +6,7 @@ feature 'Group elastic search', :js do
  let(:project) { create(:project, :repository, namespace: group) }

  def choose_group(group)
-    find('.js-search-group-dropdown').trigger('click')
+    find('.js-search-group-dropdown').click
    wait_for_requests

    page.within '.search-holder' do
@@ -41,7 +41,7 @@ feature 'Group elastic search', :js do

      choose_group group
      fill_in 'search', with: 'chosen'
-      find('.btn-search').trigger('click')
+      find('.btn-search').click

      select_filter('Issues')
      expect(page).to have_content('chosen issue title')
@@ -60,7 +60,7 @@ feature 'Group elastic search', :js do

      choose_group group
      fill_in 'search', with: 'def'
-      find('.btn-search').trigger('click')
+      find('.btn-search').click

      select_filter('Code')

@@ -83,7 +83,7 @@ feature 'Group elastic search', :js do

      choose_group group
      fill_in "search", with: "term"
-      find('.btn-search').trigger('click')
+      find('.btn-search').click

      select_filter("Wiki")

@@ -104,7 +104,7 @@ feature 'Group elastic search', :js do

      choose_group group
      fill_in 'search', with: 'add'
-      find('.btn-search').trigger('click')
+      find('.btn-search').click

      select_filter('Commits')


--- a/spec/features/explore/new_menu_spec.rb
+++ b/spec/features/explore/new_menu_spec.rb
@@ -65,9 +65,9 @@ feature 'Top Plus Menu', :js do
      visit project_path(project)

      page.within '.header-content' do
-        find('.header-new-dropdown-toggle').trigger('click')
+        find('.header-new-dropdown-toggle').click
        expect(page).to have_selector('.header-new.dropdown.open', count: 1)
-        find('.header-new-project-snippet a').trigger('click')
+        find('.header-new-project-snippet a').click
      end

      expect(page).to have_content('New Snippet')
@@ -87,9 +87,9 @@ feature 'Top Plus Menu', :js do
      visit group_path(group)

      page.within '.header-content' do
-        find('.header-new-dropdown-toggle').trigger('click')
+        find('.header-new-dropdown-toggle').click
        expect(page).to have_selector('.header-new.dropdown.open', count: 1)
-        find('.header-new-group-project a').trigger('click')
+        find('.header-new-group-project a').click
      end

      expect(page).to have_content('Project path')
@@ -155,7 +155,7 @@ feature 'Top Plus Menu', :js do

  def click_topmenuitem(item_name)
    page.within '.header-content' do
-      find('.header-new-dropdown-toggle').trigger('click')
+      find('.header-new-dropdown-toggle').click
      expect(page).to have_selector('.header-new.dropdown.open', count: 1)
      click_link item_name
    end

--- a/spec/features/groups/analytics_spec.rb
+++ b/spec/features/groups/analytics_spec.rb
@@ -14,7 +14,7 @@ feature 'Groups > Contribution Analytics', :js do
    it 'displays Contribution Analytics' do
      visit group_path(group)

-      find('a', text: 'Contribution Analytics').trigger('click')
+      find('a', text: 'Contribution Analytics').click

      expect(page).to have_content "Contribution analytics for issues, merge requests and push"
    end

--- a/spec/features/groups/audit_events_spec.rb
+++ b/spec/features/groups/audit_events_spec.rb
@@ -17,9 +17,11 @@ feature 'Groups > Audit Events', :js do
    end

    it 'returns 404' do
-      visit group_audit_events_path(group)
+      reqs = inspect_requests do
+        visit group_audit_events_path(group)
+      end

-      expect(page.status_code).to eq(404)
+      expect(reqs.first.status_code).to eq(404)
    end

    it 'does not have Audit Events button in head nav bar' do
@@ -46,8 +48,7 @@ feature 'Groups > Audit Events', :js do
        click_link 'Master'
      end

-      # This is to avoid a Capybara::Poltergeist::MouseEventFailed error
-      find(:link, text: 'Settings').trigger('click')
+      find(:link, text: 'Settings').click

      click_link 'Audit Events'


--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -65,7 +65,7 @@ feature 'Group' do
        end

        it 'updates the team URL on graph path update', :js do
-          out_span = find('span[data-bind-out="create_chat_team"]')
+          out_span = find('span[data-bind-out="create_chat_team"]', visible: false)

          expect(out_span.text).to be_empty


--- a/spec/features/issues/bulk_assignment_labels_spec.rb
+++ b/spec/features/issues/bulk_assignment_labels_spec.rb
@@ -405,7 +405,7 @@ feature 'Issues > Labels bulk assignment' do
  end

  def update_issues
-    find('.update-selected-issues').trigger('click')
+    find('.update-selected-issues').click
    wait_for_requests
  end


--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -43,15 +43,16 @@ describe 'Dropdown assignee', :js do
    end

    it 'should show loading indicator when opened' do
-      filtered_search.set('assignee:')
+      slow_requests do
+        filtered_search.set('assignee:')

-      expect(page).to have_css('#js-dropdown-assignee .filter-dropdown-loading', visible: true)
+        expect(page).to have_css('#js-dropdown-assignee .filter-dropdown-loading', visible: true)
+      end
    end

    it 'should hide loading indicator when loaded' do
      filtered_search.set('assignee:')

-      expect(find(js_dropdown_assignee)).to have_css('.filter-dropdown-loading')
      expect(find(js_dropdown_assignee)).not_to have_css('.filter-dropdown-loading')
    end


--- a/spec/features/issues/filtered_search/dropdown_author_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_author_spec.rb
@@ -51,9 +51,11 @@ describe 'Dropdown author', :js do
    end

    it 'should show loading indicator when opened' do
-      filtered_search.set('author:')
+      slow_requests do
+        filtered_search.set('author:')

-      expect(page).to have_css('#js-dropdown-author .filter-dropdown-loading', visible: true)
+        expect(page).to have_css('#js-dropdown-author .filter-dropdown-loading', visible: true)
+      end
    end

    it 'should hide loading indicator when loaded' do

--- a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
@@ -70,9 +70,11 @@ describe 'Dropdown emoji', :js do
      end

      it 'should show loading indicator when opened' do
-        filtered_search.set('my-reaction:')
+        slow_requests do
+          filtered_search.set('my-reaction:')

-        expect(page).to have_css('#js-dropdown-my-reaction .filter-dropdown-loading', visible: true)
+          expect(page).to have_css('#js-dropdown-my-reaction .filter-dropdown-loading', visible: true)
+        end
      end

      it 'should hide loading indicator when loaded' do

--- a/spec/features/issues/filtered_search/dropdown_label_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_label_spec.rb
@@ -66,9 +66,11 @@ describe 'Dropdown label', :js do
    end

    it 'shows loading indicator when opened and hides it when loaded' do
-      filtered_search.set('label:')
+      slow_requests do
+        filtered_search.set('label:')

-      expect(find(js_dropdown_label)).to have_css('.filter-dropdown-loading')
+        expect(page).to have_css("#{js_dropdown_label} .filter-dropdown-loading", visible: true)
+      end
      expect(find(js_dropdown_label)).not_to have_css('.filter-dropdown-loading')
    end


--- a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
@@ -50,15 +50,16 @@ describe 'Dropdown milestone', :js do
    end

    it 'should show loading indicator when opened' do
-      filtered_search.set('milestone:')
+      slow_requests do
+        filtered_search.set('milestone:')

-      expect(page).to have_css('#js-dropdown-milestone .filter-dropdown-loading', visible: true)
+        expect(page).to have_css('#js-dropdown-milestone .filter-dropdown-loading', visible: true)
+      end
    end

    it 'should hide loading indicator when loaded' do
      filtered_search.set('milestone:')

-      expect(find(js_dropdown_milestone)).to have_css('.filter-dropdown-loading')
      expect(find(js_dropdown_milestone)).not_to have_css('.filter-dropdown-loading')
    end


--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -156,7 +156,7 @@ describe 'Filter issues', :js do
        input_filtered_search('label:none')

        expect_tokens([label_token('none', false)])
-        expect_issues_list_count(8)
+        expect_issues_list_count(4)
        expect_filtered_search_input_empty
      end

@@ -520,7 +520,7 @@ describe 'Filter issues', :js do

    it 'updates atom feed link for group issues' do
      visit issues_group_path(group, milestone_title: milestone.title, assignee_id: user.id)
-      link = find('.nav-controls a', text: 'Subscribe')
+      link = find('.nav-controls a', text: 'Subscribe', visible: false)
      params = CGI.parse(URI.parse(link[:href]).query)
      auto_discovery_link = find('link[type="application/atom+xml"]', visible: false)
      auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)

--- a/spec/features/issues/filtered_search/recent_searches_spec.rb
+++ b/spec/features/issues/filtered_search/recent_searches_spec.rb
@@ -80,7 +80,8 @@ describe 'Recent searches', :js do
    set_recent_searches(project_1_local_storage_key, '["foo", "bar"]')
    visit project_issues_path(project_1)

-    all('.filtered-search-history-dropdown-item', visible: false)[0].trigger('click')
+    find('.filtered-search-history-dropdown-toggle-button').click
+    all('.filtered-search-history-dropdown-item', count: 2)[0].click
    wait_for_filtered_search('foo')

    expect(find('.filtered-search').value.strip).to eq('foo')
@@ -90,12 +91,11 @@ describe 'Recent searches', :js do
    set_recent_searches(project_1_local_storage_key, '["foo"]')
    visit project_issues_path(project_1)

-    items_before = all('.filtered-search-history-dropdown-item', visible: false)
+    find('.filtered-search-history-dropdown-toggle-button').click
+    all('.filtered-search-history-dropdown-item', count: 1)

-    expect(items_before.count).to eq(1)
-
-    find('.filtered-search-history-clear-button', visible: false).trigger('click')
-    items_after = all('.filtered-search-history-dropdown-item', visible: false)
+    find('.filtered-search-history-clear-button').click
+    items_after = all('.filtered-search-history-dropdown-item', count: 0)

    expect(items_after.count).to eq(0)
  end

--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'

 describe 'Visual tokens', :js do
  include FilteredSearchHelpers
-  include WaitForRequests

  let!(:project) { create(:project) }
  let!(:user) { create(:user, name: 'administrator', username: 'root') }
@@ -28,7 +27,7 @@ describe 'Visual tokens', :js do
    sign_in(user)
    create(:issue, project: project)

-    page.driver.set_cookie('sidebar_collapsed', 'true')
+    set_cookie('sidebar_collapsed', 'true')

    visit project_issues_path(project)
  end

--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -17,9 +17,9 @@ feature 'GFM autocomplete', :js do
  it 'updates issue descripton with GFM reference' do
    find('.issuable-edit').click

-    find('#issue-description').native.send_keys("@#{user.name[0...3]}")
+    simulate_input('#issue-description', "@#{user.name[0...3]}")

-    find('.atwho-view .cur').trigger('click')
+    find('.atwho-view .cur').click

    click_button 'Save changes'

@@ -28,7 +28,6 @@ feature 'GFM autocomplete', :js do

  it 'opens autocomplete menu when field starts with text' do
    page.within '.timeline-content-form' do
-      find('#note-body').native.send_keys('')
      find('#note-body').native.send_keys('@')
    end

@@ -46,7 +45,6 @@ feature 'GFM autocomplete', :js do

  it 'doesnt select the first item for non-assignee dropdowns' do
    page.within '.timeline-content-form' do
-      find('#note-body').native.send_keys('')
      find('#note-body').native.send_keys(':')
    end

@@ -86,7 +84,6 @@ feature 'GFM autocomplete', :js do

  it 'selects the first item for assignee dropdowns' do
    page.within '.timeline-content-form' do
-      find('#note-body').native.send_keys('')
      find('#note-body').native.send_keys('@')
    end

@@ -100,7 +97,7 @@ feature 'GFM autocomplete', :js do
  it 'includes items for assignee dropdowns with non-ASCII characters in name' do
    page.within '.timeline-content-form' do
      find('#note-body').native.send_keys('')
-      find('#note-body').native.send_keys("@#{user.name[0...8]}")
+      simulate_input('#note-body', "@#{user.name[0...8]}")
    end

    expect(page).to have_selector('.atwho-container')
@@ -112,7 +109,6 @@ feature 'GFM autocomplete', :js do

  it 'selects the first item for non-assignee dropdowns if a query is entered' do
    page.within '.timeline-content-form' do
-      find('#note-body').native.send_keys('')
      find('#note-body').native.send_keys(':1')
    end

@@ -127,9 +123,8 @@ feature 'GFM autocomplete', :js do
    it 'wraps the result in double quotes' do
      note = find('#note-body')
      page.within '.timeline-content-form' do
-        note.native.send_keys('')
-        note.native.send_keys("~#{label.title[0]}")
-        note.click
+        find('#note-body').native.send_keys('')
+        simulate_input('#note-body', "~#{label.title[0]}")
      end

      label_item = find('.atwho-view li', text: label.title)
@@ -152,16 +147,13 @@ feature 'GFM autocomplete', :js do
    it "does not show dropdown when preceded with a special character" do
      note = find('#note-body')
      page.within '.timeline-content-form' do
-        note.native.send_keys('')
        note.native.send_keys("@")
-        note.click
      end

      expect(page).to have_selector('.atwho-container')

      page.within '.timeline-content-form' do
        note.native.send_keys("@")
-        note.click
      end

      expect(page).to have_selector('.atwho-container', visible: false)
@@ -170,9 +162,7 @@ feature 'GFM autocomplete', :js do
    it "does not throw an error if no labels exist" do
      note = find('#note-body')
      page.within '.timeline-content-form' do
-        note.native.send_keys('')
        note.native.send_keys('~')
-        note.click
      end

      expect(page).to have_selector('.atwho-container', visible: false)
@@ -181,9 +171,7 @@ feature 'GFM autocomplete', :js do
    it 'doesn\'t wrap for assignee values' do
      note = find('#note-body')
      page.within '.timeline-content-form' do
-        note.native.send_keys('')
        note.native.send_keys("@#{user.username[0]}")
-        note.click
      end

      user_item = find('.atwho-view li', text: user.username)
@@ -194,9 +182,7 @@ feature 'GFM autocomplete', :js do
    it 'doesn\'t wrap for emoji values' do
      note = find('#note-body')
      page.within '.timeline-content-form' do
-        note.native.send_keys('')
-        note.native.send_keys(":cartwheel")
-        note.click
+        note.native.send_keys(":cartwheel_")
      end

      emoji_item = find('.atwho-view li', text: 'cartwheel_tone1')
@@ -223,12 +209,11 @@ feature 'GFM autocomplete', :js do
    it 'triggers autocomplete after selecting a quick action' do
      note = find('#note-body')
      page.within '.timeline-content-form' do
-        note.native.send_keys('')
        note.native.send_keys('/as')
-        note.click
      end

-      find('.atwho-view li', text: '/assign').native.send_keys(:tab)
+      find('.atwho-view li', text: '/assign')
+      note.native.send_keys(:tab)

      user_item = find('.atwho-view li', text: user.username)
      expect(user_item).to have_content(user.username)

--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -130,8 +130,8 @@ feature 'Issue Sidebar' do
        it 'adds new label' do
          page.within('.block.labels') do
            fill_in 'new_label_name', with: 'wontfix'
-            page.find('.suggest-colors a', match: :first).trigger('click')
-            page.find('button', text: 'Create').trigger('click')
+            page.find('.suggest-colors a', match: :first).click
+            page.find('button', text: 'Create').click

            page.within('.dropdown-page-one') do
              expect(page).to have_content 'wontfix'
@@ -142,8 +142,8 @@ feature 'Issue Sidebar' do
        it 'shows error message if label title is taken' do
          page.within('.block.labels') do
            fill_in 'new_label_name', with: label.title
-            page.find('.suggest-colors a', match: :first).trigger('click')
-            page.find('button', text: 'Create').trigger('click')
+            page.find('.suggest-colors a', match: :first).click
+            page.find('button', text: 'Create').click

            page.within('.dropdown-page-two') do
              expect(page).to have_content 'Title has already been taken'
@@ -199,7 +199,7 @@ feature 'Issue Sidebar' do
  end

  def open_issue_sidebar
-    find('aside.right-sidebar.right-sidebar-collapsed .js-sidebar-toggle').trigger('click')
+    find('aside.right-sidebar.right-sidebar-collapsed .js-sidebar-toggle').click
    find('aside.right-sidebar.right-sidebar-expanded')
  end
 end
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -38,7 +38,7 @@ feature 'issue move to another project' do
    end

    scenario 'moving issue to another project', :js do
-      find('.js-move-issue').trigger('click')
+      find('.js-move-issue').click
      wait_for_requests
      all('.js-move-issue-dropdown-item')[0].click
      find('.js-move-issue-confirmation-button').click
@@ -52,7 +52,7 @@ feature 'issue move to another project' do
    scenario 'searching project dropdown', :js do
      new_project_search.team << [user, :reporter]

-      find('.js-move-issue').trigger('click')
+      find('.js-move-issue').click
      wait_for_requests

      page.within '.js-sidebar-move-issue-block' do
@@ -69,7 +69,7 @@ feature 'issue move to another project' do
      background { another_project.team << [user, :guest] }

      scenario 'browsing projects in projects select' do
-        find('.js-move-issue').trigger('click')
+        find('.js-move-issue').click
        wait_for_requests

        page.within '.js-sidebar-move-issue-block' do

--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -118,7 +118,7 @@ feature 'Multiple issue updating from issues#index', :js do
  end

  def click_update_issues_button
-    find('.update-selected-issues').trigger('click')
+    find('.update-selected-issues').click
    wait_for_requests
  end
 end
--- a/spec/features/issues/user_uses_slash_commands_spec.rb
+++ b/spec/features/issues/user_uses_slash_commands_spec.rb
@@ -302,7 +302,7 @@ feature 'Issues > User uses quick actions', :js do
        end

        it 'applies the commands to both issues and moves the issue' do
-          write_note("/label ~#{bug.title} ~#{wontfix.title}\n/milestone %\"#{milestone.title}\"\n/move #{target_project.full_path}")
+          write_note("/label ~#{bug.title} ~#{wontfix.title}\n\n/milestone %\"#{milestone.title}\"\n\n/move #{target_project.full_path}")

          expect(page).to have_content 'Commands applied'
          expect(issue.reload).to be_closed
@@ -321,7 +321,7 @@ feature 'Issues > User uses quick actions', :js do
        end

        it 'moves the issue and applies the commands to both issues' do
-          write_note("/move #{target_project.full_path}\n/label ~#{bug.title} ~#{wontfix.title}\n/milestone %\"#{milestone.title}\"")
+          write_note("/move #{target_project.full_path}\n\n/label ~#{bug.title} ~#{wontfix.title}\n\n/milestone %\"#{milestone.title}\"")

          expect(page).to have_content 'Commands applied'
          expect(issue.reload).to be_closed

--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -378,7 +378,7 @@ describe 'Issues' do
    it 'changes incoming email address token', :js do
      find('.issue-email-modal-btn').click
      previous_token = find('input#issue_email').value
-      find('.incoming-email-token-reset').trigger('click')
+      find('.incoming-email-token-reset').click

      wait_for_requests

@@ -619,6 +619,18 @@ describe 'Issues' do

        expect(page.find_field("issue_description").value).not_to match /\n\n$/
      end
+
+      it "cancels a file upload correctly" do
+        slow_requests do
+          dropzone_file([Rails.root.join('spec', 'fixtures', 'dk.png')], 0, false)
+
+          click_button 'Cancel'
+        end
+
+        expect(page).to have_button('Attach a file')
+        expect(page).not_to have_button('Cancel')
+        expect(page).not_to have_selector('.uploading-progress-container', visible: true)
+      end
    end

    context 'form filled by URL parameters' do

--- a/spec/features/merge_requests/approvals_spec.rb
+++ b/spec/features/merge_requests/approvals_spec.rb
@@ -98,7 +98,7 @@ feature 'Merge request approvals', :js do
        visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'feature' })

        within('.approver-list li.approver-group') do
-          click_on "Remove"
+          accept_confirm { click_on "Remove" }
        end

        expect(page).to have_css('.approver-list li', count: 1)
@@ -153,7 +153,7 @@ feature 'Merge request approvals', :js do
        visit edit_project_merge_request_path(project, merge_request)

        within('.approver-list li.approver-group') do
-          click_on "Remove"
+          accept_confirm { click_on "Remove" }
        end

        expect(page).to have_css('.approver-list li', count: 1)

--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -23,11 +23,11 @@ feature 'Merge request conflict resolution', :js do

      within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
        all('button', text: 'Use ours').each do |button|
-          button.trigger('click')
+          button.send_keys(:return)
        end
      end

-      click_button 'Commit conflict resolution'
+      find_button('Commit conflict resolution').send_keys(:return)

      expect(page).to have_content('All merge conflicts were resolved')
      merge_request.reload_diff
@@ -71,7 +71,7 @@ feature 'Merge request conflict resolution', :js do
        execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");')
      end

-      click_button 'Commit conflict resolution'
+      find_button('Commit conflict resolution').send_keys(:return)

      expect(page).to have_content('All merge conflicts were resolved')
      merge_request.reload_diff

--- a/spec/features/merge_requests/diff_notes_avatars_spec.rb
+++ b/spec/features/merge_requests/diff_notes_avatars_spec.rb
@@ -22,7 +22,7 @@ feature 'Diff note avatars', :js do
    project.team << [user, :master]
    sign_in user

-    page.driver.set_cookie('sidebar_collapsed', 'true')
+    set_cookie('sidebar_collapsed', 'true')
  end

  context 'discussion tab' do
@@ -56,7 +56,7 @@ feature 'Diff note avatars', :js do
    end

    it 'does not render avatar after commenting' do
-      first('.diff-line-num').trigger('mouseover')
+      first('.diff-line-num').click
      find('.js-add-diff-note-button').click

      page.within('.js-discussion-note-form') do
@@ -85,7 +85,7 @@ feature 'Diff note avatars', :js do

      it 'shows note avatar' do
        page.within find_line(position.line_code(project.repository)) do
-          find('.diff-notes-collapse').click
+          find('.diff-notes-collapse').send_keys(:return)

          expect(page).to have_selector('img.js-diff-comment-avatar', count: 1)
        end
@@ -93,7 +93,7 @@ feature 'Diff note avatars', :js do

      it 'shows comment on note avatar' do
        page.within find_line(position.line_code(project.repository)) do
-          find('.diff-notes-collapse').click
+          find('.diff-notes-collapse').send_keys(:return)

          expect(first('img.js-diff-comment-avatar')["data-original-title"]).to eq("#{note.author.name}: #{note.note.truncate(17)}")
        end
@@ -101,7 +101,7 @@ feature 'Diff note avatars', :js do

      it 'toggles comments when clicking avatar' do
        page.within find_line(position.line_code(project.repository)) do
-          find('.diff-notes-collapse').click
+          find('.diff-notes-collapse').send_keys(:return)
        end

        expect(page).to have_selector('.notes_holder', visible: false)
@@ -117,7 +117,7 @@ feature 'Diff note avatars', :js do
        open_more_actions_dropdown(note)

        page.within find(".note-row-#{note.id}") do
-          find('.js-note-delete').click
+          accept_confirm { find('.js-note-delete').click }
        end

        wait_for_requests
@@ -139,7 +139,7 @@ feature 'Diff note avatars', :js do
        end

        page.within find_line(position.line_code(project.repository)) do
-          find('.diff-notes-collapse').trigger('click')
+          find('.diff-notes-collapse').send_keys(:return)

          expect(page).to have_selector('img.js-diff-comment-avatar', count: 2)
        end
@@ -152,14 +152,14 @@ feature 'Diff note avatars', :js do
          page.within '.js-discussion-note-form' do
            find('.js-note-text').native.send_keys('Test')

-            find('.js-comment-button').trigger('click')
+            find('.js-comment-button').click

            wait_for_requests
          end
        end

        page.within find_line(position.line_code(project.repository)) do
-          find('.diff-notes-collapse').trigger('click')
+          find('.diff-notes-collapse').send_keys(:return)

          expect(page).to have_selector('img.js-diff-comment-avatar', count: 3)
          expect(find('.diff-comments-more-count')).to have_content '+1'
@@ -177,7 +177,7 @@ feature 'Diff note avatars', :js do

        it 'shows extra comment count' do
          page.within find_line(position.line_code(project.repository)) do
-            find('.diff-notes-collapse').click
+            find('.diff-notes-collapse').send_keys(:return)

            expect(find('.diff-comments-more-count')).to have_content '+1'
          end

--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
@@ -192,7 +192,7 @@ feature 'Diff notes resolve', :js do
          page.find('.discussion-next-btn').click
        end

-        expect(page.evaluate_script("$('body').scrollTop()")).to be > 0
+        expect(page.evaluate_script("window.pageYOffset")).to be > 0
      end

      it 'hides jump to next button when all resolved' do
@@ -241,10 +241,8 @@ feature 'Diff notes resolve', :js do
      end

      it 'resolves discussion' do
-        page.all('.note').each do |note|
-          note.all('.line-resolve-btn').each do |button|
-            button.click
-          end
+        page.all('.note .line-resolve-btn').each do |button|
+          button.click
        end

        expect(page).to have_content('Resolved by')
@@ -305,10 +303,10 @@ feature 'Diff notes resolve', :js do
        end

        page.within '.line-resolve-all-container' do
-          page.find('.discussion-next-btn').trigger('click')
+          page.find('.discussion-next-btn').click
        end

-        expect(page.evaluate_script("$('body').scrollTop()")).to be > 0
+        expect(page.evaluate_script("window.pageYOffset")).to be > 0
      end

      it 'updates updated text after resolving note' do

--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
@@ -7,14 +7,12 @@ feature 'Diffs URL', :js do
  let(:merge_request) { create(:merge_request, source_project: project) }

  context 'when visit with */* as accept header' do
-    before do
-      page.driver.add_header('Accept', '*/*')
-    end
-
    it 'renders the notes' do
      create :note_on_merge_request, project: project, noteable: merge_request, note: 'Rebasing with master'

-      visit diffs_project_merge_request_path(project, merge_request)
+      inspect_requests(inject_headers: { 'Accept' => '*/*' }) do
+        visit diffs_project_merge_request_path(project, merge_request)
+      end

      # Load notes and diff through AJAX
      expect(page).to have_css('.note-text', visible: false, text: 'Rebasing with master')
@@ -90,7 +88,7 @@ feature 'Diffs URL', :js do
        visit diffs_project_merge_request_path(project, merge_request)

        # Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
-        find("[id=\"#{changelog_id}\"] .js-edit-blob").trigger('click')
+        find("[id=\"#{changelog_id}\"] .js-edit-blob").click

        expect(page).to have_selector('.js-fork-suggestion-button', count: 1)
        expect(page).to have_selector('.js-cancel-fork-suggestion-button', count: 1)

--- a/spec/features/merge_requests/form_spec.rb
+++ b/spec/features/merge_requests/form_spec.rb
@@ -43,7 +43,7 @@ describe 'New/edit merge request', :js do
          expect(page).to have_content user2.name
        end

-        find('a', text: 'Assign to me').trigger('click')
+        find('a', text: 'Assign to me').click
        expect(find('input[name="merge_request[assignee_id]"]', visible: false).value).to match(user.id.to_s)
        page.within '.js-assignee-search' do
          expect(page).to have_content user.name

--- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
@@ -83,7 +83,7 @@ feature 'Mini Pipeline Graph', :js do
    end

    before do
-      toggle.trigger('click')
+      toggle.click
      wait_for_requests
    end

@@ -92,7 +92,7 @@ feature 'Mini Pipeline Graph', :js do
    end

    it 'should close when toggle is clicked again' do
-      toggle.trigger('click')
+      toggle.click

      expect(toggle.find(:xpath, '..')).not_to have_selector('.mini-pipeline-graph-dropdown-menu')
    end

--- a/spec/features/merge_requests/update_merge_requests_spec.rb
+++ b/spec/features/merge_requests/update_merge_requests_spec.rb
@@ -127,7 +127,7 @@ feature 'Multiple merge requests updating from merge_requests#index' do
  end

  def click_update_merge_requests_button
-    find('.update-selected-issues').trigger('click')
+    find('.update-selected-issues').click
    wait_for_requests
  end
 end
--- a/spec/features/merge_requests/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
@@ -8,7 +8,7 @@ feature 'Merge requests > User posts diff notes', :js do
  let(:project) { merge_request.source_project }

  before do
-    page.driver.set_cookie('sidebar_collapsed', 'true')
+    set_cookie('sidebar_collapsed', 'true')

    project.add_developer(user)
    sign_in(user)
@@ -103,7 +103,10 @@ feature 'Merge requests > User posts diff notes', :js do
      it 'allows commenting' do
        should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))

-        first('.js-note-delete', visible: false).trigger('click')
+        accept_confirm do
+          first('button.more-actions-toggle').click
+          first('.js-note-delete').click
+        end

        should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
      end
@@ -236,7 +239,7 @@ feature 'Merge requests > User posts diff notes', :js do
  def should_allow_dismissing_a_comment(line_holder, diff_side = nil)
    write_comment_on_line(line_holder, diff_side)

-    find('.js-close-discussion-note-form').trigger('click')
+    find('.js-close-discussion-note-form').click

    assert_comment_dismissal(line_holder)
  end

--- a/spec/features/merge_requests/user_posts_notes_spec.rb
+++ b/spec/features/merge_requests/user_posts_notes_spec.rb
@@ -141,7 +141,7 @@ describe 'Merge requests > User posts notes', :js do
      end

      it 'removes the attachment div and resets the edit form' do
-        find('.js-note-attachment-delete').click
+        accept_confirm { find('.js-note-attachment-delete').click }
        is_expected.not_to have_css('.note-attachment')
        is_expected.not_to have_css('.current-note-edit-form')
        wait_for_requests

--- a/spec/features/merge_requests/versions_spec.rb
+++ b/spec/features/merge_requests/versions_spec.rb
@@ -67,8 +67,8 @@ feature 'Merge Request versions', :js do
      line_code = '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44_2_2'

      page.within(diff_file_selector) do
-        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").trigger 'mouseover'
-        find(".line_holder[id='#{line_code}'] button").trigger 'click'
+        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").hover
+        find(".line_holder[id='#{line_code}'] button").click

        page.within("form[data-line-code='#{line_code}']") do
          fill_in "note[note]", with: "Typo, please fix"
@@ -137,8 +137,8 @@ feature 'Merge Request versions', :js do
      line_code = '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44_4_4'

      page.within(diff_file_selector) do
-        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").trigger 'mouseover'
-        find(".line_holder[id='#{line_code}'] button").trigger 'click'
+        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").hover
+        find(".line_holder[id='#{line_code}'] button").click

        page.within("form[data-line-code='#{line_code}']") do
          fill_in "note[note]", with: "Typo, please fix"

--- a/spec/features/merge_requests/widget_deployments_spec.rb
+++ b/spec/features/merge_requests/widget_deployments_spec.rb
@@ -42,7 +42,7 @@ feature 'Widget Deployments Header', :js do
      end

      scenario 'does start build when stop button clicked' do
-        click_button('Stop environment')
+        accept_confirm { click_button('Stop environment') }

        expect(page).to have_content('close_app')
      end

--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -65,7 +65,7 @@ describe 'Profile account page', :js do
      within('.rss-token-reset') do
        previous_token = find("#rss_token").value

-        click_link('reset it')
+        accept_confirm { click_link('reset it') }

        expect(find('#rss_token').value).not_to eq(previous_token)
      end
@@ -84,7 +84,7 @@ describe 'Profile account page', :js do
      within('.incoming-email-token-reset') do
        previous_token = find('#incoming_email_token').value

-        click_link('reset it')
+        accept_confirm { click_link('reset it') }

        expect(find('#incoming_email_token').value).not_to eq(previous_token)
      end

--- a/spec/features/profiles/oauth_applications_spec.rb
+++ b/spec/features/profiles/oauth_applications_spec.rb
@@ -14,7 +14,7 @@ describe 'Profile > Applications' do

      page.within('.oauth-applications') do
        expect(page).to have_content('Your applications (1)')
-        click_button 'Destroy'
+        accept_confirm { click_button 'Destroy' }
      end

      expect(page).to have_content('The application was deleted successfully')
@@ -28,7 +28,7 @@ describe 'Profile > Applications' do

      page.within('.oauth-authorized-applications') do
        expect(page).to have_content('Authorized applications (1)')
-        click_button 'Revoke'
+        accept_confirm { click_button 'Revoke' }
      end

      expect(page).to have_content('The application was revoked access.')

--- a/spec/features/profiles/personal_access_tokens_spec.rb
+++ b/spec/features/profiles/personal_access_tokens_spec.rb
@@ -34,7 +34,7 @@ describe 'Profile > Personal Access Tokens', :js do
      fill_in "Name", with: name

      # Set date to 1st of next month
-      find_field("Expires at").trigger('focus')
+      find_field("Expires at").click
      find(".pika-next").click
      click_on "1"

@@ -78,7 +78,7 @@ describe 'Profile > Personal Access Tokens', :js do

    it "allows revocation of an active token" do
      visit profile_personal_access_tokens_path
-      click_on "Revoke"
+      accept_confirm { click_on "Revoke" }

      expect(page).to have_selector(".settings-message")
      expect(no_personal_access_tokens_message).to have_text("This user has no active Personal Access Tokens.")
@@ -100,7 +100,7 @@ describe 'Profile > Personal Access Tokens', :js do
        errors = ActiveModel::Errors.new(PersonalAccessToken.new).tap { |e| e.add(:name, "cannot be nil") }
        allow_any_instance_of(PersonalAccessToken).to receive(:errors).and_return(errors)

-        click_on "Revoke"
+        accept_confirm { click_on "Revoke" }
        expect(active_personal_access_tokens).to have_text(personal_access_token.name)
        expect(page).to have_content("Could not revoke")
      end

--- a/spec/features/profiles/user_visits_notifications_tab_spec.rb
+++ b/spec/features/profiles/user_visits_notifications_tab_spec.rb
@@ -13,7 +13,7 @@ feature 'User visits the notifications tab', :js do
  it 'changes the project notifications setting' do
    expect(page).to have_content('Notifications')

-    first('#notifications-button').trigger('click')
+    first('#notifications-button').click
    click_link('On mention')

    expect(page).to have_content('On mention')

--- a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
+++ b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
@@ -53,7 +53,7 @@ describe 'User visits the profile preferences page' do
      expect(page).to have_content("You don't have starred projects yet")
      expect(page.current_path).to eq starred_dashboard_projects_path

-      find('.shortcuts-activity').trigger('click')
+      find('.shortcuts-activity').click

      expect(page).not_to have_content("You don't have starred projects yet")
      expect(page.current_path).to eq dashboard_projects_path

--- a/spec/features/projects/artifacts/download_spec.rb
+++ b/spec/features/projects/artifacts/download_spec.rb
 require 'spec_helper'

-feature 'Download artifact', :js do
+feature 'Download artifact' do
  let(:project) { create(:project, :public) }
  let(:pipeline) { create(:ci_empty_pipeline, status: :success, project: project) }
  let(:job) { create(:ci_build, :artifacts, :success, pipeline: pipeline) }

--- a/spec/features/projects/artifacts/file_spec.rb
+++ b/spec/features/projects/artifacts/file_spec.rb
@@ -39,7 +39,6 @@ feature 'Artifact file', :js do

  context 'JPG file' do
    before do
-      page.driver.browser.url_blacklist = []
      visit_file('rails_sample.jpg')

      wait_for_requests

--- a/spec/features/projects/audit_events_spec.rb
+++ b/spec/features/projects/audit_events_spec.rb
@@ -16,9 +16,11 @@ feature 'Projects > Audit Events', :js do
    end

    it 'returns 404' do
-      visit project_audit_events_path(project)
+      reqs = inspect_requests do
+        visit project_audit_events_path(project)
+      end

-      expect(page.status_code).to eq(404)
+      expect(reqs.first.status_code).to eq(404)
    end

    it 'does not have Audit Events button in head nav bar' do
@@ -37,9 +39,11 @@ feature 'Projects > Audit Events', :js do
    end

    it 'returns 200' do
-      visit project_audit_events_path(project)
+      reqs = inspect_requests do
+        visit project_audit_events_path(project)
+      end

-      expect(page.status_code).to eq(200)
+      expect(reqs.first.status_code).to eq(200)
    end

    it 'does not have Audit Events button in head nav bar' do
@@ -97,8 +101,7 @@ feature 'Projects > Audit Events', :js do
        click_link 'Master'
      end

-      # This is to avoid a Capybara::Poltergeist::MouseEventFailed error
-      find(:link, text: 'Settings').trigger('click')
+      find(:link, text: 'Settings').click

      click_link 'Audit Events'


--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -69,7 +69,7 @@ describe 'Branches' do

        expect(page).to have_content('fix')
        expect(find('.all-branches')).to have_selector('li', count: 1)
-        find('.js-branch-fix .btn-remove').trigger(:click)
+        accept_confirm { find('.js-branch-fix .btn-remove').click }

        expect(page).not_to have_content('fix')
        expect(find('.all-branches')).to have_selector('li', count: 0)

--- a/spec/features/projects/commit/diff_notes_spec.rb
+++ b/spec/features/projects/commit/diff_notes_spec.rb
@@ -20,8 +20,8 @@ feature 'Commit diff', :js do
      it "adds comment to diff" do
        diff_line_num = first('.diff-line-num.new')

-        diff_line_num.trigger('mouseover')
-        diff_line_num.find('.js-add-diff-note-button').trigger('click')
+        diff_line_num.hover
+        diff_line_num.find('.js-add-diff-note-button').click

        page.within(first('.diff-viewer')) do
          find('.js-note-text').set 'test comment'

--- a/spec/features/projects/commit/mini_pipeline_graph_spec.rb
+++ b/spec/features/projects/commit/mini_pipeline_graph_spec.rb
@@ -18,7 +18,7 @@ feature 'Mini Pipeline Graph in Commit View', :js do

      expect(page).to have_selector('.mr-widget-pipeline-graph')

-      first('.mini-pipeline-graph-dropdown-toggle').trigger('click')
+      first('.mini-pipeline-graph-dropdown-toggle').click

      wait_for_requests


--- a/spec/features/projects/deploy_keys_spec.rb
+++ b/spec/features/projects/deploy_keys_spec.rb
@@ -20,7 +20,7 @@ describe 'Project deploy keys', :js do
      page.within(find('.deploy-keys')) do
        expect(page).to have_selector('.deploy-keys li', count: 1)

-        click_on 'Remove'
+        accept_confirm { find(:button, text: 'Remove').send_keys(:return) }

        expect(page).not_to have_selector('.fa-spinner', count: 0)
        expect(page).to have_selector('.deploy-keys li', count: 0)

--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
@@ -193,12 +193,14 @@ feature 'Environment' do
        create(:environment, project: project,
                             name: 'staging-1.0/review',
                             state: :available)
-
-        visit folder_project_environments_path(project, id: 'staging-1.0')
      end

      it 'renders a correct environment folder' do
-        expect(page).to have_gitlab_http_status(:ok)
+        reqs = inspect_requests do
+          visit folder_project_environments_path(project, id: 'staging-1.0')
+        end
+
+        expect(reqs.first.status_code).to eq(200)
        expect(page).to have_content('Environments / staging-1.0')
      end
    end

--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -151,7 +151,7 @@ feature 'Environments page', :js do
          find('.js-dropdown-play-icon-container').click
          expect(page).to have_content(action.name.humanize)

-          expect { find('.js-manual-action-link').trigger('click') }
+          expect { find('.js-manual-action-link').click }
            .not_to change { Ci::Pipeline.count }
        end


--- a/spec/features/projects/features_visibility_spec.rb
+++ b/spec/features/projects/features_visibility_spec.rb
@@ -22,7 +22,7 @@ describe 'Edit Project Settings' do
          # disable by clicking toggle
          toggle_feature_off("project[project_feature_attributes][#{tool_name}_access_level]")
          page.within('.sharing-permissions') do
-            click_button 'Save changes'
+            find('input[value="Save changes"]').click
          end
          wait_for_requests
          expect(page).not_to have_selector(".shortcuts-#{shortcut_name}")
@@ -30,7 +30,7 @@ describe 'Edit Project Settings' do
          # re-enable by clicking toggle again
          toggle_feature_on("project[project_feature_attributes][#{tool_name}_access_level]")
          page.within('.sharing-permissions') do
-            click_button 'Save changes'
+            find('input[value="Save changes"]').click
          end
          wait_for_requests
          expect(page).to have_selector(".shortcuts-#{shortcut_name}")

--- a/spec/features/projects/files/edit_file_soft_wrap_spec.rb
+++ b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
@@ -7,18 +7,18 @@ feature 'User uses soft wrap whilst editing file', :js do
    project.team << [user, :master]
    sign_in user
    visit project_new_blob_path(project, 'master', file_name: 'test_file-name')
-    editor = find('.file-editor.code')
-    editor.click
-    editor.send_keys 'Touch water with paw then recoil in horror chase dog then
-      run away chase the pig around the house eat owner\'s food, and knock
-      dish off table head butt cant eat out of my own dish. Cat is love, cat
-      is life rub face on everything poop on grasses so meow. Playing with
-      balls of wool flee in terror at cucumber discovered on floor run in
-      circles tuxedo cats always looking dapper, but attack dog, run away
-      and pretend to be victim so all of a sudden cat goes crazy, yet chase
-      laser. Make muffins sit in window and stare ooo, a bird! yum lick yarn
-      hanging out of own butt jump off balcony, onto stranger\'s head yet
-      chase laser. Purr for no reason stare at ceiling hola te quiero.'.squish
+    page.within('.file-editor.code') do
+      find('.ace_text-input', visible: false).send_keys 'Touch water with paw then recoil in horror chase dog then
+        run away chase the pig around the house eat owner\'s food, and knock
+        dish off table head butt cant eat out of my own dish. Cat is love, cat
+        is life rub face on everything poop on grasses so meow. Playing with
+        balls of wool flee in terror at cucumber discovered on floor run in
+        circles tuxedo cats always looking dapper, but attack dog, run away
+        and pretend to be victim so all of a sudden cat goes crazy, yet chase
+        laser. Make muffins sit in window and stare ooo, a bird! yum lick yarn
+        hanging out of own butt jump off balcony, onto stranger\'s head yet
+        chase laser. Purr for no reason stare at ceiling hola te quiero.'.squish
+    end
  end

  let(:toggle_button) { find('.soft-wrap-toggle') }
@@ -36,6 +36,6 @@ feature 'User uses soft wrap whilst editing file', :js do
  end

  def get_content_width
-    find('.ace_content')[:style].slice!(/width: \d+/).slice!(/\d+/)
+    find('.ace_content')[:style].slice!(/width: \d+/).slice!(/\d+/).to_i
  end
 end
--- a/spec/features/projects/import_export/export_file_spec.rb
+++ b/spec/features/projects/import_export/export_file_spec.rb
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
--- a/spec/features/projects/import_export/namespace_export_file_spec.rb
+++ b/spec/features/projects/import_export/namespace_export_file_spec.rb
--- a/spec/features/projects/jobs/user_browses_job_spec.rb
+++ b/spec/features/projects/jobs/user_browses_job_spec.rb
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
--- a/spec/features/projects/members/groups_with_access_list_spec.rb
+++ b/spec/features/projects/members/groups_with_access_list_spec.rb
--- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
--- a/spec/features/projects/members/share_with_group_spec.rb
+++ b/spec/features/projects/members/share_with_group_spec.rb
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
--- a/spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
+++ b/spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
--- a/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
+++ b/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
--- a/spec/features/projects/mirror_spec.rb
+++ b/spec/features/projects/mirror_spec.rb
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
--- a/spec/features/projects/path_locks_spec.rb
+++ b/spec/features/projects/path_locks_spec.rb
--- a/spec/features/projects/pipeline_schedules_spec.rb
+++ b/spec/features/projects/pipeline_schedules_spec.rb
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
--- a/spec/features/projects/ref_switcher_spec.rb
+++ b/spec/features/projects/ref_switcher_spec.rb
--- a/spec/features/projects/services/user_activates_jira_spec.rb
+++ b/spec/features/projects/services/user_activates_jira_spec.rb
--- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
--- a/spec/features/projects/settings/merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/merge_requests_settings_spec.rb
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
--- a/spec/features/projects/settings/repository_settings_spec.rb
+++ b/spec/features/projects/settings/repository_settings_spec.rb
--- a/spec/features/projects/snippets/create_snippet_spec.rb
+++ b/spec/features/projects/snippets/create_snippet_spec.rb
--- a/spec/features/projects/tree/create_directory_spec.rb
+++ b/spec/features/projects/tree/create_directory_spec.rb
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
--- a/spec/features/projects/tree/upload_file_spec.rb
+++ b/spec/features/projects/tree/upload_file_spec.rb
--- a/spec/features/projects/user_browses_files_spec.rb
+++ b/spec/features/projects/user_browses_files_spec.rb
--- a/spec/features/projects/wiki/markdown_preview_spec.rb
+++ b/spec/features/projects/wiki/markdown_preview_spec.rb
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
--- a/spec/features/projects/wiki/user_views_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
--- a/spec/features/promotion_spec.rb
+++ b/spec/features/promotion_spec.rb
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
--- a/spec/features/raven_js_spec.rb
+++ b/spec/features/raven_js_spec.rb
--- a/spec/features/search/user_searches_for_code_spec.rb
+++ b/spec/features/search/user_searches_for_code_spec.rb
--- a/spec/features/search/user_searches_for_issues_spec.rb
+++ b/spec/features/search/user_searches_for_issues_spec.rb
--- a/spec/features/search/user_searches_for_merge_requests_spec.rb
+++ b/spec/features/search/user_searches_for_merge_requests_spec.rb
--- a/spec/features/search/user_searches_for_milestones_spec.rb
+++ b/spec/features/search/user_searches_for_milestones_spec.rb
--- a/spec/features/search/user_searches_for_wiki_pages_spec.rb
+++ b/spec/features/search/user_searches_for_wiki_pages_spec.rb
--- a/spec/features/search/user_uses_search_filters_spec.rb
+++ b/spec/features/search/user_uses_search_filters_spec.rb
--- a/spec/features/snippets/notes_on_personal_snippets_spec.rb
+++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb
--- a/spec/features/snippets/user_creates_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
--- a/spec/features/tags/master_creates_tag_spec.rb
+++ b/spec/features/tags/master_creates_tag_spec.rb
--- a/spec/features/tags/master_deletes_tag_spec.rb
+++ b/spec/features/tags/master_deletes_tag_spec.rb
--- a/spec/features/triggers_spec.rb
+++ b/spec/features/triggers_spec.rb
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
--- a/spec/features/uploads/user_uploads_file_to_note_spec.rb
+++ b/spec/features/uploads/user_uploads_file_to_note_spec.rb
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
--- a/spec/features/variables_spec.rb
+++ b/spec/features/variables_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
--- a/spec/support/capybara_helpers.rb
+++ b/spec/support/capybara_helpers.rb
--- a/spec/support/cookie_helper.rb
+++ b/spec/support/cookie_helper.rb
--- a/spec/support/features/discussion_comments_shared_example.rb
+++ b/spec/support/features/discussion_comments_shared_example.rb
--- a/spec/support/features/issuable_slash_commands_shared_examples.rb
+++ b/spec/support/features/issuable_slash_commands_shared_examples.rb
--- a/spec/support/features/reportable_note_shared_examples.rb
+++ b/spec/support/features/reportable_note_shared_examples.rb
--- a/spec/support/helpers/merge_request_diff_helpers.rb
+++ b/spec/support/helpers/merge_request_diff_helpers.rb
--- a/spec/support/helpers/note_interaction_helpers.rb
+++ b/spec/support/helpers/note_interaction_helpers.rb
--- a/spec/support/input_helper.rb
+++ b/spec/support/input_helper.rb
--- a/spec/support/inspect_requests.rb
+++ b/spec/support/inspect_requests.rb
--- a/spec/support/mobile_helpers.rb
+++ b/spec/support/mobile_helpers.rb
--- a/spec/support/protected_tags/access_control_ce_shared_examples.rb
+++ b/spec/support/protected_tags/access_control_ce_shared_examples.rb
--- a/spec/support/quick_actions_helpers.rb
+++ b/spec/support/quick_actions_helpers.rb
--- a/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
+++ b/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
--- a/spec/support/time_tracking_shared_examples.rb
+++ b/spec/support/time_tracking_shared_examples.rb
--- a/spec/support/wait_for_requests.rb
+++ b/spec/support/wait_for_requests.rb