2260 files changed, 54630 insertions, 19725 deletions

diff --git a/spec/bin/changelog_spec.rb b/spec/bin/changelog_spec.rb
index ce7f7648c0c..8a86f574bf5 100644
--- a/spec/bin/changelog_spec.rb
+++ b/spec/bin/changelog_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 load File.expand_path('../../bin/changelog', __dir__)
 
-describe 'bin/changelog' do
+RSpec.describe 'bin/changelog' do
   let(:options) { OpenStruct.new(title: 'Test title', type: 'fixed', dry_run: true) }
 
   describe ChangelogEntry do
diff --git a/spec/bin/sidekiq_cluster_spec.rb b/spec/bin/sidekiq_cluster_spec.rb
index c0240214a6b..fc5e2ae861a 100644
--- a/spec/bin/sidekiq_cluster_spec.rb
+++ b/spec/bin/sidekiq_cluster_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'shellwords'
 
-describe 'bin/sidekiq-cluster' do
+RSpec.describe 'bin/sidekiq-cluster' do
   using RSpec::Parameterized::TableSyntax
 
   context 'when selecting some queues and excluding others' do
diff --git a/spec/channels/application_cable/connection_spec.rb b/spec/channels/application_cable/connection_spec.rb
index f3d67133528..e5f7ea1103c 100644
--- a/spec/channels/application_cable/connection_spec.rb
+++ b/spec/channels/application_cable/connection_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
+RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_shared_state do
   let(:session_id) { Rack::Session::SessionId.new('6919a6f1bb119dd7396fadc38fd18d0d') }
 
   before do
diff --git a/spec/channels/issues_channel_spec.rb b/spec/channels/issues_channel_spec.rb
index 1c88cc73456..4c860402f03 100644
--- a/spec/channels/issues_channel_spec.rb
+++ b/spec/channels/issues_channel_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuesChannel do
+RSpec.describe IssuesChannel do
   let_it_be(:issue) { create(:issue) }
 
   it 'rejects when project path is invalid' do
@@ -18,7 +18,7 @@ describe IssuesChannel do
   end
 
   it 'rejects when the user does not have access' do
-    stub_connection current_user: nil
+    stub_action_cable_connection current_user: nil
 
     subscribe(project_path: issue.project.full_path, iid: issue.iid)
 
@@ -26,7 +26,7 @@ describe IssuesChannel do
   end
 
   it 'subscribes to a stream when the user has access' do
-    stub_connection current_user: issue.author
+    stub_action_cable_connection current_user: issue.author
 
     subscribe(project_path: issue.project.full_path, iid: issue.iid)
 
diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb
index e6b8da690a2..94fecc26e7f 100644
--- a/spec/config/application_spec.rb
+++ b/spec/config/application_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::Application do # rubocop:disable RSpec/FilePath
+RSpec.describe Gitlab::Application do # rubocop:disable RSpec/FilePath
   using RSpec::Parameterized::TableSyntax
 
   filtered_param = ActiveSupport::ParameterFilter::FILTERED
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index bd8269fb2c5..206f2744281 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'mail_room.yml' do
+RSpec.describe 'mail_room.yml' do
   include StubENV
 
   let(:mailroom_config_path) { 'config/mail_room.yml' }
diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb
index c38910cff0a..67e77aa4466 100644
--- a/spec/config/object_store_settings_spec.rb
+++ b/spec/config/object_store_settings_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('config', 'object_store_settings.rb')
 
-describe ObjectStoreSettings do
+RSpec.describe ObjectStoreSettings do
   describe '.parse' do
     it 'sets correct default values' do
       settings = described_class.parse(nil)
diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index 20c0b92f135..9db3d35cbe5 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Settings do
+RSpec.describe Settings do
   describe 'omniauth' do
     it 'defaults to enabled' do
       expect(described_class.omniauth.enabled).to be true
diff --git a/spec/config/smime_signature_settings_spec.rb b/spec/config/smime_signature_settings_spec.rb
index 7e7b42b129a..5ce6fdd975b 100644
--- a/spec/config/smime_signature_settings_spec.rb
+++ b/spec/config/smime_signature_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SmimeSignatureSettings do
+RSpec.describe SmimeSignatureSettings do
   describe '.parse' do
     let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') }
     let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') }
diff --git a/spec/controllers/abuse_reports_controller_spec.rb b/spec/controllers/abuse_reports_controller_spec.rb
index 087b564dddb..da7577c371d 100644
--- a/spec/controllers/abuse_reports_controller_spec.rb
+++ b/spec/controllers/abuse_reports_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AbuseReportsController do
+RSpec.describe AbuseReportsController do
   let(:reporter) { create(:user) }
   let(:user)     { create(:user) }
   let(:attrs) do
diff --git a/spec/controllers/acme_challenges_controller_spec.rb b/spec/controllers/acme_challenges_controller_spec.rb
index be077a4b20d..e737999fa2d 100644
--- a/spec/controllers/acme_challenges_controller_spec.rb
+++ b/spec/controllers/acme_challenges_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AcmeChallengesController do
+RSpec.describe AcmeChallengesController do
   describe '#show' do
     let!(:acme_order) { create(:pages_domain_acme_order) }
 
diff --git a/spec/controllers/admin/appearances_controller_spec.rb b/spec/controllers/admin/appearances_controller_spec.rb
index 621aa148301..ee6a4a4c7af 100644
--- a/spec/controllers/admin/appearances_controller_spec.rb
+++ b/spec/controllers/admin/appearances_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::AppearancesController do
+RSpec.describe Admin::AppearancesController do
   let(:admin) { create(:admin) }
   let(:header_message) { 'Header message' }
   let(:footer_message) { 'Footer' }
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index fe28e791ade..8ab29a72477 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -2,8 +2,9 @@
 
 require 'spec_helper'
 
-describe Admin::ApplicationSettingsController do
+RSpec.describe Admin::ApplicationSettingsController do
   include StubENV
+  include UsageDataHelpers
 
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
@@ -16,7 +17,7 @@ describe Admin::ApplicationSettingsController do
 
   describe 'GET #usage_data with no access' do
     before do
-      allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
+      stub_usage_data_connections
       sign_in(user)
     end
 
@@ -29,7 +30,7 @@ describe Admin::ApplicationSettingsController do
 
   describe 'GET #usage_data' do
     before do
-      allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
+      stub_usage_data_connections
       sign_in(admin)
     end
 
@@ -120,6 +121,13 @@ describe Admin::ApplicationSettingsController do
       expect(ApplicationSetting.current.namespace_storage_size_limit).not_to eq(-100)
     end
 
+    it 'updates repository_storages_weighted setting' do
+      put :update, params: { application_setting: { repository_storages_weighted_default: 75 } }
+
+      expect(response).to redirect_to(general_admin_application_settings_path)
+      expect(ApplicationSetting.current.repository_storages_weighted_default).to eq(75)
+    end
+
     context 'external policy classification settings' do
       let(:settings) do
         {
diff --git a/spec/controllers/admin/applications_controller_spec.rb b/spec/controllers/admin/applications_controller_spec.rb
index 163a2033b58..732d20666cb 100644
--- a/spec/controllers/admin/applications_controller_spec.rb
+++ b/spec/controllers/admin/applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ApplicationsController do
+RSpec.describe Admin::ApplicationsController do
   let(:admin) { create(:admin) }
   let(:application) { create(:oauth_application, owner_id: nil, owner_type: nil) }
 
diff --git a/spec/controllers/admin/ci/variables_controller_spec.rb b/spec/controllers/admin/ci/variables_controller_spec.rb
index 57f2dd21f39..9f0a1bd3be1 100644
--- a/spec/controllers/admin/ci/variables_controller_spec.rb
+++ b/spec/controllers/admin/ci/variables_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Ci::VariablesController do
+RSpec.describe Admin::Ci::VariablesController do
   let_it_be(:variable) { create(:ci_instance_variable) }
 
   before do
diff --git a/spec/controllers/admin/clusters/applications_controller_spec.rb b/spec/controllers/admin/clusters/applications_controller_spec.rb
index 44693505c4f..2a77693061c 100644
--- a/spec/controllers/admin/clusters/applications_controller_spec.rb
+++ b/spec/controllers/admin/clusters/applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Clusters::ApplicationsController do
+RSpec.describe Admin::Clusters::ApplicationsController do
   include AccessMatchersForController
 
   def current_application
diff --git a/spec/controllers/admin/clusters_controller_spec.rb b/spec/controllers/admin/clusters_controller_spec.rb
index d4a12e0dc52..d899e86ae5f 100644
--- a/spec/controllers/admin/clusters_controller_spec.rb
+++ b/spec/controllers/admin/clusters_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ClustersController do
+RSpec.describe Admin::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
 
@@ -42,6 +42,13 @@ describe Admin::ClustersController do
           expect(response).to match_response_schema('cluster_list')
         end
 
+        it 'sets the polling interval header for json requests' do
+          get_index(format: :json)
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response.headers['Poll-Interval']).to eq("10000")
+        end
+
         context 'when page is specified' do
           let(:last_page) { Clusters::Cluster.instance_type.page.total_pages }
           let(:total_count) { Clusters::Cluster.instance_type.page.total_count }
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
index 4de69a9aea1..283d82a3ab8 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::DashboardController do
+RSpec.describe Admin::DashboardController do
   describe '#index' do
     context 'with pending_delete projects' do
       render_views
diff --git a/spec/controllers/admin/gitaly_servers_controller_spec.rb b/spec/controllers/admin/gitaly_servers_controller_spec.rb
index db94ea06f59..53f8a06ab52 100644
--- a/spec/controllers/admin/gitaly_servers_controller_spec.rb
+++ b/spec/controllers/admin/gitaly_servers_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::GitalyServersController do
+RSpec.describe Admin::GitalyServersController do
   describe '#index' do
     before do
       sign_in(create(:admin))
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index 1123563c1e3..3f32209543f 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::GroupsController do
+RSpec.describe Admin::GroupsController do
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
   let(:admin) { create(:admin) }
diff --git a/spec/controllers/admin/health_check_controller_spec.rb b/spec/controllers/admin/health_check_controller_spec.rb
index cf5b27156c0..06aace429e3 100644
--- a/spec/controllers/admin/health_check_controller_spec.rb
+++ b/spec/controllers/admin/health_check_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::HealthCheckController do
+RSpec.describe Admin::HealthCheckController do
   let(:admin) { create(:admin) }
 
   before do
diff --git a/spec/controllers/admin/hooks_controller_spec.rb b/spec/controllers/admin/hooks_controller_spec.rb
index 9973ef93cd9..8975f746dd7 100644
--- a/spec/controllers/admin/hooks_controller_spec.rb
+++ b/spec/controllers/admin/hooks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::HooksController do
+RSpec.describe Admin::HooksController do
   let(:admin) { create(:admin) }
 
   before do
diff --git a/spec/controllers/admin/identities_controller_spec.rb b/spec/controllers/admin/identities_controller_spec.rb
index f483c88d18d..6ac5ce13884 100644
--- a/spec/controllers/admin/identities_controller_spec.rb
+++ b/spec/controllers/admin/identities_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::IdentitiesController do
+RSpec.describe Admin::IdentitiesController do
   let(:admin) { create(:admin) }
 
   before do
diff --git a/spec/controllers/admin/impersonations_controller_spec.rb b/spec/controllers/admin/impersonations_controller_spec.rb
index fa3923bca8c..326003acaf8 100644
--- a/spec/controllers/admin/impersonations_controller_spec.rb
+++ b/spec/controllers/admin/impersonations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ImpersonationsController do
+RSpec.describe Admin::ImpersonationsController do
   let(:impersonator) { create(:admin) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/admin/integrations_controller_spec.rb b/spec/controllers/admin/integrations_controller_spec.rb
index 817223bd91a..7e7b60db2dc 100644
--- a/spec/controllers/admin/integrations_controller_spec.rb
+++ b/spec/controllers/admin/integrations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::IntegrationsController do
+RSpec.describe Admin::IntegrationsController do
   let(:admin) { create(:admin) }
 
   before do
@@ -36,7 +36,9 @@ describe Admin::IntegrationsController do
     let(:integration) { create(:jira_service, :instance) }
 
     before do
-      put :update, params: { id: integration.class.to_param, service: { url: url } }
+      allow(PropagateIntegrationWorker).to receive(:perform_async)
+
+      put :update, params: { id: integration.class.to_param, overwrite: true, service: { url: url } }
     end
 
     context 'valid params' do
@@ -46,6 +48,10 @@ describe Admin::IntegrationsController do
         expect(response).to have_gitlab_http_status(:found)
         expect(integration.reload.url).to eq(url)
       end
+
+      it 'calls to PropagateIntegrationWorker' do
+        expect(PropagateIntegrationWorker).to have_received(:perform_async).with(integration.id, true)
+      end
     end
 
     context 'invalid params' do
@@ -56,6 +62,10 @@ describe Admin::IntegrationsController do
         expect(response).to render_template(:edit)
         expect(integration.reload.url).not_to eq(url)
       end
+
+      it 'does not call to PropagateIntegrationWorker' do
+        expect(PropagateIntegrationWorker).not_to have_received(:perform_async)
+      end
     end
   end
 end
diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb
index f0157fb4260..b5f411c9121 100644
--- a/spec/controllers/admin/projects_controller_spec.rb
+++ b/spec/controllers/admin/projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ProjectsController do
+RSpec.describe Admin::ProjectsController do
   let!(:project) { create(:project, :public) }
 
   before do
diff --git a/spec/controllers/admin/requests_profiles_controller_spec.rb b/spec/controllers/admin/requests_profiles_controller_spec.rb
index 629233b04e7..7ee46b5b28a 100644
--- a/spec/controllers/admin/requests_profiles_controller_spec.rb
+++ b/spec/controllers/admin/requests_profiles_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::RequestsProfilesController do
+RSpec.describe Admin::RequestsProfilesController do
   let_it_be(:admin) { create(:admin) }
 
   before do
diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb
index 803fcf90135..013eee19409 100644
--- a/spec/controllers/admin/runners_controller_spec.rb
+++ b/spec/controllers/admin/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::RunnersController do
+RSpec.describe Admin::RunnersController do
   let_it_be(:runner) { create(:ci_runner) }
 
   before do
diff --git a/spec/controllers/admin/serverless/domains_controller_spec.rb b/spec/controllers/admin/serverless/domains_controller_spec.rb
index 43c3f0117bc..e7503fb37fa 100644
--- a/spec/controllers/admin/serverless/domains_controller_spec.rb
+++ b/spec/controllers/admin/serverless/domains_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::Serverless::DomainsController do
+RSpec.describe Admin::Serverless::DomainsController do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/admin/services_controller_spec.rb b/spec/controllers/admin/services_controller_spec.rb
index 5dde0d57293..2ad4989af4f 100644
--- a/spec/controllers/admin/services_controller_spec.rb
+++ b/spec/controllers/admin/services_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ServicesController do
+RSpec.describe Admin::ServicesController do
   let(:admin) { create(:admin) }
 
   before do
diff --git a/spec/controllers/admin/sessions_controller_spec.rb b/spec/controllers/admin/sessions_controller_spec.rb
index 351148dbc65..82366cc6952 100644
--- a/spec/controllers/admin/sessions_controller_spec.rb
+++ b/spec/controllers/admin/sessions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SessionsController, :do_not_mock_admin_mode do
+RSpec.describe Admin::SessionsController, :do_not_mock_admin_mode do
   include_context 'custom session'
 
   let(:user) { create(:user) }
diff --git a/spec/controllers/admin/spam_logs_controller_spec.rb b/spec/controllers/admin/spam_logs_controller_spec.rb
index ec0d8c47660..13038339d08 100644
--- a/spec/controllers/admin/spam_logs_controller_spec.rb
+++ b/spec/controllers/admin/spam_logs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::SpamLogsController do
+RSpec.describe Admin::SpamLogsController do
   let(:admin) { create(:admin) }
   let(:user) { create(:user) }
   let!(:first_spam) { create(:spam_log, user: user) }
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 7a7201a6454..08a1d7c9fa9 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::UsersController do
+RSpec.describe Admin::UsersController do
   let(:user) { create(:user) }
 
   let_it_be(:admin) { create(:admin) }
@@ -254,6 +254,18 @@ describe Admin::UsersController do
       errors = assigns[:user].errors
       expect(errors).to contain_exactly(errors.full_message(:email, I18n.t('errors.messages.invalid')))
     end
+
+    context 'admin notes' do
+      it 'creates the user with note' do
+        note = '2020-05-12 | Note | DCMA | Link'
+        user_params = attributes_for(:user, note: note)
+
+        expect { post :create, params: { user: user_params } }.to change { User.count }.by(1)
+
+        new_user = User.last
+        expect(new_user.note).to eq(note)
+      end
+    end
   end
 
   describe 'POST update' do
@@ -338,6 +350,20 @@ describe Admin::UsersController do
         end
       end
     end
+
+    context 'admin notes' do
+      it 'updates the note for the user' do
+        note = '2020-05-12 | Note | DCMA | Link'
+        params = {
+          id: user.to_param,
+          user: {
+            note: note
+          }
+        }
+
+        expect { post :update, params: params }.to change { user.reload.note }.to(note)
+      end
+    end
   end
 
   describe "DELETE #remove_email" do
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index ed2e61d6cf6..4002b7aca63 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe ApplicationController do
+RSpec.describe ApplicationController do
   include TermsHelper
 
   let(:user) { create(:user) }
@@ -310,13 +310,6 @@ describe ApplicationController do
 
         expect(subject).to be_truthy
       end
-
-      it 'returns true if user has signed up using omniauth-ultraauth' do
-        user = create(:omniauth_user, provider: 'ultraauth')
-        allow(controller).to receive(:current_user).and_return(user)
-
-        expect(subject).to be_truthy
-      end
     end
 
     describe '#two_factor_grace_period' do
diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb
index 7b1e9748268..aeb3f4dcb17 100644
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AutocompleteController do
+RSpec.describe AutocompleteController do
   let(:project) { create(:project) }
   let(:user) { project.owner }
 
diff --git a/spec/controllers/boards/issues_controller_spec.rb b/spec/controllers/boards/issues_controller_spec.rb
index 8639b76ef0f..601b8d427e0 100644
--- a/spec/controllers/boards/issues_controller_spec.rb
+++ b/spec/controllers/boards/issues_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Boards::IssuesController do
+RSpec.describe Boards::IssuesController do
   include ExternalAuthorizationServiceHelpers
 
   let(:project) { create(:project, :private) }
diff --git a/spec/controllers/boards/lists_controller_spec.rb b/spec/controllers/boards/lists_controller_spec.rb
index d0b34b55c36..c72d9e5053a 100644
--- a/spec/controllers/boards/lists_controller_spec.rb
+++ b/spec/controllers/boards/lists_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Boards::ListsController do
+RSpec.describe Boards::ListsController do
   let(:project) { create(:project) }
   let(:board)   { create(:board, project: project) }
   let(:user)    { create(:user) }
diff --git a/spec/controllers/chaos_controller_spec.rb b/spec/controllers/chaos_controller_spec.rb
index 5812990ce7a..550303d292a 100644
--- a/spec/controllers/chaos_controller_spec.rb
+++ b/spec/controllers/chaos_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ChaosController do
+RSpec.describe ChaosController do
   describe '#leakmem' do
     it 'calls synchronously' do
       expect(Gitlab::Chaos).to receive(:leak_mem).with(100, 30.seconds)
diff --git a/spec/controllers/concerns/boards_responses_spec.rb b/spec/controllers/concerns/boards_responses_spec.rb
index bdebdf94761..553a547d42c 100644
--- a/spec/controllers/concerns/boards_responses_spec.rb
+++ b/spec/controllers/concerns/boards_responses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BoardsResponses do
+RSpec.describe BoardsResponses do
   let(:controller_class) do
     Class.new do
       include BoardsResponses
diff --git a/spec/controllers/concerns/checks_collaboration_spec.rb b/spec/controllers/concerns/checks_collaboration_spec.rb
index 7187e239486..be8beff5dd6 100644
--- a/spec/controllers/concerns/checks_collaboration_spec.rb
+++ b/spec/controllers/concerns/checks_collaboration_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ChecksCollaboration do
+RSpec.describe ChecksCollaboration do
   include ProjectForksHelper
 
   let(:helper) do
diff --git a/spec/controllers/concerns/confirm_email_warning_spec.rb b/spec/controllers/concerns/confirm_email_warning_spec.rb
index 93e3423261c..24ee6fb30d2 100644
--- a/spec/controllers/concerns/confirm_email_warning_spec.rb
+++ b/spec/controllers/concerns/confirm_email_warning_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ConfirmEmailWarning do
+RSpec.describe ConfirmEmailWarning do
   before do
     stub_feature_flags(soft_email_confirmation: true)
   end
diff --git a/spec/controllers/concerns/continue_params_spec.rb b/spec/controllers/concerns/continue_params_spec.rb
index 6af01aa837c..c010e8ffbd0 100644
--- a/spec/controllers/concerns/continue_params_spec.rb
+++ b/spec/controllers/concerns/continue_params_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContinueParams do
+RSpec.describe ContinueParams do
   let(:controller_class) do
     Class.new(ActionController::Base) do
       include ContinueParams
diff --git a/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb b/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
index 3f9d690837b..a58b83dc42c 100644
--- a/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
+++ b/spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ControllerWithCrossProjectAccessCheck do
+RSpec.describe ControllerWithCrossProjectAccessCheck do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/concerns/enforces_admin_authentication_spec.rb b/spec/controllers/concerns/enforces_admin_authentication_spec.rb
index 1809bb2d636..c6ad1a00484 100644
--- a/spec/controllers/concerns/enforces_admin_authentication_spec.rb
+++ b/spec/controllers/concerns/enforces_admin_authentication_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnforcesAdminAuthentication do
+RSpec.describe EnforcesAdminAuthentication do
   include AdminModeHelper
 
   let(:user) { create(:user) }
diff --git a/spec/controllers/concerns/group_tree_spec.rb b/spec/controllers/concerns/group_tree_spec.rb
index 543f0170be0..a0707688e54 100644
--- a/spec/controllers/concerns/group_tree_spec.rb
+++ b/spec/controllers/concerns/group_tree_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupTree do
+RSpec.describe GroupTree do
   let(:group) { create(:group, :public) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/concerns/import_url_params_spec.rb b/spec/controllers/concerns/import_url_params_spec.rb
index 41e29d71386..72f13cdcc94 100644
--- a/spec/controllers/concerns/import_url_params_spec.rb
+++ b/spec/controllers/concerns/import_url_params_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ImportUrlParams do
+RSpec.describe ImportUrlParams do
   let(:import_url_params) do
     controller = OpenStruct.new(params: params).extend(described_class)
     controller.import_url_params
diff --git a/spec/controllers/concerns/internal_redirect_spec.rb b/spec/controllers/concerns/internal_redirect_spec.rb
index cc6422f2817..3741ff647e4 100644
--- a/spec/controllers/concerns/internal_redirect_spec.rb
+++ b/spec/controllers/concerns/internal_redirect_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InternalRedirect do
+RSpec.describe InternalRedirect do
   let(:controller_class) do
     Class.new do
       include InternalRedirect
diff --git a/spec/controllers/concerns/issuable_actions_spec.rb b/spec/controllers/concerns/issuable_actions_spec.rb
index 2ab46992b99..c3fef591b91 100644
--- a/spec/controllers/concerns/issuable_actions_spec.rb
+++ b/spec/controllers/concerns/issuable_actions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuableActions do
+RSpec.describe IssuableActions do
   let(:project) { double('project') }
   let(:user) { double('user') }
   let(:issuable) { double('issuable') }
diff --git a/spec/controllers/concerns/issuable_collections_spec.rb b/spec/controllers/concerns/issuable_collections_spec.rb
index 7bdf5c49425..befdd760965 100644
--- a/spec/controllers/concerns/issuable_collections_spec.rb
+++ b/spec/controllers/concerns/issuable_collections_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuableCollections do
+RSpec.describe IssuableCollections do
   let(:user) { create(:user) }
 
   let(:controller) do
diff --git a/spec/controllers/concerns/lfs_request_spec.rb b/spec/controllers/concerns/lfs_request_spec.rb
index f771a3438cf..3bafd761a3e 100644
--- a/spec/controllers/concerns/lfs_request_spec.rb
+++ b/spec/controllers/concerns/lfs_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LfsRequest do
+RSpec.describe LfsRequest do
   include ProjectForksHelper
 
   controller(Repositories::GitHttpClientController) do
diff --git a/spec/controllers/concerns/metrics_dashboard_spec.rb b/spec/controllers/concerns/metrics_dashboard_spec.rb
index e2fa03670d9..39ddf687dca 100644
--- a/spec/controllers/concerns/metrics_dashboard_spec.rb
+++ b/spec/controllers/concerns/metrics_dashboard_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MetricsDashboard do
+RSpec.describe MetricsDashboard do
   include MetricsDashboardHelpers
 
   describe 'GET #metrics_dashboard' do
@@ -134,7 +134,7 @@ describe MetricsDashboard do
             it 'adds starred dashboard information and sorts the list' do
               all_dashboards = json_response['all_dashboards'].map { |dashboard| dashboard.slice('display_name', 'starred', 'user_starred_path') }
               expected_response = [
-                { "display_name" => "Default", "starred" => false, 'user_starred_path' => api_v4_projects_metrics_user_starred_dashboards_path(id: project.id, params: { dashboard_path: 'config/prometheus/common_metrics.yml' }) },
+                { "display_name" => "Default dashboard", "starred" => false, 'user_starred_path' => api_v4_projects_metrics_user_starred_dashboards_path(id: project.id, params: { dashboard_path: 'config/prometheus/common_metrics.yml' }) },
                 { "display_name" => "anomaly.yml", "starred" => false, 'user_starred_path' => api_v4_projects_metrics_user_starred_dashboards_path(id: project.id, params: { dashboard_path: '.gitlab/dashboards/anomaly.yml' }) },
                 { "display_name" => "errors.yml", "starred" => true, 'user_starred_path' => api_v4_projects_metrics_user_starred_dashboards_path(id: project.id, params: { dashboard_path: '.gitlab/dashboards/errors.yml' }) },
                 { "display_name" => "test.yml", "starred" => true, 'user_starred_path' => api_v4_projects_metrics_user_starred_dashboards_path(id: project.id, params: { dashboard_path: '.gitlab/dashboards/test.yml' }) }
diff --git a/spec/controllers/concerns/page_limiter_spec.rb b/spec/controllers/concerns/page_limiter_spec.rb
index 287b62cb66c..a4177943c05 100644
--- a/spec/controllers/concerns/page_limiter_spec.rb
+++ b/spec/controllers/concerns/page_limiter_spec.rb
@@ -14,7 +14,7 @@ class PageLimiterSpecController < ApplicationController
   end
 end
 
-describe PageLimiter do
+RSpec.describe PageLimiter do
   let(:controller_class) do
     PageLimiterSpecController
   end
diff --git a/spec/controllers/concerns/project_unauthorized_spec.rb b/spec/controllers/concerns/project_unauthorized_spec.rb
index 9b40660811e..4fce160cdaf 100644
--- a/spec/controllers/concerns/project_unauthorized_spec.rb
+++ b/spec/controllers/concerns/project_unauthorized_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectUnauthorized do
+RSpec.describe ProjectUnauthorized do
   include ExternalAuthorizationServiceHelpers
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/concerns/redirects_for_missing_path_on_tree_spec.rb b/spec/controllers/concerns/redirects_for_missing_path_on_tree_spec.rb
index 903100ba93f..5c3b6e13ee3 100644
--- a/spec/controllers/concerns/redirects_for_missing_path_on_tree_spec.rb
+++ b/spec/controllers/concerns/redirects_for_missing_path_on_tree_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RedirectsForMissingPathOnTree, type: :controller do
+RSpec.describe RedirectsForMissingPathOnTree, type: :controller do
   controller(ActionController::Base) do
     include Gitlab::Routing.url_helpers
     include RedirectsForMissingPathOnTree
diff --git a/spec/controllers/concerns/renders_commits_spec.rb b/spec/controllers/concerns/renders_commits_spec.rb
index c43ceb6b795..0bffb39d608 100644
--- a/spec/controllers/concerns/renders_commits_spec.rb
+++ b/spec/controllers/concerns/renders_commits_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RendersCommits do
+RSpec.describe RendersCommits do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
   let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/concerns/routable_actions_spec.rb b/spec/controllers/concerns/routable_actions_spec.rb
index 80c67022219..f28f990ecbb 100644
--- a/spec/controllers/concerns/routable_actions_spec.rb
+++ b/spec/controllers/concerns/routable_actions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RoutableActions do
+RSpec.describe RoutableActions do
   controller(::ApplicationController) do
     include RoutableActions
 
diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb
index 3cfb7b5a488..7cfaf1b248f 100644
--- a/spec/controllers/concerns/send_file_upload_spec.rb
+++ b/spec/controllers/concerns/send_file_upload_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SendFileUpload do
+RSpec.describe SendFileUpload do
   let(:uploader_class) do
     Class.new(GitlabUploader) do
       include ObjectStorage::Concern
diff --git a/spec/controllers/concerns/sorting_preference_spec.rb b/spec/controllers/concerns/sorting_preference_spec.rb
index a36124c6776..4f9506d4675 100644
--- a/spec/controllers/concerns/sorting_preference_spec.rb
+++ b/spec/controllers/concerns/sorting_preference_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SortingPreference do
+RSpec.describe SortingPreference do
   let(:user) { create(:user) }
 
   let(:controller_class) do
diff --git a/spec/controllers/concerns/sourcegraph_decorator_spec.rb b/spec/controllers/concerns/sourcegraph_decorator_spec.rb
index f1f3f0489c6..2fca5a606d8 100644
--- a/spec/controllers/concerns/sourcegraph_decorator_spec.rb
+++ b/spec/controllers/concerns/sourcegraph_decorator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SourcegraphDecorator do
+RSpec.describe SourcegraphDecorator do
   let_it_be(:enabled_user) { create(:user, sourcegraph_enabled: true) }
   let_it_be(:disabled_user) { create(:user, sourcegraph_enabled: false) }
   let_it_be(:public_project) { create(:project, :public) }
@@ -25,7 +25,7 @@ describe SourcegraphDecorator do
   end
 
   before do
-    Feature.get(:sourcegraph).enable(feature_enabled)
+    stub_feature_flags(sourcegraph: feature_enabled)
 
     stub_application_setting(sourcegraph_url: sourcegraph_url, sourcegraph_enabled: sourcegraph_enabled, sourcegraph_public_only: sourcegraph_public_only)
 
@@ -36,10 +36,6 @@ describe SourcegraphDecorator do
     sign_in user if user
   end
 
-  after do
-    Feature.get(:sourcegraph).disable
-  end
-
   subject do
     get :index, format: format
 
diff --git a/spec/controllers/concerns/static_object_external_storage_spec.rb b/spec/controllers/concerns/static_object_external_storage_spec.rb
index d3ece587ef7..afb43d531c0 100644
--- a/spec/controllers/concerns/static_object_external_storage_spec.rb
+++ b/spec/controllers/concerns/static_object_external_storage_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StaticObjectExternalStorage do
+RSpec.describe StaticObjectExternalStorage do
   controller(Projects::ApplicationController) do
     include StaticObjectExternalStorage
 
diff --git a/spec/controllers/dashboard/groups_controller_spec.rb b/spec/controllers/dashboard/groups_controller_spec.rb
index b615bcc1e6b..f246d7bcaf1 100644
--- a/spec/controllers/dashboard/groups_controller_spec.rb
+++ b/spec/controllers/dashboard/groups_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::GroupsController do
+RSpec.describe Dashboard::GroupsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/controllers/dashboard/labels_controller_spec.rb b/spec/controllers/dashboard/labels_controller_spec.rb
index cb9c3660b9b..415cb821545 100644
--- a/spec/controllers/dashboard/labels_controller_spec.rb
+++ b/spec/controllers/dashboard/labels_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::LabelsController do
+RSpec.describe Dashboard::LabelsController do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
   let!(:label)  { create(:label, project: project) }
diff --git a/spec/controllers/dashboard/milestones_controller_spec.rb b/spec/controllers/dashboard/milestones_controller_spec.rb
index f4b04ad6dee..899aa7a41c1 100644
--- a/spec/controllers/dashboard/milestones_controller_spec.rb
+++ b/spec/controllers/dashboard/milestones_controller_spec.rb
@@ -2,18 +2,13 @@
 
 require 'spec_helper'
 
-describe Dashboard::MilestonesController do
+RSpec.describe Dashboard::MilestonesController do
   let(:project) { create(:project) }
   let(:group) { create(:group) }
   let(:user) { create(:user) }
   let(:project_milestone) { create(:milestone, project: project) }
   let(:group_milestone) { create(:milestone, group: group) }
-  let(:milestone) do
-    DashboardMilestone.build(
-      [project],
-      project_milestone.title
-    )
-  end
+  let(:milestone) { create(:milestone, group: group) }
   let(:issue) { create(:issue, project: project, milestone: project_milestone) }
   let(:group_issue) { create(:issue, milestone: group_milestone, project: create(:project, group: group)) }
 
@@ -28,22 +23,6 @@ describe Dashboard::MilestonesController do
     group.add_developer(user)
   end
 
-  it_behaves_like 'milestone tabs'
-
-  describe "#show" do
-    render_views
-
-    def view_milestone
-      get :show, params: { id: milestone.safe_title, title: milestone.title }
-    end
-
-    it 'shows milestone page' do
-      view_milestone
-
-      expect(response).to have_gitlab_http_status(:ok)
-    end
-  end
-
   describe "#index" do
     let(:public_group) { create(:group, :public) }
     let!(:public_milestone) { create(:milestone, group: public_group) }
@@ -58,7 +37,6 @@ describe Dashboard::MilestonesController do
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response.size).to eq(2)
       expect(json_response.map { |i| i["name"] }).to match_array([group_milestone.name, project_milestone.name])
-      expect(json_response.map { |i| i["group_name"] }.compact).to match_array(group.name)
     end
 
     it 'returns closed group and project milestones to which the user belongs' do
@@ -67,7 +45,6 @@ describe Dashboard::MilestonesController do
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response.size).to eq(2)
       expect(json_response.map { |i| i["name"] }).to match_array([closed_group_milestone.name, closed_project_milestone.name])
-      expect(json_response.map { |i| i["group_name"] }.compact).to match_array(group.name)
     end
 
     it 'searches legacy project milestones by title when search_title is given' do
diff --git a/spec/controllers/dashboard/projects_controller_spec.rb b/spec/controllers/dashboard/projects_controller_spec.rb
index eeac696c3f2..ee043fde0ff 100644
--- a/spec/controllers/dashboard/projects_controller_spec.rb
+++ b/spec/controllers/dashboard/projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::ProjectsController do
+RSpec.describe Dashboard::ProjectsController do
   include ExternalAuthorizationServiceHelpers
 
   describe '#index' do
diff --git a/spec/controllers/dashboard/snippets_controller_spec.rb b/spec/controllers/dashboard/snippets_controller_spec.rb
index d5e3a348cd2..3c316d07408 100644
--- a/spec/controllers/dashboard/snippets_controller_spec.rb
+++ b/spec/controllers/dashboard/snippets_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::SnippetsController do
+RSpec.describe Dashboard::SnippetsController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/dashboard/todos_controller_spec.rb b/spec/controllers/dashboard/todos_controller_spec.rb
index 004eef1873e..f0aa351bee0 100644
--- a/spec/controllers/dashboard/todos_controller_spec.rb
+++ b/spec/controllers/dashboard/todos_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Dashboard::TodosController do
+RSpec.describe Dashboard::TodosController do
   let(:user) { create(:user) }
   let(:author)  { create(:user) }
   let(:project) { create(:project) }
diff --git a/spec/controllers/dashboard_controller_spec.rb b/spec/controllers/dashboard_controller_spec.rb
index a280d829d83..d27817c0a82 100644
--- a/spec/controllers/dashboard_controller_spec.rb
+++ b/spec/controllers/dashboard_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DashboardController do
+RSpec.describe DashboardController do
   context 'signed in' do
     let(:user) { create(:user) }
     let(:project) { create(:project) }
diff --git a/spec/controllers/explore/groups_controller_spec.rb b/spec/controllers/explore/groups_controller_spec.rb
index eccbd7fa14d..310fe609cf1 100644
--- a/spec/controllers/explore/groups_controller_spec.rb
+++ b/spec/controllers/explore/groups_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::GroupsController do
+RSpec.describe Explore::GroupsController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/explore/projects_controller_spec.rb b/spec/controllers/explore/projects_controller_spec.rb
index 00cc2d5a81c..fd86501ff5d 100644
--- a/spec/controllers/explore/projects_controller_spec.rb
+++ b/spec/controllers/explore/projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::ProjectsController do
+RSpec.describe Explore::ProjectsController do
   shared_examples 'explore projects' do
     describe 'GET #index.json' do
       render_views
diff --git a/spec/controllers/explore/snippets_controller_spec.rb b/spec/controllers/explore/snippets_controller_spec.rb
index ab91faa6cef..f7bd2ba917e 100644
--- a/spec/controllers/explore/snippets_controller_spec.rb
+++ b/spec/controllers/explore/snippets_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Explore::SnippetsController do
+RSpec.describe Explore::SnippetsController do
   describe 'GET #index' do
     let!(:project_snippet) { create_list(:project_snippet, 3, :public) }
     let!(:personal_snippet) { create_list(:personal_snippet, 3, :public) }
diff --git a/spec/controllers/google_api/authorizations_controller_spec.rb b/spec/controllers/google_api/authorizations_controller_spec.rb
index 9d0e0d92978..3dd2cc307d5 100644
--- a/spec/controllers/google_api/authorizations_controller_spec.rb
+++ b/spec/controllers/google_api/authorizations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GoogleApi::AuthorizationsController do
+RSpec.describe GoogleApi::AuthorizationsController do
   describe 'GET|POST #callback' do
     let(:user) { create(:user) }
     let(:token) { 'token' }
diff --git a/spec/controllers/graphql_controller_spec.rb b/spec/controllers/graphql_controller_spec.rb
index 68150504fe3..c5643f96b7a 100644
--- a/spec/controllers/graphql_controller_spec.rb
+++ b/spec/controllers/graphql_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GraphqlController do
+RSpec.describe GraphqlController do
   include GraphqlHelpers
 
   before do
diff --git a/spec/controllers/groups/avatars_controller_spec.rb b/spec/controllers/groups/avatars_controller_spec.rb
index 1229328000b..18b116831b2 100644
--- a/spec/controllers/groups/avatars_controller_spec.rb
+++ b/spec/controllers/groups/avatars_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::AvatarsController do
+RSpec.describe Groups::AvatarsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user)  { create(:user) }
diff --git a/spec/controllers/groups/boards_controller_spec.rb b/spec/controllers/groups/boards_controller_spec.rb
index b556af0eedc..66595c27531 100644
--- a/spec/controllers/groups/boards_controller_spec.rb
+++ b/spec/controllers/groups/boards_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::BoardsController do
+RSpec.describe Groups::BoardsController do
   let(:group) { create(:group) }
   let(:user)  { create(:user) }
 
diff --git a/spec/controllers/groups/children_controller_spec.rb b/spec/controllers/groups/children_controller_spec.rb
index a8921300e6b..e97fe50c468 100644
--- a/spec/controllers/groups/children_controller_spec.rb
+++ b/spec/controllers/groups/children_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::ChildrenController do
+RSpec.describe Groups::ChildrenController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group, :public) }
diff --git a/spec/controllers/groups/clusters/applications_controller_spec.rb b/spec/controllers/groups/clusters/applications_controller_spec.rb
index bab9e64cfdb..c1d170edce3 100644
--- a/spec/controllers/groups/clusters/applications_controller_spec.rb
+++ b/spec/controllers/groups/clusters/applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Clusters::ApplicationsController do
+RSpec.describe Groups::Clusters::ApplicationsController do
   include AccessMatchersForController
 
   def current_application
diff --git a/spec/controllers/groups/clusters_controller_spec.rb b/spec/controllers/groups/clusters_controller_spec.rb
index 1f2f6bd811b..6765cf0990a 100644
--- a/spec/controllers/groups/clusters_controller_spec.rb
+++ b/spec/controllers/groups/clusters_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::ClustersController do
+RSpec.describe Groups::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
 
@@ -47,6 +47,13 @@ describe Groups::ClustersController do
           expect(response).to match_response_schema('cluster_list')
         end
 
+        it 'sets the polling interval header for json requests' do
+          go(format: :json)
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response.headers['Poll-Interval']).to eq("10000")
+        end
+
         context 'when page is specified' do
           let(:last_page) { group.clusters.page.total_pages }
           let(:total_count) { group.clusters.page.total_count }
diff --git a/spec/controllers/groups/group_links_controller_spec.rb b/spec/controllers/groups/group_links_controller_spec.rb
index ca430414d17..07299382230 100644
--- a/spec/controllers/groups/group_links_controller_spec.rb
+++ b/spec/controllers/groups/group_links_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::GroupLinksController do
+RSpec.describe Groups::GroupLinksController do
   let(:shared_with_group) { create(:group, :private) }
   let(:shared_group) { create(:group, :private) }
   let(:user) { create(:user) }
diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb
index f69d0602404..85f1b247ee9 100644
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::GroupMembersController do
+RSpec.describe Groups::GroupMembersController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/controllers/groups/imports_controller_spec.rb b/spec/controllers/groups/imports_controller_spec.rb
new file mode 100644
index 00000000000..eb43a62b75b
--- /dev/null
+++ b/spec/controllers/groups/imports_controller_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Groups::ImportsController do
+  describe 'GET #show' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:group) { create(:group, :private) }
+
+    context 'when the user has permission to view the group' do
+      before do
+        sign_in(user)
+        group.add_maintainer(user)
+      end
+
+      context 'when the import is in progress' do
+        before do
+          create(:group_import_state, group: group)
+        end
+
+        it 'renders the show template' do
+          get :show, params: { group_id: group }
+
+          expect(response).to render_template :show
+        end
+
+        it 'sets the flash notice' do
+          get :show, params: { group_id: group, continue: { to: '/', notice_now: 'In progress' } }
+
+          expect(flash.now[:notice]).to eq 'In progress'
+        end
+      end
+
+      context 'when the import has failed' do
+        before do
+          create(:group_import_state, :failed, group: group)
+        end
+
+        it 'redirects to the new group path' do
+          get :show, params: { group_id: group }
+
+          expect(response).to redirect_to new_group_path(group)
+        end
+
+        it 'sets a flash error' do
+          get :show, params: { group_id: group }
+
+          expect(flash[:alert]).to eq 'Failed to import group.'
+        end
+      end
+
+      context 'when the import has finished' do
+        before do
+          create(:group_import_state, :finished, group: group)
+        end
+
+        it 'redirects to the group page' do
+          get :show, params: { group_id: group }
+
+          expect(response).to redirect_to group_path(group)
+        end
+      end
+
+      context 'when there is no import state' do
+        it 'redirects to the group page' do
+          get :show, params: { group_id: group }
+
+          expect(response).to redirect_to group_path(group)
+        end
+      end
+    end
+
+    context 'when the user does not have permission to view the group' do
+      before do
+        sign_in(user)
+      end
+
+      it 'returns a 404' do
+        get :show, params: { group_id: group }
+
+        expect(response).to have_gitlab_http_status :not_found
+      end
+    end
+  end
+end
diff --git a/spec/controllers/groups/labels_controller_spec.rb b/spec/controllers/groups/labels_controller_spec.rb
index 90f91a4ff72..20ee19b01d1 100644
--- a/spec/controllers/groups/labels_controller_spec.rb
+++ b/spec/controllers/groups/labels_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::LabelsController do
+RSpec.describe Groups::LabelsController do
   let_it_be(:group) { create(:group) }
   let_it_be(:user)  { create(:user) }
   let_it_be(:project) { create(:project, namespace: group) }
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index afb950bc538..e47bb75af22 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -2,21 +2,13 @@
 
 require 'spec_helper'
 
-describe Groups::MilestonesController do
+RSpec.describe Groups::MilestonesController do
   let(:group) { create(:group, :public) }
   let!(:project) { create(:project, :public, group: group) }
   let!(:project2) { create(:project, group: group) }
   let(:user)    { create(:user) }
   let(:title) { '肯定不是中文的问题' }
-  let(:milestone) do
-    project_milestone = create(:milestone, project: project)
-
-    GroupMilestone.build(
-      group,
-      [project],
-      project_milestone.title
-    )
-  end
+  let(:milestone) { create(:milestone, project: project) }
   let(:milestone_path) { group_milestone_path(group, milestone.safe_title, title: milestone.title) }
 
   let(:milestone_params) do
@@ -168,17 +160,16 @@ describe Groups::MilestonesController do
 
     context 'as JSON' do
       let!(:milestone) { create(:milestone, group: group, title: 'group milestone') }
-      let!(:legacy_milestone1) { create(:milestone, project: project, title: 'legacy') }
-      let!(:legacy_milestone2) { create(:milestone, project: project2, title: 'legacy') }
+      let!(:project_milestone1) { create(:milestone, project: project, title: 'same name') }
+      let!(:project_milestone2) { create(:milestone, project: project2, title: 'same name') }
 
-      it 'lists legacy group milestones and group milestones' do
+      it 'lists project and group milestones' do
         get :index, params: { group_id: group.to_param }, format: :json
 
         milestones = json_response
 
-        expect(milestones.count).to eq(2)
-        expect(milestones.first["title"]).to eq("group milestone")
-        expect(milestones.second["title"]).to eq("legacy")
+        expect(milestones.count).to eq(3)
+        expect(milestones.collect { |m| m['title'] }).to match_array(['same name', 'same name', 'group milestone'])
         expect(response).to have_gitlab_http_status(:ok)
         expect(response.content_type).to eq 'application/json'
       end
@@ -191,8 +182,9 @@ describe Groups::MilestonesController do
           get :index, params: { group_id: group.to_param }, format: :json
           milestones = json_response
 
-          expect(milestones.count).to eq(3)
-          expect(milestones.second["title"]).to eq("subgroup milestone")
+          milestone_titles = milestones.map { |m| m['title'] }
+          expect(milestones.count).to eq(4)
+          expect(milestone_titles).to match_array(['same name', 'same name', 'group milestone', 'subgroup milestone'])
         end
       end
 
@@ -218,31 +210,18 @@ describe Groups::MilestonesController do
   end
 
   describe '#show' do
-    let(:milestone1) { create(:milestone, project: project, title: 'legacy') }
-    let(:milestone2) { create(:milestone, project: project, title: 'legacy') }
-    let(:group_milestone) { create(:milestone, group: group) }
+    render_views
 
-    context 'when there is a title parameter' do
-      it 'searches for a legacy group milestone' do
-        expect(GroupMilestone).to receive(:build)
-        expect(Milestone).not_to receive(:find_by_iid)
+    let!(:group_milestone) { create(:milestone, group: group) }
 
-        get :show, params: { group_id: group.to_param, id: title, title: milestone1.safe_title }
-      end
-    end
+    it 'renders for a group milestone' do
+      get :show, params: { group_id: group.to_param, id: group_milestone.iid }
 
-    context 'when there is not a title parameter' do
-      it 'searches for a group milestone' do
-        expect(GlobalMilestone).not_to receive(:build)
-        expect(Milestone).to receive(:find_by_iid)
-
-        get :show, params: { group_id: group.to_param, id: group_milestone.id }
-      end
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response.body).to include(group_milestone.title)
     end
   end
 
-  it_behaves_like 'milestone tabs'
-
   describe "#create" do
     it "creates group milestone with Chinese title" do
       post :create,
@@ -277,34 +256,6 @@ describe Groups::MilestonesController do
       expect(response).to redirect_to(group_milestone_path(group, milestone.iid))
       expect(milestone.title).to eq("title changed")
     end
-
-    context "legacy group milestones" do
-      let!(:milestone1) { create(:milestone, project: project, title: 'legacy milestone', description: "old description") }
-      let!(:milestone2) { create(:milestone, project: project2, title: 'legacy milestone', description: "old description") }
-
-      it "updates only group milestones state" do
-        milestone_params[:title] = "title changed"
-        milestone_params[:description] = "description changed"
-        milestone_params[:state_event] = "close"
-
-        put :update,
-             params: {
-               id: milestone1.title.to_slug.to_s,
-               group_id: group.to_param,
-               milestone: milestone_params,
-               title: milestone1.title
-             }
-
-        expect(response).to redirect_to(group_milestone_path(group, milestone1.safe_title, title: milestone1.title))
-
-        [milestone1, milestone2].each do |milestone|
-          milestone.reload
-          expect(milestone.title).to eq("legacy milestone")
-          expect(milestone.description).to eq("old description")
-          expect(milestone.state).to eq("closed")
-        end
-      end
-    end
   end
 
   describe "#destroy" do
diff --git a/spec/controllers/groups/registry/repositories_controller_spec.rb b/spec/controllers/groups/registry/repositories_controller_spec.rb
index 7b78aeadbd8..ddac8fc5002 100644
--- a/spec/controllers/groups/registry/repositories_controller_spec.rb
+++ b/spec/controllers/groups/registry/repositories_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Registry::RepositoriesController do
+RSpec.describe Groups::Registry::RepositoriesController do
   let_it_be(:user)  { create(:user) }
   let_it_be(:guest) { create(:user) }
   let_it_be(:group, reload: true) { create(:group) }
@@ -17,6 +17,7 @@ describe Groups::Registry::RepositoriesController do
 
   before do
     stub_container_registry_config(enabled: true)
+    stub_container_registry_tags(repository: :any, tags: [])
     group.add_owner(user)
     group.add_guest(guest)
     sign_in(user)
diff --git a/spec/controllers/groups/runners_controller_spec.rb b/spec/controllers/groups/runners_controller_spec.rb
index bf556078eec..376cd569952 100644
--- a/spec/controllers/groups/runners_controller_spec.rb
+++ b/spec/controllers/groups/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::RunnersController do
+RSpec.describe Groups::RunnersController do
   let(:user)   { create(:user) }
   let(:group)  { create(:group) }
   let(:runner) { create(:ci_runner, :group, groups: [group]) }
diff --git a/spec/controllers/groups/settings/ci_cd_controller_spec.rb b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
index 45d62a7e6cf..55c19de4aa1 100644
--- a/spec/controllers/groups/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::CiCdController do
+RSpec.describe Groups::Settings::CiCdController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }
diff --git a/spec/controllers/groups/settings/integrations_controller_spec.rb b/spec/controllers/groups/settings/integrations_controller_spec.rb
index 29c93c621bd..d079f3f077e 100644
--- a/spec/controllers/groups/settings/integrations_controller_spec.rb
+++ b/spec/controllers/groups/settings/integrations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::IntegrationsController do
+RSpec.describe Groups::Settings::IntegrationsController do
   let_it_be(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:group) { create(:group) }
diff --git a/spec/controllers/groups/settings/repository_controller_spec.rb b/spec/controllers/groups/settings/repository_controller_spec.rb
index 9523d404538..6d0caf6d655 100644
--- a/spec/controllers/groups/settings/repository_controller_spec.rb
+++ b/spec/controllers/groups/settings/repository_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::Settings::RepositoryController do
+RSpec.describe Groups::Settings::RepositoryController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }
diff --git a/spec/controllers/groups/shared_projects_controller_spec.rb b/spec/controllers/groups/shared_projects_controller_spec.rb
index a31b5682ae0..dafce094b14 100644
--- a/spec/controllers/groups/shared_projects_controller_spec.rb
+++ b/spec/controllers/groups/shared_projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::SharedProjectsController do
+RSpec.describe Groups::SharedProjectsController do
   def get_shared_projects(params = {})
     get :index, params: params.reverse_merge(format: :json, group_id: group.full_path)
   end
diff --git a/spec/controllers/groups/uploads_controller_spec.rb b/spec/controllers/groups/uploads_controller_spec.rb
index 8abebd04e8b..ea6a5ce8841 100644
--- a/spec/controllers/groups/uploads_controller_spec.rb
+++ b/spec/controllers/groups/uploads_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::UploadsController do
+RSpec.describe Groups::UploadsController do
   include WorkhorseHelpers
 
   let(:model) { create(:group, :public) }
diff --git a/spec/controllers/groups/variables_controller_spec.rb b/spec/controllers/groups/variables_controller_spec.rb
index d6c790ae7b8..e2a14165cb4 100644
--- a/spec/controllers/groups/variables_controller_spec.rb
+++ b/spec/controllers/groups/variables_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Groups::VariablesController do
+RSpec.describe Groups::VariablesController do
   include ExternalAuthorizationServiceHelpers
 
   let(:group) { create(:group) }
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 354c9e047c8..dce7105c073 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupsController do
+RSpec.describe GroupsController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
@@ -37,6 +37,8 @@ describe GroupsController do
   end
 
   shared_examples 'details view' do
+    let(:namespace) { group }
+
     it { is_expected.to render_template('groups/show') }
 
     context 'as atom' do
@@ -50,6 +52,8 @@ describe GroupsController do
         expect(assigns(:events).map(&:id)).to contain_exactly(event.id)
       end
     end
+
+    it_behaves_like 'namespace storage limit alert'
   end
 
   describe 'GET #show' do
@@ -62,7 +66,19 @@ describe GroupsController do
 
     subject { get :show, params: { id: group.to_param }, format: format }
 
-    it_behaves_like 'details view'
+    context 'when the group is not importing' do
+      it_behaves_like 'details view'
+    end
+
+    context 'when the group is importing' do
+      before do
+        create(:group_import_state, group: group)
+      end
+
+      it 'redirects to the import status page' do
+        expect(subject).to redirect_to group_import_path(group)
+      end
+    end
   end
 
   describe 'GET #details' do
@@ -301,6 +317,66 @@ describe GroupsController do
         end
       end
     end
+
+    describe 'tracking group creation for onboarding issues experiment' do
+      before do
+        sign_in(user)
+      end
+
+      subject(:create_namespace) { post :create, params: { group: { name: 'new_group', path: 'new_group' } } }
+
+      context 'experiment disabled' do
+        before do
+          stub_experiment(onboarding_issues: false)
+        end
+
+        it 'does not track anything' do
+          expect(Gitlab::Tracking).not_to receive(:event)
+
+          create_namespace
+        end
+      end
+
+      context 'experiment enabled' do
+        before do
+          stub_experiment(onboarding_issues: true)
+        end
+
+        context 'and the user is part of the control group' do
+          before do
+            stub_experiment_for_user(onboarding_issues: false)
+          end
+
+          it 'tracks the event with the "created_namespace" action with the "control_group" property' do
+            expect(Gitlab::Tracking).to receive(:event).with(
+              'Growth::Conversion::Experiment::OnboardingIssues',
+              'created_namespace',
+              label: anything,
+              property: 'control_group'
+            )
+
+            create_namespace
+          end
+        end
+
+        context 'and the user is part of the experimental group' do
+          before do
+            stub_experiment_for_user(onboarding_issues: true)
+          end
+
+          it 'tracks the event with the "created_namespace" action with the "experimental_group" property' do
+            expect(Gitlab::Tracking).to receive(:event).with(
+              'Growth::Conversion::Experiment::OnboardingIssues',
+              'created_namespace',
+              label: anything,
+              property: 'experimental_group'
+            )
+
+            create_namespace
+          end
+        end
+      end
+    end
   end
 
   describe 'GET #index' do
@@ -862,14 +938,17 @@ describe GroupsController do
     context 'when the endpoint receives requests above the rate limit' do
       before do
         sign_in(admin)
-        allow(Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(true)
+
+        allow(Gitlab::ApplicationRateLimiter)
+          .to receive(:increment)
+          .and_return(Gitlab::ApplicationRateLimiter.rate_limits[:group_export][:threshold] + 1)
       end
 
       it 'throttles the endpoint' do
         post :export, params: { id: group.to_param }
 
-        expect(flash[:alert]).to eq('This endpoint has been requested too many times. Try again later.')
-        expect(response).to have_gitlab_http_status(:found)
+        expect(response.body).to eq('This endpoint has been requested too many times. Try again later.')
+        expect(response).to have_gitlab_http_status :too_many_requests
       end
     end
   end
@@ -933,14 +1012,17 @@ describe GroupsController do
     context 'when the endpoint receives requests above the rate limit' do
       before do
         sign_in(admin)
-        allow(Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(true)
+
+        allow(Gitlab::ApplicationRateLimiter)
+          .to receive(:increment)
+          .and_return(Gitlab::ApplicationRateLimiter.rate_limits[:group_download_export][:threshold] + 1)
       end
 
       it 'throttles the endpoint' do
         get :download_export, params: { id: group.to_param }
 
-        expect(flash[:alert]).to eq('This endpoint has been requested too many times. Try again later.')
-        expect(response).to have_gitlab_http_status(:found)
+        expect(response.body).to eq('This endpoint has been requested too many times. Try again later.')
+        expect(response).to have_gitlab_http_status :too_many_requests
       end
     end
   end
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb
index d1de669ad43..32b72eec0d6 100644
--- a/spec/controllers/health_check_controller_spec.rb
+++ b/spec/controllers/health_check_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HealthCheckController, :request_store do
+RSpec.describe HealthCheckController, :request_store do
   include StubENV
 
   let(:xml_response) { Hash.from_xml(response.body)['hash'] }
diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb
index fafbe6bffe1..6c0b3efa53b 100644
--- a/spec/controllers/help_controller_spec.rb
+++ b/spec/controllers/help_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HelpController do
+RSpec.describe HelpController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/ide_controller_spec.rb b/spec/controllers/ide_controller_spec.rb
index 0462f9520d5..39d92846863 100644
--- a/spec/controllers/ide_controller_spec.rb
+++ b/spec/controllers/ide_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IdeController do
+RSpec.describe IdeController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb
index d44edb63635..ec38a635c2d 100644
--- a/spec/controllers/import/bitbucket_controller_spec.rb
+++ b/spec/controllers/import/bitbucket_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::BitbucketController do
+RSpec.describe Import::BitbucketController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }
@@ -56,8 +56,42 @@ describe Import::BitbucketController do
 
   describe "GET status" do
     before do
-      @repo = double(slug: 'vim', owner: 'asd', full_name: 'asd/vim', "valid?" => true)
+      @repo = double(name: 'vim', slug: 'vim', owner: 'asd', full_name: 'asd/vim', clone_url: 'http://test.host/demo/url.git', 'valid?' => true)
+      @invalid_repo = double(name: 'mercurialrepo', slug: 'mercurialrepo', owner: 'asd', full_name: 'asd/mercurialrepo', clone_url: 'http://test.host/demo/mercurialrepo.git', 'valid?' => false)
+
       assign_session_tokens
+      stub_feature_flags(new_import_ui: false)
+    end
+
+    it_behaves_like 'import controller with new_import_ui feature flag' do
+      before do
+        allow(controller).to receive(:provider_url).and_return('http://demobitbucket.org')
+      end
+
+      let(:repo) { @repo }
+      let(:repo_id) { @repo.full_name }
+      let(:import_source) { @repo.full_name }
+      let(:provider_name) { 'bitbucket' }
+      let(:client_repos_field) { :repos }
+    end
+
+    context 'with new_import_ui feature flag enabled' do
+      before do
+        stub_feature_flags(new_import_ui: true)
+        allow(controller).to receive(:provider_url).and_return('http://demobitbucket.org')
+      end
+
+      it 'returns invalid repos' do
+        allow_any_instance_of(Bitbucket::Client).to receive(:repos).and_return([@repo, @invalid_repo])
+
+        get :status, format: :json
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['incompatible_repos'].length).to eq(1)
+        expect(json_response.dig("incompatible_repos", 0, "id")).to eq(@invalid_repo.full_name)
+        expect(json_response['provider_repos'].length).to eq(1)
+        expect(json_response.dig("provider_repos", 0, "id")).to eq(@repo.full_name)
+      end
     end
 
     it "assigns variables" do
diff --git a/spec/controllers/import/bitbucket_server_controller_spec.rb b/spec/controllers/import/bitbucket_server_controller_spec.rb
index 3a347368884..af471b478fa 100644
--- a/spec/controllers/import/bitbucket_server_controller_spec.rb
+++ b/spec/controllers/import/bitbucket_server_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::BitbucketServerController do
+RSpec.describe Import::BitbucketServerController do
   let(:user) { create(:user) }
   let(:project_key) { 'test-project' }
   let(:repo_slug) { 'some-repo' }
@@ -33,7 +33,7 @@ describe Import::BitbucketServerController do
     let(:project_name) { "my-project_123" }
 
     before do
-      allow(controller).to receive(:bitbucket_client).and_return(client)
+      allow(controller).to receive(:client).and_return(client)
       repo = double(name: project_name)
       allow(client).to receive(:repo).with(project_key, repo_slug).and_return(repo)
       assign_session_tokens
@@ -139,12 +139,39 @@ describe Import::BitbucketServerController do
     let(:repos) { instance_double(BitbucketServer::Collection) }
 
     before do
-      allow(controller).to receive(:bitbucket_client).and_return(client)
+      allow(controller).to receive(:client).and_return(client)
 
       @repo = double(slug: 'vim', project_key: 'asd', full_name: 'asd/vim', "valid?" => true, project_name: 'asd', browse_url: 'http://test', name: 'vim')
-      @invalid_repo = double(slug: 'invalid', project_key: 'foobar', full_name: 'asd/foobar', "valid?" => false, browse_url: 'http://bad-repo')
+      @invalid_repo = double(slug: 'invalid', project_key: 'foobar', full_name: 'asd/foobar', "valid?" => false, browse_url: 'http://bad-repo', name: 'invalid')
       @created_repo = double(slug: 'created', project_key: 'existing', full_name: 'group/created', "valid?" => true, browse_url: 'http://existing')
       assign_session_tokens
+      stub_feature_flags(new_import_ui: false)
+    end
+
+    context 'with new_import_ui feature flag enabled' do
+      before do
+        stub_feature_flags(new_import_ui: true)
+      end
+
+      it 'returns invalid repos' do
+        allow(client).to receive(:repos).with(filter: nil, limit: 25, page_offset: 0).and_return([@repo, @invalid_repo])
+
+        get :status, format: :json
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['incompatible_repos'].length).to eq(1)
+        expect(json_response.dig("incompatible_repos", 0, "id")).to eq(@invalid_repo.full_name)
+        expect(json_response['provider_repos'].length).to eq(1)
+        expect(json_response.dig("provider_repos", 0, "id")).to eq(@repo.full_name)
+      end
+    end
+
+    it_behaves_like 'import controller with new_import_ui feature flag' do
+      let(:repo) { @repo }
+      let(:repo_id) { @repo.full_name }
+      let(:import_source) { @repo.browse_url }
+      let(:provider_name) { 'bitbucket_server' }
+      let(:client_repos_field) { :repos }
     end
 
     it 'assigns repository categories' do
diff --git a/spec/controllers/import/fogbugz_controller_spec.rb b/spec/controllers/import/fogbugz_controller_spec.rb
index c833fbfaea5..aabbcb30358 100644
--- a/spec/controllers/import/fogbugz_controller_spec.rb
+++ b/spec/controllers/import/fogbugz_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::FogbugzController do
+RSpec.describe Import::FogbugzController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }
@@ -80,8 +80,17 @@ describe Import::FogbugzController do
 
   describe 'GET status' do
     before do
-      @repo = OpenStruct.new(name: 'vim')
+      @repo = OpenStruct.new(id: 'demo', name: 'vim')
       stub_client(valid?: true)
+      stub_feature_flags(new_import_ui: false)
+    end
+
+    it_behaves_like 'import controller with new_import_ui feature flag' do
+      let(:repo) { @repo }
+      let(:repo_id) { @repo.id }
+      let(:import_source) { @repo.name }
+      let(:provider_name) { 'fogbugz' }
+      let(:client_repos_field) { :repos }
     end
 
     it 'assigns variables' do
diff --git a/spec/controllers/import/gitea_controller_spec.rb b/spec/controllers/import/gitea_controller_spec.rb
index 006b423ce5f..9001faef408 100644
--- a/spec/controllers/import/gitea_controller_spec.rb
+++ b/spec/controllers/import/gitea_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GiteaController do
+RSpec.describe Import::GiteaController do
   include ImportSpecHelper
 
   let(:provider) { :gitea }
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb
index 40ea0bb3a44..a5a3dc463d3 100644
--- a/spec/controllers/import/github_controller_spec.rb
+++ b/spec/controllers/import/github_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GithubController do
+RSpec.describe Import::GithubController do
   include ImportSpecHelper
 
   let(:provider) { :github }
diff --git a/spec/controllers/import/gitlab_controller_spec.rb b/spec/controllers/import/gitlab_controller_spec.rb
index 96a8eb99d5c..1cd0593f762 100644
--- a/spec/controllers/import/gitlab_controller_spec.rb
+++ b/spec/controllers/import/gitlab_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GitlabController do
+RSpec.describe Import::GitlabController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }
@@ -34,8 +34,17 @@ describe Import::GitlabController do
 
   describe "GET status" do
     before do
-      @repo = OpenStruct.new(path: 'vim', path_with_namespace: 'asd/vim')
+      @repo = OpenStruct.new(id: 1, path: 'vim', path_with_namespace: 'asd/vim', web_url: 'https://gitlab.com/asd/vim')
       assign_session_token
+      stub_feature_flags(new_import_ui: false)
+    end
+
+    it_behaves_like 'import controller with new_import_ui feature flag' do
+      let(:repo) { @repo }
+      let(:repo_id) { @repo.id }
+      let(:import_source) { @repo.path_with_namespace }
+      let(:provider_name) { 'gitlab' }
+      let(:client_repos_field) { :projects }
     end
 
     it "assigns variables" do
diff --git a/spec/controllers/import/google_code_controller_spec.rb b/spec/controllers/import/google_code_controller_spec.rb
index 3773f691ed0..0fda111c029 100644
--- a/spec/controllers/import/google_code_controller_spec.rb
+++ b/spec/controllers/import/google_code_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::GoogleCodeController do
+RSpec.describe Import::GoogleCodeController do
   include ImportSpecHelper
 
   let(:user) { create(:user) }
diff --git a/spec/controllers/import/phabricator_controller_spec.rb b/spec/controllers/import/phabricator_controller_spec.rb
index d29a06efbb5..9827a6d077c 100644
--- a/spec/controllers/import/phabricator_controller_spec.rb
+++ b/spec/controllers/import/phabricator_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Import::PhabricatorController do
+RSpec.describe Import::PhabricatorController do
   let(:current_user) { create(:user) }
 
   before do
diff --git a/spec/controllers/instance_statistics/cohorts_controller_spec.rb b/spec/controllers/instance_statistics/cohorts_controller_spec.rb
index 596d3c7abe5..b92fcb2575c 100644
--- a/spec/controllers/instance_statistics/cohorts_controller_spec.rb
+++ b/spec/controllers/instance_statistics/cohorts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InstanceStatistics::CohortsController do
+RSpec.describe InstanceStatistics::CohortsController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/instance_statistics/dev_ops_score_controller_spec.rb b/spec/controllers/instance_statistics/dev_ops_score_controller_spec.rb
index 5825c6295f6..d729682bef0 100644
--- a/spec/controllers/instance_statistics/dev_ops_score_controller_spec.rb
+++ b/spec/controllers/instance_statistics/dev_ops_score_controller_spec.rb
@@ -2,6 +2,6 @@
 
 require 'spec_helper'
 
-describe InstanceStatistics::DevOpsScoreController do
+RSpec.describe InstanceStatistics::DevOpsScoreController do
   it_behaves_like 'instance statistics availability'
 end
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 9daaa258aa2..f2821bb67e8 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe InvitesController do
+RSpec.describe InvitesController do
   let(:token) { '123456' }
   let(:user) { create(:user) }
   let(:member) { create(:project_member, invite_token: token, invite_email: 'test@abc.com', user: user) }
diff --git a/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb b/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb
index 0242a91ac60..2de824bbf3c 100644
--- a/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ldap::OmniauthCallbacksController do
+RSpec.describe Ldap::OmniauthCallbacksController do
   include_context 'Ldap::OmniauthCallbacksController'
 
   it 'allows sign in' do
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb
index 75509cc509f..f350d7378dc 100644
--- a/spec/controllers/metrics_controller_spec.rb
+++ b/spec/controllers/metrics_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MetricsController, :request_store do
+RSpec.describe MetricsController, :request_store do
   include StubENV
 
   let(:metrics_multiproc_dir) { @metrics_multiproc_dir }
diff --git a/spec/controllers/notification_settings_controller_spec.rb b/spec/controllers/notification_settings_controller_spec.rb
index f3b608aee0c..c4d67df15f7 100644
--- a/spec/controllers/notification_settings_controller_spec.rb
+++ b/spec/controllers/notification_settings_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe NotificationSettingsController do
+RSpec.describe NotificationSettingsController do
   let(:project) { create(:project) }
   let(:group) { create(:group, :internal) }
   let(:user) { create(:user) }
diff --git a/spec/controllers/oauth/applications_controller_spec.rb b/spec/controllers/oauth/applications_controller_spec.rb
index 09f8ad4332d..f20204b6718 100644
--- a/spec/controllers/oauth/applications_controller_spec.rb
+++ b/spec/controllers/oauth/applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Oauth::ApplicationsController do
+RSpec.describe Oauth::ApplicationsController do
   let(:user) { create(:user) }
   let(:application) { create(:oauth_application, owner: user) }
 
diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb
index f975502ca4e..89b74675d28 100644
--- a/spec/controllers/oauth/authorizations_controller_spec.rb
+++ b/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Oauth::AuthorizationsController do
+RSpec.describe Oauth::AuthorizationsController do
   let!(:application) { create(:oauth_application, scopes: 'api read_user', redirect_uri: 'http://example.com') }
   let(:params) do
     {
diff --git a/spec/controllers/oauth/authorized_applications_controller_spec.rb b/spec/controllers/oauth/authorized_applications_controller_spec.rb
index 32be6a3ddb7..15b2969a859 100644
--- a/spec/controllers/oauth/authorized_applications_controller_spec.rb
+++ b/spec/controllers/oauth/authorized_applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Oauth::AuthorizedApplicationsController do
+RSpec.describe Oauth::AuthorizedApplicationsController do
   let(:user) { create(:user) }
   let(:guest) { create(:user) }
   let(:application) { create(:oauth_application, owner: guest) }
diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb
index 0d8a6827afe..0b99f28f79b 100644
--- a/spec/controllers/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/omniauth_callbacks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe OmniauthCallbacksController, type: :controller do
+RSpec.describe OmniauthCallbacksController, type: :controller do
   include LoginHelpers
 
   describe 'omniauth' do
@@ -212,7 +212,7 @@ describe OmniauthCallbacksController, type: :controller do
           end
 
           it 'allows linking the disabled provider' do
-            user.identities.destroy_all # rubocop: disable DestroyAll
+            user.identities.destroy_all # rubocop: disable Cop/DestroyAll
             sign_in(user)
 
             expect { post provider }.to change { user.reload.identities.count }.by(1)
diff --git a/spec/controllers/passwords_controller_spec.rb b/spec/controllers/passwords_controller_spec.rb
index 3ec8e347659..ba2c0c0455d 100644
--- a/spec/controllers/passwords_controller_spec.rb
+++ b/spec/controllers/passwords_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PasswordsController do
+RSpec.describe PasswordsController do
   describe '#check_password_authentication_available' do
     before do
       @request.env["devise.mapping"] = Devise.mappings[:user]
diff --git a/spec/controllers/profiles/accounts_controller_spec.rb b/spec/controllers/profiles/accounts_controller_spec.rb
index 518ea4e5c48..52a7a1609a1 100644
--- a/spec/controllers/profiles/accounts_controller_spec.rb
+++ b/spec/controllers/profiles/accounts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::AccountsController do
+RSpec.describe Profiles::AccountsController do
   describe 'DELETE unlink' do
     let(:user) { create(:omniauth_user) }
 
diff --git a/spec/controllers/profiles/avatars_controller_spec.rb b/spec/controllers/profiles/avatars_controller_spec.rb
index 1a64cb72265..d120d9ce559 100644
--- a/spec/controllers/profiles/avatars_controller_spec.rb
+++ b/spec/controllers/profiles/avatars_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::AvatarsController do
+RSpec.describe Profiles::AvatarsController do
   let(:user) { create(:user, avatar: fixture_file_upload("spec/fixtures/dk.png")) }
 
   before do
diff --git a/spec/controllers/profiles/emails_controller_spec.rb b/spec/controllers/profiles/emails_controller_spec.rb
index ffec43fea2c..246f8a6cd76 100644
--- a/spec/controllers/profiles/emails_controller_spec.rb
+++ b/spec/controllers/profiles/emails_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::EmailsController do
+RSpec.describe Profiles::EmailsController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/profiles/keys_controller_spec.rb b/spec/controllers/profiles/keys_controller_spec.rb
index 8582ecbb06d..258ed62262a 100644
--- a/spec/controllers/profiles/keys_controller_spec.rb
+++ b/spec/controllers/profiles/keys_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::KeysController do
+RSpec.describe Profiles::KeysController do
   let(:user) { create(:user) }
 
   describe 'POST #create' do
diff --git a/spec/controllers/profiles/notifications_controller_spec.rb b/spec/controllers/profiles/notifications_controller_spec.rb
index 343f29ef687..40b4c8f0371 100644
--- a/spec/controllers/profiles/notifications_controller_spec.rb
+++ b/spec/controllers/profiles/notifications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::NotificationsController do
+RSpec.describe Profiles::NotificationsController do
   let(:user) do
     create(:user) do |user|
       user.emails.create(email: 'original@example.com', confirmed_at: Time.current)
diff --git a/spec/controllers/profiles/personal_access_tokens_controller_spec.rb b/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
index b467ecc4af9..1fdd1200028 100644
--- a/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
+++ b/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::PersonalAccessTokensController do
+RSpec.describe Profiles::PersonalAccessTokensController do
   let(:user) { create(:user) }
   let(:token_attributes) { attributes_for(:personal_access_token) }
 
diff --git a/spec/controllers/profiles/preferences_controller_spec.rb b/spec/controllers/profiles/preferences_controller_spec.rb
index 98a9c3eaec6..4a68475c37f 100644
--- a/spec/controllers/profiles/preferences_controller_spec.rb
+++ b/spec/controllers/profiles/preferences_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::PreferencesController do
+RSpec.describe Profiles::PreferencesController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/profiles/two_factor_auths_controller_spec.rb b/spec/controllers/profiles/two_factor_auths_controller_spec.rb
index b02af0096a5..f645081219a 100644
--- a/spec/controllers/profiles/two_factor_auths_controller_spec.rb
+++ b/spec/controllers/profiles/two_factor_auths_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Profiles::TwoFactorAuthsController do
+RSpec.describe Profiles::TwoFactorAuthsController do
   before do
     # `user` should be defined within the action-specific describe blocks
     sign_in(user)
diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/controllers/profiles_controller_spec.rb
index d6d2c73d049..e08c92da87f 100644
--- a/spec/controllers/profiles_controller_spec.rb
+++ b/spec/controllers/profiles_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe ProfilesController, :request_store do
+RSpec.describe ProfilesController, :request_store do
   let(:user) { create(:user) }
 
   describe 'POST update' do
diff --git a/spec/controllers/projects/alert_management_controller_spec.rb b/spec/controllers/projects/alert_management_controller_spec.rb
index b84376db33d..6a1952f949b 100644
--- a/spec/controllers/projects/alert_management_controller_spec.rb
+++ b/spec/controllers/projects/alert_management_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::AlertManagementController do
+RSpec.describe Projects::AlertManagementController do
   let_it_be(:project) { create(:project) }
   let_it_be(:role) { :developer }
   let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/projects/alerting/notifications_controller_spec.rb b/spec/controllers/projects/alerting/notifications_controller_spec.rb
index 9d26c2278b1..33fd73c762a 100644
--- a/spec/controllers/projects/alerting/notifications_controller_spec.rb
+++ b/spec/controllers/projects/alerting/notifications_controller_spec.rb
@@ -2,90 +2,101 @@
 
 require 'spec_helper'
 
-describe Projects::Alerting::NotificationsController do
+RSpec.describe Projects::Alerting::NotificationsController do
   let_it_be(:project) { create(:project) }
   let_it_be(:environment) { create(:environment, project: project) }
 
   describe 'POST #create' do
-    let(:service_response) { ServiceResponse.success }
-    let(:notify_service) { instance_double(Projects::Alerting::NotifyService, execute: service_response) }
-
     around do |example|
       ForgeryProtection.with_forgery_protection { example.run }
     end
 
-    before do
-      allow(Projects::Alerting::NotifyService).to receive(:new).and_return(notify_service)
-    end
+    shared_examples 'process alert payload' do |notify_service_class|
+      let(:service_response) { ServiceResponse.success }
+      let(:notify_service) { instance_double(notify_service_class, execute: service_response) }
 
-    def make_request(body = {})
-      post :create, params: project_params, body: body.to_json, as: :json
-    end
+      before do
+        allow(notify_service_class).to receive(:new).and_return(notify_service)
+      end
 
-    context 'when notification service succeeds' do
-      let(:payload) do
-        {
-          title: 'Alert title',
-          hosts: 'https://gitlab.com'
-        }
+      def make_request
+        post :create, params: project_params, body: payload.to_json, as: :json
       end
 
-      let(:permitted_params) { ActionController::Parameters.new(payload).permit! }
+      context 'when notification service succeeds' do
+        let(:permitted_params) { ActionController::Parameters.new(payload).permit! }
 
-      it 'responds with ok' do
-        make_request
+        it 'responds with ok' do
+          make_request
 
-        expect(response).to have_gitlab_http_status(:ok)
-      end
+          expect(response).to have_gitlab_http_status(:ok)
+        end
 
-      it 'does not pass excluded parameters to the notify service' do
-        make_request(payload)
+        it 'does not pass excluded parameters to the notify service' do
+          make_request
 
-        expect(Projects::Alerting::NotifyService)
-          .to have_received(:new)
-          .with(project, nil, permitted_params)
+          expect(notify_service_class)
+            .to have_received(:new)
+            .with(project, nil, permitted_params)
+        end
       end
-    end
 
-    context 'when notification service fails' do
-      let(:service_response) { ServiceResponse.error(message: 'Unauthorized', http_status: :unauthorized) }
+      context 'when notification service fails' do
+        let(:service_response) { ServiceResponse.error(message: 'Unauthorized', http_status: :unauthorized) }
 
-      it 'responds with the service response' do
-        make_request
+        it 'responds with the service response' do
+          make_request
 
-        expect(response).to have_gitlab_http_status(:unauthorized)
+          expect(response).to have_gitlab_http_status(:unauthorized)
+        end
       end
-    end
 
-    context 'bearer token' do
-      context 'when set' do
-        it 'extracts bearer token' do
-          request.headers['HTTP_AUTHORIZATION'] = 'Bearer some token'
+      context 'bearer token' do
+        context 'when set' do
+          it 'extracts bearer token' do
+            request.headers['HTTP_AUTHORIZATION'] = 'Bearer some token'
 
-          expect(notify_service).to receive(:execute).with('some token')
+            expect(notify_service).to receive(:execute).with('some token')
 
-          make_request
-        end
+            make_request
+          end
 
-        it 'pass nil if cannot extract a non-bearer token' do
-          request.headers['HTTP_AUTHORIZATION'] = 'some token'
+          it 'pass nil if cannot extract a non-bearer token' do
+            request.headers['HTTP_AUTHORIZATION'] = 'some token'
 
-          expect(notify_service).to receive(:execute).with(nil)
+            expect(notify_service).to receive(:execute).with(nil)
 
-          make_request
+            make_request
+          end
         end
-      end
 
-      context 'when missing' do
-        it 'passes nil' do
-          expect(notify_service).to receive(:execute).with(nil)
+        context 'when missing' do
+          it 'passes nil' do
+            expect(notify_service).to receive(:execute).with(nil)
 
-          make_request
+            make_request
+          end
         end
       end
     end
+
+    context 'generic alert payload' do
+      it_behaves_like 'process alert payload', Projects::Alerting::NotifyService do
+        let(:payload) { { title: 'Alert title' } }
+      end
+    end
+
+    context 'Prometheus alert payload' do
+      include PrometheusHelpers
+
+      it_behaves_like 'process alert payload', Projects::Prometheus::Alerts::NotifyService do
+        let(:payload) { prometheus_alert_payload }
+      end
+    end
   end
 
+  private
+
   def project_params(opts = {})
     opts.reverse_merge(namespace_id: project.namespace, project_id: project)
   end
diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb
index 4c815a5b40c..69ab9873b90 100644
--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ArtifactsController do
+RSpec.describe Projects::ArtifactsController do
   include RepoHelpers
 
   let(:user) { project.owner }
@@ -371,10 +371,9 @@ describe Projects::ArtifactsController do
         end
 
         context 'when the artifact is zip' do
-          let!(:artifact) { create(:ci_job_artifact, :lsif, job: job, file_path: Rails.root.join("spec/fixtures/#{file_name}")) }
+          let!(:artifact) { create(:ci_job_artifact, :lsif, job: job) }
           let(:path) { 'lsif/main.go.json' }
-          let(:file_name) { 'lsif.json.zip' }
-          let(:archive_matcher) { file_name }
+          let(:archive_matcher) { 'lsif.json.zip' }
           let(:query_params) { super().merge(file_type: :lsif, path: path) }
 
           it_behaves_like 'a valid file' do
diff --git a/spec/controllers/projects/autocomplete_sources_controller_spec.rb b/spec/controllers/projects/autocomplete_sources_controller_spec.rb
index d35192b2ccb..865b31a28d7 100644
--- a/spec/controllers/projects/autocomplete_sources_controller_spec.rb
+++ b/spec/controllers/projects/autocomplete_sources_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::AutocompleteSourcesController do
+RSpec.describe Projects::AutocompleteSourcesController do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, namespace: group) }
   let_it_be(:issue) { create(:issue, project: project) }
diff --git a/spec/controllers/projects/avatars_controller_spec.rb b/spec/controllers/projects/avatars_controller_spec.rb
index 54c2397625f..16e9c845307 100644
--- a/spec/controllers/projects/avatars_controller_spec.rb
+++ b/spec/controllers/projects/avatars_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::AvatarsController do
+RSpec.describe Projects::AvatarsController do
   let_it_be(:project) { create(:project, :repository) }
 
   before do
diff --git a/spec/controllers/projects/badges_controller_spec.rb b/spec/controllers/projects/badges_controller_spec.rb
index 4ae29ba7f54..7e7a630921f 100644
--- a/spec/controllers/projects/badges_controller_spec.rb
+++ b/spec/controllers/projects/badges_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::BadgesController do
+RSpec.describe Projects::BadgesController do
   let(:project) { pipeline.project }
   let!(:pipeline) { create(:ci_empty_pipeline) }
   let(:user) { create(:user) }
@@ -54,7 +54,7 @@ describe Projects::BadgesController do
 
       context 'when style param is set to `flat`' do
         it 'renders the `flat` badge layout' do
-          get_badge(badge_type, 'flat')
+          get_badge(badge_type, style: 'flat')
 
           expect(response).to render_template('projects/badges/badge')
         end
@@ -62,7 +62,7 @@ describe Projects::BadgesController do
 
       context 'when style param is set to an invalid type' do
         it 'renders the `flat` (default) badge layout' do
-          get_badge(badge_type, 'xxx')
+          get_badge(badge_type, style: 'xxx')
 
           expect(response).to render_template('projects/badges/badge')
         end
@@ -70,7 +70,7 @@ describe Projects::BadgesController do
 
       context 'when style param is set to `flat-square`' do
         it 'renders the `flat-square` badge layout' do
-          get_badge(badge_type, 'flat-square')
+          get_badge(badge_type, style: 'flat-square')
 
           expect(response).to render_template('projects/badges/badge_flat-square')
         end
@@ -102,12 +102,37 @@ describe Projects::BadgesController do
         end
 
         it 'defaults to project permissions' do
-          get_badge(:coverage)
+          get_badge(badge_type)
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
       end
     end
+
+    context 'customization' do
+      render_views
+
+      before do
+        project.add_maintainer(user)
+        sign_in(user)
+      end
+
+      context 'when key_text param is used' do
+        it 'sets custom key text' do
+          get_badge(badge_type, key_text: 'custom key text')
+
+          expect(response.body).to include('custom key text')
+        end
+      end
+
+      context 'when key_width param is used' do
+        it 'sets custom key width' do
+          get_badge(badge_type, key_width: '123')
+
+          expect(response.body).to include('123')
+        end
+      end
+    end
   end
 
   describe '#pipeline' do
@@ -118,13 +143,12 @@ describe Projects::BadgesController do
     it_behaves_like 'a badge resource', :coverage
   end
 
-  def get_badge(badge, style = nil)
+  def get_badge(badge, args = {})
     params = {
       namespace_id: project.namespace.to_param,
       project_id: project,
-      ref: pipeline.ref,
-      style: style
-    }
+      ref: pipeline.ref
+    }.merge(args.slice(:style, :key_text, :key_width))
 
     get badge, params: params, format: :svg
   end
diff --git a/spec/controllers/projects/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb
index ac8394e3cd4..bf475f6135a 100644
--- a/spec/controllers/projects/blame_controller_spec.rb
+++ b/spec/controllers/projects/blame_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::BlameController do
+RSpec.describe Projects::BlameController do
   let(:project) { create(:project, :repository) }
   let(:user)    { create(:user) }
 
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index ad04c6e61e8..9fee97f938c 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::BlobController do
+RSpec.describe Projects::BlobController do
   include ProjectForksHelper
 
   let(:project) { create(:project, :public, :repository) }
@@ -378,6 +378,22 @@ describe Projects::BlobController do
 
         expect(response).to redirect_to(after_delete_path)
       end
+
+      context 'when a validation failure occurs' do
+        let(:failure_path) { project_blob_path(project, default_params[:id]) }
+
+        render_views
+
+        it 'redirects to a valid page' do
+          expect_next_instance_of(Files::DeleteService) do |instance|
+            expect(instance).to receive(:validate!).and_raise(Commits::CreateService::ValidationError, "validation error")
+          end
+
+          delete :destroy, params: default_params
+
+          expect(response).to redirect_to(failure_path)
+        end
+      end
     end
 
     context 'if deleted file is the last one in a subdirectory' do
diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb
index 6634801939b..dad932f9cdf 100644
--- a/spec/controllers/projects/boards_controller_spec.rb
+++ b/spec/controllers/projects/boards_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::BoardsController do
+RSpec.describe Projects::BoardsController do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
 
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 174d8904481..625fc5bddda 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -2,14 +2,13 @@
 
 require 'spec_helper'
 
-describe Projects::BranchesController do
+RSpec.describe Projects::BranchesController do
   let(:project)   { create(:project, :repository) }
   let(:user)      { create(:user) }
   let(:developer) { create(:user) }
 
   before do
-    project.add_maintainer(user)
-    project.add_developer(user)
+    project.add_developer(developer)
 
     allow(project).to receive(:branches).and_return(['master', 'foo/bar/baz'])
     allow(project).to receive(:tags).and_return(['v1.0.0', 'v2.0.0'])
@@ -21,7 +20,7 @@ describe Projects::BranchesController do
 
     context "on creation of a new branch" do
       before do
-        sign_in(user)
+        sign_in(developer)
 
         post :create,
              params: {
@@ -80,7 +79,7 @@ describe Projects::BranchesController do
       let(:issue) { create(:issue, project: project) }
 
       before do
-        sign_in(user)
+        sign_in(developer)
       end
 
       it 'redirects' do
@@ -97,7 +96,7 @@ describe Projects::BranchesController do
       end
 
       it 'posts a system note' do
-        expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch", branch_project: project)
+        expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, developer, "1-feature-branch", branch_project: project)
 
         post :create,
              params: {
@@ -136,14 +135,14 @@ describe Projects::BranchesController do
 
         context 'user can update issue' do
           before do
-            confidential_issue_project.add_reporter(user)
+            confidential_issue_project.add_reporter(developer)
           end
 
           context 'issue is under the specified project' do
             let(:issue) { create(:issue, project: confidential_issue_project) }
 
             it 'posts a system note' do
-              expect(SystemNoteService).to receive(:new_issue_branch).with(issue, confidential_issue_project, user, "1-feature-branch", branch_project: project)
+              expect(SystemNoteService).to receive(:new_issue_branch).with(issue, confidential_issue_project, developer, "1-feature-branch", branch_project: project)
 
               create_branch_with_confidential_issue_project
             end
@@ -264,7 +263,7 @@ describe Projects::BranchesController do
 
   describe 'POST create with JSON format' do
     before do
-      sign_in(user)
+      sign_in(developer)
     end
 
     context 'with valid params' do
@@ -305,7 +304,7 @@ describe Projects::BranchesController do
     render_views
 
     before do
-      sign_in(user)
+      sign_in(developer)
     end
 
     it 'returns 303' do
@@ -325,7 +324,7 @@ describe Projects::BranchesController do
     render_views
 
     before do
-      sign_in(user)
+      sign_in(developer)
 
       post :destroy,
            format: format,
@@ -436,7 +435,7 @@ describe Projects::BranchesController do
 
     context 'when user is allowed to push' do
       before do
-        sign_in(user)
+        sign_in(developer)
       end
 
       it 'redirects to branches' do
@@ -454,7 +453,7 @@ describe Projects::BranchesController do
 
     context 'when user is not allowed to push' do
       before do
-        sign_in(developer)
+        sign_in(user)
       end
 
       it 'responds with status 404' do
@@ -469,7 +468,7 @@ describe Projects::BranchesController do
     render_views
 
     before do
-      sign_in(user)
+      sign_in(developer)
     end
 
     context 'when rendering a JSON format' do
@@ -487,6 +486,82 @@ describe Projects::BranchesController do
       end
     end
 
+    context 'when a branch has multiple pipelines' do
+      it 'chooses the latest to determine status' do
+        sha = project.repository.create_file(developer, generate(:branch), 'content', message: 'message', branch_name: 'master')
+        create(:ci_pipeline,
+          project: project,
+          user: developer,
+          ref: "master",
+          sha: sha,
+          status: :running,
+          created_at: 6.months.ago)
+        create(:ci_pipeline,
+          project: project,
+          user: developer,
+          ref: "master",
+          sha: sha,
+          status: :success,
+          created_at: 2.months.ago)
+
+        get :index,
+            format: :html,
+            params: {
+              namespace_id: project.namespace,
+              project_id: project,
+              state: 'all'
+            }
+
+        expect(controller.instance_variable_get(:@branch_pipeline_statuses)["master"].group).to eq("success")
+      end
+    end
+
+    context 'when multiple branches exist' do
+      it 'all relevant commit statuses are received' do
+        master_sha = project.repository.create_file(developer, generate(:branch), 'content', message: 'message', branch_name: 'master')
+        create(:ci_pipeline,
+          project: project,
+          user: developer,
+          ref: "master",
+          sha: master_sha,
+          status: :running,
+          created_at: 6.months.ago)
+        test_sha = project.repository.create_file(developer, generate(:branch), 'content', message: 'message', branch_name: 'test')
+        create(:ci_pipeline,
+          project: project,
+          user: developer,
+          ref: "test",
+          sha: test_sha,
+          status: :success,
+          created_at: 2.months.ago)
+
+        get :index,
+            format: :html,
+            params: {
+              namespace_id: project.namespace,
+              project_id: project,
+              state: 'all'
+            }
+
+        expect(controller.instance_variable_get(:@branch_pipeline_statuses)["master"].group).to eq("running")
+        expect(controller.instance_variable_get(:@branch_pipeline_statuses)["test"].group).to eq("success")
+      end
+    end
+
+    context 'when a branch contains no pipelines' do
+      it 'no commit statuses are received' do
+        get :index,
+            format: :html,
+            params: {
+              namespace_id: project.namespace,
+              project_id: project,
+              state: 'all'
+            }
+
+        expect(controller.instance_variable_get(:@branch_pipeline_statuses)).to be_blank
+      end
+    end
+
     # We need :request_store because Gitaly only counts the queries whenever
     # `RequestStore.active?` in GitalyClient.enforce_gitaly_request_limits
     # And the main goal of this test is making sure TooManyInvocationsError
@@ -564,7 +639,7 @@ describe Projects::BranchesController do
 
   describe 'GET diverging_commit_counts' do
     before do
-      sign_in(user)
+      sign_in(developer)
     end
 
     it 'returns the commit counts behind and ahead of default branch' do
diff --git a/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb b/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb
index ac31045678f..252ad6ec9c4 100644
--- a/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb
+++ b/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb
@@ -2,34 +2,27 @@
 
 require 'spec_helper'
 
-describe Projects::Ci::DailyBuildGroupReportResultsController do
+RSpec.describe Projects::Ci::DailyBuildGroupReportResultsController do
   describe 'GET index' do
     let(:project) { create(:project, :public, :repository) }
     let(:ref_path) { 'refs/heads/master' }
     let(:param_type) { 'coverage' }
     let(:start_date) { '2019-12-10' }
     let(:end_date) { '2020-03-09' }
-
-    def create_daily_coverage(group_name, coverage, date)
-      create(
-        :ci_daily_build_group_report_result,
-        project: project,
-        ref_path: ref_path,
-        group_name: group_name,
-        data: { 'coverage' => coverage },
-        date: date
-      )
-    end
-
-    def csv_response
-      CSV.parse(response.body)
-    end
+    let(:allowed_to_read) { true }
+    let(:user) { create(:user) }
 
     before do
       create_daily_coverage('rspec', 79.0, '2020-03-09')
+      create_daily_coverage('rspec', 77.0, '2020-03-08')
       create_daily_coverage('karma', 81.0, '2019-12-10')
-      create_daily_coverage('rspec', 67.0, '2019-12-09')
-      create_daily_coverage('karma', 71.0, '2019-12-09')
+      create_daily_coverage('minitest', 67.0, '2019-12-09')
+      create_daily_coverage('mocha', 71.0, '2019-12-09')
+
+      sign_in(user)
+
+      allow(Ability).to receive(:allowed?).and_call_original
+      allow(Ability).to receive(:allowed?).with(user, :read_build_report_results, project).and_return(allowed_to_read)
 
       get :index, params: {
         namespace_id: project.namespace,
@@ -38,43 +31,126 @@ describe Projects::Ci::DailyBuildGroupReportResultsController do
         param_type: param_type,
         start_date: start_date,
         end_date: end_date,
-        format: :csv
+        format: format
       }
     end
 
-    it 'serves the results in CSV' do
-      expect(response).to have_gitlab_http_status(:ok)
-      expect(response.headers['Content-Type']).to eq('text/csv; charset=utf-8')
+    shared_examples_for 'validating param_type' do
+      context 'when given param_type is invalid' do
+        let(:param_type) { 'something_else' }
 
-      expect(csv_response).to eq([
-        %w[date group_name coverage],
-        ['2020-03-09', 'rspec', '79.0'],
-        ['2019-12-10', 'karma', '81.0']
-      ])
+        it 'responds with 422 error' do
+          expect(response).to have_gitlab_http_status(:unprocessable_entity)
+        end
+      end
     end
 
-    context 'when given date range spans more than 90 days' do
-      let(:start_date) { '2019-12-09' }
-      let(:end_date) { '2020-03-09' }
+    shared_examples_for 'ensuring policy' do
+      context 'when user is not allowed to read build report results' do
+        let(:allowed_to_read) { false }
+
+        it 'responds with 404 error' do
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+    end
 
-      it 'limits the result to 90 days from the given start_date' do
+    context 'when format is CSV' do
+      let(:format) { :csv }
+
+      it 'serves the results in CSV' do
         expect(response).to have_gitlab_http_status(:ok)
         expect(response.headers['Content-Type']).to eq('text/csv; charset=utf-8')
 
         expect(csv_response).to eq([
           %w[date group_name coverage],
           ['2020-03-09', 'rspec', '79.0'],
+          ['2020-03-08', 'rspec', '77.0'],
           ['2019-12-10', 'karma', '81.0']
         ])
       end
+
+      context 'when given date range spans more than 90 days' do
+        let(:start_date) { '2019-12-09' }
+        let(:end_date) { '2020-03-09' }
+
+        it 'limits the result to 90 days from the given start_date' do
+          expect(csv_response).to eq([
+            %w[date group_name coverage],
+            ['2020-03-09', 'rspec', '79.0'],
+            ['2020-03-08', 'rspec', '77.0'],
+            ['2019-12-10', 'karma', '81.0']
+          ])
+        end
+      end
+
+      it_behaves_like 'validating param_type'
+      it_behaves_like 'ensuring policy'
     end
 
-    context 'when given param_type is invalid' do
-      let(:param_type) { 'something_else' }
+    context 'when format is JSON' do
+      let(:format) { :json }
+
+      it 'serves the results in JSON' do
+        expect(response).to have_gitlab_http_status(:ok)
 
-      it 'responds with 422 error' do
-        expect(response).to have_gitlab_http_status(:unprocessable_entity)
+        expect(json_response).to eq([
+          {
+            'group_name' => 'rspec',
+            'data' => [
+              { 'date' => '2020-03-09', 'coverage' => 79.0 },
+              { 'date' => '2020-03-08', 'coverage' => 77.0 }
+            ]
+          },
+          {
+            'group_name' => 'karma',
+            'data' => [
+              { 'date' => '2019-12-10', 'coverage' => 81.0 }
+            ]
+          }
+        ])
       end
+
+      context 'when given date range spans more than 90 days' do
+        let(:start_date) { '2019-12-09' }
+        let(:end_date) { '2020-03-09' }
+
+        it 'limits the result to 90 days from the given start_date' do
+          expect(json_response).to eq([
+            {
+              'group_name' => 'rspec',
+              'data' => [
+                { 'date' => '2020-03-09', 'coverage' => 79.0 },
+                { 'date' => '2020-03-08', 'coverage' => 77.0 }
+              ]
+            },
+            {
+              'group_name' => 'karma',
+              'data' => [
+                { 'date' => '2019-12-10', 'coverage' => 81.0 }
+              ]
+            }
+          ])
+        end
+      end
+
+      it_behaves_like 'validating param_type'
+      it_behaves_like 'ensuring policy'
     end
   end
+
+  def create_daily_coverage(group_name, coverage, date)
+    create(
+      :ci_daily_build_group_report_result,
+      project: project,
+      ref_path: ref_path,
+      group_name: group_name,
+      data: { 'coverage' => coverage },
+      date: date
+    )
+  end
+
+  def csv_response
+    CSV.parse(response.body)
+  end
 end
diff --git a/spec/controllers/projects/ci/lints_controller_spec.rb b/spec/controllers/projects/ci/lints_controller_spec.rb
index f45b1d7ddd8..eb92385fc83 100644
--- a/spec/controllers/projects/ci/lints_controller_spec.rb
+++ b/spec/controllers/projects/ci/lints_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Ci::LintsController do
+RSpec.describe Projects::Ci::LintsController do
   include StubRequests
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb
index 6de3593be28..b50814b4790 100644
--- a/spec/controllers/projects/clusters/applications_controller_spec.rb
+++ b/spec/controllers/projects/clusters/applications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Clusters::ApplicationsController do
+RSpec.describe Projects::Clusters::ApplicationsController do
   include AccessMatchersForController
 
   def current_application
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index 698a3773d59..5645e25b741 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ClustersController do
+RSpec.describe Projects::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
   include KubernetesHelpers
@@ -41,6 +41,13 @@ describe Projects::ClustersController do
           expect(response).to match_response_schema('cluster_list')
         end
 
+        it 'sets the polling interval header for json requests' do
+          go(format: :json)
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response.headers['Poll-Interval']).to eq("10000")
+        end
+
         context 'when page is specified' do
           let(:last_page) { project.clusters.page.total_pages }
           let(:total_count) { project.clusters.page.total_count }
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index c8ddd181d10..706bf787b2d 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::CommitController do
+RSpec.describe Projects::CommitController do
   let_it_be(:project)  { create(:project, :repository) }
   let_it_be(:user)     { create(:user) }
 
diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb
index 1977e92e42b..557002acbc0 100644
--- a/spec/controllers/projects/commits_controller_spec.rb
+++ b/spec/controllers/projects/commits_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::CommitsController do
+RSpec.describe Projects::CommitsController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb
index d1a4a9a0058..6aa4bfe235b 100644
--- a/spec/controllers/projects/compare_controller_spec.rb
+++ b/spec/controllers/projects/compare_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::CompareController do
+RSpec.describe Projects::CompareController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/cycle_analytics/events_controller_spec.rb b/spec/controllers/projects/cycle_analytics/events_controller_spec.rb
index 942e095d669..408ce51d34b 100644
--- a/spec/controllers/projects/cycle_analytics/events_controller_spec.rb
+++ b/spec/controllers/projects/cycle_analytics/events_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::CycleAnalytics::EventsController do
+RSpec.describe Projects::CycleAnalytics::EventsController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/cycle_analytics_controller_spec.rb b/spec/controllers/projects/cycle_analytics_controller_spec.rb
index 65eee7b8ead..8feb964cdde 100644
--- a/spec/controllers/projects/cycle_analytics_controller_spec.rb
+++ b/spec/controllers/projects/cycle_analytics_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::CycleAnalyticsController do
+RSpec.describe Projects::CycleAnalyticsController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/deploy_keys_controller_spec.rb b/spec/controllers/projects/deploy_keys_controller_spec.rb
index 9d41e2f59cb..821f7fca73d 100644
--- a/spec/controllers/projects/deploy_keys_controller_spec.rb
+++ b/spec/controllers/projects/deploy_keys_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::DeployKeysController do
+RSpec.describe Projects::DeployKeysController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:admin) { create(:admin) }
diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index 37dcfa78772..85dd86d91e9 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::DeploymentsController do
+RSpec.describe Projects::DeploymentsController do
   include ApiHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb b/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb
index 30d2b79a92f..f664604ac15 100644
--- a/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb
+++ b/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::DesignManagement::Designs::RawImagesController do
+RSpec.describe Projects::DesignManagement::Designs::RawImagesController do
   include DesignManagementTestHelpers
 
   let_it_be(:project) { create(:project, :private) }
diff --git a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb
index 6bfec1b314e..96ecbaf55b6 100644
--- a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb
+++ b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::DesignManagement::Designs::ResizedImageController do
+RSpec.describe Projects::DesignManagement::Designs::ResizedImageController do
   include DesignManagementTestHelpers
 
   let_it_be(:project) { create(:project, :private) }
diff --git a/spec/controllers/projects/discussions_controller_spec.rb b/spec/controllers/projects/discussions_controller_spec.rb
index b2e4a3b7b0d..f2efd40afdb 100644
--- a/spec/controllers/projects/discussions_controller_spec.rb
+++ b/spec/controllers/projects/discussions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::DiscussionsController do
+RSpec.describe Projects::DiscussionsController do
   let(:user) { create(:user) }
   let(:merge_request) { create(:merge_request) }
   let(:project) { merge_request.source_project }
diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
index fb8da52930c..17952aa0683 100644
--- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
+++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Environments::PrometheusApiController do
+RSpec.describe Projects::Environments::PrometheusApiController do
   let_it_be(:project) { create(:project) }
   let_it_be(:environment) { create(:environment, project: project) }
   let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/projects/environments/sample_metrics_controller_spec.rb b/spec/controllers/projects/environments/sample_metrics_controller_spec.rb
index 19b07a2ccc4..14e3ded76f2 100644
--- a/spec/controllers/projects/environments/sample_metrics_controller_spec.rb
+++ b/spec/controllers/projects/environments/sample_metrics_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Environments::SampleMetricsController do
+RSpec.describe Projects::Environments::SampleMetricsController do
   include StubENV
 
   let_it_be(:project) { create(:project) }
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 56fff2771ec..cca4b597f4c 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::EnvironmentsController do
+RSpec.describe Projects::EnvironmentsController do
   include MetricsDashboardHelpers
 
   let_it_be(:project) { create(:project) }
@@ -354,6 +354,19 @@ describe Projects::EnvironmentsController do
       expect(response).to redirect_to(environment_metrics_path(environment))
     end
 
+    context 'with anonymous user and public dashboard visibility' do
+      let(:project) { create(:project, :public) }
+      let(:user) { create(:user) }
+
+      it 'redirects successfully' do
+        project.project_feature.update!(metrics_dashboard_access_level: ProjectFeature::ENABLED)
+
+        get :metrics_redirect, params: { namespace_id: project.namespace, project_id: project }
+
+        expect(response).to redirect_to(environment_metrics_path(environment))
+      end
+    end
+
     context 'when there are no environments' do
       let(:environment) { }
 
@@ -422,6 +435,19 @@ describe Projects::EnvironmentsController do
         get :metrics, params: environment_params
       end
     end
+
+    context 'with anonymous user and public dashboard visibility' do
+      let(:project) { create(:project, :public) }
+      let(:user) { create(:user) }
+
+      it 'returns success' do
+        project.project_feature.update!(metrics_dashboard_access_level: ProjectFeature::ENABLED)
+
+        get :metrics, params: environment_params
+
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
   end
 
   describe 'GET #additional_metrics' do
@@ -497,6 +523,26 @@ describe Projects::EnvironmentsController do
         get :metrics, params: environment_params
       end
     end
+
+    context 'with anonymous user and public dashboard visibility' do
+      let(:project) { create(:project, :public) }
+      let(:user) { create(:user) }
+
+      it 'does not fail' do
+        allow(environment)
+          .to receive(:additional_metrics)
+          .and_return({
+            success: true,
+            data: {},
+            last_update: 42
+          })
+        project.project_feature.update!(metrics_dashboard_access_level: ProjectFeature::ENABLED)
+
+        additional_metrics(window_params)
+
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
   end
 
   describe 'GET #metrics_dashboard' do
@@ -673,6 +719,17 @@ describe Projects::EnvironmentsController do
     it_behaves_like 'dashboard can be specified'
     it_behaves_like 'dashboard can be embedded'
 
+    context 'with anonymous user and public dashboard visibility' do
+      let(:project) { create(:project, :public) }
+      let(:user) { create(:user) }
+
+      before do
+        project.project_feature.update!(metrics_dashboard_access_level: ProjectFeature::ENABLED)
+      end
+
+      it_behaves_like 'the default dashboard'
+    end
+
     context 'permissions' do
       before do
         allow(controller).to receive(:can?).and_return true
diff --git a/spec/controllers/projects/error_tracking/projects_controller_spec.rb b/spec/controllers/projects/error_tracking/projects_controller_spec.rb
index 1737528b597..67947d1c9d9 100644
--- a/spec/controllers/projects/error_tracking/projects_controller_spec.rb
+++ b/spec/controllers/projects/error_tracking/projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ErrorTracking::ProjectsController do
+RSpec.describe Projects::ErrorTracking::ProjectsController do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb b/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb
index 27d49147e99..7c080504c31 100644
--- a/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb
+++ b/spec/controllers/projects/error_tracking/stack_traces_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ErrorTracking::StackTracesController do
+RSpec.describe Projects::ErrorTracking::StackTracesController do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/error_tracking_controller_spec.rb b/spec/controllers/projects/error_tracking_controller_spec.rb
index 6be979418ad..5ea885e4fd6 100644
--- a/spec/controllers/projects/error_tracking_controller_spec.rb
+++ b/spec/controllers/projects/error_tracking_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ErrorTrackingController do
+RSpec.describe Projects::ErrorTrackingController do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/find_file_controller_spec.rb b/spec/controllers/projects/find_file_controller_spec.rb
index 4d8933f3aaf..a6c71cff74b 100644
--- a/spec/controllers/projects/find_file_controller_spec.rb
+++ b/spec/controllers/projects/find_file_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::FindFileController do
+RSpec.describe Projects::FindFileController do
   let(:project) { create(:project, :repository) }
   let(:user)    { create(:user) }
 
diff --git a/spec/controllers/projects/forks_controller_spec.rb b/spec/controllers/projects/forks_controller_spec.rb
index e362790cd3c..4c0fd7b8954 100644
--- a/spec/controllers/projects/forks_controller_spec.rb
+++ b/spec/controllers/projects/forks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ForksController do
+RSpec.describe Projects::ForksController do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:forked_project) { Projects::ForkService.new(project, user, name: 'Some name').execute }
diff --git a/spec/controllers/projects/grafana_api_controller_spec.rb b/spec/controllers/projects/grafana_api_controller_spec.rb
index 8502bd1ab0a..baee9705127 100644
--- a/spec/controllers/projects/grafana_api_controller_spec.rb
+++ b/spec/controllers/projects/grafana_api_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::GrafanaApiController do
+RSpec.describe Projects::GrafanaApiController do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/graphs_controller_spec.rb b/spec/controllers/projects/graphs_controller_spec.rb
index e589815c45d..12cef6bea09 100644
--- a/spec/controllers/projects/graphs_controller_spec.rb
+++ b/spec/controllers/projects/graphs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::GraphsController do
+RSpec.describe Projects::GraphsController do
   let(:project) { create(:project, :repository) }
   let(:user)    { create(:user) }
 
@@ -42,23 +42,42 @@ describe Projects::GraphsController do
         expect(response).to render_template(:charts)
       end
 
-      it 'sets the daily coverage options' do
-        Timecop.freeze do
+      context 'when anonymous users can read build report results' do
+        it 'sets the daily coverage options' do
+          Timecop.freeze do
+            get(:charts, params: { namespace_id: project.namespace.path, project_id: project.path, id: 'master' })
+
+            expect(assigns[:daily_coverage_options]).to eq(
+              base_params: {
+                start_date: Date.current - 90.days,
+                end_date: Date.current,
+                ref_path: project.repository.expand_ref('master'),
+                param_type: 'coverage'
+              },
+              download_path: namespace_project_ci_daily_build_group_report_results_path(
+                namespace_id: project.namespace,
+                project_id: project,
+                format: :csv
+              ),
+              graph_api_path: namespace_project_ci_daily_build_group_report_results_path(
+                namespace_id: project.namespace,
+                project_id: project,
+                format: :json
+              )
+            )
+          end
+        end
+      end
+
+      context 'when anonymous users cannot read build report results' do
+        before do
+          project.update_column(:public_builds, false)
+
           get(:charts, params: { namespace_id: project.namespace.path, project_id: project.path, id: 'master' })
+        end
 
-          expect(assigns[:daily_coverage_options]).to eq(
-            base_params: {
-              start_date: Time.current.to_date - 90.days,
-              end_date: Time.current.to_date,
-              ref_path: project.repository.expand_ref('master'),
-              param_type: 'coverage'
-            },
-            download_path: namespace_project_ci_daily_build_group_report_results_path(
-              namespace_id: project.namespace,
-              project_id: project,
-              format: :csv
-            )
-          )
+        it 'does not set daily coverage options' do
+          expect(assigns[:daily_coverage_options]).to be_nil
         end
       end
     end
diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb
index 28999257957..762ef795f6e 100644
--- a/spec/controllers/projects/group_links_controller_spec.rb
+++ b/spec/controllers/projects/group_links_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::GroupLinksController do
+RSpec.describe Projects::GroupLinksController do
   let(:group) { create(:group, :private) }
   let(:group2) { create(:group, :private) }
   let(:project) { create(:project, :private, group: group2) }
diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb
index e97f602d9ab..440e6b2a74c 100644
--- a/spec/controllers/projects/hooks_controller_spec.rb
+++ b/spec/controllers/projects/hooks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::HooksController do
+RSpec.describe Projects::HooksController do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/import/jira_controller_spec.rb b/spec/controllers/projects/import/jira_controller_spec.rb
index d1b0a086576..b82735a56b3 100644
--- a/spec/controllers/projects/import/jira_controller_spec.rb
+++ b/spec/controllers/projects/import/jira_controller_spec.rb
@@ -2,230 +2,101 @@
 
 require 'spec_helper'
 
-describe Projects::Import::JiraController do
+RSpec.describe Projects::Import::JiraController do
   include JiraServiceHelper
 
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:jira_project_key) { 'Test' }
 
-  context 'with anonymous user' do
-    before do
-      stub_feature_flags(jira_issue_import: true)
-    end
+  def ensure_correct_config
+    sign_in(user)
+    project.add_maintainer(user)
+    stub_feature_flags(jira_issue_import: true)
+    stub_jira_service_test
+  end
 
-    context 'get show' do
-      it 'redirects to issues page' do
-        get :show, params: { namespace_id: project.namespace, project_id: project }
+  shared_examples 'redirect with error' do |error|
+    it 'redirects to project issues path' do
+      subject
 
-        expect(response).to redirect_to(new_user_session_path)
-      end
+      expect(response).to redirect_to(project_issues_path(project))
     end
 
-    context 'post import' do
-      it 'redirects to issues page' do
-        post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: jira_project_key }
+    it 'renders a correct error' do
+      subject
 
-        expect(response).to redirect_to(new_user_session_path)
-      end
+      expect(flash[:notice]).to eq(error)
     end
   end
 
-  context 'with logged in user' do
-    before do
-      sign_in(user)
-      project.add_maintainer(user)
-    end
+  shared_examples 'template with no message' do
+    it 'does not set any message' do
+      subject
 
-    context 'when feature flag not enabled' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-      end
+      expect(flash).to be_empty
+    end
 
-      context 'get show' do
-        it 'redirects to issues page' do
-          get :show, params: { namespace_id: project.namespace, project_id: project }
+    it 'renders show template' do
+      subject
 
-          expect(response).to redirect_to(project_issues_path(project))
-        end
-      end
+      expect(response).to render_template(template)
+    end
+  end
 
-      context 'post import' do
-        it 'redirects to issues page' do
-          post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: jira_project_key }
+  shared_examples 'users without permissions' do
+    context 'with anonymous user' do
+      it 'redirects to new user page' do
+        subject
 
-          expect(response).to redirect_to(project_issues_path(project))
-        end
+        expect(response).to redirect_to(new_user_session_path)
       end
     end
 
-    context 'when feature flag enabled' do
+    context 'when loged user is a developer' do
       before do
-        stub_feature_flags(jira_issue_import: true)
-        stub_feature_flags(jira_issue_import_vue: false)
+        create(:jira_service, project: project)
         stub_jira_service_test
-      end
-
-      context 'when Jira service is enabled for the project' do
-        let_it_be(:jira_service) { create(:jira_service, project: project) }
-
-        context 'when user is developer' do
-          let_it_be(:dev) { create(:user) }
-
-          before do
-            sign_in(dev)
-            project.add_developer(dev)
-          end
-
-          context 'get show' do
-            before do
-              get :show, params: { namespace_id: project.namespace.to_param, project_id: project }
-            end
-
-            it 'does not query Jira service' do
-              expect(project).not_to receive(:jira_service)
-            end
-
-            it 'renders show template' do
-              expect(response).to render_template(:show)
-              expect(assigns(:jira_projects)).not_to be_present
-            end
-          end
-
-          context 'post import' do
-            it 'returns 404' do
-              post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: jira_project_key }
 
-              expect(response).to have_gitlab_http_status(:not_found)
-            end
-          end
-        end
-
-        context 'when issues disabled' do
-          let_it_be(:disabled_issues_project) { create(:project, :public, :issues_disabled) }
-
-          context 'get show' do
-            it 'returs 404' do
-              get :show, params: { namespace_id: project.namespace.to_param, project_id: disabled_issues_project }
-
-              expect(response).to have_gitlab_http_status(:not_found)
-            end
-          end
-
-          context 'post import' do
-            it 'returs 404' do
-              post :import, params: { namespace_id: disabled_issues_project.namespace, project_id: disabled_issues_project, jira_project_key: jira_project_key }
-
-              expect(response).to have_gitlab_http_status(:not_found)
-            end
-          end
-        end
-
-        context 'when running Jira import first time' do
-          context 'get show' do
-            before do
-              allow(JIRA::Resource::Project).to receive(:all).and_return(jira_projects)
-
-              expect(project.jira_imports).to be_empty
-
-              get :show, params: { namespace_id: project.namespace.to_param, project_id: project }
-            end
-
-            context 'when no projects have been retrieved from Jira' do
-              let(:jira_projects) { [] }
-
-              it 'render an error message' do
-                expect(flash[:alert]).to eq('No projects have been returned from Jira. Please check your Jira configuration.')
-                expect(response).to render_template(:show)
-              end
-            end
-
-            context 'when projects retrieved from Jira' do
-              let(:jira_projects) { [double(name: 'FOO project', key: 'FOO')] }
-
-              it 'renders show template' do
-                expect(response).to render_template(:show)
-              end
-            end
-          end
+        sign_in(user)
+        project.add_developer(user)
+      end
 
-          context 'post import' do
-            context 'when Jira project key is empty' do
-              it 'redirects back to show with an error' do
-                post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: '' }
+      it_behaves_like 'redirect with error', 'You do not have permissions to run the import.'
+    end
+  end
 
-                expect(response).to redirect_to(project_import_jira_path(project))
-                expect(flash[:alert]).to eq('No Jira project key has been provided.')
-              end
-            end
+  describe 'GET #show' do
+    let(:template) { 'show' }
 
-            context 'when everything is ok' do
-              it 'creates import state' do
-                expect(project.latest_jira_import).to be_nil
+    subject { get :show, params: { namespace_id: project.namespace, project_id: project } }
 
-                post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: jira_project_key }
+    it_behaves_like 'users without permissions'
 
-                project.reload
+    context 'jira service configuration' do
+      before do
+        sign_in(user)
+        project.add_maintainer(user)
+        stub_feature_flags(jira_issue_import: true)
+      end
 
-                jira_import = project.latest_jira_import
-                expect(project.import_type).to eq 'jira'
-                expect(jira_import.status).to eq 'scheduled'
-                expect(jira_import.jira_project_key).to eq jira_project_key
-                expect(response).to redirect_to(project_import_jira_path(project))
-              end
-            end
-          end
+      context 'when Jira service is not enabled for the project' do
+        it 'does not query Jira service' do
+          expect(project).not_to receive(:jira_service)
         end
 
-        context 'when import state is scheduled' do
-          let_it_be(:jira_import_state) { create(:jira_import_state, :scheduled, project: project) }
-
-          context 'get show' do
-            it 'renders import status' do
-              get :show, params: { namespace_id: project.namespace.to_param, project_id: project }
-
-              jira_import = project.latest_jira_import
-              expect(jira_import.status).to eq 'scheduled'
-              expect(flash.now[:notice]).to eq 'Import scheduled'
-            end
-          end
+        it_behaves_like 'template with no message'
+      end
 
-          context 'post import' do
-            it 'uses the existing import data' do
-              post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: 'New Project' }
+      context 'when Jira service is not configured correctly for the project' do
+        let_it_be(:jira_service) { create(:jira_service, project: project) }
 
-              expect(flash[:notice]).to eq('Jira import is already running.')
-              expect(response).to redirect_to(project_import_jira_path(project))
-            end
-          end
+        before do
+          WebMock.stub_request(:get, 'https://jira.example.com/rest/api/2/serverInfo')
+            .to_raise(JIRA::HTTPError.new(double(message: 'Some failure.')))
         end
 
-        context 'when Jira import ran before' do
-          let_it_be(:jira_import_state) { create(:jira_import_state, :finished, project: project, jira_project_key: jira_project_key) }
-
-          context 'get show' do
-            it 'renders import status' do
-              allow(JIRA::Resource::Project).to receive(:all).and_return([])
-              get :show, params: { namespace_id: project.namespace.to_param, project_id: project }
-
-              expect(project.latest_jira_import.status).to eq 'finished'
-              expect(flash.now[:notice]).to eq 'Import finished'
-            end
-          end
-
-          context 'post import' do
-            it 'uses the existing import data' do
-              post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: 'New Project' }
-
-              project.reload
-              expect(project.latest_jira_import.status).to eq 'scheduled'
-              expect(project.jira_imports.size).to eq 2
-              expect(project.jira_imports.first.jira_project_key).to eq jira_project_key
-              expect(project.jira_imports.last.jira_project_key).to eq 'New Project'
-              expect(response).to redirect_to(project_import_jira_path(project))
-            end
-          end
-        end
+        it_behaves_like 'template with no message'
       end
     end
   end
diff --git a/spec/controllers/projects/imports_controller_spec.rb b/spec/controllers/projects/imports_controller_spec.rb
index bdc81efe3bc..29cfd1c352e 100644
--- a/spec/controllers/projects/imports_controller_spec.rb
+++ b/spec/controllers/projects/imports_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ImportsController do
+RSpec.describe Projects::ImportsController do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 96f11f11dc4..bcd1a53bd47 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::IssuesController do
+RSpec.describe Projects::IssuesController do
   include ProjectForksHelper
   include_context 'includes Spam constants'
 
@@ -332,8 +332,7 @@ describe Projects::IssuesController do
       end
 
       before do
-        allow(controller).to receive(:find_routable!)
-          .with(Project, project.full_path, any_args).and_return(project)
+        allow(controller).to receive(:find_routable!).and_return(project)
         allow(project).to receive(:default_branch).and_return(master_branch)
         allow_next_instance_of(Issues::RelatedBranchesService) do |service|
           allow(service).to receive(:execute).and_return(related_branches)
@@ -536,7 +535,7 @@ describe Projects::IssuesController do
         before do
           stub_application_setting(recaptcha_enabled: true)
           expect_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
-            expect(verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+            expect(verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
           end
         end
 
@@ -851,7 +850,7 @@ describe Projects::IssuesController do
           context 'when recaptcha is not verified' do
             before do
               expect_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
-                expect(verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+                expect(verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
               end
             end
 
@@ -1103,7 +1102,7 @@ describe Projects::IssuesController do
         context 'when captcha is not verified' do
           before do
             expect_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
-              expect(verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+              expect(verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
             end
           end
 
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index ef1253edda5..44dcb0caab2 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Projects::JobsController, :clean_gitlab_redis_shared_state do
+RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state do
   include ApiHelpers
   include HttpIOHelpers
 
@@ -1225,4 +1225,198 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
       get :terminal_websocket_authorize, params: params.merge(extra_params)
     end
   end
+
+  describe 'GET #proxy_websocket_authorize' do
+    let_it_be(:owner) { create(:owner) }
+    let_it_be(:admin) { create(:admin) }
+    let_it_be(:maintainer) { create(:user) }
+    let_it_be(:developer) { create(:user) }
+    let_it_be(:reporter) { create(:user) }
+    let_it_be(:guest) { create(:user) }
+    let_it_be(:project) { create(:project, :private, :repository, namespace: owner.namespace) }
+    let(:user) { maintainer }
+    let(:pipeline) { create(:ci_pipeline, project: project, source: :webide, config_source: :webide_source, user: user) }
+    let(:job) { create(:ci_build, :running, :with_runner_session, pipeline: pipeline, user: user) }
+    let(:extra_params) { { id: job.id } }
+    let(:path) { :proxy_websocket_authorize }
+    let(:render_method) { :channel_websocket }
+    let(:expected_data) do
+      {
+        'Channel' => {
+          'Subprotocols' => ["terminal.gitlab.com"],
+          'Url' => 'wss://localhost/proxy/build/default_port/',
+          'Header' => {
+            'Authorization' => [nil]
+          },
+          'MaxSessionTime' => nil,
+          'CAPem' => nil
+        }
+      }.to_json
+    end
+
+    before do
+      stub_feature_flags(build_service_proxy: true)
+      allow(job).to receive(:has_terminal?).and_return(true)
+
+      project.add_maintainer(maintainer)
+      project.add_developer(developer)
+      project.add_reporter(reporter)
+      project.add_guest(guest)
+
+      sign_in(user)
+    end
+
+    context 'access rights' do
+      before do
+        allow(Gitlab::Workhorse).to receive(:verify_api_request!).and_return(nil)
+
+        make_request
+      end
+
+      context 'with admin' do
+        let(:user) { admin }
+
+        context 'when admin mode is enabled', :enable_admin_mode do
+          it 'returns 200' do
+            expect(response).to have_gitlab_http_status(:ok)
+          end
+        end
+
+        context 'when admin mode is disabled' do
+          it 'returns 404' do
+            expect(response).to have_gitlab_http_status(:not_found)
+          end
+        end
+      end
+
+      context 'with owner' do
+        let(:user) { owner }
+
+        it 'returns 200' do
+          expect(response).to have_gitlab_http_status(:ok)
+        end
+      end
+
+      context 'with maintainer' do
+        let(:user) { maintainer }
+
+        it 'returns 200' do
+          expect(response).to have_gitlab_http_status(:ok)
+        end
+      end
+
+      context 'with developer' do
+        let(:user) { developer }
+
+        it 'returns 404' do
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+
+      context 'with reporter' do
+        let(:user) { reporter }
+
+        it 'returns 404' do
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+
+      context 'with guest' do
+        let(:user) { guest }
+
+        it 'returns 404' do
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+
+      context 'with non member' do
+        let(:user) { create(:user) }
+
+        it 'returns 404' do
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+    end
+
+    context 'when pipeline is not from a webide source' do
+      context 'with admin' do
+        let(:user) { admin }
+        let(:pipeline) { create(:ci_pipeline, project: project, source: :chat, user: user) }
+
+        before do
+          allow(Gitlab::Workhorse).to receive(:verify_api_request!).and_return(nil)
+          make_request
+        end
+
+        it 'returns 404' do
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+    end
+
+    context 'when workhorse signature is valid' do
+      before do
+        allow(Gitlab::Workhorse).to receive(:verify_api_request!).and_return(nil)
+      end
+
+      context 'and the id is valid' do
+        it 'returns the proxy data for the service running in the job' do
+          make_request
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response.headers["Content-Type"]).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
+          expect(response.body).to eq(expected_data)
+        end
+      end
+
+      context 'and the id is invalid' do
+        let(:extra_params) { { id: non_existing_record_id } }
+
+        it 'returns 404' do
+          make_request
+
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+    end
+
+    context 'with invalid workhorse signature' do
+      it 'aborts with an exception' do
+        allow(Gitlab::Workhorse).to receive(:verify_api_request!).and_raise(JWT::DecodeError)
+
+        expect { make_request }.to raise_error(JWT::DecodeError)
+      end
+    end
+
+    context 'when feature flag :build_service_proxy is disabled' do
+      let(:user) { admin }
+
+      it 'returns 404' do
+        allow(Gitlab::Workhorse).to receive(:verify_api_request!).and_return(nil)
+        stub_feature_flags(build_service_proxy: false)
+
+        make_request
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    it 'converts the url scheme into wss' do
+      allow(Gitlab::Workhorse).to receive(:verify_api_request!).and_return(nil)
+
+      expect(job.runner_session_url).to start_with('https://')
+      expect(Gitlab::Workhorse).to receive(:channel_websocket).with(a_hash_including(url: "wss://localhost/proxy/build/default_port/"))
+
+      make_request
+    end
+
+    def make_request
+      params = {
+        namespace_id: project.namespace.to_param,
+        project_id: project
+      }
+
+      get path, params: params.merge(extra_params)
+    end
+  end
 end
diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
index c6098f5934d..f213d104747 100644
--- a/spec/controllers/projects/labels_controller_spec.rb
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::LabelsController do
+RSpec.describe Projects::LabelsController do
   let(:group)   { create(:group) }
   let(:project) { create(:project, namespace: group) }
   let(:user)    { create(:user) }
diff --git a/spec/controllers/projects/logs_controller_spec.rb b/spec/controllers/projects/logs_controller_spec.rb
index e86a42b03c8..1eb5a6fcc12 100644
--- a/spec/controllers/projects/logs_controller_spec.rb
+++ b/spec/controllers/projects/logs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::LogsController do
+RSpec.describe Projects::LogsController do
   include KubernetesHelpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/projects/mattermosts_controller_spec.rb b/spec/controllers/projects/mattermosts_controller_spec.rb
index 693176d0cfc..001f2564698 100644
--- a/spec/controllers/projects/mattermosts_controller_spec.rb
+++ b/spec/controllers/projects/mattermosts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MattermostsController do
+RSpec.describe Projects::MattermostsController do
   let!(:project) { create(:project) }
   let!(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
index 8e4ac64f7b0..5f636bd4340 100644
--- a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MergeRequests::ConflictsController do
+RSpec.describe Projects::MergeRequests::ConflictsController do
   let(:project) { create(:project, :repository) }
   let(:user)    { project.owner }
   let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
diff --git a/spec/controllers/projects/merge_requests/content_controller_spec.rb b/spec/controllers/projects/merge_requests/content_controller_spec.rb
index 72eedc837a4..7fb20b4666a 100644
--- a/spec/controllers/projects/merge_requests/content_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/content_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MergeRequests::ContentController do
+RSpec.describe Projects::MergeRequests::ContentController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:merge_request) { create(:merge_request, target_project: project, source_project: project) }
diff --git a/spec/controllers/projects/merge_requests/creations_controller_spec.rb b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
index db25ad62019..091a44130a1 100644
--- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MergeRequests::CreationsController do
+RSpec.describe Projects::MergeRequests::CreationsController do
   let(:project) { create(:project, :repository) }
   let(:user)    { project.owner }
   let(:fork_project) { create(:forked_project_with_submodules) }
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
index 3d9193e3e33..02b4c2d1da9 100644
--- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MergeRequests::DiffsController do
+RSpec.describe Projects::MergeRequests::DiffsController do
   include ProjectForksHelper
 
   shared_examples '404 for unexistent diffable' do
diff --git a/spec/controllers/projects/merge_requests/drafts_controller_spec.rb b/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
new file mode 100644
index 00000000000..7d74e872d29
--- /dev/null
+++ b/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
@@ -0,0 +1,455 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Projects::MergeRequests::DraftsController do
+  include RepoHelpers
+
+  let(:project)       { create(:project, :repository) }
+  let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
+  let(:user)          { project.owner }
+  let(:user2)         { create(:user) }
+
+  let(:params) do
+    {
+      namespace_id: project.namespace.to_param,
+      project_id: project.to_param,
+      merge_request_id: merge_request.iid
+    }
+  end
+
+  before do
+    sign_in(user)
+    stub_licensed_features(multiple_merge_request_assignees: true)
+    stub_commonmark_sourcepos_disabled
+  end
+
+  describe 'GET #index' do
+    let!(:draft_note) { create(:draft_note, merge_request: merge_request, author: user) }
+
+    it 'list merge request draft notes for current user' do
+      get :index, params: params
+
+      expect(json_response.first['merge_request_id']).to eq(merge_request.id)
+      expect(json_response.first['author']['id']).to eq(user.id)
+      expect(json_response.first['note_html']).not_to be_empty
+    end
+  end
+
+  describe 'POST #create' do
+    def create_draft_note(draft_overrides: {}, overrides: {})
+      post_params = params.merge({
+        draft_note: {
+          note: 'This is a unpublished comment'
+        }.merge(draft_overrides)
+      }.merge(overrides))
+
+      post :create, params: post_params
+    end
+
+    context 'without permissions' do
+      let(:project) { create(:project, :private) }
+
+      before do
+        sign_in(user2)
+      end
+
+      it 'does not allow draft note creation' do
+        expect { create_draft_note }.to change { DraftNote.count }.by(0)
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    it 'creates a draft note' do
+      expect { create_draft_note }.to change { DraftNote.count }.by(1)
+    end
+
+    it 'creates draft note with position' do
+      diff_refs = project.commit(sample_commit.id).try(:diff_refs)
+
+      position = Gitlab::Diff::Position.new(
+        old_path: "files/ruby/popen.rb",
+        new_path: "files/ruby/popen.rb",
+        old_line: nil,
+        new_line: 14,
+        diff_refs: diff_refs
+      )
+
+      create_draft_note(draft_overrides: { position: position.to_json })
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['position']).to be_present
+      expect(json_response['file_hash']).to be_present
+      expect(json_response['file_identifier_hash']).to be_present
+      expect(json_response['line_code']).to match(/\w+_\d+_\d+/)
+      expect(json_response['note_html']).to eq('<p dir="auto">This is a unpublished comment</p>')
+    end
+
+    it 'creates a draft note with quick actions' do
+      create_draft_note(draft_overrides: { note: "#{user2.to_reference}\n/assign #{user.to_reference}" })
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['note_html']).to match(/#{user2.to_reference}/)
+      expect(json_response['references']['commands']).to match(/Assigns/)
+      expect(json_response['references']['users']).to include(user2.username)
+    end
+
+    context 'in a thread' do
+      let(:discussion) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project).discussion }
+
+      it 'creates draft note as a reply' do
+        expect do
+          create_draft_note(overrides: { in_reply_to_discussion_id: discussion.reply_id })
+        end.to change { DraftNote.count }.by(1)
+
+        draft_note = DraftNote.last
+
+        expect(draft_note).to be_valid
+        expect(draft_note.discussion_id).to eq(discussion.reply_id)
+      end
+
+      it 'creates a draft note that will resolve a thread' do
+        expect do
+          create_draft_note(
+            overrides: { in_reply_to_discussion_id: discussion.reply_id },
+            draft_overrides: { resolve_discussion: true }
+          )
+        end.to change { DraftNote.count }.by(1)
+
+        draft_note = DraftNote.last
+
+        expect(draft_note).to be_valid
+        expect(draft_note.discussion_id).to eq(discussion.reply_id)
+        expect(draft_note.resolve_discussion).to eq(true)
+      end
+
+      it 'cannot create more than one draft note per thread' do
+        expect do
+          create_draft_note(
+            overrides: { in_reply_to_discussion_id: discussion.reply_id },
+            draft_overrides: { resolve_discussion: true }
+          )
+        end.to change { DraftNote.count }.by(1)
+
+        expect do
+          create_draft_note(
+            overrides: { in_reply_to_discussion_id: discussion.reply_id },
+            draft_overrides: { resolve_discussion: true, note: 'A note' }
+          )
+        end.to change { DraftNote.count }.by(0)
+      end
+    end
+
+    context 'commit_id is present' do
+      let(:commit) { project.commit(sample_commit.id) }
+
+      let(:position) do
+        Gitlab::Diff::Position.new(
+          old_path: "files/ruby/popen.rb",
+          new_path: "files/ruby/popen.rb",
+          old_line: nil,
+          new_line: 14,
+          diff_refs: commit.diff_refs
+        )
+      end
+
+      before do
+        create_draft_note(draft_overrides: { commit_id: commit_id, position: position.to_json })
+      end
+
+      context 'value is a commit sha' do
+        let(:commit_id) { commit.id }
+
+        it 'creates the draft note with commit ID' do
+          expect(DraftNote.last.commit_id).to eq(commit_id)
+        end
+      end
+
+      context 'value is "undefined"' do
+        let(:commit_id) { 'undefined' }
+
+        it 'creates the draft note with nil commit ID' do
+          expect(DraftNote.last.commit_id).to be_nil
+        end
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    let(:draft) { create(:draft_note, merge_request: merge_request, author: user) }
+
+    def update_draft_note(overrides = {})
+      put_params = params.merge({
+        id: draft.id,
+        draft_note: {
+          note: 'This is an updated unpublished comment'
+        }.merge(overrides)
+      })
+
+      put :update, params: put_params
+    end
+
+    context 'without permissions' do
+      before do
+        sign_in(user2)
+        project.add_developer(user2)
+      end
+
+      it 'does not allow editing draft note belonging to someone else' do
+        update_draft_note
+
+        expect(response).to have_gitlab_http_status(:not_found)
+        expect(draft.reload.note).not_to eq('This is an updated unpublished comment')
+      end
+    end
+
+    it 'updates the draft' do
+      expect(draft.note).not_to be_empty
+
+      expect { update_draft_note }.not_to change { DraftNote.count }
+
+      draft.reload
+
+      expect(draft.note).to eq('This is an updated unpublished comment')
+      expect(json_response['note_html']).not_to be_empty
+    end
+  end
+
+  describe 'POST #publish' do
+    context 'without permissions' do
+      shared_examples_for 'action that does not allow publishing draft note' do
+        it 'does not allow publishing draft note' do
+          expect { action }
+            .to not_change { Note.count }
+            .and not_change { DraftNote.count }
+
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+
+      before do
+        sign_in(user2)
+      end
+
+      context 'when note belongs to someone else' do
+        before do
+          project.add_developer(user2)
+        end
+
+        it_behaves_like 'action that does not allow publishing draft note' do
+          let!(:draft) { create(:draft_note, merge_request: merge_request, author: user) }
+          let(:action) { post :publish, params: params.merge(id: draft.id) }
+        end
+      end
+
+      context 'when merge request discussion is locked' do
+        let(:project) { create(:project, :public, :merge_requests_public, :repository) }
+
+        before do
+          create(:draft_note, merge_request: merge_request, author: user2)
+          merge_request.update!(discussion_locked: true)
+        end
+
+        it_behaves_like 'action that does not allow publishing draft note' do
+          let(:action) { post :publish, params: params }
+        end
+      end
+    end
+
+    context 'when PublishService errors' do
+      it 'returns message and 500 response' do
+        create(:draft_note, merge_request: merge_request, author: user)
+        error_message = "Something went wrong"
+
+        expect_next_instance_of(DraftNotes::PublishService) do |service|
+          allow(service).to receive(:execute).and_return({ message: error_message, status: :error })
+        end
+
+        post :publish, params: params
+
+        expect(response).to have_gitlab_http_status(:error)
+        expect(json_response["message"]).to include(error_message)
+      end
+    end
+
+    it 'publishes draft notes with position' do
+      diff_refs = project.commit(sample_commit.id).try(:diff_refs)
+
+      position = Gitlab::Diff::Position.new(
+        old_path: "files/ruby/popen.rb",
+        new_path: "files/ruby/popen.rb",
+        old_line: nil,
+        new_line: 14,
+        diff_refs: diff_refs
+      )
+
+      draft = create(:draft_note_on_text_diff, merge_request: merge_request, author: user, position: position)
+
+      expect { post :publish, params: params }.to change { Note.count }.by(1)
+        .and change { DraftNote.count }.by(-1)
+
+      note = merge_request.notes.reload.last
+
+      expect(note.note).to eq(draft.note)
+      expect(note.position).to eq(draft.position)
+    end
+
+    it 'does nothing if there are no draft notes' do
+      expect { post :publish, params: params }.to change { Note.count }.by(0).and change { DraftNote.count }.by(0)
+    end
+
+    it 'publishes a draft note with quick actions and applies them' do
+      project.add_developer(user2)
+      create(:draft_note, merge_request: merge_request, author: user,
+                          note: "/assign #{user2.to_reference}")
+
+      expect(merge_request.assignees).to be_empty
+
+      expect { post :publish, params: params }.to change { Note.count }.by(1)
+        .and change { DraftNote.count }.by(-1)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(merge_request.reload.assignee_ids).to match_array([user2.id])
+      expect(Note.last.system?).to be true
+    end
+
+    it 'publishes all draft notes for an MR' do
+      draft_params = { merge_request: merge_request, author: user }
+
+      drafts = create_list(:draft_note, 4, draft_params)
+
+      note = create(:discussion_note_on_merge_request, noteable: merge_request, project: project)
+      draft_reply = create(:draft_note, draft_params.merge(discussion_id: note.discussion_id))
+
+      diff_note = create(:diff_note_on_merge_request, noteable: merge_request, project: project)
+      diff_draft_reply = create(:draft_note, draft_params.merge(discussion_id: diff_note.discussion_id))
+
+      expect { post :publish, params: params }.to change { Note.count }.by(6)
+        .and change { DraftNote.count }.by(-6)
+
+      expect(response).to have_gitlab_http_status(:ok)
+
+      notes = merge_request.notes.reload
+
+      expect(notes.pluck(:note)).to include(*drafts.map(&:note))
+      expect(note.discussion.notes.last.note).to eq(draft_reply.note)
+      expect(diff_note.discussion.notes.last.note).to eq(diff_draft_reply.note)
+    end
+
+    it 'can publish just a single draft note' do
+      draft_params = { merge_request: merge_request, author: user }
+
+      drafts = create_list(:draft_note, 4, draft_params)
+
+      expect { post :publish, params: params.merge(id: drafts.first.id) }.to change { Note.count }.by(1)
+        .and change { DraftNote.count }.by(-1)
+    end
+
+    context 'when publishing drafts in a thread' do
+      let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
+
+      def create_reply(discussion_id, resolves: false)
+        create(:draft_note,
+               merge_request: merge_request,
+               author: user,
+               discussion_id: discussion_id,
+               resolve_discussion: resolves
+              )
+      end
+
+      it 'resolves a thread if the draft note resolves it' do
+        draft_reply = create_reply(note.discussion_id, resolves: true)
+
+        post :publish, params: params
+
+        discussion = note.discussion
+
+        expect(discussion.notes.last.note).to eq(draft_reply.note)
+        expect(discussion.resolved?).to eq(true)
+        expect(discussion.resolved_by.id).to eq(user.id)
+      end
+
+      it 'unresolves a thread if the draft note unresolves it' do
+        note.discussion.resolve!(user)
+        expect(note.discussion.resolved?).to eq(true)
+
+        draft_reply = create_reply(note.discussion_id, resolves: false)
+
+        post :publish, params: params
+
+        discussion = note.discussion
+
+        expect(discussion.notes.last.note).to eq(draft_reply.note)
+        expect(discussion.resolved?).to eq(false)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let(:draft) { create(:draft_note, merge_request: merge_request, author: user) }
+
+    def create_draft
+      create(:draft_note, merge_request: merge_request, author: user)
+    end
+
+    context 'without permissions' do
+      before do
+        sign_in(user2)
+        project.add_developer(user2)
+      end
+
+      it 'does not allow destroying a draft note belonging to someone else' do
+        draft = create(:draft_note, merge_request: merge_request, author: user)
+
+        expect { post :destroy, params: params.merge(id: draft.id) }
+          .not_to change { DraftNote.count }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    it 'destroys the draft note when ID is given' do
+      draft = create_draft
+
+      expect { delete :destroy, params: params.merge(id: draft.id) }.to change { DraftNote.count }.by(-1)
+      expect(response).to have_gitlab_http_status(:ok)
+    end
+
+    context 'without permissions' do
+      before do
+        sign_in(user2)
+      end
+
+      it 'does not allow editing draft note belonging to someone else' do
+        draft = create_draft
+
+        expect { delete :destroy, params: params.merge(id: draft.id) }.to change { DraftNote.count }.by(0)
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
+  describe 'DELETE #discard' do
+    it 'deletes all DraftNotes belonging to a user in a Merge Request' do
+      create_list(:draft_note, 6, merge_request: merge_request, author: user)
+
+      expect { delete :discard, params: params }.to change { DraftNote.count }.by(-6)
+      expect(response).to have_gitlab_http_status(:ok)
+    end
+
+    context 'without permissions' do
+      before do
+        sign_in(user2)
+        project.add_developer(user2)
+      end
+
+      it 'does not destroys a draft note belonging to someone else' do
+        create(:draft_note, merge_request: merge_request, author: user)
+
+        expect { post :discard, params: params }
+          .not_to change { DraftNote.count }
+
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 7d9e42fcc2d..382593fd7cb 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MergeRequestsController do
+RSpec.describe Projects::MergeRequestsController do
   include ProjectForksHelper
   include Gitlab::Routing
 
@@ -1183,15 +1183,19 @@ describe Projects::MergeRequestsController do
           subject
 
           expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response).to match(
-            a_hash_including(
-              'tfplan.json' => hash_including(
-                'create' => 0,
-                'delete' => 0,
-                'update' => 1
+
+          pipeline.builds.each do |build|
+            expect(json_response).to match(
+              a_hash_including(
+                build.id.to_s => hash_including(
+                  'create' => 0,
+                  'delete' => 0,
+                  'update' => 1,
+                  'job_name' => build.options.dig(:artifacts, :name).to_s
+                )
               )
             )
-          )
+          end
         end
       end
 
@@ -1409,20 +1413,6 @@ describe Projects::MergeRequestsController do
       end
     end
 
-    context 'when feature flag is disabled' do
-      let(:accessibility_comparison) { { status: :parsed, data: { summary: 1 } } }
-
-      before do
-        stub_feature_flags(accessibility_report_view: false)
-      end
-
-      it 'returns 204 HTTP status' do
-        subject
-
-        expect(response).to have_gitlab_http_status(:no_content)
-      end
-    end
-
     context 'when pipeline has jobs with accessibility reports' do
       before do
         allow_any_instance_of(MergeRequest)
diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb
index ee61ef73b45..0c7391c1b9c 100644
--- a/spec/controllers/projects/milestones_controller_spec.rb
+++ b/spec/controllers/projects/milestones_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MilestonesController do
+RSpec.describe Projects::MilestonesController do
   let(:project) { create(:project, :repository) }
   let(:user)    { create(:user) }
   let(:milestone) { create(:milestone, project: project) }
@@ -145,7 +145,7 @@ describe Projects::MilestonesController do
       delete :destroy, params: { namespace_id: project.namespace.id, project_id: project.id, id: milestone.iid }, format: :js
       expect(response).to be_successful
 
-      expect(Event.recent.first.action).to eq(Event::DESTROYED)
+      expect(Event.recent.first).to be_destroyed_action
 
       expect { Milestone.find(milestone.id) }.to raise_exception(ActiveRecord::RecordNotFound)
       issue.reload
diff --git a/spec/controllers/projects/mirrors_controller_spec.rb b/spec/controllers/projects/mirrors_controller_spec.rb
index 8cd940978c0..7c5d14d3a22 100644
--- a/spec/controllers/projects/mirrors_controller_spec.rb
+++ b/spec/controllers/projects/mirrors_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MirrorsController do
+RSpec.describe Projects::MirrorsController do
   include ReactiveCachingHelpers
 
   shared_examples 'only admin is allowed when mirroring is disabled' do
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index 39594ff287d..b3a83723189 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::NotesController do
+RSpec.describe Projects::NotesController do
   include ProjectForksHelper
 
   let(:user)    { create(:user) }
@@ -37,7 +37,7 @@ describe Projects::NotesController do
       project.add_developer(user)
     end
 
-    it 'passes last_fetched_at from headers to NotesFinder' do
+    it 'passes last_fetched_at from headers to NotesFinder and MergeIntoNotesService' do
       last_fetched_at = 3.hours.ago.to_i
 
       request.headers['X-Last-Fetched-At'] = last_fetched_at
@@ -46,6 +46,10 @@ describe Projects::NotesController do
         .with(anything, hash_including(last_fetched_at: last_fetched_at))
         .and_call_original
 
+      expect(ResourceEvents::MergeIntoNotesService).to receive(:new)
+        .with(anything, anything, hash_including(last_fetched_at: last_fetched_at))
+        .and_call_original
+
       get :index, params: request_params
     end
 
diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb
index 102c0b6b048..1fa8838b548 100644
--- a/spec/controllers/projects/pages_controller_spec.rb
+++ b/spec/controllers/projects/pages_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PagesController do
+RSpec.describe Projects::PagesController do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
diff --git a/spec/controllers/projects/pages_domains_controller_spec.rb b/spec/controllers/projects/pages_domains_controller_spec.rb
index 40a6f77f0d6..691508d1e14 100644
--- a/spec/controllers/projects/pages_domains_controller_spec.rb
+++ b/spec/controllers/projects/pages_domains_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PagesDomainsController do
+RSpec.describe Projects::PagesDomainsController do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let!(:pages_domain) { create(:pages_domain, project: project) }
diff --git a/spec/controllers/projects/performance_monitoring/dashboards_controller_spec.rb b/spec/controllers/projects/performance_monitoring/dashboards_controller_spec.rb
index 6a53e8f3dbf..8a344a72120 100644
--- a/spec/controllers/projects/performance_monitoring/dashboards_controller_spec.rb
+++ b/spec/controllers/projects/performance_monitoring/dashboards_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PerformanceMonitoring::DashboardsController do
+RSpec.describe Projects::PerformanceMonitoring::DashboardsController do
   let_it_be(:user) { create(:user) }
   let_it_be(:namespace) { create(:namespace) }
   let!(:project) { create(:project, :repository, name: 'dashboard-project', namespace: namespace) }
diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
index 635980ba93b..27a3e95896a 100644
--- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb
+++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PipelineSchedulesController do
+RSpec.describe Projects::PipelineSchedulesController do
   include AccessMatchersForController
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index b3d8fb94fb3..ca09d2b1428 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PipelinesController do
+RSpec.describe Projects::PipelinesController do
   include ApiHelpers
 
   let_it_be(:user) { create(:user) }
@@ -26,10 +26,6 @@ describe Projects::PipelinesController do
     context 'when using persisted stages', :request_store do
       render_views
 
-      before do
-        stub_feature_flags(ci_pipeline_persisted_stages: true)
-      end
-
       it 'returns serialized pipelines' do
         expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original
 
@@ -66,46 +62,6 @@ describe Projects::PipelinesController do
       end
     end
 
-    context 'when using legacy stages', :request_store do
-      before do
-        stub_feature_flags(ci_pipeline_persisted_stages: false)
-      end
-
-      it 'returns JSON with serialized pipelines' do
-        get_pipelines_index_json
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(response).to match_response_schema('pipeline')
-
-        expect(json_response).to include('pipelines')
-        expect(json_response['pipelines'].count).to eq 6
-        expect(json_response['count']['all']).to eq '6'
-        expect(json_response['count']['running']).to eq '2'
-        expect(json_response['count']['pending']).to eq '1'
-        expect(json_response['count']['finished']).to eq '3'
-
-        json_response.dig('pipelines', 0, 'details', 'stages').tap do |stages|
-          expect(stages.count).to eq 3
-        end
-      end
-
-      it 'does not execute N+1 queries' do
-        get_pipelines_index_json
-
-        control_count = ActiveRecord::QueryRecorder.new do
-          get_pipelines_index_json
-        end.count
-
-        create_all_pipeline_types
-
-        # There appears to be one extra query for Pipelines#has_warnings? for some reason
-        expect { get_pipelines_index_json }.not_to exceed_query_limit(control_count + 1)
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['pipelines'].count).to eq 12
-      end
-    end
-
     it 'does not include coverage data for the pipelines' do
       get_pipelines_index_json
 
@@ -215,6 +171,40 @@ describe Projects::PipelinesController do
       end
     end
 
+    context 'filter by status' do
+      context 'when pipelines with the status exists' do
+        it 'returns matched pipelines' do
+          get_pipelines_index_json(status: 'success')
+
+          check_pipeline_response(returned: 1, all: 1, running: 0, pending: 0, finished: 1)
+        end
+
+        context 'when filter by unrelated scope' do
+          it 'returns empty list' do
+            get_pipelines_index_json(status: 'success', scope: 'running')
+
+            check_pipeline_response(returned: 0, all: 1, running: 0, pending: 0, finished: 1)
+          end
+        end
+      end
+
+      context 'when no pipeline with the status exists' do
+        it 'returns empty list' do
+          get_pipelines_index_json(status: 'manual')
+
+          check_pipeline_response(returned: 0, all: 0, running: 0, pending: 0, finished: 0)
+        end
+      end
+
+      context 'when invalid status' do
+        it 'returns all list' do
+          get_pipelines_index_json(status: 'invalid-status')
+
+          check_pipeline_response(returned: 6, all: 6, running: 2, pending: 1, finished: 3)
+        end
+      end
+    end
+
     def get_pipelines_index_json(params = {})
       get :index, params: {
                     namespace_id: project.namespace,
@@ -548,6 +538,39 @@ describe Projects::PipelinesController do
     end
   end
 
+  describe 'GET dag.json' do
+    let(:pipeline) { create(:ci_pipeline, project: project) }
+
+    before do
+      create_build('build', 1, 'build')
+      create_build('test', 2, 'test', scheduling_type: 'dag').tap do |job|
+        create(:ci_build_need, build: job, name: 'build')
+      end
+    end
+
+    it 'returns the pipeline with DAG serialization' do
+      get :dag, params: { namespace_id: project.namespace, project_id: project, id: pipeline }, format: :json
+
+      expect(response).to have_gitlab_http_status(:ok)
+
+      expect(json_response.fetch('stages')).not_to be_empty
+
+      build_stage = json_response['stages'].first
+      expect(build_stage.fetch('name')).to eq 'build'
+      expect(build_stage.fetch('groups').first.fetch('jobs'))
+        .to eq [{ 'name' => 'build', 'scheduling_type' => 'stage' }]
+
+      test_stage = json_response['stages'].last
+      expect(test_stage.fetch('name')).to eq 'test'
+      expect(test_stage.fetch('groups').first.fetch('jobs'))
+        .to eq [{ 'name' => 'test', 'scheduling_type' => 'dag', 'needs' => ['build'] }]
+    end
+
+    def create_build(stage, stage_idx, name, params = {})
+      create(:ci_build, pipeline: pipeline, stage: stage, stage_idx: stage_idx, name: name, **params)
+    end
+  end
+
   describe 'GET stages.json' do
     let(:pipeline) { create(:ci_pipeline, project: project) }
 
@@ -685,7 +708,7 @@ describe Projects::PipelinesController do
       end
 
       shared_examples 'creates a pipeline' do
-        it do
+        specify do
           expect { post_request }.to change { project.ci_pipelines.count }.by(1)
 
           pipeline = project.ci_pipelines.last
diff --git a/spec/controllers/projects/pipelines_settings_controller_spec.rb b/spec/controllers/projects/pipelines_settings_controller_spec.rb
index 789b2104d3c..ad631b7c3da 100644
--- a/spec/controllers/projects/pipelines_settings_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_settings_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PipelinesSettingsController do
+RSpec.describe Projects::PipelinesSettingsController do
   let_it_be(:user) { create(:user) }
   let_it_be(:project_auto_devops) { create(:project_auto_devops) }
   let(:project) { project_auto_devops.project }
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index f354bba902a..7457e4c5023 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe Projects::ProjectMembersController do
+RSpec.describe Projects::ProjectMembersController do
   let(:user) { create(:user) }
   let(:group) { create(:group, :public) }
   let(:project) { create(:project, :public) }
diff --git a/spec/controllers/projects/prometheus/alerts_controller_spec.rb b/spec/controllers/projects/prometheus/alerts_controller_spec.rb
index e936cb5916e..6e3148231bd 100644
--- a/spec/controllers/projects/prometheus/alerts_controller_spec.rb
+++ b/spec/controllers/projects/prometheus/alerts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Prometheus::AlertsController do
+RSpec.describe Projects::Prometheus::AlertsController do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:environment) { create(:environment, project: project) }
diff --git a/spec/controllers/projects/prometheus/metrics_controller_spec.rb b/spec/controllers/projects/prometheus/metrics_controller_spec.rb
index 36f694cda29..c7c3be20f29 100644
--- a/spec/controllers/projects/prometheus/metrics_controller_spec.rb
+++ b/spec/controllers/projects/prometheus/metrics_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Prometheus::MetricsController do
+RSpec.describe Projects::Prometheus::MetricsController do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:prometheus_project) }
 
diff --git a/spec/controllers/projects/protected_branches_controller_spec.rb b/spec/controllers/projects/protected_branches_controller_spec.rb
index 262f77a7328..09eb1a45c73 100644
--- a/spec/controllers/projects/protected_branches_controller_spec.rb
+++ b/spec/controllers/projects/protected_branches_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe Projects::ProtectedBranchesController do
+RSpec.describe Projects::ProtectedBranchesController do
   let(:project) { create(:project, :repository) }
   let(:protected_branch) { create(:protected_branch, project: project) }
   let(:project_params) { { namespace_id: project.namespace.to_param, project_id: project } }
diff --git a/spec/controllers/projects/protected_tags_controller_spec.rb b/spec/controllers/projects/protected_tags_controller_spec.rb
index a900947d82e..2c2240cb0d0 100644
--- a/spec/controllers/projects/protected_tags_controller_spec.rb
+++ b/spec/controllers/projects/protected_tags_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe Projects::ProtectedTagsController do
+RSpec.describe Projects::ProtectedTagsController do
   describe "GET #index" do
     let(:project) { create(:project_empty_repo, :public) }
 
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index 4a684dcfbc6..5f10343eb76 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::RawController do
+RSpec.describe Projects::RawController do
   include RepoHelpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/controllers/projects/refs_controller_spec.rb b/spec/controllers/projects/refs_controller_spec.rb
index b043e7f2538..a6a4aff7ce9 100644
--- a/spec/controllers/projects/refs_controller_spec.rb
+++ b/spec/controllers/projects/refs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::RefsController do
+RSpec.describe Projects::RefsController do
   let(:project) { create(:project, :repository) }
   let(:user)    { create(:user) }
 
@@ -73,7 +73,7 @@ describe Projects::RefsController do
 
         cache_key = "projects/#{project.id}/logs/#{project.commit.id}/#{path}/25"
         expect(Rails.cache.fetch(cache_key)).to eq(['logs', 50])
-        expect(response.headers['More-Logs-Offset']).to eq(50)
+        expect(response.headers['More-Logs-Offset']).to eq("50")
       end
     end
   end
diff --git a/spec/controllers/projects/registry/repositories_controller_spec.rb b/spec/controllers/projects/registry/repositories_controller_spec.rb
index badb84f9b50..098fa9bac2c 100644
--- a/spec/controllers/projects/registry/repositories_controller_spec.rb
+++ b/spec/controllers/projects/registry/repositories_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Registry::RepositoriesController do
+RSpec.describe Projects::Registry::RepositoriesController do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :private) }
 
@@ -46,7 +46,7 @@ describe Projects::Registry::RepositoriesController do
       context 'when root container repository is not created' do
         context 'when there are tags for this repository' do
           before do
-            stub_container_registry_tags(repository: project.full_path,
+            stub_container_registry_tags(repository: :any,
                                          tags: %w[rc1 latest])
           end
 
diff --git a/spec/controllers/projects/registry/tags_controller_spec.rb b/spec/controllers/projects/registry/tags_controller_spec.rb
index 5ab32b7d81d..6adee35b60a 100644
--- a/spec/controllers/projects/registry/tags_controller_spec.rb
+++ b/spec/controllers/projects/registry/tags_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Registry::TagsController do
+RSpec.describe Projects::Registry::TagsController do
   let(:user)    { create(:user) }
   let(:project) { create(:project, :private) }
 
diff --git a/spec/controllers/projects/releases/evidences_controller_spec.rb b/spec/controllers/projects/releases/evidences_controller_spec.rb
index d3808087681..d5a9665d6a5 100644
--- a/spec/controllers/projects/releases/evidences_controller_spec.rb
+++ b/spec/controllers/projects/releases/evidences_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Releases::EvidencesController do
+RSpec.describe Projects::Releases::EvidencesController do
   let!(:project) { create(:project, :repository, :public) }
   let_it_be(:private_project) { create(:project, :repository, :private) }
   let_it_be(:developer)  { create(:user) }
@@ -31,8 +31,8 @@ describe Projects::Releases::EvidencesController do
   end
 
   describe 'GET #show' do
-    let_it_be(:tag_name) { "v1.1.0-evidence" }
-    let!(:release) { create(:release, :with_evidence, project: project, tag: tag_name) }
+    let(:tag_name) { "v1.1.0-evidence" }
+    let!(:release) { create(:release, project: project, tag: tag_name) }
     let(:evidence) { release.evidences.first }
     let(:tag) { CGI.escape(release.tag) }
     let(:format) { :json }
@@ -48,6 +48,8 @@ describe Projects::Releases::EvidencesController do
     end
 
     before do
+      ::Releases::CreateEvidenceService.new(release).execute
+
       sign_in(user)
     end
 
@@ -84,14 +86,9 @@ describe Projects::Releases::EvidencesController do
     end
 
     context 'when release is associated to a milestone which includes an issue' do
-      let_it_be(:project) { create(:project, :repository, :public) }
-      let_it_be(:issue) { create(:issue, project: project) }
-      let_it_be(:milestone) { create(:milestone, project: project, issues: [issue]) }
-      let_it_be(:release) { create(:release, project: project, tag: tag_name, milestones: [milestone]) }
-
-      before do
-        create(:evidence, release: release)
-      end
+      let(:issue) { create(:issue, project: project) }
+      let(:milestone) { create(:milestone, project: project, issues: [issue]) }
+      let(:release) { create(:release, project: project, tag: tag_name, milestones: [milestone]) }
 
       shared_examples_for 'does not show the issue in evidence' do
         it do
@@ -111,7 +108,9 @@ describe Projects::Releases::EvidencesController do
         end
       end
 
-      shared_examples_for 'safely expose evidence' do
+      context 'when user is non-project member' do
+        let(:user) { create(:user) }
+
         it_behaves_like 'does not show the issue in evidence'
 
         context 'when the issue is confidential' do
@@ -127,28 +126,50 @@ describe Projects::Releases::EvidencesController do
         end
 
         context 'when project is private' do
-          let!(:project) { create(:project, :repository, :private) }
+          let(:project) { create(:project, :repository, :private) }
 
           it_behaves_like 'evidence not found'
         end
 
         context 'when project restricts the visibility of issues to project members only' do
-          let!(:project) { create(:project, :repository, :issues_private) }
+          let(:project) { create(:project, :repository, :issues_private) }
 
           it_behaves_like 'evidence not found'
         end
       end
 
-      context 'when user is non-project member' do
-        let(:user) { create(:user) }
-
-        it_behaves_like 'safely expose evidence'
-      end
-
       context 'when user is auditor', if: Gitlab.ee? do
         let(:user) { create(:user, :auditor) }
 
-        it_behaves_like 'safely expose evidence'
+        it_behaves_like 'does not show the issue in evidence'
+
+        context 'when the issue is confidential' do
+          let(:issue) { create(:issue, :confidential, project: project) }
+
+          it_behaves_like 'does not show the issue in evidence'
+        end
+
+        context 'when the user is the author of the confidential issue' do
+          let(:issue) { create(:issue, :confidential, project: project, author: user) }
+
+          it_behaves_like 'does not show the issue in evidence'
+        end
+
+        context 'when project is private' do
+          let(:project) { create(:project, :repository, :private) }
+
+          it 'returns evidence ' do
+            subject
+
+            expect(json_response).to eq(evidence.summary)
+          end
+        end
+
+        context 'when project restricts the visibility of issues to project members only' do
+          let(:project) { create(:project, :repository, :issues_private) }
+
+          it_behaves_like 'evidence not found'
+        end
       end
 
       context 'when external authorization control is enabled' do
diff --git a/spec/controllers/projects/releases_controller_spec.rb b/spec/controllers/projects/releases_controller_spec.rb
index 45f4433ed0a..96c38c1b726 100644
--- a/spec/controllers/projects/releases_controller_spec.rb
+++ b/spec/controllers/projects/releases_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ReleasesController do
+RSpec.describe Projects::ReleasesController do
   let!(:project) { create(:project, :repository, :public) }
   let_it_be(:private_project) { create(:project, :repository, :private) }
   let_it_be(:developer)  { create(:user) }
diff --git a/spec/controllers/projects/repositories_controller_spec.rb b/spec/controllers/projects/repositories_controller_spec.rb
index 42032b4cad0..97eea7c7e9d 100644
--- a/spec/controllers/projects/repositories_controller_spec.rb
+++ b/spec/controllers/projects/repositories_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Projects::RepositoriesController do
+RSpec.describe Projects::RepositoriesController do
   let(:project) { create(:project, :repository) }
 
   describe "GET archive" do
diff --git a/spec/controllers/projects/runners_controller_spec.rb b/spec/controllers/projects/runners_controller_spec.rb
index 1893180fe9b..66f20bd50c4 100644
--- a/spec/controllers/projects/runners_controller_spec.rb
+++ b/spec/controllers/projects/runners_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::RunnersController do
+RSpec.describe Projects::RunnersController do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:runner) { create(:ci_runner, :project, projects: [project]) }
diff --git a/spec/controllers/projects/serverless/functions_controller_spec.rb b/spec/controllers/projects/serverless/functions_controller_spec.rb
index 203e1e49994..3071d0b7f54 100644
--- a/spec/controllers/projects/serverless/functions_controller_spec.rb
+++ b/spec/controllers/projects/serverless/functions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Serverless::FunctionsController do
+RSpec.describe Projects::Serverless::FunctionsController do
   include KubernetesHelpers
   include ReactiveCachingHelpers
 
diff --git a/spec/controllers/projects/service_hook_logs_controller_spec.rb b/spec/controllers/projects/service_hook_logs_controller_spec.rb
index a5130cd6e32..97fb31f0546 100644
--- a/spec/controllers/projects/service_hook_logs_controller_spec.rb
+++ b/spec/controllers/projects/service_hook_logs_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ServiceHookLogsController do
+RSpec.describe Projects::ServiceHookLogsController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:service) { create(:drone_ci_service, project: project) }
diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index c669119fa4e..04c74dfdefe 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ServicesController do
+RSpec.describe Projects::ServicesController do
   let(:project) { create(:project, :repository) }
   let(:user)    { create(:user) }
   let(:service) { create(:jira_service, project: project) }
@@ -134,24 +134,50 @@ describe Projects::ServicesController do
   describe 'PUT #update' do
     describe 'as HTML' do
       let(:service_params) { { active: true } }
+      let(:params)         { project_params(service: service_params) }
+
+      let(:message) { 'Jira activated.' }
+      let(:redirect_url) { project_settings_integrations_path(project) }
 
       before do
-        put :update, params: project_params(service: service_params)
+        put :update, params: params
+      end
+
+      shared_examples 'service update' do
+        it 'redirects to the correct url with a flash message' do
+          expect(response).to redirect_to(redirect_url)
+          expect(flash[:notice]).to eq(message)
+        end
       end
 
       context 'when param `active` is set to true' do
-        it 'activates the service and redirects to integrations paths' do
-          expect(response).to redirect_to(project_settings_integrations_path(project))
-          expect(flash[:notice]).to eq 'Jira activated.'
+        let(:params) { project_params(service: service_params, redirect_to: redirect) }
+
+        context 'when redirect_to param is present' do
+          let(:redirect)     { '/redirect_here' }
+          let(:redirect_url) { redirect }
+
+          it_behaves_like 'service update'
+        end
+
+        context 'when redirect_to is an external domain' do
+          let(:redirect) { 'http://examle.com' }
+
+          it_behaves_like 'service update'
+        end
+
+        context 'when redirect_to param is an empty string' do
+          let(:redirect) { '' }
+
+          it_behaves_like 'service update'
         end
       end
 
       context 'when param `active` is set to false' do
         let(:service_params) { { active: false } }
+        let(:message)        { 'Jira settings saved, but not activated.' }
 
-        it 'does not activate the service but saves the settings' do
-          expect(flash[:notice]).to eq 'Jira settings saved, but not activated.'
-        end
+        it_behaves_like 'service update'
       end
     end
 
diff --git a/spec/controllers/projects/settings/access_tokens_controller_spec.rb b/spec/controllers/projects/settings/access_tokens_controller_spec.rb
index 884a5bc2836..4743ab2b7c1 100644
--- a/spec/controllers/projects/settings/access_tokens_controller_spec.rb
+++ b/spec/controllers/projects/settings/access_tokens_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe Projects::Settings::AccessTokensController do
+RSpec.describe Projects::Settings::AccessTokensController do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
 
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
index 6891af54eb4..8498ff49826 100644
--- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe Projects::Settings::CiCdController do
+RSpec.describe Projects::Settings::CiCdController do
   let_it_be(:user) { create(:user) }
   let_it_be(:project_auto_devops) { create(:project_auto_devops) }
   let(:project) { project_auto_devops.project }
diff --git a/spec/controllers/projects/settings/integrations_controller_spec.rb b/spec/controllers/projects/settings/integrations_controller_spec.rb
index 5d9fe3da912..0652786c787 100644
--- a/spec/controllers/projects/settings/integrations_controller_spec.rb
+++ b/spec/controllers/projects/settings/integrations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Settings::IntegrationsController do
+RSpec.describe Projects::Settings::IntegrationsController do
   let(:project) { create(:project, :public) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/settings/operations_controller_spec.rb b/spec/controllers/projects/settings/operations_controller_spec.rb
index c9afff0b73d..6b440e910ad 100644
--- a/spec/controllers/projects/settings/operations_controller_spec.rb
+++ b/spec/controllers/projects/settings/operations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Settings::OperationsController do
+RSpec.describe Projects::Settings::OperationsController do
   let_it_be(:user) { create(:user) }
   let_it_be(:project, reload: true) { create(:project) }
 
diff --git a/spec/controllers/projects/settings/repository_controller_spec.rb b/spec/controllers/projects/settings/repository_controller_spec.rb
index fb9cdd860dc..46dba691bc4 100644
--- a/spec/controllers/projects/settings/repository_controller_spec.rb
+++ b/spec/controllers/projects/settings/repository_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Settings::RepositoryController do
+RSpec.describe Projects::Settings::RepositoryController do
   let(:project) { create(:project_empty_repo, :public) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/snippets_controller_spec.rb b/spec/controllers/projects/snippets_controller_spec.rb
index b5f4929d8ce..8bbfaa8d327 100644
--- a/spec/controllers/projects/snippets_controller_spec.rb
+++ b/spec/controllers/projects/snippets_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::SnippetsController do
+RSpec.describe Projects::SnippetsController do
   include Gitlab::Routing
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/projects/stages_controller_spec.rb b/spec/controllers/projects/stages_controller_spec.rb
index c38e3d2544f..dcf8607ae18 100644
--- a/spec/controllers/projects/stages_controller_spec.rb
+++ b/spec/controllers/projects/stages_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::StagesController do
+RSpec.describe Projects::StagesController do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
diff --git a/spec/controllers/projects/starrers_controller_spec.rb b/spec/controllers/projects/starrers_controller_spec.rb
index 5774ff7c576..66888fa3024 100644
--- a/spec/controllers/projects/starrers_controller_spec.rb
+++ b/spec/controllers/projects/starrers_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::StarrersController do
+RSpec.describe Projects::StarrersController do
   let(:user_1) { create(:user, name: 'John') }
   let(:user_2) { create(:user, name: 'Michael') }
   let(:private_user) { create(:user, name: 'Michael Douglas', private_profile: true) }
diff --git a/spec/controllers/projects/static_site_editor_controller_spec.rb b/spec/controllers/projects/static_site_editor_controller_spec.rb
index 7b470254de1..384218504b9 100644
--- a/spec/controllers/projects/static_site_editor_controller_spec.rb
+++ b/spec/controllers/projects/static_site_editor_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::StaticSiteEditorController do
+RSpec.describe Projects::StaticSiteEditorController do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/tags/releases_controller_spec.rb b/spec/controllers/projects/tags/releases_controller_spec.rb
index cb12e074732..b3d4d944440 100644
--- a/spec/controllers/projects/tags/releases_controller_spec.rb
+++ b/spec/controllers/projects/tags/releases_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Tags::ReleasesController do
+RSpec.describe Projects::Tags::ReleasesController do
   let!(:project) { create(:project, :repository) }
   let!(:user)    { create(:user) }
   let!(:release) { create(:release, project: project) }
@@ -16,7 +16,7 @@ describe Projects::Tags::ReleasesController do
   describe 'GET #edit' do
     it 'initializes a new release' do
       tag_id = release.tag
-      project.releases.destroy_all # rubocop: disable DestroyAll
+      project.releases.destroy_all # rubocop: disable Cop/DestroyAll
 
       response = get :edit, params: { namespace_id: project.namespace, project_id: project, tag_id: tag_id }
 
diff --git a/spec/controllers/projects/tags_controller_spec.rb b/spec/controllers/projects/tags_controller_spec.rb
index 15ef1c65c53..122d1b072d0 100644
--- a/spec/controllers/projects/tags_controller_spec.rb
+++ b/spec/controllers/projects/tags_controller_spec.rb
@@ -2,10 +2,11 @@
 
 require 'spec_helper'
 
-describe Projects::TagsController do
+RSpec.describe Projects::TagsController do
   let(:project) { create(:project, :public, :repository) }
   let!(:release) { create(:release, project: project) }
   let!(:invalid_release) { create(:release, project: project, tag: 'does-not-exist') }
+  let(:user) { create(:user) }
 
   describe 'GET index' do
     before do
@@ -61,4 +62,69 @@ describe Projects::TagsController do
       end
     end
   end
+
+  describe 'POST #create' do
+    before do
+      project.add_developer(user)
+      sign_in(user)
+    end
+
+    let(:release_description) { nil }
+    let(:request) do
+      post(:create, params: {
+             namespace_id: project.namespace.to_param,
+             project_id: project,
+             tag_name: '1.0',
+             ref: 'master',
+             release_description: release_description
+           })
+    end
+
+    it 'creates tag' do
+      request
+
+      expect(response).to have_gitlab_http_status(:found)
+      expect(project.repository.find_tag('1.0')).to be_present
+    end
+
+    # TODO: remove this with the release creation moved to it's own form https://gitlab.com/gitlab-org/gitlab/-/issues/214245
+    context 'when release description is set' do
+      let(:release_description) { 'some release description' }
+
+      it 'creates tag and release' do
+        request
+
+        expect(response).to have_gitlab_http_status(:found)
+        expect(project.repository.find_tag('1.0')).to be_present
+
+        release = project.releases.find_by_tag!('1.0')
+
+        expect(release).to be_present
+        expect(release.description).to eq(release_description)
+      end
+
+      it 'passes the last pipeline for evidence creation', :sidekiq_inline do
+        sha = project.repository.commit('master').sha
+        create(:ci_empty_pipeline, sha: sha, project: project) # old pipeline
+        pipeline = create(:ci_empty_pipeline, sha: sha, project: project)
+
+        # simulating pipeline creation by new tag
+        expect_any_instance_of(Repository).to receive(:add_tag).and_wrap_original do |m, *args|
+          create(:ci_empty_pipeline, sha: sha, project: project)
+          m.call(*args)
+        end
+
+        expect_next_instance_of(Releases::CreateEvidenceService, anything, pipeline: pipeline) do |service|
+          expect(service).to receive(:execute).and_call_original
+        end
+
+        request
+
+        release = project.releases.find_by_tag!('1.0')
+
+        expect(release).to be_present
+        expect(release.description).to eq(release_description)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/projects/templates_controller_spec.rb b/spec/controllers/projects/templates_controller_spec.rb
index fcd9b4aa8bd..40632e0dea7 100644
--- a/spec/controllers/projects/templates_controller_spec.rb
+++ b/spec/controllers/projects/templates_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::TemplatesController do
+RSpec.describe Projects::TemplatesController do
   let(:project) { create(:project, :repository, :private) }
   let(:user) { create(:user) }
   let(:file_path_1) { '.gitlab/issue_templates/issue_template.md' }
diff --git a/spec/controllers/projects/todos_controller_spec.rb b/spec/controllers/projects/todos_controller_spec.rb
index b7d40d2a452..e1e1e455094 100644
--- a/spec/controllers/projects/todos_controller_spec.rb
+++ b/spec/controllers/projects/todos_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe Projects::TodosController do
+RSpec.describe Projects::TodosController do
   let(:user)          { create(:user) }
   let(:project)       { create(:project) }
   let(:issue)         { create(:issue, project: project) }
diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb
index 96838383540..f6ec04d4dd7 100644
--- a/spec/controllers/projects/tree_controller_spec.rb
+++ b/spec/controllers/projects/tree_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::TreeController do
+RSpec.describe Projects::TreeController do
   let(:project) { create(:project, :repository) }
   let(:user)    { create(:user) }
 
diff --git a/spec/controllers/projects/uploads_controller_spec.rb b/spec/controllers/projects/uploads_controller_spec.rb
index bb5415ee62c..dda58f06a37 100644
--- a/spec/controllers/projects/uploads_controller_spec.rb
+++ b/spec/controllers/projects/uploads_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::UploadsController do
+RSpec.describe Projects::UploadsController do
   include WorkhorseHelpers
 
   let(:model) { create(:project, :public) }
diff --git a/spec/controllers/projects/usage_ping_controller_spec.rb b/spec/controllers/projects/usage_ping_controller_spec.rb
index a68967c228f..9ace072d561 100644
--- a/spec/controllers/projects/usage_ping_controller_spec.rb
+++ b/spec/controllers/projects/usage_ping_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::UsagePingController do
+RSpec.describe Projects::UsagePingController do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/variables_controller_spec.rb b/spec/controllers/projects/variables_controller_spec.rb
index 21e106660d0..8bb4c2dae4b 100644
--- a/spec/controllers/projects/variables_controller_spec.rb
+++ b/spec/controllers/projects/variables_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::VariablesController do
+RSpec.describe Projects::VariablesController do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/controllers/projects/web_ide_terminals_controller_spec.rb b/spec/controllers/projects/web_ide_terminals_controller_spec.rb
new file mode 100644
index 00000000000..2ae5899c258
--- /dev/null
+++ b/spec/controllers/projects/web_ide_terminals_controller_spec.rb
@@ -0,0 +1,304 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Projects::WebIdeTerminalsController do
+  let_it_be(:owner) { create(:owner) }
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:maintainer) { create(:user) }
+  let_it_be(:developer) { create(:user) }
+  let_it_be(:reporter) { create(:user) }
+  let_it_be(:guest) { create(:user) }
+  let_it_be(:project) { create(:project, :private, :repository, namespace: owner.namespace) }
+  let(:pipeline) { create(:ci_pipeline, project: project, source: :webide, config_source: :webide_source, user: user) }
+  let(:job) { create(:ci_build, pipeline: pipeline, user: user, project: project) }
+  let(:user) { maintainer }
+
+  before do
+    project.add_maintainer(maintainer)
+    project.add_developer(developer)
+    project.add_reporter(reporter)
+    project.add_guest(guest)
+
+    sign_in(user)
+  end
+
+  shared_examples 'terminal access rights' do
+    context 'with admin' do
+      let(:user) { admin }
+
+      context 'when admin mode is enabled', :enable_admin_mode do
+        it 'returns 200' do
+          expect(response).to have_gitlab_http_status(:ok)
+        end
+      end
+
+      context 'when admin mode is disabled' do
+        it 'returns 404' do
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+    end
+
+    context 'with owner' do
+      let(:user) { owner }
+
+      it 'returns 200' do
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+
+    context 'with maintainer' do
+      let(:user) { maintainer }
+
+      it 'returns 200' do
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+
+    context 'with developer' do
+      let(:user) { developer }
+
+      it 'returns 404' do
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'with reporter' do
+      let(:user) { reporter }
+
+      it 'returns 404' do
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'with guest' do
+      let(:user) { guest }
+
+      it 'returns 404' do
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'with non member' do
+      let(:user) { create(:user) }
+
+      it 'returns 404' do
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
+  shared_examples 'when pipeline is not from a webide source' do
+    context 'with admin' do
+      let(:user) { admin }
+      let(:pipeline) { create(:ci_pipeline, project: project, source: :chat, user: user) }
+
+      it 'returns 404' do
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
+  describe 'GET show' do
+    before do
+      get(:show, params: { namespace_id: project.namespace.to_param, project_id: project, id: job.id })
+    end
+
+    it_behaves_like 'terminal access rights'
+    it_behaves_like 'when pipeline is not from a webide source'
+  end
+
+  describe 'POST check_config' do
+    let(:result) { { status: :success } }
+
+    before do
+      allow_next_instance_of(::Ci::WebIdeConfigService) do |instance|
+        allow(instance).to receive(:execute).and_return(result)
+      end
+
+      post :check_config, params: {
+                            namespace_id: project.namespace.to_param,
+                            project_id: project.to_param,
+                            branch: 'master'
+                          }
+    end
+
+    it_behaves_like 'terminal access rights'
+
+    context 'when invalid config file' do
+      let(:user) { admin }
+      let(:result) { { status: :error } }
+
+      it 'returns 422', :enable_admin_mode do
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
+      end
+    end
+  end
+
+  describe 'POST create' do
+    let(:branch) { 'master' }
+
+    subject do
+      post :create, params: {
+                      namespace_id: project.namespace.to_param,
+                      project_id: project.to_param,
+                      branch: branch
+                    }
+    end
+
+    context 'when terminal job is created successfully' do
+      let(:build) { create(:ci_build, project: project) }
+      let(:pipeline) { build.pipeline }
+
+      before do
+        allow_next_instance_of(::Ci::CreateWebIdeTerminalService) do |instance|
+          allow(instance).to receive(:execute).and_return(status: :success, pipeline: pipeline)
+        end
+      end
+
+      context 'access rights' do
+        before do
+          subject
+        end
+
+        it_behaves_like 'terminal access rights'
+      end
+
+      it 'increases the web ide terminal counter' do
+        expect(Gitlab::UsageDataCounters::WebIdeCounter).to receive(:increment_terminals_count)
+
+        subject
+      end
+    end
+
+    shared_examples 'web ide terminal usage counter' do
+      it 'does not increase', :enable_admin_mode do
+        expect(Gitlab::UsageDataCounters::WebIdeCounter).not_to receive(:increment_terminals_count)
+
+        subject
+      end
+    end
+
+    context 'when branch does not exist' do
+      let(:user) { admin }
+      let(:branch) { 'foobar' }
+
+      it 'returns 400', :enable_admin_mode do
+        subject
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it_behaves_like 'web ide terminal usage counter'
+    end
+
+    context 'when there is an error creating the job' do
+      let(:user) { admin }
+
+      before do
+        allow_next_instance_of(::Ci::CreateWebIdeTerminalService) do |instance|
+          allow(instance).to receive(:execute).and_return(status: :error, message: 'foobar')
+        end
+      end
+
+      it 'returns 400', :enable_admin_mode do
+        subject
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it_behaves_like 'web ide terminal usage counter'
+    end
+
+    context 'when the current build is nil' do
+      let(:user) { admin }
+
+      before do
+        allow(pipeline).to receive(:builds).and_return([])
+        allow_next_instance_of(::Ci::CreateWebIdeTerminalService) do |instance|
+          allow(instance).to receive(:execute).and_return(status: :success, pipeline: pipeline)
+        end
+      end
+
+      it 'returns 400', :enable_admin_mode do
+        subject
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it_behaves_like 'web ide terminal usage counter'
+    end
+  end
+
+  describe 'POST cancel' do
+    let(:job) { create(:ci_build, :running, pipeline: pipeline, user: user, project: project) }
+
+    before do
+      post(:cancel, params: {
+                      namespace_id: project.namespace.to_param,
+                      project_id: project.to_param,
+                      id: job.id
+                    })
+    end
+
+    it_behaves_like 'terminal access rights'
+    it_behaves_like 'when pipeline is not from a webide source'
+
+    context 'when job is not cancelable' do
+      let!(:job) { create(:ci_build, :failed, pipeline: pipeline, user: user) }
+
+      it 'returns 422' do
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
+      end
+    end
+  end
+
+  describe 'POST retry' do
+    let(:status) { :failed }
+    let(:job) { create(:ci_build, status, pipeline: pipeline, user: user, project: project) }
+
+    before do
+      post(:retry, params: {
+                     namespace_id: project.namespace.to_param,
+                     project_id: project.to_param,
+                     id: job.id
+                   })
+    end
+
+    it_behaves_like 'terminal access rights'
+    it_behaves_like 'when pipeline is not from a webide source'
+
+    context 'when job is not retryable' do
+      let(:status) { :running }
+
+      it 'returns 422' do
+        expect(response).to have_gitlab_http_status(:unprocessable_entity)
+      end
+    end
+
+    context 'when job is cancelled' do
+      let(:status) { :canceled }
+
+      it 'returns 200' do
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+
+    context 'when job fails' do
+      let(:status) { :failed }
+
+      it 'returns 200' do
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+
+    context 'when job is successful' do
+      let(:status) { :success }
+
+      it 'returns 200' do
+        expect(response).to have_gitlab_http_status(:ok)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/projects/wikis_controller_spec.rb b/spec/controllers/projects/wikis_controller_spec.rb
index b4bbf76ce18..4e58822b613 100644
--- a/spec/controllers/projects/wikis_controller_spec.rb
+++ b/spec/controllers/projects/wikis_controller_spec.rb
@@ -2,283 +2,9 @@
 
 require 'spec_helper'
 
-describe Projects::WikisController do
-  let_it_be(:project) { create(:project, :public, :repository) }
-  let(:user) { project.owner }
-  let(:project_wiki) { ProjectWiki.new(project, user) }
-  let(:wiki) { project_wiki.wiki }
-  let(:wiki_title) { 'page title test' }
-
-  before do
-    create_page(wiki_title, 'hello world')
-
-    sign_in(user)
-  end
-
-  after do
-    destroy_page(wiki_title)
-  end
-
-  describe 'GET #new' do
-    subject { get :new, params: { namespace_id: project.namespace, project_id: project } }
-
-    it 'redirects to #show and appends a `random_title` param' do
-      subject
-
-      expect(response).to have_gitlab_http_status(:found)
-      expect(Rails.application.routes.recognize_path(response.redirect_url)).to include(
-        controller: 'projects/wikis',
-        action: 'show'
-      )
-      expect(response.redirect_url).to match(/\?random_title=true\Z/)
-    end
-  end
-
-  describe 'GET #pages' do
-    subject { get :pages, params: { namespace_id: project.namespace, project_id: project, id: wiki_title } }
-
-    it 'does not load the pages content' do
-      expect(controller).to receive(:load_wiki).and_return(project_wiki)
-
-      expect(project_wiki).to receive(:list_pages).twice.and_call_original
-
-      subject
-    end
-  end
-
-  describe 'GET #history' do
-    before do
-      allow(controller)
-        .to receive(:can?)
-        .with(any_args)
-        .and_call_original
-
-      # The :create_wiki permission is irrelevant to reading history.
-      expect(controller)
-        .not_to receive(:can?)
-        .with(anything, :create_wiki, any_args)
-
-      allow(controller)
-        .to receive(:can?)
-        .with(anything, :read_wiki, any_args)
-        .and_return(allow_read_wiki)
-    end
-
-    shared_examples 'fetching history' do |expected_status|
-      before do
-        get :history, params: { namespace_id: project.namespace, project_id: project, id: wiki_title }
-      end
-
-      it "returns status #{expected_status}" do
-        expect(response).to have_gitlab_http_status(expected_status)
-      end
-    end
-
-    it_behaves_like 'fetching history', :ok do
-      let(:allow_read_wiki)   { true }
-
-      it 'assigns @page_versions' do
-        expect(assigns(:page_versions)).to be_present
-      end
-    end
-
-    it_behaves_like 'fetching history', :not_found do
-      let(:allow_read_wiki)   { false }
-    end
-  end
-
-  describe 'GET #show' do
-    render_views
-
-    let(:random_title) { nil }
-
-    subject { get :show, params: { namespace_id: project.namespace, project_id: project, id: id, random_title: random_title } }
-
-    context 'when page exists' do
-      let(:id) { wiki_title }
-
-      it 'limits the retrieved pages for the sidebar' do
-        subject
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(assigns(:page).title).to eq(wiki_title)
-        expect(assigns(:sidebar_wiki_entries)).to contain_exactly(an_instance_of(WikiPage))
-        expect(assigns(:sidebar_limited)).to be(false)
-      end
-
-      context 'when page content encoding is invalid' do
-        it 'sets flash error' do
-          allow(controller).to receive(:valid_encoding?).and_return(false)
-
-          subject
-
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(flash[:notice]).to eq(_('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.'))
-        end
-      end
-    end
-
-    context 'when the page does not exist' do
-      let(:id) { 'does not exist' }
-
-      before do
-        subject
-      end
-
-      it 'builds a new wiki page with the id as the title' do
-        expect(assigns(:page).title).to eq(id)
-      end
-
-      context 'when a random_title param is present' do
-        let(:random_title) { true }
-
-        it 'builds a new wiki page with no title' do
-          expect(assigns(:page).title).to be_empty
-        end
-      end
-    end
-
-    context 'when page is a file' do
-      include WikiHelpers
-
-      let(:id) { upload_file_to_wiki(project, user, file_name) }
-
-      context 'when file is an image' do
-        let(:file_name) { 'dk.png' }
-
-        it 'delivers the image' do
-          subject
-
-          expect(response.headers['Content-Disposition']).to match(/^inline/)
-          expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
-        end
-
-        context 'when file is a svg' do
-          let(:file_name) { 'unsanitized.svg' }
-
-          it 'delivers the image' do
-            subject
-
-            expect(response.headers['Content-Disposition']).to match(/^inline/)
-            expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
-          end
-        end
-
-        it_behaves_like 'project cache control headers'
-      end
-
-      context 'when file is a pdf' do
-        let(:file_name) { 'git-cheat-sheet.pdf' }
-
-        it 'sets the content type to sets the content response headers' do
-          subject
-
-          expect(response.headers['Content-Disposition']).to match(/^inline/)
-          expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
-        end
-
-        it_behaves_like 'project cache control headers'
-      end
-    end
-  end
-
-  describe 'POST #preview_markdown' do
-    it 'renders json in a correct format' do
-      post :preview_markdown, params: { namespace_id: project.namespace, project_id: project, id: 'page/path', text: '*Markdown* text' }
-
-      expect(json_response.keys).to match_array(%w(body references))
-    end
-  end
-
-  describe 'GET #edit' do
-    subject { get(:edit, params: { namespace_id: project.namespace, project_id: project, id: wiki_title }) }
-
-    context 'when page content encoding is invalid' do
-      it 'redirects to show' do
-        allow(controller).to receive(:valid_encoding?).and_return(false)
-
-        subject
-
-        expect(response).to redirect_to_wiki(project, project_wiki.list_pages.first)
-      end
-    end
-
-    context 'when the page has nil content' do
-      let(:page) { create(:wiki_page) }
-
-      it 'redirects to show' do
-        allow(page).to receive(:content).and_return(nil)
-        allow(controller).to receive(:find_page).and_return(page)
-
-        subject
-
-        expect(response).to redirect_to_wiki(project, page)
-      end
-    end
-
-    context 'when page content encoding is valid' do
-      render_views
-
-      it 'shows the edit page' do
-        subject
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(response.body).to include(s_('Wiki|Edit Page'))
-      end
-    end
-  end
-
-  describe 'PATCH #update' do
-    let(:new_title) { 'New title' }
-    let(:new_content) { 'New content' }
-
-    subject do
-      patch(:update,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              id: wiki_title,
-              wiki: { title: new_title, content: new_content }
-            })
-    end
-
-    context 'when page content encoding is invalid' do
-      it 'redirects to show' do
-        allow(controller).to receive(:valid_encoding?).and_return(false)
-
-        subject
-        expect(response).to redirect_to_wiki(project, project_wiki.list_pages.first)
-      end
-    end
-
-    context 'when page content encoding is valid' do
-      render_views
-
-      it 'updates the page' do
-        subject
-
-        wiki_page = project_wiki.list_pages(load_content: true).first
-
-        expect(wiki_page.title).to eq new_title
-        expect(wiki_page.content).to eq new_content
-      end
-    end
-  end
-
-  def create_page(name, content)
-    wiki.write_page(name, :markdown, content, commit_details(name))
-  end
-
-  def commit_details(name)
-    Gitlab::Git::Wiki::CommitDetails.new(user.id, user.username, user.name, user.email, "created page #{name}")
-  end
-
-  def destroy_page(title, dir = '')
-    page = wiki.page(title: title, dir: dir)
-    project_wiki.delete_page(page, "test commit")
-  end
-
-  def redirect_to_wiki(project, page)
-    redirect_to(controller.project_wiki_path(project, page))
+RSpec.describe Projects::WikisController do
+  it_behaves_like 'wiki controller actions' do
+    let(:container) { create(:project, :public, :repository, namespace: user.namespace) }
+    let(:routing_params) { { namespace_id: container.namespace, project_id: container } }
   end
 end
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 6c00dad8bb7..8aae9ef85be 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require('spec_helper')
 
-describe ProjectsController do
+RSpec.describe ProjectsController do
   include ExternalAuthorizationServiceHelpers
   include ProjectForksHelper
 
@@ -41,6 +41,27 @@ describe ProjectsController do
           end
         end
       end
+
+      context 'with the new_create_project_ui experiment enabled and the user is part of the control group' do
+        before do
+          stub_experiment(new_create_project_ui: true)
+          stub_experiment_for_user(new_create_project_ui: false)
+          allow_any_instance_of(described_class).to receive(:experimentation_subject_id).and_return('uuid')
+        end
+
+        it 'passes the right tracking parameters to the frontend' do
+          get(:new)
+
+          expect(Gon.tracking_data).to eq(
+            {
+              category: 'Manage::Import::Experiment::NewCreateProjectUi',
+              action: 'click_tab',
+              label: 'uuid',
+              property: 'control_group'
+            }
+          )
+        end
+      end
     end
   end
 
@@ -359,6 +380,15 @@ describe ProjectsController do
         end
       end
     end
+
+    context 'namespace storage limit' do
+      let_it_be(:project) { create(:project, :public, :repository ) }
+      let(:namespace) { project.namespace }
+
+      subject { get :show, params: { namespace_id: namespace, id: project } }
+
+      it_behaves_like 'namespace storage limit alert'
+    end
   end
 
   describe 'GET edit' do
@@ -1160,16 +1190,16 @@ describe ProjectsController do
 
     shared_examples 'rate limits project export endpoint' do
       before do
-        allow(::Gitlab::ApplicationRateLimiter)
-          .to receive(:throttled?)
-          .and_return(true)
+        allow(Gitlab::ApplicationRateLimiter)
+          .to receive(:increment)
+          .and_return(Gitlab::ApplicationRateLimiter.rate_limits["project_#{action}".to_sym][:threshold] + 1)
       end
 
       it 'prevents requesting project export' do
         post action, params: { namespace_id: project.namespace, id: project }
 
-        expect(flash[:alert]).to eq('This endpoint has been requested too many times. Try again later.')
-        expect(response).to have_gitlab_http_status(:found)
+        expect(response.body).to eq('This endpoint has been requested too many times. Try again later.')
+        expect(response).to have_gitlab_http_status(:too_many_requests)
       end
     end
 
@@ -1226,7 +1256,18 @@ describe ProjectsController do
         end
 
         context 'when the endpoint receives requests above the limit', :clean_gitlab_redis_cache do
-          include_examples 'rate limits project export endpoint'
+          before do
+            allow(Gitlab::ApplicationRateLimiter)
+              .to receive(:increment)
+              .and_return(Gitlab::ApplicationRateLimiter.rate_limits[:project_download_export][:threshold] + 1)
+          end
+
+          it 'prevents requesting project export' do
+            post action, params: { namespace_id: project.namespace, id: project }
+
+            expect(response.body).to eq('This endpoint has been requested too many times. Try again later.')
+            expect(response).to have_gitlab_http_status(:too_many_requests)
+          end
         end
       end
     end
diff --git a/spec/controllers/registrations/experience_levels_controller_spec.rb b/spec/controllers/registrations/experience_levels_controller_spec.rb
new file mode 100644
index 00000000000..1fc728f5de8
--- /dev/null
+++ b/spec/controllers/registrations/experience_levels_controller_spec.rb
@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Registrations::ExperienceLevelsController do
+  let_it_be(:namespace) { create(:group, path: 'group-path' ) }
+  let_it_be(:user) { create(:user) }
+
+  let(:params) { { namespace_path: namespace.to_param } }
+
+  describe 'GET #show' do
+    subject { get :show, params: params }
+
+    context 'with an unauthenticated user' do
+      it { is_expected.to have_gitlab_http_status(:redirect) }
+      it { is_expected.to redirect_to(new_user_session_path) }
+    end
+
+    context 'with an authenticated user' do
+      before do
+        sign_in(user)
+        stub_experiment_for_user(onboarding_issues: true)
+      end
+
+      it { is_expected.to have_gitlab_http_status(:ok) }
+      it { is_expected.to render_template(:show) }
+
+      context 'when not part of the onboarding issues experiment' do
+        before do
+          stub_experiment_for_user(onboarding_issues: false)
+        end
+
+        it { is_expected.to have_gitlab_http_status(:not_found) }
+      end
+    end
+  end
+
+  describe 'PUT/PATCH #update' do
+    subject { patch :update, params: params }
+
+    context 'with an unauthenticated user' do
+      it { is_expected.to have_gitlab_http_status(:redirect) }
+      it { is_expected.to redirect_to(new_user_session_path) }
+    end
+
+    context 'with an authenticated user' do
+      before do
+        sign_in(user)
+        stub_experiment_for_user(onboarding_issues: true)
+      end
+
+      context 'when not part of the onboarding issues experiment' do
+        before do
+          stub_experiment_for_user(onboarding_issues: false)
+        end
+
+        it { is_expected.to have_gitlab_http_status(:not_found) }
+      end
+
+      context 'when user is successfully updated' do
+        it { is_expected.to set_flash[:message].to('Welcome! You have signed up successfully.') }
+
+        context 'when no experience_level is sent' do
+          before do
+            user.user_preference.update_attribute(:experience_level, :novice)
+          end
+
+          it 'will unset the user’s experience level' do
+            expect { subject }.to change { user.reload.experience_level }.to(nil)
+          end
+        end
+
+        context 'when an expected experience level is sent' do
+          let(:params) { super().merge(experience_level: :novice) }
+
+          it 'sets the user’s experience level' do
+            expect { subject }.to change { user.reload.experience_level }.from(nil).to('novice')
+          end
+        end
+
+        context 'when an unexpected experience level is sent' do
+          let(:params) { super().merge(experience_level: :nonexistent) }
+
+          it 'raises an exception' do
+            expect { subject }.to raise_error(ArgumentError, "'nonexistent' is not a valid experience_level")
+          end
+        end
+
+        context 'when a namespace_path is sent' do
+          it { is_expected.to have_gitlab_http_status(:redirect) }
+          it { is_expected.to redirect_to(group_path(namespace)) }
+        end
+
+        context 'when no namespace_path is sent' do
+          let(:params) { super().merge(namespace_path: nil) }
+
+          it { is_expected.to have_gitlab_http_status(:redirect) }
+          it { is_expected.to redirect_to(root_path) }
+        end
+
+        describe 'applying the chosen level' do
+          context "when an 'onboarding_issues_settings' cookie does not exist" do
+            let(:params) { super().merge(experience_level: :novice) }
+
+            it 'does not change the cookie' do
+              expect { subject }.not_to change { cookies[:onboarding_issues_settings] }
+            end
+          end
+
+          context "when an 'onboarding_issues_settings' cookie does exist" do
+            before do
+              request.cookies[:onboarding_issues_settings] = '{}'
+            end
+
+            context 'when novice' do
+              let(:params) { super().merge(experience_level: :novice) }
+
+              it "adds a 'hideAdvanced' setting to the cookie" do
+                expect { subject }.to change { Gitlab::Json.parse(cookies[:onboarding_issues_settings])['hideAdvanced'] }.from(nil).to(true)
+              end
+            end
+
+            context 'when experienced' do
+              let(:params) { super().merge(experience_level: :experienced) }
+
+              it 'does not change the cookie' do
+                expect { subject }.not_to change { cookies[:onboarding_issues_settings] }
+              end
+            end
+          end
+        end
+      end
+
+      context 'when user update fails' do
+        before do
+          allow_any_instance_of(User).to receive(:save).and_return(false)
+        end
+
+        it { is_expected.to render_template(:show) }
+      end
+    end
+  end
+end
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index 01a9647a763..66caa58666f 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RegistrationsController do
+RSpec.describe RegistrationsController do
   include TermsHelper
 
   before do
diff --git a/spec/controllers/repositories/git_http_controller_spec.rb b/spec/controllers/repositories/git_http_controller_spec.rb
index 1a2eee5d3a9..aafb933df32 100644
--- a/spec/controllers/repositories/git_http_controller_spec.rb
+++ b/spec/controllers/repositories/git_http_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Repositories::GitHttpController do
+RSpec.describe Repositories::GitHttpController do
   include GitHttpHelpers
 
   let_it_be(:project) { create(:project, :public, :repository) }
diff --git a/spec/controllers/root_controller_spec.rb b/spec/controllers/root_controller_spec.rb
index 4892ff43086..9eefbcb0835 100644
--- a/spec/controllers/root_controller_spec.rb
+++ b/spec/controllers/root_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe RootController do
+RSpec.describe RootController do
   describe 'GET index' do
     context 'when user is not logged in' do
       it 'redirects to the sign-in page' do
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 79ffa297da3..bae6bd07b67 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SearchController do
+RSpec.describe SearchController do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
@@ -211,9 +211,4 @@ describe SearchController do
       end.to raise_error(ActionController::ParameterMissing)
     end
   end
-
-  describe 'GET #autocomplete' do
-    it_behaves_like 'when the user cannot read cross project', :autocomplete, { term: 'hello' }
-    it_behaves_like 'with external authorization service enabled', :autocomplete, { term: 'hello' }
-  end
 end
diff --git a/spec/controllers/sent_notifications_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb
index a0a18f66b0c..0c4a77d5926 100644
--- a/spec/controllers/sent_notifications_controller_spec.rb
+++ b/spec/controllers/sent_notifications_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SentNotificationsController do
+RSpec.describe SentNotificationsController do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
   let(:private_project) { create(:project, :private) }
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index a65698a5b56..16a58112479 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SessionsController do
+RSpec.describe SessionsController do
   include DeviseHelpers
   include LdapHelpers
 
diff --git a/spec/controllers/snippets/notes_controller_spec.rb b/spec/controllers/snippets/notes_controller_spec.rb
index 0676ed05212..487635169fc 100644
--- a/spec/controllers/snippets/notes_controller_spec.rb
+++ b/spec/controllers/snippets/notes_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Snippets::NotesController do
+RSpec.describe Snippets::NotesController do
   let(:user) { create(:user) }
 
   let(:private_snippet)  { create(:personal_snippet, :private) }
diff --git a/spec/controllers/snippets_controller_spec.rb b/spec/controllers/snippets_controller_spec.rb
index 046ee40cec2..70df1faf7dd 100644
--- a/spec/controllers/snippets_controller_spec.rb
+++ b/spec/controllers/snippets_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SnippetsController do
+RSpec.describe SnippetsController do
   let_it_be(:user) { create(:user) }
 
   describe 'GET #index' do
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 309a8226226..043fd97f1ad 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-shared_examples 'content 5 min private cached with revalidation' do
+RSpec.shared_examples 'content 5 min private cached with revalidation' do
   it 'ensures content will not be cached without revalidation' do
     expect(subject['Cache-Control']).to eq('max-age=300, private, must-revalidate')
   end
 end
 
-shared_examples 'content not cached' do
+RSpec.shared_examples 'content not cached' do
   it 'ensures content will not be cached without revalidation' do
     expect(subject['Cache-Control']).to eq('max-age=0, private, must-revalidate')
   end
 end
 
-shared_examples 'content publicly cached' do
+RSpec.shared_examples 'content publicly cached' do
   it 'ensures content is publicly cached' do
     expect(subject['Cache-Control']).to eq('max-age=300, public')
   end
 end
 
-describe UploadsController do
+RSpec.describe UploadsController do
   include WorkhorseHelpers
 
   let!(:user) { create(:user, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
diff --git a/spec/controllers/user_callouts_controller_spec.rb b/spec/controllers/user_callouts_controller_spec.rb
index 04f73749e1d..279f825e40f 100644
--- a/spec/controllers/user_callouts_controller_spec.rb
+++ b/spec/controllers/user_callouts_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserCalloutsController do
+RSpec.describe UserCalloutsController do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/controllers/users/terms_controller_spec.rb b/spec/controllers/users/terms_controller_spec.rb
index 99582652c39..0acc3008187 100644
--- a/spec/controllers/users/terms_controller_spec.rb
+++ b/spec/controllers/users/terms_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Users::TermsController do
+RSpec.describe Users::TermsController do
   include TermsHelper
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 2af398e143d..bec4b24484a 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UsersController do
+RSpec.describe UsersController do
   let(:user) { create(:user) }
   let(:private_user) { create(:user, private_profile: true) }
   let(:public_user) { create(:user) }
diff --git a/spec/db/development/import_common_metrics_spec.rb b/spec/db/development/import_common_metrics_spec.rb
index 25061ef0887..396eae9293e 100644
--- a/spec/db/development/import_common_metrics_spec.rb
+++ b/spec/db/development/import_common_metrics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Import metrics on development seed' do
+RSpec.describe 'Import metrics on development seed' do
   subject { load Rails.root.join('db', 'fixtures', 'development', '99_common_metrics.rb') }
 
   it "imports all prometheus metrics" do
diff --git a/spec/db/production/import_common_metrics_spec.rb b/spec/db/production/import_common_metrics_spec.rb
index 1e4ff818a86..1cc0c2fd77f 100644
--- a/spec/db/production/import_common_metrics_spec.rb
+++ b/spec/db/production/import_common_metrics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Import metrics on production seed' do
+RSpec.describe 'Import metrics on production seed' do
   subject { load Rails.root.join('db', 'fixtures', 'production', '999_common_metrics.rb') }
 
   it "imports all prometheus metrics" do
diff --git a/spec/db/production/settings_spec.rb b/spec/db/production/settings_spec.rb
index 02e25aa37e3..84f7ae12728 100644
--- a/spec/db/production/settings_spec.rb
+++ b/spec/db/production/settings_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rainbow/ext/string'
 
-describe 'seed production settings' do
+RSpec.describe 'seed production settings' do
   let(:settings_file) { Rails.root.join('db/fixtures/production/010_settings.rb') }
   let(:settings) { Gitlab::CurrentSettings.current_application_settings }
 
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index eac9eb7aa47..95d7981b85c 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('ee', 'spec', 'db', 'schema_support') if Gitlab.ee?
 
-describe 'Database schema' do
+RSpec.describe 'Database schema' do
   prepend_if_ee('EE::DB::SchemaSupport')
 
   let(:connection) { ActiveRecord::Base.connection }
@@ -92,7 +92,8 @@ describe 'Database schema' do
         let(:indexes) { connection.indexes(table) }
         let(:columns) { connection.columns(table) }
         let(:foreign_keys) { connection.foreign_keys(table) }
-        let(:primary_key_column) { connection.primary_key(table) }
+        # take the first column in case we're using a composite primary key
+        let(:primary_key_column) { Array(connection.primary_key(table)).first }
 
         context 'all foreign keys' do
           # for index to be effective, the FK constraint has to be at first place
diff --git a/spec/dependencies/omniauth_saml_spec.rb b/spec/dependencies/omniauth_saml_spec.rb
index e0ea9c38e69..fa179eb1516 100644
--- a/spec/dependencies/omniauth_saml_spec.rb
+++ b/spec/dependencies/omniauth_saml_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'omniauth/strategies/saml'
 
-describe 'processing of SAMLResponse in dependencies' do
+RSpec.describe 'processing of SAMLResponse in dependencies' do
   let(:mock_saml_response) { File.read('spec/fixtures/authentication/saml_response.xml') }
   let(:saml_strategy) { OmniAuth::Strategies::SAML.new({}) }
   let(:session_mock) { {} }
diff --git a/spec/factories/alert_management/alerts.rb b/spec/factories/alert_management/alerts.rb
index 01f40a7a465..8724a626d77 100644
--- a/spec/factories/alert_management/alerts.rb
+++ b/spec/factories/alert_management/alerts.rb
@@ -8,10 +8,23 @@ FactoryBot.define do
     title { FFaker::Lorem.sentence }
     started_at { Time.current }
 
+    trait :with_validation_errors do
+      after(:create) do |alert|
+        too_many_hosts = Array.new(AlertManagement::Alert::HOSTS_MAX_LENGTH + 1) { |_| 'host' }
+        alert.update_columns(hosts: too_many_hosts)
+      end
+    end
+
     trait :with_issue do
       issue
     end
 
+    trait :with_assignee do |alert|
+      after(:create) do |alert|
+        alert.alert_assignees.create(assignee: create(:user))
+      end
+    end
+
     trait :with_fingerprint do
       fingerprint { SecureRandom.hex }
     end
@@ -70,6 +83,7 @@ FactoryBot.define do
 
     trait :all_fields do
       with_issue
+      with_assignee
       with_fingerprint
       with_service
       with_monitoring_tool
diff --git a/spec/factories/ci/build_report_results.rb b/spec/factories/ci/build_report_results.rb
new file mode 100644
index 00000000000..0685c0e5554
--- /dev/null
+++ b/spec/factories/ci/build_report_results.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :ci_build_report_result, class: 'Ci::BuildReportResult' do
+    build factory: :ci_build
+    project factory: :project
+    data do
+      {
+        tests: {
+          name: "rspec",
+          duration: 0.42,
+          failed: 0,
+          errored: 2,
+          skipped: 0,
+          success: 0
+        }
+      }
+    end
+
+    trait :with_junit_success do
+      data do
+        {
+          tests: {
+            name: "rspec",
+            duration: 0.42,
+            failed: 0,
+            errored: 0,
+            skipped: 0,
+            success: 2
+          }
+        }
+      end
+    end
+  end
+end
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 26786aab12c..9403967aa0a 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -378,6 +378,21 @@ FactoryBot.define do
       end
     end
 
+    trait :release_options do
+      options do
+        {
+          only: 'tags',
+          script: ['make changelog | tee release_changelog.txt'],
+          release: {
+            name: 'Release $CI_COMMIT_SHA',
+            description: 'Created using the release-cli $EXTRA_DESCRIPTION',
+            tag_name: 'release-$CI_COMMIT_SHA',
+            ref: '$CI_COMMIT_SHA'
+          }
+        }
+      end
+    end
+
     trait :no_options do
       options { {} }
     end
@@ -400,6 +415,14 @@ FactoryBot.define do
       end
     end
 
+    trait :secret_detection do
+      options do
+        {
+            artifacts: { reports: { secret_detection: 'gl-secret-detection-report.json' } }
+        }
+      end
+    end
+
     trait :dependency_scanning do
       options do
         {
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 26c09795a0b..1bd4b2826c4 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -233,12 +233,9 @@ FactoryBot.define do
       file_type { :lsif }
       file_format { :zip }
 
-      transient do
-        file_path { Rails.root.join('spec/fixtures/lsif.json.gz') }
-      end
-
       after(:build) do |artifact, evaluator|
-        artifact.file = fixture_file_upload(evaluator.file_path, 'application/x-gzip')
+        artifact.file = fixture_file_upload(
+          Rails.root.join('spec/fixtures/lsif.json.zip'), 'application/zip')
       end
     end
 
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 0b3653a01ed..85cdeaca12c 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -21,6 +21,12 @@ FactoryBot.define do
     end
 
     factory :ci_pipeline do
+      transient { ci_ref_presence { true } }
+
+      after(:build) do |pipeline, evaluator|
+        pipeline.ensure_ci_ref! if evaluator.ci_ref_presence && pipeline.ci_ref_id.nil?
+      end
+
       trait :invalid do
         status { :failed }
         yaml_errors { 'invalid YAML' }
@@ -104,6 +110,7 @@ FactoryBot.define do
 
         after(:build) do |pipeline, evaluator|
           pipeline.builds << build(:ci_build, :terraform_reports, pipeline: pipeline, project: pipeline.project)
+          pipeline.builds << build(:ci_build, :terraform_reports, pipeline: pipeline, project: pipeline.project)
         end
       end
 
@@ -155,6 +162,11 @@ FactoryBot.define do
         source_sha { merge_request.source_branch_sha }
         target_sha { merge_request.target_branch_sha }
       end
+
+      trait :webide do
+        source { :webide }
+        config_source { :webide_source }
+      end
     end
   end
 end
diff --git a/spec/factories/ci/ref.rb b/spec/factories/ci/ref.rb
index 891d8848a72..bf6fa743743 100644
--- a/spec/factories/ci/ref.rb
+++ b/spec/factories/ci/ref.rb
@@ -2,15 +2,7 @@
 
 FactoryBot.define do
   factory :ci_ref, class: 'Ci::Ref' do
-    ref { 'master' }
-    status { :success }
-    tag { false }
+    ref_path { 'refs/heads/master' }
     project
-
-    before(:create) do |ref, evaluator|
-      next if ref.pipelines.exists?
-
-      ref.update!(last_updated_by_pipeline: create(:ci_pipeline, project: evaluator.project, ref: evaluator.ref, tag: evaluator.tag, status: evaluator.status))
-    end
   end
 end
diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb
index 843f87ef7d6..7d0aaa45e40 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -86,6 +86,23 @@ FactoryBot.define do
       application_helm factory: %i(clusters_applications_helm installed)
     end
 
+    trait :with_installed_prometheus do
+      application_prometheus factory: %i(clusters_applications_prometheus installed)
+    end
+
+    trait :with_all_applications do
+      application_helm factory: %i(clusters_applications_helm installed)
+      application_ingress factory: %i(clusters_applications_ingress installed)
+      application_cert_manager factory: %i(clusters_applications_cert_manager installed)
+      application_crossplane factory: %i(clusters_applications_crossplane installed)
+      application_prometheus factory: %i(clusters_applications_prometheus installed)
+      application_runner factory: %i(clusters_applications_runner installed)
+      application_jupyter factory: %i(clusters_applications_jupyter installed)
+      application_knative factory: %i(clusters_applications_knative installed)
+      application_elastic_stack factory: %i(clusters_applications_elastic_stack installed)
+      application_fluentd factory: %i(clusters_applications_fluentd installed)
+    end
+
     trait :with_domain do
       domain { 'example.com' }
     end
diff --git a/spec/factories/design_management/designs.rb b/spec/factories/design_management/designs.rb
index 59d4cc56f95..6d1229063d8 100644
--- a/spec/factories/design_management/designs.rb
+++ b/spec/factories/design_management/designs.rb
@@ -35,7 +35,7 @@ FactoryBot.define do
           sha = commit_version[action]
           version = DesignManagement::Version.new(sha: sha, issue: issue, author: evaluator.author)
           version.save(validate: false) # We need it to have an ID, validate later
-          Gitlab::Database.bulk_insert(dv_table_name, [action.row_attrs(version)])
+          Gitlab::Database.bulk_insert(dv_table_name, [action.row_attrs(version)]) # rubocop:disable Gitlab/BulkInsert
         end
 
         # always a creation
diff --git a/spec/factories/draft_note.rb b/spec/factories/draft_note.rb
new file mode 100644
index 00000000000..24563dc92b7
--- /dev/null
+++ b/spec/factories/draft_note.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+FactoryBot.define do
+  factory :draft_note do
+    note { generate(:title) }
+    association :author, factory: :user
+    association :merge_request, factory: :merge_request
+
+    factory :draft_note_on_text_diff do
+      transient do
+        line_number { 14 }
+        diff_refs { merge_request.try(:diff_refs) }
+      end
+
+      position do
+        Gitlab::Diff::Position.new(
+          old_path: "files/ruby/popen.rb",
+          new_path: "files/ruby/popen.rb",
+          old_line: nil,
+          new_line: line_number,
+          diff_refs: diff_refs
+        )
+      end
+    end
+
+    factory :draft_note_on_discussion, traits: [:on_discussion]
+
+    trait :on_discussion do
+      discussion_id { create(:discussion_note_on_merge_request, noteable: merge_request, project: project).discussion_id }
+    end
+  end
+end
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index ed6cb3505f4..60bb3044191 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -4,27 +4,28 @@ FactoryBot.define do
   factory :event do
     project
     author(factory: :user) { project.creator }
-    action { Event::JOINED }
-
-    trait(:created)   { action { Event::CREATED } }
-    trait(:updated)   { action { Event::UPDATED } }
-    trait(:closed)    { action { Event::CLOSED } }
-    trait(:reopened)  { action { Event::REOPENED } }
-    trait(:pushed)    { action { Event::PUSHED } }
-    trait(:commented) { action { Event::COMMENTED } }
-    trait(:merged)    { action { Event::MERGED } }
-    trait(:joined)    { action { Event::JOINED } }
-    trait(:left)      { action { Event::LEFT } }
-    trait(:destroyed) { action { Event::DESTROYED } }
-    trait(:expired)   { action { Event::EXPIRED } }
+    action { :joined }
+
+    trait(:created)   { action { :created } }
+    trait(:updated)   { action { :updated } }
+    trait(:closed)    { action { :closed } }
+    trait(:reopened)  { action { :reopened } }
+    trait(:pushed)    { action { :pushed } }
+    trait(:commented) { action { :commented } }
+    trait(:merged)    { action { :merged } }
+    trait(:joined)    { action { :joined } }
+    trait(:left)      { action { :left } }
+    trait(:destroyed) { action { :destroyed } }
+    trait(:expired)   { action { :expired } }
+    trait(:archived)  { action { :archived } }
 
     factory :closed_issue_event do
-      action { Event::CLOSED }
+      action { :closed }
       target factory: :closed_issue
     end
 
     factory :wiki_page_event do
-      action { Event::CREATED }
+      action { :created }
       project { @overrides[:wiki_page]&.container || create(:project, :wiki_repo) }
       target { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
 
@@ -33,21 +34,33 @@ FactoryBot.define do
       end
     end
 
-    trait :for_design do
+    trait :has_design do
       transient do
         design { create(:design, issue: create(:issue, project: project)) }
+      end
+    end
+
+    trait :for_design do
+      has_design
+
+      transient do
         note { create(:note, author: author, project: project, noteable: design) }
       end
 
-      action { Event::COMMENTED }
+      action { :commented }
       target { note }
     end
+
+    factory :design_event, traits: [:has_design] do
+      action { :created }
+      target { design }
+    end
   end
 
   factory :push_event, class: 'PushEvent' do
     project factory: :project_empty_repo
     author(factory: :user) { project.creator }
-    action { Event::PUSHED }
+    action { :pushed }
   end
 
   factory :push_event_payload do
diff --git a/spec/factories/evidences.rb b/spec/factories/evidences.rb
index 77116d8e9ed..dc9fc374103 100644
--- a/spec/factories/evidences.rb
+++ b/spec/factories/evidences.rb
@@ -3,5 +3,7 @@
 FactoryBot.define do
   factory :evidence, class: 'Releases::Evidence' do
     release
+    summary_sha { "760d6cdfb0879c3ffedec13af470e0f71cf52c6cde4d" }
+    summary { { "release": { "tag": "v4.0", "name": "New release", "project_name": "Project name" } } }
   end
 end
diff --git a/spec/factories/group_import_states.rb b/spec/factories/group_import_states.rb
new file mode 100644
index 00000000000..0b491d444fa
--- /dev/null
+++ b/spec/factories/group_import_states.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :group_import_state, class: 'GroupImportState', traits: %i[created] do
+    association :group, factory: :group
+
+    trait :created do
+      status { 0 }
+    end
+
+    trait :started do
+      status { 1 }
+      sequence(:jid) { |n| "group_import_state_#{n}" }
+    end
+
+    trait :finished do
+      status { 2 }
+      sequence(:jid) { |n| "group_import_state_#{n}" }
+    end
+
+    trait :failed do
+      status { -1 }
+    end
+  end
+end
diff --git a/spec/factories/keys.rb b/spec/factories/keys.rb
index 087d2521836..cf52e772ae0 100644
--- a/spec/factories/keys.rb
+++ b/spec/factories/keys.rb
@@ -13,6 +13,10 @@ FactoryBot.define do
 
     factory :deploy_key, class: 'DeployKey'
 
+    factory :group_deploy_key, class: 'GroupDeployKey' do
+      user
+    end
+
     factory :personal_key do
       user
     end
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index 81d3e4be6fd..2e783adcc94 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -6,6 +6,18 @@ FactoryBot.define do
     color { "#990000" }
   end
 
+  trait :described do
+    description { "Description of #{title}" }
+  end
+
+  trait :scoped do
+    transient do
+      prefix { 'scope' }
+    end
+
+    title { "#{prefix}::#{generate(:label_title)}" }
+  end
+
   factory :label, traits: [:base_label], class: 'ProjectLabel' do
     project
 
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index b10c04a37f7..2a06690f894 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -109,6 +109,17 @@ FactoryBot.define do
       end
     end
 
+    trait :with_head_pipeline do
+      after(:build) do |merge_request|
+        merge_request.head_pipeline = build(
+          :ci_pipeline,
+          :running,
+          project: merge_request.source_project,
+          ref: merge_request.source_branch,
+          sha: merge_request.diff_head_sha)
+      end
+    end
+
     trait :with_test_reports do
       after(:build) do |merge_request|
         merge_request.head_pipeline = build(
@@ -133,6 +144,11 @@ FactoryBot.define do
       end
     end
 
+    trait :unique_branches do
+      source_branch { generate(:branch) }
+      target_branch { generate(:branch) }
+    end
+
     trait :with_coverage_reports do
       after(:build) do |merge_request|
         merge_request.head_pipeline = build(
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 7c3ba122b5a..52e91f31ec1 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -17,17 +17,13 @@ FactoryBot.define do
     factory :note_on_project_snippet,    traits: [:on_project_snippet]
     factory :note_on_personal_snippet,   traits: [:on_personal_snippet]
     factory :note_on_design,             traits: [:on_design]
+    factory :note_on_alert,              traits: [:on_alert]
     factory :system_note,                traits: [:system]
 
     factory :discussion_note, class: 'DiscussionNote'
 
     factory :discussion_note_on_merge_request, traits: [:on_merge_request], class: 'DiscussionNote' do
       association :project, :repository
-
-      trait :resolved do
-        resolved_at { Time.now }
-        resolved_by { create(:user) }
-      end
     end
 
     factory :track_mr_picking_note, traits: [:on_merge_request, :system] do
@@ -76,11 +72,6 @@ FactoryBot.define do
         end
       end
 
-      trait :resolved do
-        resolved_at { Time.now }
-        resolved_by { create(:user) }
-      end
-
       factory :image_diff_note_on_merge_request do
         position do
           build(:image_diff_position,
@@ -155,6 +146,15 @@ FactoryBot.define do
       end
     end
 
+    trait :on_alert do
+      noteable { association(:alert_management_alert, project: project) }
+    end
+
+    trait :resolved do
+      resolved_at { Time.now }
+      resolved_by { association(:user) }
+    end
+
     trait :system do
       system { true }
     end
@@ -183,6 +183,10 @@ FactoryBot.define do
       confidential { true }
     end
 
+    trait :with_review do
+      review
+    end
+
     transient do
       in_reply_to { nil }
     end
diff --git a/spec/factories/project_group_links.rb b/spec/factories/project_group_links.rb
index b9119a5788b..5e3e83f18c1 100644
--- a/spec/factories/project_group_links.rb
+++ b/spec/factories/project_group_links.rb
@@ -5,10 +5,15 @@ FactoryBot.define do
     project
     group
     expires_at { nil }
+    group_access { Gitlab::Access::DEVELOPER }
 
     trait(:guest) { group_access { Gitlab::Access::GUEST } }
     trait(:reporter) { group_access { Gitlab::Access::REPORTER } }
     trait(:developer) { group_access { Gitlab::Access::DEVELOPER } }
     trait(:maintainer) { group_access { Gitlab::Access::MAINTAINER } }
+
+    after(:create) do |project_group_link, evaluator|
+      project_group_link.group.refresh_members_authorized_projects
+    end
   end
 end
diff --git a/spec/factories/project_repository_storage_moves.rb b/spec/factories/project_repository_storage_moves.rb
index aa8576834eb..b35d5e1d535 100644
--- a/spec/factories/project_repository_storage_moves.rb
+++ b/spec/factories/project_repository_storage_moves.rb
@@ -10,5 +10,9 @@ FactoryBot.define do
     trait :scheduled do
       state { ProjectRepositoryStorageMove.state_machines[:state].states[:scheduled].value }
     end
+
+    trait :started do
+      state { ProjectRepositoryStorageMove.state_machines[:state].states[:started].value }
+    end
   end
 end
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 45caa7a2b6a..4affab295b8 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -297,6 +297,12 @@ FactoryBot.define do
     trait :auto_devops_disabled do
       association :auto_devops, factory: [:project_auto_devops, :disabled]
     end
+
+    trait :without_container_expiration_policy do
+      after :create do |project|
+        project.container_expiration_policy.destroy!
+      end
+    end
   end
 
   # Project with empty repository
diff --git a/spec/factories/releases/link.rb b/spec/factories/releases/link.rb
index 001deeb71a0..da0efe4a749 100644
--- a/spec/factories/releases/link.rb
+++ b/spec/factories/releases/link.rb
@@ -6,5 +6,6 @@ FactoryBot.define do
     sequence(:name) { |n| "release-18.#{n}.dmg" }
     sequence(:url) { |n| "https://example.com/scrambled-url/app-#{n}.zip" }
     sequence(:filepath) { |n| "/binaries/awesome-app-#{n}" }
+    link_type { 'other' }
   end
 end
diff --git a/spec/factories/reviews.rb b/spec/factories/reviews.rb
new file mode 100644
index 00000000000..7cf752f1cd9
--- /dev/null
+++ b/spec/factories/reviews.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :review do
+    merge_request
+    association :project, :repository
+    author factory: :user
+  end
+end
diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index b6696769da9..fd97f6abb85 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -45,9 +45,13 @@ FactoryBot.define do
   end
 
   factory :alerts_service do
+    active
     project
     type { 'AlertsService' }
-    active { true }
+
+    trait :active do
+      active { true }
+    end
 
     trait :inactive do
       active { false }
@@ -165,6 +169,13 @@ FactoryBot.define do
     type { 'SlackService' }
   end
 
+  factory :pipelines_email_service do
+    project
+    active { true }
+    type { 'PipelinesEmailService' }
+    recipients { 'test@example.com' }
+  end
+
   # this is for testing storing values inside properties, which is deprecated and will be removed in
   # https://gitlab.com/gitlab-org/gitlab/issues/29404
   trait :without_properties_callback do
diff --git a/spec/factories/usage_data.rb b/spec/factories/usage_data.rb
index 8fe0018b5a6..c0c5b1103fe 100644
--- a/spec/factories/usage_data.rb
+++ b/spec/factories/usage_data.rb
@@ -33,6 +33,12 @@ FactoryBot.define do
       issues = create_list(:issue, 4, project: projects[0])
       create_list(:prometheus_alert, 2, project: projects[0])
       create(:prometheus_alert, project: projects[1])
+      create(:merge_request, :simple, :with_terraform_reports, source_project: projects[0])
+      create(:merge_request, :rebased, :with_terraform_reports, source_project: projects[0])
+      create(:merge_request, :simple, :with_terraform_reports, source_project: projects[1])
+      create(:terraform_state, project: projects[0])
+      create(:terraform_state, project: projects[0])
+      create(:terraform_state, project: projects[1])
       create(:zoom_meeting, project: projects[0], issue: projects[0].issues[0], issue_status: :added)
       create_list(:zoom_meeting, 2, project: projects[0], issue: projects[0].issues[1], issue_status: :removed)
       create(:zoom_meeting, project: projects[0], issue: projects[0].issues[2], issue_status: :added)
@@ -52,6 +58,7 @@ FactoryBot.define do
       # Alert Issues
       create(:alert_management_alert, issue: issues[0], project: projects[0])
       create(:alert_management_alert, issue: alert_bot_issues[0], project: projects[0])
+      create(:self_managed_prometheus_alert_event, related_issues: [issues[1]], project: projects[0])
 
       # Enabled clusters
       gcp_cluster = create(:cluster_provider_gcp, :created).cluster
diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb
index aa72a116be2..f89aeb1c93d 100644
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'factories' do
+RSpec.describe 'factories' do
   FactoryBot.factories.each do |factory|
     describe "#{factory.name} factory" do
       it 'does not raise error when built' do
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index 1a8af335244..cbab809cddb 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -13,4 +13,5 @@ require 'active_support/all'
 
 ActiveSupport::Dependencies.autoload_paths << 'lib'
 ActiveSupport::Dependencies.autoload_paths << 'ee/lib'
+
 ActiveSupport::XmlMini.backend = 'Nokogiri'
diff --git a/spec/features/abuse_report_spec.rb b/spec/features/abuse_report_spec.rb
index b1573bfb270..5959fcd6306 100644
--- a/spec/features/abuse_report_spec.rb
+++ b/spec/features/abuse_report_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Abuse reports' do
+RSpec.describe 'Abuse reports' do
   let(:another_user) { create(:user) }
 
   before do
diff --git a/spec/features/action_cable_logging_spec.rb b/spec/features/action_cable_logging_spec.rb
new file mode 100644
index 00000000000..ce7c0e03aad
--- /dev/null
+++ b/spec/features/action_cable_logging_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'ActionCable logging', :js do
+  let_it_be(:project) { create(:project, :public) }
+  let_it_be(:issue) { create(:issue, project: project) }
+  let_it_be(:user) { create(:user) }
+
+  before_all do
+    project.add_developer(user)
+  end
+
+  it 'adds extra context to logs' do
+    allow(ActiveSupport::Notifications).to receive(:instrument).and_call_original
+
+    expect(ActiveSupport::Notifications).to receive(:instrument).with(
+      'connect.action_cable',
+      a_hash_including(remote_ip: '127.0.0.1', user_id: nil, username: nil)
+    )
+
+    subscription_data = a_hash_including(
+      remote_ip: '127.0.0.1',
+      user_id: user.id,
+      username: user.username,
+      params: a_hash_including(
+        project_path: project.full_path,
+        iid: issue.iid.to_s
+      )
+    )
+
+    expect(ActiveSupport::Notifications).to receive(:instrument).with('subscribe.action_cable', subscription_data)
+
+    gitlab_sign_in(user)
+    visit project_issue_path(project, issue)
+
+    # Because there is no visual indicator for Capybara to wait on before closing the browser,
+    # we need to test an actual feature to ensure that the subscription was already established.
+
+    expect(page.find('.assignee')).to have_content 'None'
+
+    fill_in 'note[note]', with: "/assign #{user.username}"
+    click_button 'Comment'
+
+    expect(page.find('.assignee')).to have_content user.name
+  end
+end
diff --git a/spec/features/admin/admin_abuse_reports_spec.rb b/spec/features/admin/admin_abuse_reports_spec.rb
index 93051a8a355..845e186dd5b 100644
--- a/spec/features/admin/admin_abuse_reports_spec.rb
+++ b/spec/features/admin/admin_abuse_reports_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin::AbuseReports", :js do
+RSpec.describe "Admin::AbuseReports", :js do
   let(:user) { create(:user) }
 
   context 'as an admin' do
diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb
index e711ee7d40e..48aaec6e6df 100644
--- a/spec/features/admin/admin_appearance_spec.rb
+++ b/spec/features/admin/admin_appearance_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin Appearance' do
+RSpec.describe 'Admin Appearance' do
   let!(:appearance) { create(:appearance) }
 
   it 'Create new appearance' do
diff --git a/spec/features/admin/admin_broadcast_messages_spec.rb b/spec/features/admin/admin_broadcast_messages_spec.rb
index bf7f8563e68..091ed0a3396 100644
--- a/spec/features/admin/admin_broadcast_messages_spec.rb
+++ b/spec/features/admin/admin_broadcast_messages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin Broadcast Messages' do
+RSpec.describe 'Admin Broadcast Messages' do
   before do
     sign_in(create(:admin))
     create(:broadcast_message, :expired, message: 'Migration to new server')
diff --git a/spec/features/admin/admin_browse_spam_logs_spec.rb b/spec/features/admin/admin_browse_spam_logs_spec.rb
index c79524a7fb3..65847876c11 100644
--- a/spec/features/admin/admin_browse_spam_logs_spec.rb
+++ b/spec/features/admin/admin_browse_spam_logs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin browse spam logs' do
+RSpec.describe 'Admin browse spam logs' do
   let!(:spam_log) { create(:spam_log, description: 'abcde ' * 20) }
 
   before do
diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index afdf8eb0cca..85f0c44ed9c 100644
--- a/spec/features/admin/admin_builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin Builds' do
+RSpec.describe 'Admin Builds' do
   before do
     sign_in(create(:admin))
   end
diff --git a/spec/features/admin/admin_disables_git_access_protocol_spec.rb b/spec/features/admin/admin_disables_git_access_protocol_spec.rb
index 05ebb7e90d2..d7feb21a8b3 100644
--- a/spec/features/admin/admin_disables_git_access_protocol_spec.rb
+++ b/spec/features/admin/admin_disables_git_access_protocol_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin disables Git access protocol', :js do
+RSpec.describe 'Admin disables Git access protocol', :js do
   include StubENV
   include MobileHelpers
 
diff --git a/spec/features/admin/admin_disables_two_factor_spec.rb b/spec/features/admin/admin_disables_two_factor_spec.rb
index 7227141168e..216c8ae36c7 100644
--- a/spec/features/admin/admin_disables_two_factor_spec.rb
+++ b/spec/features/admin/admin_disables_two_factor_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin disables 2FA for a user' do
+RSpec.describe 'Admin disables 2FA for a user' do
   it 'successfully', :js do
     sign_in(create(:admin))
     user = create(:user, :two_factor)
diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb
index 1d82650d11d..9cd335ffb8c 100644
--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin Groups' do
+RSpec.describe 'Admin Groups' do
   include Select2Helper
 
   let(:internal) { Gitlab::VisibilityLevel::INTERNAL }
@@ -181,7 +181,7 @@ describe 'Admin Groups' do
     end
   end
 
-  describe 'admin remove himself from a group', :js do
+  describe 'admin remove themself from a group', :js, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/222342' do
     it 'removes admin from the group' do
       group.add_user(current_user, Gitlab::Access::DEVELOPER)
 
diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb
index 9ce96fe8020..dfc7f5f6f84 100644
--- a/spec/features/admin/admin_health_check_spec.rb
+++ b/spec/features/admin/admin_health_check_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin Health Check", :feature do
+RSpec.describe "Admin Health Check", :feature do
   include StubENV
   let_it_be(:admin) { create(:admin) }
 
diff --git a/spec/features/admin/admin_hook_logs_spec.rb b/spec/features/admin/admin_hook_logs_spec.rb
index 98900142353..f4a70621cee 100644
--- a/spec/features/admin/admin_hook_logs_spec.rb
+++ b/spec/features/admin/admin_hook_logs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin::HookLogs' do
+RSpec.describe 'Admin::HookLogs' do
   let(:project) { create(:project) }
   let(:system_hook) { create(:system_hook) }
   let(:hook_log) { create(:web_hook_log, web_hook: system_hook, internal_error_message: 'some error') }
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index 40bcf4a31e4..1c14d65a1cd 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin::Hooks' do
+RSpec.describe 'Admin::Hooks' do
   let(:user) { create(:admin) }
 
   before do
diff --git a/spec/features/admin/admin_mode/login_spec.rb b/spec/features/admin/admin_mode/login_spec.rb
index afc6f2ddb56..4b26ceb55e2 100644
--- a/spec/features/admin/admin_mode/login_spec.rb
+++ b/spec/features/admin/admin_mode/login_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin Mode Login', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
+RSpec.describe 'Admin Mode Login', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
   include TermsHelper
   include UserLoginHelper
   include LdapHelpers
diff --git a/spec/features/admin/admin_mode/logout_spec.rb b/spec/features/admin/admin_mode/logout_spec.rb
index e1b4aba5724..b4d49fe760f 100644
--- a/spec/features/admin/admin_mode/logout_spec.rb
+++ b/spec/features/admin/admin_mode/logout_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin Mode Logout', :js, :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
+RSpec.describe 'Admin Mode Logout', :js, :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
   include TermsHelper
   include UserLoginHelper
 
diff --git a/spec/features/admin/admin_mode/workers_spec.rb b/spec/features/admin/admin_mode/workers_spec.rb
index 0ca61e6c193..d037f5555dc 100644
--- a/spec/features/admin/admin_mode/workers_spec.rb
+++ b/spec/features/admin/admin_mode/workers_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # Test an operation that triggers background jobs requiring administrative rights
-describe 'Admin mode for workers', :do_not_mock_admin_mode, :request_store, :clean_gitlab_redis_shared_state do
+RSpec.describe 'Admin mode for workers', :do_not_mock_admin_mode, :request_store, :clean_gitlab_redis_shared_state do
   let(:user) { create(:user) }
   let(:user_to_delete) { create(:user) }
 
diff --git a/spec/features/admin/admin_mode_spec.rb b/spec/features/admin/admin_mode_spec.rb
index f642d614a5d..3b4edbc1a07 100644
--- a/spec/features/admin/admin_mode_spec.rb
+++ b/spec/features/admin/admin_mode_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin mode', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
+RSpec.describe 'Admin mode', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
   include MobileHelpers
   include StubENV
 
diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb
index d1889d3a89a..cbaa18509ba 100644
--- a/spec/features/admin/admin_projects_spec.rb
+++ b/spec/features/admin/admin_projects_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin::Projects" do
+RSpec.describe "Admin::Projects" do
   include Select2Helper
 
   let(:user) { create :user }
diff --git a/spec/features/admin/admin_requests_profiles_spec.rb b/spec/features/admin/admin_requests_profiles_spec.rb
index e93c0ff8b20..c649fdd8e19 100644
--- a/spec/features/admin/admin_requests_profiles_spec.rb
+++ b/spec/features/admin/admin_requests_profiles_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin::RequestsProfilesController' do
+RSpec.describe 'Admin::RequestsProfilesController' do
   let(:tmpdir) { Dir.mktmpdir('profiler-test') }
 
   before do
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index ca2fd2f2e9e..0e20ccf6bec 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin Runners" do
+RSpec.describe "Admin Runners" do
   include StubENV
   include FilteredSearchHelpers
   include SortingHelper
diff --git a/spec/features/admin/admin_sees_project_statistics_spec.rb b/spec/features/admin/admin_sees_project_statistics_spec.rb
index ecd0aab925b..6e8211a9b4e 100644
--- a/spec/features/admin/admin_sees_project_statistics_spec.rb
+++ b/spec/features/admin/admin_sees_project_statistics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin > Admin sees project statistics" do
+RSpec.describe "Admin > Admin sees project statistics" do
   let(:current_user) { create(:admin) }
 
   before do
diff --git a/spec/features/admin/admin_sees_projects_statistics_spec.rb b/spec/features/admin/admin_sees_projects_statistics_spec.rb
index 6a6f369ac7c..786fa98255c 100644
--- a/spec/features/admin/admin_sees_projects_statistics_spec.rb
+++ b/spec/features/admin/admin_sees_projects_statistics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin > Admin sees projects statistics" do
+RSpec.describe "Admin > Admin sees projects statistics" do
   let(:current_user) { create(:admin) }
 
   before do
diff --git a/spec/features/admin/admin_serverless_domains_spec.rb b/spec/features/admin/admin_serverless_domains_spec.rb
index 48f6af8d4bd..256887f425f 100644
--- a/spec/features/admin/admin_serverless_domains_spec.rb
+++ b/spec/features/admin/admin_serverless_domains_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin Serverless Domains', :js do
+RSpec.describe 'Admin Serverless Domains', :js do
   let(:sample_domain) { build(:pages_domain) }
 
   before do
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 7ec3c2abb51..55f6a9930ff 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -2,9 +2,10 @@
 
 require 'spec_helper'
 
-describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
+RSpec.describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
   include StubENV
   include TermsHelper
+  include UsageDataHelpers
 
   let(:admin) { create(:admin) }
 
@@ -104,6 +105,16 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc
         expect(page).to have_content "Application settings saved successfully"
       end
 
+      it 'Change Maximum import size' do
+        page.within('.as-account-limit') do
+          fill_in 'Maximum import size (MB)', with: 15
+          click_button 'Save changes'
+        end
+
+        expect(current_settings.max_import_size).to eq 15
+        expect(page).to have_content "Application settings saved successfully"
+      end
+
       it 'Change New users set to external', :js do
         user_internal_regex = find('#application_setting_user_default_internal_regex', visible: :all)
 
@@ -277,16 +288,31 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc
       end
     end
 
+    context 'Repository page' do
+      it 'Change Repository storage settings' do
+        visit repository_admin_application_settings_path
+
+        page.within('.as-repository-storage') do
+          fill_in 'application_setting_repository_storages_weighted_default', with: 50
+          click_button 'Save changes'
+        end
+
+        expect(current_settings.repository_storages_weighted_default).to be 50
+      end
+    end
+
     context 'Reporting page' do
       it 'Change Spam settings' do
         visit reporting_admin_application_settings_path
 
         page.within('.as-spam') do
-          check 'Enable reCAPTCHA'
-          check 'Enable reCAPTCHA for login'
           fill_in 'reCAPTCHA Site Key', with: 'key'
           fill_in 'reCAPTCHA Private Key', with: 'key'
+          check 'Enable reCAPTCHA'
+          check 'Enable reCAPTCHA for login'
           fill_in 'IPs per user', with: 15
+          check 'Enable Spam Check via external API endpoint'
+          fill_in 'URL of the external Spam Check endpoint', with: 'https://www.example.com/spamcheck'
           click_button 'Save changes'
         end
 
@@ -294,6 +320,8 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc
         expect(current_settings.recaptcha_enabled).to be true
         expect(current_settings.login_recaptcha_protection_enabled).to be true
         expect(current_settings.unique_ips_limit_per_user).to eq(15)
+        expect(current_settings.spam_check_endpoint_enabled).to be true
+        expect(current_settings.spam_check_endpoint_url).to eq 'https://www.example.com/spamcheck'
       end
     end
 
@@ -336,7 +364,7 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc
       end
 
       it 'loads usage ping payload on click', :js do
-        allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
+        stub_usage_data_connections
 
         page.within('#js-usage-settings') do
           expected_payload_content = /(?=.*"uuid")(?=.*"hostname")/m
@@ -377,7 +405,7 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc
         visit network_admin_application_settings_path
 
         page.within('.as-issue-limits') do
-          fill_in 'Max requests per second per user', with: 0
+          fill_in 'Max requests per minute per user', with: 0
           click_button 'Save changes'
         end
 
diff --git a/spec/features/admin/admin_system_info_spec.rb b/spec/features/admin/admin_system_info_spec.rb
index 3dacf63e25a..6a0448fd890 100644
--- a/spec/features/admin/admin_system_info_spec.rb
+++ b/spec/features/admin/admin_system_info_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin System Info' do
+RSpec.describe 'Admin System Info' do
   before do
     sign_in(create(:admin))
   end
diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
index b9de858e3b9..ec3dd322f97 100644
--- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb
+++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin > Users > Impersonation Tokens', :js do
+RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
   let(:admin) { create(:admin) }
   let!(:user) { create(:user) }
 
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 0c8cd895c00..369f91c6faa 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin::Users" do
+RSpec.describe "Admin::Users" do
   include Spec::Support::Helpers::Features::ResponsiveTableHelpers
 
   let!(:user) do
diff --git a/spec/features/admin/admin_uses_repository_checks_spec.rb b/spec/features/admin/admin_uses_repository_checks_spec.rb
index 954773e766d..b8851c28531 100644
--- a/spec/features/admin/admin_uses_repository_checks_spec.rb
+++ b/spec/features/admin/admin_uses_repository_checks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin uses repository checks', :request_store, :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
+RSpec.describe 'Admin uses repository checks', :request_store, :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do
   include StubENV
 
   let(:admin) { create(:admin) }
diff --git a/spec/features/admin/clusters/applications_spec.rb b/spec/features/admin/clusters/applications_spec.rb
index 8310811b43d..3bcadfdbfc1 100644
--- a/spec/features/admin/clusters/applications_spec.rb
+++ b/spec/features/admin/clusters/applications_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../../../spec/features/clusters/installing_applications_shared_examples'
 
-describe 'Instance-level Cluster Applications', :js do
+RSpec.describe 'Instance-level Cluster Applications', :js do
   include GoogleApi::CloudPlatformHelpers
 
   let(:user) { create(:admin) }
diff --git a/spec/features/admin/clusters/eks_spec.rb b/spec/features/admin/clusters/eks_spec.rb
index 40561aa508c..ef49aebc7c5 100644
--- a/spec/features/admin/clusters/eks_spec.rb
+++ b/spec/features/admin/clusters/eks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Instance-level AWS EKS Cluster', :js do
+RSpec.describe 'Instance-level AWS EKS Cluster', :js do
   let(:user) { create(:admin) }
 
   before do
diff --git a/spec/features/admin/dashboard_spec.rb b/spec/features/admin/dashboard_spec.rb
index 018ef13cbb6..4ffa5e3be0b 100644
--- a/spec/features/admin/dashboard_spec.rb
+++ b/spec/features/admin/dashboard_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'admin visits dashboard' do
+RSpec.describe 'admin visits dashboard' do
   include ProjectForksHelper
 
   before do
diff --git a/spec/features/admin/services/admin_activates_prometheus_spec.rb b/spec/features/admin/services/admin_activates_prometheus_spec.rb
index 64c57cd425b..35af9dd6c68 100644
--- a/spec/features/admin/services/admin_activates_prometheus_spec.rb
+++ b/spec/features/admin/services/admin_activates_prometheus_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Admin activates Prometheus' do
+RSpec.describe 'Admin activates Prometheus', :js do
   let(:admin) { create(:user, :admin) }
 
   before do
diff --git a/spec/features/atom/dashboard_issues_spec.rb b/spec/features/atom/dashboard_issues_spec.rb
index d523e2992db..511cdcc2940 100644
--- a/spec/features/atom/dashboard_issues_spec.rb
+++ b/spec/features/atom/dashboard_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Dashboard Issues Feed" do
+RSpec.describe "Dashboard Issues Feed" do
   describe "GET /issues" do
     let!(:user)     { create(:user, email: 'private1@example.com', public_email: 'public1@example.com') }
     let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
diff --git a/spec/features/atom/dashboard_spec.rb b/spec/features/atom/dashboard_spec.rb
index 7df0e47cd14..851ae7b02a0 100644
--- a/spec/features/atom/dashboard_spec.rb
+++ b/spec/features/atom/dashboard_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Dashboard Feed" do
+RSpec.describe "Dashboard Feed" do
   describe "GET /" do
     let!(:user) { create(:user, name: "Jonh") }
 
diff --git a/spec/features/atom/issues_spec.rb b/spec/features/atom/issues_spec.rb
index c0413f0f352..13798a94fe9 100644
--- a/spec/features/atom/issues_spec.rb
+++ b/spec/features/atom/issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues Feed' do
+RSpec.describe 'Issues Feed' do
   describe 'GET /issues' do
     let!(:user)     { create(:user, email: 'private1@example.com', public_email: 'public1@example.com') }
     let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb
index 6f013e13ae4..c79b812df46 100644
--- a/spec/features/atom/users_spec.rb
+++ b/spec/features/atom/users_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User Feed" do
+RSpec.describe "User Feed" do
   describe "GET /" do
     let!(:user) { create(:user) }
 
diff --git a/spec/features/boards/add_issues_modal_spec.rb b/spec/features/boards/add_issues_modal_spec.rb
index 0412dc2b69c..d432825e113 100644
--- a/spec/features/boards/add_issues_modal_spec.rb
+++ b/spec/features/boards/add_issues_modal_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards add issue modal', :js do
+RSpec.describe 'Issue Boards add issue modal', :js do
   let(:project) { create(:project, :public) }
   let(:board) { create(:board, project: project) }
   let(:user) { create(:user) }
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index e82b1be4310..8e2a9381aa0 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards', :js do
+RSpec.describe 'Issue Boards', :js do
   include DragTo
   include MobileHelpers
 
diff --git a/spec/features/boards/focus_mode_spec.rb b/spec/features/boards/focus_mode_spec.rb
index fff3cce3c1a..b1684ad69a6 100644
--- a/spec/features/boards/focus_mode_spec.rb
+++ b/spec/features/boards/focus_mode_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards focus mode', :js do
+RSpec.describe 'Issue Boards focus mode', :js do
   let(:project) { create(:project, :public) }
 
   before do
diff --git a/spec/features/boards/issue_ordering_spec.rb b/spec/features/boards/issue_ordering_spec.rb
index 4c723ddf324..03a76d9d3fd 100644
--- a/spec/features/boards/issue_ordering_spec.rb
+++ b/spec/features/boards/issue_ordering_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards', :js do
+RSpec.describe 'Issue Boards', :js do
   include DragTo
 
   let(:project) { create(:project, :public) }
diff --git a/spec/features/boards/keyboard_shortcut_spec.rb b/spec/features/boards/keyboard_shortcut_spec.rb
index 6074c559701..f51b4d21e3b 100644
--- a/spec/features/boards/keyboard_shortcut_spec.rb
+++ b/spec/features/boards/keyboard_shortcut_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards shortcut', :js do
+RSpec.describe 'Issue Boards shortcut', :js do
   context 'issues are enabled' do
     let(:project) { create(:project) }
 
diff --git a/spec/features/boards/modal_filter_spec.rb b/spec/features/boards/modal_filter_spec.rb
index 31f4c502c61..5aeb9eb5e50 100644
--- a/spec/features/boards/modal_filter_spec.rb
+++ b/spec/features/boards/modal_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards add issue modal filtering', :js do
+RSpec.describe 'Issue Boards add issue modal filtering', :js do
   let(:project) { create(:project, :public) }
   let(:board) { create(:board, project: project) }
   let(:planning) { create(:label, project: project, name: 'Planning') }
diff --git a/spec/features/boards/multi_select_spec.rb b/spec/features/boards/multi_select_spec.rb
index 885dc08e38d..162455f75e6 100644
--- a/spec/features/boards/multi_select_spec.rb
+++ b/spec/features/boards/multi_select_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Multi Select Issue', :js do
+RSpec.describe 'Multi Select Issue', :js do
   include DragTo
 
   let(:group) { create(:group, :nested) }
diff --git a/spec/features/boards/multiple_boards_spec.rb b/spec/features/boards/multiple_boards_spec.rb
index 8e56be6bdd0..2894d5c7666 100644
--- a/spec/features/boards/multiple_boards_spec.rb
+++ b/spec/features/boards/multiple_boards_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Multiple Issue Boards', :js do
+RSpec.describe 'Multiple Issue Boards', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:planning) { create(:label, project: project, name: 'Planning') }
diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index 2d41b5d612d..efa1f8cfc0d 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards new issue', :js do
+RSpec.describe 'Issue Boards new issue', :js do
   let(:project) { create(:project, :public) }
   let(:board)   { create(:board, project: project) }
   let!(:list)   { create(:list, board: board, position: 0) }
diff --git a/spec/features/boards/reload_boards_on_browser_back_spec.rb b/spec/features/boards/reload_boards_on_browser_back_spec.rb
index 6528b8f58bb..181cbcc9811 100644
--- a/spec/features/boards/reload_boards_on_browser_back_spec.rb
+++ b/spec/features/boards/reload_boards_on_browser_back_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Ensure Boards do not show stale data on browser back', :js do
+RSpec.describe 'Ensure Boards do not show stale data on browser back', :js do
   let(:project) {create(:project, :public)}
   let(:board)   {create(:board, project: project)}
   let(:user)    {create(:user)}
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index d05709b7e2f..65f2e5dfc0d 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Boards', :js do
+RSpec.describe 'Issue Boards', :js do
   include BoardHelpers
   include FilteredSearchHelpers
 
diff --git a/spec/features/boards/sub_group_project_spec.rb b/spec/features/boards/sub_group_project_spec.rb
index 4384a1a9379..cd3d61726f6 100644
--- a/spec/features/boards/sub_group_project_spec.rb
+++ b/spec/features/boards/sub_group_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Sub-group project issue boards', :js do
+RSpec.describe 'Sub-group project issue boards', :js do
   let(:group) { create(:group) }
   let(:nested_group_1) { create(:group, parent: group) }
   let(:project) { create(:project, group: nested_group_1) }
diff --git a/spec/features/broadcast_messages_spec.rb b/spec/features/broadcast_messages_spec.rb
index c770e6e4f81..f339d45671d 100644
--- a/spec/features/broadcast_messages_spec.rb
+++ b/spec/features/broadcast_messages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Broadcast Messages' do
+RSpec.describe 'Broadcast Messages' do
   let_it_be(:user) { create(:user) }
 
   shared_examples 'a Broadcast Messages' do |type|
diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index acdc38038aa..5b78d93ae04 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Contributions Calendar', :js do
+RSpec.describe 'Contributions Calendar', :js do
   include MobileHelpers
 
   let(:user) { create(:user) }
@@ -59,7 +59,7 @@ describe 'Contributions Calendar', :js do
   def note_comment_contribution
     note_comment_params = {
       project: contributed_project,
-      action: Event::COMMENTED,
+      action: :commented,
       target: issue_note,
       author_id: user.id
     }
diff --git a/spec/features/clusters/cluster_detail_page_spec.rb b/spec/features/clusters/cluster_detail_page_spec.rb
index 4b478163952..6058c35c2cf 100644
--- a/spec/features/clusters/cluster_detail_page_spec.rb
+++ b/spec/features/clusters/cluster_detail_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Clusterable > Show page' do
+RSpec.describe 'Clusterable > Show page' do
   include KubernetesHelpers
 
   let(:current_user) { create(:user) }
diff --git a/spec/features/clusters/installing_applications_shared_examples.rb b/spec/features/clusters/installing_applications_shared_examples.rb
index 5b565c0a304..d2f28f5b219 100644
--- a/spec/features/clusters/installing_applications_shared_examples.rb
+++ b/spec/features/clusters/installing_applications_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples "installing applications for a cluster" do |managed_apps_local_tiller|
+RSpec.shared_examples "installing applications for a cluster" do |managed_apps_local_tiller|
   before do
     stub_feature_flags(managed_apps_local_tiller: managed_apps_local_tiller)
 
@@ -279,7 +279,7 @@ shared_examples "installing applications for a cluster" do |managed_apps_local_t
   end
 end
 
-shared_examples "installing applications on a cluster" do
+RSpec.shared_examples "installing applications on a cluster" do
   it_behaves_like "installing applications for a cluster", false
   it_behaves_like "installing applications for a cluster", true
 end
diff --git a/spec/features/commits/user_uses_quick_actions_spec.rb b/spec/features/commits/user_uses_quick_actions_spec.rb
index 70ea920b7ec..12e7865e490 100644
--- a/spec/features/commits/user_uses_quick_actions_spec.rb
+++ b/spec/features/commits/user_uses_quick_actions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Commit > User uses quick actions', :js do
+RSpec.describe 'Commit > User uses quick actions', :js do
   include Spec::Support::Helpers::Features::NotesHelpers
   include RepoHelpers
 
diff --git a/spec/features/commits/user_view_commits_spec.rb b/spec/features/commits/user_view_commits_spec.rb
index 133baca8b1c..5907534220d 100644
--- a/spec/features/commits/user_view_commits_spec.rb
+++ b/spec/features/commits/user_view_commits_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Commit > User view commits' do
+RSpec.describe 'Commit > User view commits' do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:user) { project.creator }
 
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index d8b886b239f..60c37d1e125 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Commits' do
+RSpec.describe 'Commits' do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/features/contextual_sidebar_spec.rb b/spec/features/contextual_sidebar_spec.rb
index e250e8cc90a..8ea1ebac6b7 100644
--- a/spec/features/contextual_sidebar_spec.rb
+++ b/spec/features/contextual_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Contextual sidebar', :js do
+RSpec.describe 'Contextual sidebar', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 50d9cb1c833..0294ebbe13f 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Value Stream Analytics', :js do
+RSpec.describe 'Value Stream Analytics', :js do
   let(:user) { create(:user) }
   let(:guest) { create(:user) }
   let(:project) { create(:project, :repository) }
diff --git a/spec/features/dashboard/activity_spec.rb b/spec/features/dashboard/activity_spec.rb
index 0a3b550c0c4..b419a063858 100644
--- a/spec/features/dashboard/activity_spec.rb
+++ b/spec/features/dashboard/activity_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard > Activity' do
+RSpec.describe 'Dashboard > Activity' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb
index 56b47b74626..ed28ec6099d 100644
--- a/spec/features/dashboard/datetime_on_tooltips_spec.rb
+++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Tooltips on .timeago dates', :js do
+RSpec.describe 'Tooltips on .timeago dates', :js do
   let(:user)            { create(:user) }
   let(:project)         { create(:project, name: 'test', namespace: user.namespace) }
   let(:created_date)    { Date.yesterday.to_time }
@@ -12,7 +12,7 @@ describe 'Tooltips on .timeago dates', :js do
     before do
       project.add_maintainer(user)
 
-      Event.create( project: project, author_id: user.id, action: Event::JOINED,
+      Event.create( project: project, author_id: user.id, action: :joined,
                     updated_at: created_date, created_at: created_date)
 
       sign_in user
diff --git a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
index aebc2eb1916..c2a3b90b6f4 100644
--- a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
+++ b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'The group dashboard' do
+RSpec.describe 'The group dashboard' do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb
index 5b336f994f7..8c941b27cd2 100644
--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard Groups page', :js do
+RSpec.describe 'Dashboard Groups page', :js do
   let(:user) { create :user }
   let(:group) { create(:group) }
   let(:nested_group) { create(:group, :nested) }
diff --git a/spec/features/dashboard/instance_statistics_spec.rb b/spec/features/dashboard/instance_statistics_spec.rb
index feb568d8ef4..f85b8454113 100644
--- a/spec/features/dashboard/instance_statistics_spec.rb
+++ b/spec/features/dashboard/instance_statistics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Showing analytics' do
+RSpec.describe 'Showing analytics' do
   before do
     sign_in user if user
   end
diff --git a/spec/features/dashboard/issuables_counter_spec.rb b/spec/features/dashboard/issuables_counter_spec.rb
index eca78749171..7526a55a3c1 100644
--- a/spec/features/dashboard/issuables_counter_spec.rb
+++ b/spec/features/dashboard/issuables_counter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Navigation bar counter', :use_clean_rails_memory_store_caching do
+RSpec.describe 'Navigation bar counter', :use_clean_rails_memory_store_caching do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let(:issue) { create(:issue, project: project) }
diff --git a/spec/features/dashboard/issues_filter_spec.rb b/spec/features/dashboard/issues_filter_spec.rb
index 8e2a3d983b1..4bd00bd0a80 100644
--- a/spec/features/dashboard/issues_filter_spec.rb
+++ b/spec/features/dashboard/issues_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard Issues filtering', :js do
+RSpec.describe 'Dashboard Issues filtering', :js do
   include Spec::Support::Helpers::Features::SortingHelpers
   include FilteredSearchHelpers
 
diff --git a/spec/features/dashboard/label_filter_spec.rb b/spec/features/dashboard/label_filter_spec.rb
index 630b2b636b4..ebe5c3e1091 100644
--- a/spec/features/dashboard/label_filter_spec.rb
+++ b/spec/features/dashboard/label_filter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard > label filter', :js do
+RSpec.describe 'Dashboard > label filter', :js do
   include FilteredSearchHelpers
 
   let(:filtered_search) { find('.filtered-search') }
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb
index 0c728ab22de..5331b5559d8 100644
--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard Merge Requests' do
+RSpec.describe 'Dashboard Merge Requests' do
   include Spec::Support::Helpers::Features::SortingHelpers
   include FilteredSearchHelpers
   include ProjectForksHelper
diff --git a/spec/features/dashboard/milestone_tabs_spec.rb b/spec/features/dashboard/milestone_tabs_spec.rb
deleted file mode 100644
index a83e4c1f7c9..00000000000
--- a/spec/features/dashboard/milestone_tabs_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'Dashboard milestone tabs', :js do
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
-  let!(:label) { create(:label, project: project) }
-  let(:project_milestone) { create(:milestone, project: project) }
-  let(:milestone) do
-    DashboardMilestone.build(
-      [project],
-      project_milestone.title
-    )
-  end
-  let!(:merge_request) { create(:labeled_merge_request, source_project: project, target_project: project, milestone: project_milestone, labels: [label]) }
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-
-    visit dashboard_milestone_path(milestone.safe_title, title: milestone.title)
-  end
-
-  it 'loads merge requests async' do
-    click_link 'Merge Requests'
-
-    expect(page).to have_selector('.milestone-merge_requests-list')
-  end
-
-  it 'loads participants async' do
-    click_link 'Participants'
-
-    expect(page).to have_selector('#tab-participants .bordered-list')
-  end
-
-  it 'loads labels async' do
-    click_link 'Labels'
-
-    expect(page).to have_selector('#tab-labels .bordered-list')
-  end
-end
diff --git a/spec/features/dashboard/milestones_spec.rb b/spec/features/dashboard/milestones_spec.rb
index 4ad19710d90..308432b7a1b 100644
--- a/spec/features/dashboard/milestones_spec.rb
+++ b/spec/features/dashboard/milestones_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard > Milestones' do
+RSpec.describe 'Dashboard > Milestones' do
   describe 'as anonymous user' do
     before do
       visit dashboard_milestones_path
diff --git a/spec/features/dashboard/project_member_activity_index_spec.rb b/spec/features/dashboard/project_member_activity_index_spec.rb
index 8e7a0b2a611..6e6e466294f 100644
--- a/spec/features/dashboard/project_member_activity_index_spec.rb
+++ b/spec/features/dashboard/project_member_activity_index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project member activity', :js do
+RSpec.describe 'Project member activity', :js do
   let(:user)            { create(:user) }
   let(:project)         { create(:project, :public, name: 'x', namespace: user.namespace) }
 
@@ -18,7 +18,7 @@ describe 'Project member activity', :js do
 
   context 'when a user joins the project' do
     before do
-      visit_activities_and_wait_with_event(Event::JOINED)
+      visit_activities_and_wait_with_event(:joined)
     end
 
     it "presents the correct message" do
@@ -29,7 +29,7 @@ describe 'Project member activity', :js do
 
   context 'when a user leaves the project' do
     before do
-      visit_activities_and_wait_with_event(Event::LEFT)
+      visit_activities_and_wait_with_event(:left)
     end
 
     it "presents the correct message" do
@@ -40,7 +40,7 @@ describe 'Project member activity', :js do
 
   context 'when a users membership expires for the project' do
     before do
-      visit_activities_and_wait_with_event(Event::EXPIRED)
+      visit_activities_and_wait_with_event(:expired)
     end
 
     it "presents the correct message" do
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb
index 218cbf871a9..e1beaf923e8 100644
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard Projects' do
+RSpec.describe 'Dashboard Projects' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, name: 'awesome stuff') }
   let(:project2) { create(:project, :public, name: 'Community project') }
@@ -125,7 +125,7 @@ describe 'Dashboard Projects' do
   end
 
   context 'when on Starred projects tab', :js do
-    it 'shows the empty state when there are no starred projects' do
+    it 'shows the empty state when there are no starred projects', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/222357' do
       visit(starred_dashboard_projects_path)
 
       element = page.find('.row.empty-state')
diff --git a/spec/features/dashboard/root_explore_spec.rb b/spec/features/dashboard/root_explore_spec.rb
index 0e065dbed67..a3c346ffe2a 100644
--- a/spec/features/dashboard/root_explore_spec.rb
+++ b/spec/features/dashboard/root_explore_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Root explore' do
+RSpec.describe 'Root explore' do
   let_it_be(:public_project) { create(:project, :public) }
   let_it_be(:archived_project) { create(:project, :archived) }
   let_it_be(:internal_project) { create(:project, :internal) }
diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index 6907c681417..04bbc3059de 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard shortcuts', :js do
+RSpec.describe 'Dashboard shortcuts', :js do
   context 'logged in' do
     let(:user) { create(:user) }
     let(:project) { create(:project) }
diff --git a/spec/features/dashboard/snippets_spec.rb b/spec/features/dashboard/snippets_spec.rb
index 94aef03e093..224f2111014 100644
--- a/spec/features/dashboard/snippets_spec.rb
+++ b/spec/features/dashboard/snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard snippets' do
+RSpec.describe 'Dashboard snippets' do
   let_it_be(:user) { create(:user) }
 
   context 'when the project has snippets' do
diff --git a/spec/features/dashboard/todos/target_state_spec.rb b/spec/features/dashboard/todos/target_state_spec.rb
index 0ea1f43e34b..4c43948201c 100644
--- a/spec/features/dashboard/todos/target_state_spec.rb
+++ b/spec/features/dashboard/todos/target_state_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard > Todo target states' do
+RSpec.describe 'Dashboard > Todo target states' do
   let(:user)    { create(:user) }
   let(:author)  { create(:user) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/dashboard/todos/todos_filtering_spec.rb b/spec/features/dashboard/todos/todos_filtering_spec.rb
index efa163042f9..f60b07c976e 100644
--- a/spec/features/dashboard/todos/todos_filtering_spec.rb
+++ b/spec/features/dashboard/todos/todos_filtering_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard > User filters todos', :js do
+RSpec.describe 'Dashboard > User filters todos', :js do
   let(:user_1)    { create(:user, username: 'user_1', name: 'user_1') }
   let(:user_2)    { create(:user, username: 'user_2', name: 'user_2') }
 
diff --git a/spec/features/dashboard/todos/todos_sorting_spec.rb b/spec/features/dashboard/todos/todos_sorting_spec.rb
index 421a66c6d48..d0f9a2b35f3 100644
--- a/spec/features/dashboard/todos/todos_sorting_spec.rb
+++ b/spec/features/dashboard/todos/todos_sorting_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard > User sorts todos' do
+RSpec.describe 'Dashboard > User sorts todos' do
   let(:user)    { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/features/dashboard/todos/todos_spec.rb b/spec/features/dashboard/todos/todos_spec.rb
index 63867d5796a..cf773d2caed 100644
--- a/spec/features/dashboard/todos/todos_spec.rb
+++ b/spec/features/dashboard/todos/todos_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard Todos' do
+RSpec.describe 'Dashboard Todos' do
   let_it_be(:user)    { create(:user, username: 'john') }
   let_it_be(:author)  { create(:user) }
   let_it_be(:project) { create(:project, :public) }
@@ -114,7 +114,7 @@ describe 'Dashboard Todos' do
     context 'todo is stale on the page' do
       before do
         todos = TodosFinder.new(user, state: :pending).execute
-        TodoService.new.mark_todos_as_done(todos, user)
+        TodoService.new.resolve_todos(todos, user)
       end
 
       it_behaves_like 'deleting the todo'
diff --git a/spec/features/dashboard/user_filters_projects_spec.rb b/spec/features/dashboard/user_filters_projects_spec.rb
index c4e4eb8affe..832f50932f4 100644
--- a/spec/features/dashboard/user_filters_projects_spec.rb
+++ b/spec/features/dashboard/user_filters_projects_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard > User filters projects' do
+RSpec.describe 'Dashboard > User filters projects' do
   let(:user) { create(:user) }
   let(:project) { create(:project, name: 'Victorialand', namespace: user.namespace, created_at: 2.seconds.ago, updated_at: 2.seconds.ago) }
   let(:user2) { create(:user) }
diff --git a/spec/features/discussion_comments/commit_spec.rb b/spec/features/discussion_comments/commit_spec.rb
index f594a30165b..5a744e43bb6 100644
--- a/spec/features/discussion_comments/commit_spec.rb
+++ b/spec/features/discussion_comments/commit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Thread Comments Commit', :js do
+RSpec.describe 'Thread Comments Commit', :js do
   include RepoHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/discussion_comments/issue_spec.rb b/spec/features/discussion_comments/issue_spec.rb
index fbceb2a51ae..2ad77a2884c 100644
--- a/spec/features/discussion_comments/issue_spec.rb
+++ b/spec/features/discussion_comments/issue_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Thread Comments Issue', :js do
+RSpec.describe 'Thread Comments Issue', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:issue) { create(:issue, project: project) }
diff --git a/spec/features/discussion_comments/merge_request_spec.rb b/spec/features/discussion_comments/merge_request_spec.rb
index c5457522c8e..43801b30608 100644
--- a/spec/features/discussion_comments/merge_request_spec.rb
+++ b/spec/features/discussion_comments/merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Thread Comments Merge Request', :js do
+RSpec.describe 'Thread Comments Merge Request', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/discussion_comments/snippets_spec.rb b/spec/features/discussion_comments/snippets_spec.rb
index bf78a5261c5..50201bbdb21 100644
--- a/spec/features/discussion_comments/snippets_spec.rb
+++ b/spec/features/discussion_comments/snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Thread Comments Snippet', :js do
+RSpec.describe 'Thread Comments Snippet', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:snippet) { create(:project_snippet, :private, :repository, project: project, author: user) }
diff --git a/spec/features/display_system_header_and_footer_bar_spec.rb b/spec/features/display_system_header_and_footer_bar_spec.rb
index e32da1a02bc..0979371a574 100644
--- a/spec/features/display_system_header_and_footer_bar_spec.rb
+++ b/spec/features/display_system_header_and_footer_bar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Display system header and footer bar' do
+RSpec.describe 'Display system header and footer bar' do
   let(:header_message) { "Foo" }
   let(:footer_message) { "Bar" }
 
diff --git a/spec/features/error_pages_spec.rb b/spec/features/error_pages_spec.rb
index 562277388bb..77f8aa87237 100644
--- a/spec/features/error_pages_spec.rb
+++ b/spec/features/error_pages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Error Pages' do
+RSpec.describe 'Error Pages' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
diff --git a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb
index 4b5bc16c4db..a0d93b791d9 100644
--- a/spec/features/error_tracking/user_filters_errors_by_status_spec.rb
+++ b/spec/features/error_tracking/user_filters_errors_by_status_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'When a user filters Sentry errors by status', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
+RSpec.describe 'When a user filters Sentry errors by status', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
   include_context 'sentry error tracking context feature'
 
   let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') }
diff --git a/spec/features/error_tracking/user_searches_sentry_errors_spec.rb b/spec/features/error_tracking/user_searches_sentry_errors_spec.rb
index c5559081feb..025a6261957 100644
--- a/spec/features/error_tracking/user_searches_sentry_errors_spec.rb
+++ b/spec/features/error_tracking/user_searches_sentry_errors_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'When a user searches for Sentry errors', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
+RSpec.describe 'When a user searches for Sentry errors', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
   include_context 'sentry error tracking context feature'
 
   let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') }
diff --git a/spec/features/error_tracking/user_sees_error_details_spec.rb b/spec/features/error_tracking/user_sees_error_details_spec.rb
index 6f72c44c689..e4a09d04ca1 100644
--- a/spec/features/error_tracking/user_sees_error_details_spec.rb
+++ b/spec/features/error_tracking/user_sees_error_details_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'View error details page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
+RSpec.describe 'View error details page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
   include_context 'sentry error tracking context feature'
 
   context 'with current user as project owner' do
diff --git a/spec/features/error_tracking/user_sees_error_index_spec.rb b/spec/features/error_tracking/user_sees_error_index_spec.rb
index 34a3a4b5a49..a4b15432ef3 100644
--- a/spec/features/error_tracking/user_sees_error_index_spec.rb
+++ b/spec/features/error_tracking/user_sees_error_index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'View error index page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
+RSpec.describe 'View error index page', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
   include_context 'sentry error tracking context feature'
 
   let_it_be(:issues_response_body) { fixture_file('sentry/issues_sample_response.json') }
diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb
index 4bd2a305dfa..6b8df8467e5 100644
--- a/spec/features/expand_collapse_diffs_spec.rb
+++ b/spec/features/expand_collapse_diffs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Expand and collapse diffs', :js do
+RSpec.describe 'Expand and collapse diffs', :js do
   let(:branch) { 'expand-collapse-diffs' }
   let(:project) { create(:project, :repository) }
 
diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb
index c14144ab3d5..ba09cc20154 100644
--- a/spec/features/explore/groups_list_spec.rb
+++ b/spec/features/explore/groups_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Explore Groups page', :js do
+RSpec.describe 'Explore Groups page', :js do
   let!(:user) { create :user }
   let!(:group) { create(:group) }
   let!(:public_group) { create(:group, :public) }
diff --git a/spec/features/explore/groups_spec.rb b/spec/features/explore/groups_spec.rb
index aee0a7c5573..6e9749f29c3 100644
--- a/spec/features/explore/groups_spec.rb
+++ b/spec/features/explore/groups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Explore Groups', :js do
+RSpec.describe 'Explore Groups', :js do
   let(:user) { create :user }
   let(:group) { create :group }
   let!(:private_project) do
diff --git a/spec/features/explore/user_explores_projects_spec.rb b/spec/features/explore/user_explores_projects_spec.rb
index 6adf51a1cf6..e217638f62b 100644
--- a/spec/features/explore/user_explores_projects_spec.rb
+++ b/spec/features/explore/user_explores_projects_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User explores projects' do
+RSpec.describe 'User explores projects' do
   let_it_be(:archived_project) { create(:project, :archived) }
   let_it_be(:internal_project) { create(:project, :internal) }
   let_it_be(:private_project) { create(:project, :private) }
diff --git a/spec/features/global_search_spec.rb b/spec/features/global_search_spec.rb
index a7c8c29517e..c878ee7329f 100644
--- a/spec/features/global_search_spec.rb
+++ b/spec/features/global_search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Global search' do
+RSpec.describe 'Global search' do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
 
@@ -14,7 +14,8 @@ describe 'Global search' do
   end
 
   it 'increases usage ping searches counter' do
-    expect(Gitlab::UsageDataCounters::SearchCounter).to receive(:increment_navbar_searches_count)
+    expect(Gitlab::UsageDataCounters::SearchCounter).to receive(:count).with(:navbar_searches)
+    expect(Gitlab::UsageDataCounters::SearchCounter).to receive(:count).with(:all_searches)
 
     submit_search('foobar')
   end
diff --git a/spec/features/graphiql_spec.rb b/spec/features/graphiql_spec.rb
index 329758113ab..91f53b4bb7c 100644
--- a/spec/features/graphiql_spec.rb
+++ b/spec/features/graphiql_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'GraphiQL' do
+RSpec.describe 'GraphiQL' do
   context 'without relative_url_root' do
     before do
       visit '/-/graphql-explorer'
diff --git a/spec/features/group_variables_spec.rb b/spec/features/group_variables_spec.rb
index 524ae837b5e..9a3dca61680 100644
--- a/spec/features/group_variables_spec.rb
+++ b/spec/features/group_variables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group variables', :js do
+RSpec.describe 'Group variables', :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let!(:variable) { create(:ci_group_variable, key: 'test_key', value: 'test_value', masked: true, group: group) }
diff --git a/spec/features/groups/activity_spec.rb b/spec/features/groups/activity_spec.rb
index c102e19d477..6ca69e76d33 100644
--- a/spec/features/groups/activity_spec.rb
+++ b/spec/features/groups/activity_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group activity page' do
+RSpec.describe 'Group activity page' do
   let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user }
   let(:group) { create(:group) }
   let(:path) { activity_group_path(group) }
diff --git a/spec/features/groups/board_sidebar_spec.rb b/spec/features/groups/board_sidebar_spec.rb
index ed874141ef4..3bbeed10948 100644
--- a/spec/features/groups/board_sidebar_spec.rb
+++ b/spec/features/groups/board_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group Issue Boards', :js do
+RSpec.describe 'Group Issue Boards', :js do
   include BoardHelpers
 
   let(:group)            { create(:group) }
diff --git a/spec/features/groups/board_spec.rb b/spec/features/groups/board_spec.rb
index f95e2e91cd7..29d0347086c 100644
--- a/spec/features/groups/board_spec.rb
+++ b/spec/features/groups/board_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group Boards' do
+RSpec.describe 'Group Boards' do
   let(:group) { create(:group) }
   let!(:project) { create(:project_empty_repo, group: group) }
   let(:user) { create(:group_member, :maintainer, user: create(:user), group: group ).user }
diff --git a/spec/features/groups/clusters/applications_spec.rb b/spec/features/groups/clusters/applications_spec.rb
index 5d48df234eb..324ef24efc4 100644
--- a/spec/features/groups/clusters/applications_spec.rb
+++ b/spec/features/groups/clusters/applications_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../../../spec/features/clusters/installing_applications_shared_examples'
 
-describe 'Group-level Cluster Applications', :js do
+RSpec.describe 'Group-level Cluster Applications', :js do
   include GoogleApi::CloudPlatformHelpers
 
   let(:group) { create(:group) }
diff --git a/spec/features/groups/clusters/eks_spec.rb b/spec/features/groups/clusters/eks_spec.rb
index a9267d58739..5a62741250a 100644
--- a/spec/features/groups/clusters/eks_spec.rb
+++ b/spec/features/groups/clusters/eks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group AWS EKS Cluster', :js do
+RSpec.describe 'Group AWS EKS Cluster', :js do
   let(:group) { create(:group) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/groups/clusters/user_spec.rb b/spec/features/groups/clusters/user_spec.rb
index a29afba99e4..c6e5da92160 100644
--- a/spec/features/groups/clusters/user_spec.rb
+++ b/spec/features/groups/clusters/user_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User Cluster', :js do
+RSpec.describe 'User Cluster', :js do
   include GoogleApi::CloudPlatformHelpers
 
   let(:group) { create(:group) }
diff --git a/spec/features/groups/container_registry_spec.rb b/spec/features/groups/container_registry_spec.rb
index 7e3c1728f3c..87ef2131211 100644
--- a/spec/features/groups/container_registry_spec.rb
+++ b/spec/features/groups/container_registry_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Container Registry', :js do
+RSpec.describe 'Container Registry', :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
@@ -24,6 +24,13 @@ describe 'Container Registry', :js do
     expect(page).to have_title _('Container Registry')
   end
 
+  it 'sidebar menu is open' do
+    visit_container_registry
+
+    sidebar = find('.nav-sidebar')
+    expect(sidebar).to have_link _('Container Registry')
+  end
+
   context 'when there are no image repositories' do
     it 'list page has no container title' do
       visit_container_registry
@@ -75,7 +82,7 @@ describe 'Container Registry', :js do
         expect(service).to receive(:execute).with(container_repository) { { status: :success } }
         expect(Projects::ContainerRepository::DeleteTagsService).to receive(:new).with(container_repository.project, user, tags: ['latest']) { service }
 
-        click_on(class: 'js-delete-registry')
+        first('[data-testid="singleDeleteButton"]').click
         expect(find('.modal .modal-title')).to have_content _('Remove tag')
         find('.modal .modal-footer .btn-danger').click
       end
diff --git a/spec/features/groups/empty_states_spec.rb b/spec/features/groups/empty_states_spec.rb
index bbc80b7eec4..d76cf993004 100644
--- a/spec/features/groups/empty_states_spec.rb
+++ b/spec/features/groups/empty_states_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group empty states' do
+RSpec.describe 'Group empty states' do
   let(:group) { create(:group) }
   let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user }
 
diff --git a/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
index a71b930d35f..8ef1b60d8ca 100644
--- a/spec/features/groups/group_page_with_external_authorization_service_spec.rb
+++ b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'The group page' do
+RSpec.describe 'The group page' do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb
index d686e0ed9d2..8972be45acb 100644
--- a/spec/features/groups/group_settings_spec.rb
+++ b/spec/features/groups/group_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Edit group settings' do
+RSpec.describe 'Edit group settings' do
   let(:user)  { create(:user) }
   let(:group) { create(:group, path: 'foo') }
 
diff --git a/spec/features/groups/import_export/export_file_spec.rb b/spec/features/groups/import_export/export_file_spec.rb
index 5829e659722..9feb8085e66 100644
--- a/spec/features/groups/import_export/export_file_spec.rb
+++ b/spec/features/groups/import_export/export_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group Export', :js do
+RSpec.describe 'Group Export', :js do
   include ExportFileHelper
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/features/groups/import_export/import_file_spec.rb b/spec/features/groups/import_export/import_file_spec.rb
new file mode 100644
index 00000000000..577198ef3f1
--- /dev/null
+++ b/spec/features/groups/import_export/import_file_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Import/Export - Group Import', :js do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:import_path) { "#{Dir.tmpdir}/group_import_spec" }
+
+  before do
+    allow_next_instance_of(Gitlab::ImportExport) do |import_export|
+      allow(import_export).to receive(:storage_path).and_return(import_path)
+    end
+
+    stub_uploads_object_storage(FileUploader)
+
+    gitlab_sign_in(user)
+  end
+
+  after do
+    FileUtils.rm_rf(import_path, secure: true)
+  end
+
+  context 'when the user uploads a valid export file' do
+    let(:file) { File.join(Rails.root, 'spec', %w[fixtures group_export.tar.gz]) }
+
+    context 'when using the pre-filled path', :sidekiq_inline do
+      it 'successfully imports the group' do
+        group_name = 'Test Group Import'
+
+        visit new_group_path
+
+        fill_in :group_name, with: group_name
+        find('#import-group-tab').click
+
+        expect(page).to have_content 'GitLab group export'
+        attach_file(file) do
+          find('.js-filepicker-button').click
+        end
+
+        expect { click_on 'Import group' }.to change { Group.count }.by 1
+
+        group = Group.find_by(name: group_name)
+
+        expect(group).not_to be_nil
+        expect(group.description).to eq 'A voluptate non sequi temporibus quam at.'
+        expect(group.path).to eq 'test-group-import'
+        expect(group.import_state.status).to eq GroupImportState.state_machine.states[:finished].value
+      end
+    end
+
+    context 'when modifying the pre-filled path' do
+      it 'successfully imports the group' do
+        visit new_group_path
+
+        fill_in :group_name, with: 'Test Group Import'
+        find('#import-group-tab').click
+
+        fill_in :import_group_path, with: 'custom-path'
+        attach_file(file) do
+          find('.js-filepicker-button').click
+        end
+
+        expect { click_on 'Import group' }.to change { Group.count }.by 1
+
+        group = Group.find_by(name: 'Test Group Import')
+        expect(group.path).to eq 'custom-path'
+      end
+    end
+
+    context 'when the path is already taken' do
+      before do
+        create(:group, path: 'test-group-import')
+      end
+
+      it 'suggests a unique path' do
+        visit new_group_path
+        find('#import-group-tab').click
+
+        fill_in :import_group_path, with: 'test-group-import'
+        expect(page).to have_content 'Group path is already taken. Suggestions: test-group-import1'
+      end
+    end
+  end
+
+  context 'when the user uploads an invalid export file' do
+    let(:file) { File.join(Rails.root, 'spec', %w[fixtures big-image.png]) }
+
+    it 'displays an error' do
+      visit new_group_path
+
+      fill_in :group_name, with: 'Test Group Import'
+      find('#import-group-tab').click
+      attach_file(file) do
+        find('.js-filepicker-button').click
+      end
+
+      expect { click_on 'Import group' }.not_to change { Group.count }
+
+      page.within('.flash-container') do
+        expect(page).to have_content('Unable to process group import file')
+      end
+    end
+  end
+end
diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb
index 1cefcd18989..c76e0c311a6 100644
--- a/spec/features/groups/issues_spec.rb
+++ b/spec/features/groups/issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group issues page' do
+RSpec.describe 'Group issues page' do
   include FilteredSearchHelpers
   include DragTo
 
diff --git a/spec/features/groups/labels/create_spec.rb b/spec/features/groups/labels/create_spec.rb
index f5062a65321..9c1a3672ebd 100644
--- a/spec/features/groups/labels/create_spec.rb
+++ b/spec/features/groups/labels/create_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Create a group label' do
+RSpec.describe 'Create a group label' do
   let(:user)  { create(:user) }
   let(:group) { create(:group) }
 
diff --git a/spec/features/groups/labels/edit_spec.rb b/spec/features/groups/labels/edit_spec.rb
index 43f067b89d6..2be7f61eeb9 100644
--- a/spec/features/groups/labels/edit_spec.rb
+++ b/spec/features/groups/labels/edit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Edit group label' do
+RSpec.describe 'Edit group label' do
   let(:user)  { create(:user) }
   let(:group) { create(:group) }
   let(:label) { create(:group_label, group: group) }
diff --git a/spec/features/groups/labels/index_spec.rb b/spec/features/groups/labels/index_spec.rb
index 62308d3b518..3de29231f5c 100644
--- a/spec/features/groups/labels/index_spec.rb
+++ b/spec/features/groups/labels/index_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group labels' do
+RSpec.describe 'Group labels' do
   let(:user)  { create(:user) }
   let(:group) { create(:group) }
   let!(:label) { create(:group_label, group: group) }
diff --git a/spec/features/groups/labels/search_labels_spec.rb b/spec/features/groups/labels/search_labels_spec.rb
index 14b88a561b1..fbb0acfb923 100644
--- a/spec/features/groups/labels/search_labels_spec.rb
+++ b/spec/features/groups/labels/search_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Search for labels', :js do
+RSpec.describe 'Search for labels', :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let!(:label1) { create(:group_label, title: 'Foo', description: 'Lorem ipsum', group: group) }
diff --git a/spec/features/groups/labels/sort_labels_spec.rb b/spec/features/groups/labels/sort_labels_spec.rb
index 2aea4d77675..b5657db23cb 100644
--- a/spec/features/groups/labels/sort_labels_spec.rb
+++ b/spec/features/groups/labels/sort_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Sort labels', :js do
+RSpec.describe 'Sort labels', :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let!(:label1) { create(:group_label, title: 'Foo', description: 'Lorem ipsum', group: group) }
diff --git a/spec/features/groups/labels/subscription_spec.rb b/spec/features/groups/labels/subscription_spec.rb
index cbccf4f3880..dedded777ac 100644
--- a/spec/features/groups/labels/subscription_spec.rb
+++ b/spec/features/groups/labels/subscription_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Labels subscription' do
+RSpec.describe 'Labels subscription' do
   let(:user)     { create(:user) }
   let(:group)    { create(:group) }
   let!(:label1)  { create(:group_label, group: group, title: 'foo') }
diff --git a/spec/features/groups/labels/user_sees_links_to_issuables_spec.rb b/spec/features/groups/labels/user_sees_links_to_issuables_spec.rb
index 38561c71323..b0508633065 100644
--- a/spec/features/groups/labels/user_sees_links_to_issuables_spec.rb
+++ b/spec/features/groups/labels/user_sees_links_to_issuables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Labels > User sees links to issuables' do
+RSpec.describe 'Groups > Labels > User sees links to issuables' do
   let_it_be(:group) { create(:group, :public) }
 
   before do
diff --git a/spec/features/groups/members/filter_members_spec.rb b/spec/features/groups/members/filter_members_spec.rb
index cba86f7e651..643c8407578 100644
--- a/spec/features/groups/members/filter_members_spec.rb
+++ b/spec/features/groups/members/filter_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Filter members' do
+RSpec.describe 'Groups > Members > Filter members' do
   let(:user)              { create(:user) }
   let(:nested_group_user) { create(:user) }
   let(:user_with_2fa)     { create(:user, :two_factor_via_otp) }
diff --git a/spec/features/groups/members/leave_group_spec.rb b/spec/features/groups/members/leave_group_spec.rb
index 5c7c83aea6d..fecc90f20c7 100644
--- a/spec/features/groups/members/leave_group_spec.rb
+++ b/spec/features/groups/members/leave_group_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Leave group' do
+RSpec.describe 'Groups > Members > Leave group' do
   let(:user) { create(:user) }
   let(:other_user) { create(:user) }
   let(:group) { create(:group) }
@@ -31,6 +31,7 @@ describe 'Groups > Members > Leave group' do
 
     page.accept_confirm
 
+    wait_for_all_requests
     expect(current_path).to eq(dashboard_groups_path)
     expect(group.users).not_to include(user)
   end
diff --git a/spec/features/groups/members/list_members_spec.rb b/spec/features/groups/members/list_members_spec.rb
index 8df807186be..415c6927320 100644
--- a/spec/features/groups/members/list_members_spec.rb
+++ b/spec/features/groups/members/list_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > List members' do
+RSpec.describe 'Groups > Members > List members' do
   include Select2Helper
   include Spec::Support::Helpers::Features::ListRowsHelpers
 
diff --git a/spec/features/groups/members/manage_groups_spec.rb b/spec/features/groups/members/manage_groups_spec.rb
index 593c450c6d6..f1cf04417c0 100644
--- a/spec/features/groups/members/manage_groups_spec.rb
+++ b/spec/features/groups/members/manage_groups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Manage groups', :js do
+RSpec.describe 'Groups > Members > Manage groups', :js do
   include Select2Helper
   include Spec::Support::Helpers::Features::ListRowsHelpers
 
diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb
index e4ba3022d8b..e29d8fd651e 100644
--- a/spec/features/groups/members/manage_members_spec.rb
+++ b/spec/features/groups/members/manage_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Manage members' do
+RSpec.describe 'Groups > Members > Manage members' do
   include Select2Helper
   include Spec::Support::Helpers::Features::ListRowsHelpers
 
diff --git a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb
index 491937ce4ab..f80925186ed 100644
--- a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Owner adds member with expiration date', :js do
+RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js do
   include Select2Helper
   include ActiveSupport::Testing::TimeHelpers
 
diff --git a/spec/features/groups/members/master_manages_access_requests_spec.rb b/spec/features/groups/members/master_manages_access_requests_spec.rb
index 1c13bd3d59e..2a17e7d2a5c 100644
--- a/spec/features/groups/members/master_manages_access_requests_spec.rb
+++ b/spec/features/groups/members/master_manages_access_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Maintainer manages access requests' do
+RSpec.describe 'Groups > Members > Maintainer manages access requests' do
   it_behaves_like 'Maintainer manages access requests' do
     let(:entity) { create(:group, :public) }
     let(:members_page_path) { group_group_members_path(entity) }
diff --git a/spec/features/groups/members/request_access_spec.rb b/spec/features/groups/members/request_access_spec.rb
index 5f22af3529c..307cb63ec8e 100644
--- a/spec/features/groups/members/request_access_spec.rb
+++ b/spec/features/groups/members/request_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Request access' do
+RSpec.describe 'Groups > Members > Request access' do
   let(:user) { create(:user) }
   let(:owner) { create(:user) }
   let(:group) { create(:group, :public) }
diff --git a/spec/features/groups/members/search_members_spec.rb b/spec/features/groups/members/search_members_spec.rb
index fda129ce422..4c34ccf87c3 100644
--- a/spec/features/groups/members/search_members_spec.rb
+++ b/spec/features/groups/members/search_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Search group member' do
+RSpec.describe 'Search group member' do
   let(:user) { create :user }
   let(:member) { create :user }
 
diff --git a/spec/features/groups/members/sort_members_spec.rb b/spec/features/groups/members/sort_members_spec.rb
index 76709199942..cfc0e421aeb 100644
--- a/spec/features/groups/members/sort_members_spec.rb
+++ b/spec/features/groups/members/sort_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > Members > Sort members' do
+RSpec.describe 'Groups > Members > Sort members' do
   let(:owner)     { create(:user, name: 'John Doe') }
   let(:developer) { create(:user, name: 'Mary Jane', last_sign_in_at: 5.days.ago) }
   let(:group)     { create(:group) }
diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb
index f87fa10e2f4..43d4b6b23e0 100644
--- a/spec/features/groups/merge_requests_spec.rb
+++ b/spec/features/groups/merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group merge requests page' do
+RSpec.describe 'Group merge requests page' do
   include FilteredSearchHelpers
 
   let(:path) { merge_requests_group_path(group) }
diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb
index 65ef0af5be3..2217bd9d6b5 100644
--- a/spec/features/groups/milestone_spec.rb
+++ b/spec/features/groups/milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group milestones' do
+RSpec.describe 'Group milestones' do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project_empty_repo, group: group) }
   let_it_be(:user) { create(:group_member, :maintainer, user: create(:user), group: group ).user }
@@ -102,11 +102,9 @@ describe 'Group milestones' do
         expect(find('.top-area .all .badge').text).to eq("6")
       end
 
-      it 'lists legacy group milestones and group milestones' do
-        legacy_milestone = GroupMilestone.build_collection(group, group.projects, { state: 'active' }).first
-
+      it 'lists group and project milestones' do
         expect(page).to have_selector("#milestone_#{active_group_milestone.id}", count: 1)
-        expect(page).to have_selector("#milestone_#{legacy_milestone.milestone.id}", count: 1)
+        expect(page).to have_selector("#milestone_#{active_project_milestone2.id}", count: 1)
       end
 
       it 'shows milestone detail and supports its edit' do
@@ -126,74 +124,34 @@ describe 'Group milestones' do
         expect(page).to have_content('v1.1')
         expect(page).to have_content('GL-113')
         expect(page).to have_link(
+          'v1.0',
+          href: project_milestone_path(project, active_project_milestone1)
+        )
+        expect(page).to have_link(
           '1 Issue',
-          href: issues_group_path(group, milestone_title: 'v1.0')
+          href: project_issues_path(project, milestone_title: 'v1.0')
         )
         expect(page).to have_link(
           '0 Merge Requests',
-          href: merge_requests_group_path(group, milestone_title: 'v1.0')
+          href: project_merge_requests_path(project, milestone_title: 'v1.0')
+        )
+        expect(page).to have_link(
+          'GL-113',
+          href: group_milestone_path(group, active_group_milestone)
+        )
+        expect(page).to have_link(
+          '0 Issues',
+          href: issues_group_path(group, milestone_title: 'GL-113')
+        )
+        expect(page).to have_link(
+          '0 Merge Requests',
+          href: merge_requests_group_path(group, milestone_title: 'GL-113')
         )
-      end
-
-      it 'renders group milestone details' do
-        click_link 'v1.0'
-
-        expect(page).to have_content('expires on Aug 20, 2114')
-        expect(page).to have_content('v1.0')
-        expect(page).to have_content('Issues 1 Open: 1 Closed: 0')
-        expect(page).to have_link(issue.title, href: project_issue_path(issue.project, issue))
       end
     end
   end
 
   describe 'milestone tabs', :js do
-    context 'for a legacy group milestone' do
-      let_it_be(:milestone) { create(:milestone, project: project) }
-      let_it_be(:label)     { create(:label, project: project) }
-      let_it_be(:issue)     { create(:labeled_issue, project: project, milestone: milestone, labels: [label], assignees: [create(:user)]) }
-      let_it_be(:mr)        { create(:merge_request, source_project: project, milestone: milestone) }
-
-      before do
-        visit group_milestone_path(group, milestone.title, title: milestone.title)
-      end
-
-      it 'renders the issues tab' do
-        within('#tab-issues') do
-          expect(page).to have_content issue.title
-        end
-      end
-
-      it 'renders the merge requests tab' do
-        within('.js-milestone-tabs') do
-          click_link('Merge Requests')
-        end
-
-        within('#tab-merge-requests') do
-          expect(page).to have_content mr.title
-        end
-      end
-
-      it 'renders the participants tab' do
-        within('.js-milestone-tabs') do
-          click_link('Participants')
-        end
-
-        within('#tab-participants') do
-          expect(page).to have_content issue.assignees.first.name
-        end
-      end
-
-      it 'renders the labels tab' do
-        within('.js-milestone-tabs') do
-          click_link('Labels')
-        end
-
-        within('#tab-labels') do
-          expect(page).to have_content label.title
-        end
-      end
-    end
-
     context 'for a group milestone' do
       let_it_be(:other_project) { create(:project_empty_repo, group: group) }
       let_it_be(:milestone) { create(:milestone, group: group) }
diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb
index d27511be0b0..a06e64fdee0 100644
--- a/spec/features/groups/milestones_sorting_spec.rb
+++ b/spec/features/groups/milestones_sorting_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Milestones sorting', :js do
+RSpec.describe 'Milestones sorting', :js do
   let(:group) { create(:group) }
   let!(:project) { create(:project_empty_repo, group: group) }
   let!(:other_project) { create(:project_empty_repo, group: group) }
@@ -24,21 +24,12 @@ describe 'Milestones sorting', :js do
 
     # assert default sorting
     within '.milestones' do
-      expect(page.all('ul.content-list > li').first.text).to include('v2.0')
-      expect(page.all('ul.content-list > li')[1].text).to include('v3.0')
-      expect(page.all('ul.content-list > li').last.text).to include('v1.0')
+      expect(page.all('ul.content-list > li strong > a').map(&:text)).to eq(['v2.0', 'v2.0', 'v3.0', 'v1.0', 'v1.0'])
     end
 
     click_button 'Due soon'
 
-    sort_options = find('ul.dropdown-menu-sort li').all('a').collect(&:text)
-
-    expect(sort_options[0]).to eq('Due soon')
-    expect(sort_options[1]).to eq('Due later')
-    expect(sort_options[2]).to eq('Start soon')
-    expect(sort_options[3]).to eq('Start later')
-    expect(sort_options[4]).to eq('Name, ascending')
-    expect(sort_options[5]).to eq('Name, descending')
+    expect(find('ul.dropdown-menu-sort li').all('a').map(&:text)).to eq(['Due soon', 'Due later', 'Start soon', 'Start later', 'Name, ascending', 'Name, descending'])
 
     click_link 'Due later'
 
@@ -46,9 +37,7 @@ describe 'Milestones sorting', :js do
 
     # assert descending sorting
     within '.milestones' do
-      expect(page.all('ul.content-list > li').first.text).to include('v1.0')
-      expect(page.all('ul.content-list > li')[1].text).to include('v3.0')
-      expect(page.all('ul.content-list > li').last.text).to include('v2.0')
+      expect(page.all('ul.content-list > li strong > a').map(&:text)).to eq(['v1.0', 'v1.0', 'v3.0', 'v2.0', 'v2.0'])
     end
   end
 end
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index fd5b4ec9345..cfa1f3338a1 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group navbar' do
+RSpec.describe 'Group navbar' do
   include NavbarStructureHelper
 
   include_context 'group navbar structure'
@@ -46,6 +46,7 @@ describe 'Group navbar' do
 
   before do
     stub_feature_flags(group_push_rules: false)
+    stub_feature_flags(group_iterations: false)
     group.add_maintainer(user)
     sign_in(user)
   end
diff --git a/spec/features/groups/settings/ci_cd_spec.rb b/spec/features/groups/settings/ci_cd_spec.rb
index 5b1a9512c55..9c2f9512b9d 100644
--- a/spec/features/groups/settings/ci_cd_spec.rb
+++ b/spec/features/groups/settings/ci_cd_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group CI/CD settings' do
+RSpec.describe 'Group CI/CD settings' do
   include WaitForRequests
 
   let(:user) { create(:user) }
diff --git a/spec/features/groups/settings/group_badges_spec.rb b/spec/features/groups/settings/group_badges_spec.rb
index 72e74df368b..5bf736cc7ce 100644
--- a/spec/features/groups/settings/group_badges_spec.rb
+++ b/spec/features/groups/settings/group_badges_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group Badges' do
+RSpec.describe 'Group Badges' do
   include WaitForRequests
 
   let(:user) { create(:user) }
diff --git a/spec/features/groups/settings/repository_spec.rb b/spec/features/groups/settings/repository_spec.rb
index 722fd98ce59..d20303027e5 100644
--- a/spec/features/groups/settings/repository_spec.rb
+++ b/spec/features/groups/settings/repository_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group Repository settings' do
+RSpec.describe 'Group Repository settings' do
   include WaitForRequests
 
   let(:user) { create(:user) }
diff --git a/spec/features/groups/share_lock_spec.rb b/spec/features/groups/share_lock_spec.rb
index 777f5d98720..d8207899e24 100644
--- a/spec/features/groups/share_lock_spec.rb
+++ b/spec/features/groups/share_lock_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group share with group lock' do
+RSpec.describe 'Group share with group lock' do
   let(:root_owner) { create(:user) }
   let(:root_group) { create(:group) }
 
diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb
index bcaed2a5f18..ec30f34199d 100644
--- a/spec/features/groups/show_spec.rb
+++ b/spec/features/groups/show_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group show page' do
+RSpec.describe 'Group show page' do
   let(:group) { create(:group) }
   let(:path) { group_path(group) }
 
diff --git a/spec/features/groups/user_browse_projects_group_page_spec.rb b/spec/features/groups/user_browse_projects_group_page_spec.rb
index 68221e3fefe..999449a94b0 100644
--- a/spec/features/groups/user_browse_projects_group_page_spec.rb
+++ b/spec/features/groups/user_browse_projects_group_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User browse group projects page' do
+RSpec.describe 'User browse group projects page' do
   let(:user) { create :user }
   let(:group) { create :group }
 
diff --git a/spec/features/groups/user_sees_package_sidebar_spec.rb b/spec/features/groups/user_sees_package_sidebar_spec.rb
index f85b6841636..ee216488232 100644
--- a/spec/features/groups/user_sees_package_sidebar_spec.rb
+++ b/spec/features/groups/user_sees_package_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > sidebar' do
+RSpec.describe 'Groups > sidebar' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
 
diff --git a/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb b/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb
index 742021ae4a1..9fe11070187 100644
--- a/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb
+++ b/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups > User sees users dropdowns in issuables list' do
+RSpec.describe 'Groups > User sees users dropdowns in issuables list' do
   let(:entity) { create(:group) }
   let(:user_in_dropdown) { create(:user) }
   let!(:user_not_in_dropdown) { create(:user) }
diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index c1cb0b4951e..78a35fe1d3f 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group' do
+RSpec.describe 'Group' do
   let(:user) { create(:admin) }
 
   before do
diff --git a/spec/features/help_pages_spec.rb b/spec/features/help_pages_spec.rb
index 1ba3849fe2c..1f8397e45f7 100644
--- a/spec/features/help_pages_spec.rb
+++ b/spec/features/help_pages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Help Pages' do
+RSpec.describe 'Help Pages' do
   describe 'Get the main help page' do
     before do
       allow(File).to receive(:read).and_call_original
diff --git a/spec/features/ics/dashboard_issues_spec.rb b/spec/features/ics/dashboard_issues_spec.rb
index bde5488f375..4a93a4b490a 100644
--- a/spec/features/ics/dashboard_issues_spec.rb
+++ b/spec/features/ics/dashboard_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dashboard Issues Calendar Feed' do
+RSpec.describe 'Dashboard Issues Calendar Feed' do
   describe 'GET /issues' do
     let!(:user)     { create(:user, email: 'private1@example.com', public_email: 'public1@example.com') }
     let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
diff --git a/spec/features/ics/group_issues_spec.rb b/spec/features/ics/group_issues_spec.rb
index 0b317095678..05caca4b5a8 100644
--- a/spec/features/ics/group_issues_spec.rb
+++ b/spec/features/ics/group_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group Issues Calendar Feed' do
+RSpec.describe 'Group Issues Calendar Feed' do
   describe 'GET /issues' do
     let!(:user)     { create(:user, email: 'private1@example.com', public_email: 'public1@example.com') }
     let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
diff --git a/spec/features/ics/project_issues_spec.rb b/spec/features/ics/project_issues_spec.rb
index 3c940149670..58a1a32eac2 100644
--- a/spec/features/ics/project_issues_spec.rb
+++ b/spec/features/ics/project_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Issues Calendar Feed' do
+RSpec.describe 'Project Issues Calendar Feed' do
   describe 'GET /issues' do
     let!(:user)     { create(:user, email: 'private1@example.com', public_email: 'public1@example.com') }
     let!(:assignee) { create(:user, email: 'private2@example.com', public_email: 'public2@example.com') }
diff --git a/spec/features/ide/clientside_preview_csp_spec.rb b/spec/features/ide/clientside_preview_csp_spec.rb
index e097513def3..eadcb9cd008 100644
--- a/spec/features/ide/clientside_preview_csp_spec.rb
+++ b/spec/features/ide/clientside_preview_csp_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'IDE Clientside Preview CSP' do
+RSpec.describe 'IDE Clientside Preview CSP' do
   let_it_be(:user) { create(:user) }
 
   shared_context 'disable feature' do
diff --git a/spec/features/ide/static_object_external_storage_csp_spec.rb b/spec/features/ide/static_object_external_storage_csp_spec.rb
index 739b3fe2471..24d37f25739 100644
--- a/spec/features/ide/static_object_external_storage_csp_spec.rb
+++ b/spec/features/ide/static_object_external_storage_csp_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Static Object External Storage Content Security Policy' do
+RSpec.describe 'Static Object External Storage Content Security Policy' do
   let_it_be(:user) { create(:user) }
 
   shared_context 'disable feature' do
diff --git a/spec/features/ide/user_commits_changes_spec.rb b/spec/features/ide/user_commits_changes_spec.rb
index 56f2c6b8afc..1b1e71e2862 100644
--- a/spec/features/ide/user_commits_changes_spec.rb
+++ b/spec/features/ide/user_commits_changes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'IDE user commits changes', :js do
+RSpec.describe 'IDE user commits changes', :js do
   include WebIdeSpecHelpers
 
   let(:project) { create(:project, :public, :repository) }
@@ -30,14 +30,4 @@ describe 'IDE user commits changes', :js do
     expect(project.repository.blob_at('master', 'foo/bar/.gitkeep')).to be_nil
     expect(project.repository.blob_at('master', 'foo/bar/lorem_ipsum.md').data).to eql(content)
   end
-
-  it 'user adds then deletes new file' do
-    ide_create_new_file('foo/bar/lorem_ipsum.md')
-
-    expect(page).to have_selector(ide_commit_tab_selector)
-
-    ide_delete_file('foo/bar/lorem_ipsum.md')
-
-    expect(page).not_to have_selector(ide_commit_tab_selector)
-  end
 end
diff --git a/spec/features/ide/user_opens_merge_request_spec.rb b/spec/features/ide/user_opens_merge_request_spec.rb
index 03318287db9..e6101e90a83 100644
--- a/spec/features/ide/user_opens_merge_request_spec.rb
+++ b/spec/features/ide/user_opens_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'IDE merge request', :js do
+RSpec.describe 'IDE merge request', :js do
   let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.owner }
diff --git a/spec/features/ide_spec.rb b/spec/features/ide_spec.rb
index 73f6180d944..2505ab0afee 100644
--- a/spec/features/ide_spec.rb
+++ b/spec/features/ide_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'IDE', :js do
+RSpec.describe 'IDE', :js do
   describe 'sub-groups' do
     let(:user) { create(:user) }
     let(:group) { create(:group) }
diff --git a/spec/features/import/manifest_import_spec.rb b/spec/features/import/manifest_import_spec.rb
index 36478128dd1..1efbc5642d4 100644
--- a/spec/features/import/manifest_import_spec.rb
+++ b/spec/features/import/manifest_import_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Import multiple repositories by uploading a manifest file', :js do
+RSpec.describe 'Import multiple repositories by uploading a manifest file', :js do
   include Select2Helper
 
   let(:user) { create(:admin) }
diff --git a/spec/features/instance_statistics/cohorts_spec.rb b/spec/features/instance_statistics/cohorts_spec.rb
index 0bb2e4b997d..1f112e1831c 100644
--- a/spec/features/instance_statistics/cohorts_spec.rb
+++ b/spec/features/instance_statistics/cohorts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Cohorts page' do
+RSpec.describe 'Cohorts page' do
   before do
     sign_in(create(:admin))
 
diff --git a/spec/features/instance_statistics/dev_ops_score_spec.rb b/spec/features/instance_statistics/dev_ops_score_spec.rb
index 453b5582f48..da87aedab5c 100644
--- a/spec/features/instance_statistics/dev_ops_score_spec.rb
+++ b/spec/features/instance_statistics/dev_ops_score_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'DevOps Score' do
+RSpec.describe 'DevOps Score' do
   before do
     sign_in(create(:admin))
   end
diff --git a/spec/features/instance_statistics/instance_statistics_spec.rb b/spec/features/instance_statistics/instance_statistics_spec.rb
index 0fb78c6eef8..7695bf7874b 100644
--- a/spec/features/instance_statistics/instance_statistics_spec.rb
+++ b/spec/features/instance_statistics/instance_statistics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Cohorts page', :js do
+RSpec.describe 'Cohorts page', :js do
   before do
     sign_in(create(:admin))
   end
diff --git a/spec/features/invites_spec.rb b/spec/features/invites_spec.rb
index 9cd01894575..f85b4b78e35 100644
--- a/spec/features/invites_spec.rb
+++ b/spec/features/invites_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Invites' do
+RSpec.describe 'Invites' do
   let(:user) { create(:user) }
   let(:owner) { create(:user, name: 'John Doe') }
   let(:group) { create(:group, name: 'Owned') }
diff --git a/spec/features/issuables/close_reopen_report_toggle_spec.rb b/spec/features/issuables/close_reopen_report_toggle_spec.rb
index 8805018902f..cf3028ec4c9 100644
--- a/spec/features/issuables/close_reopen_report_toggle_spec.rb
+++ b/spec/features/issuables/close_reopen_report_toggle_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issuables Close/Reopen/Report toggle' do
+RSpec.describe 'Issuables Close/Reopen/Report toggle' do
   let(:user) { create(:user) }
 
   shared_examples 'an issuable close/reopen/report toggle' do
diff --git a/spec/features/issuables/discussion_lock_spec.rb b/spec/features/issuables/discussion_lock_spec.rb
index 0cd2c077081..13f1742fbf6 100644
--- a/spec/features/issuables/discussion_lock_spec.rb
+++ b/spec/features/issuables/discussion_lock_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Discussion Lock', :js do
+RSpec.describe 'Discussion Lock', :js do
   let(:user) { create(:user) }
   let(:issue) { create(:issue, project: project, author: user) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index 7014a51ccdc..382a7a9321c 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'issuable list' do
+RSpec.describe 'issuable list' do
   let(:project) { create(:project) }
   let(:user)    { create(:user) }
 
diff --git a/spec/features/issuables/markdown_references/internal_references_spec.rb b/spec/features/issuables/markdown_references/internal_references_spec.rb
index efd84cf67b0..aceaea8d2ed 100644
--- a/spec/features/issuables/markdown_references/internal_references_spec.rb
+++ b/spec/features/issuables/markdown_references/internal_references_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Internal references", :js do
+RSpec.describe "Internal references", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
 
   let(:private_project_user) { private_project.owner }
diff --git a/spec/features/issuables/markdown_references/jira_spec.rb b/spec/features/issuables/markdown_references/jira_spec.rb
index 779606effdc..a3a259e21a1 100644
--- a/spec/features/issuables/markdown_references/jira_spec.rb
+++ b/spec/features/issuables/markdown_references/jira_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Jira", :js do
+RSpec.describe "Jira", :js do
   let(:user) { create(:user) }
   let(:actual_project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, target_project: actual_project, source_project: actual_project) }
diff --git a/spec/features/issuables/shortcuts_issuable_spec.rb b/spec/features/issuables/shortcuts_issuable_spec.rb
index da8a0dd7b0f..78cd8d0bef3 100644
--- a/spec/features/issuables/shortcuts_issuable_spec.rb
+++ b/spec/features/issuables/shortcuts_issuable_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Blob shortcuts', :js do
+RSpec.describe 'Blob shortcuts', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:issue) { create(:issue, project: project, author: user) }
diff --git a/spec/features/issuables/sorting_list_spec.rb b/spec/features/issuables/sorting_list_spec.rb
index b7813c8ba30..59518723740 100644
--- a/spec/features/issuables/sorting_list_spec.rb
+++ b/spec/features/issuables/sorting_list_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'Sort Issuable List' do
+RSpec.describe 'Sort Issuable List' do
   let(:project) { create(:project, :public) }
 
   let(:first_created_issuable) { issuables.order_created_asc.first }
diff --git a/spec/features/issuables/user_sees_sidebar_spec.rb b/spec/features/issuables/user_sees_sidebar_spec.rb
index 52040eb8cbb..04bf704b6a4 100644
--- a/spec/features/issuables/user_sees_sidebar_spec.rb
+++ b/spec/features/issuables/user_sees_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Sidebar on Mobile' do
+RSpec.describe 'Issue Sidebar on Mobile' do
   include MobileHelpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/issues/bulk_assignment_labels_spec.rb b/spec/features/issues/bulk_assignment_labels_spec.rb
index fc9176715c3..84a786e91a7 100644
--- a/spec/features/issues/bulk_assignment_labels_spec.rb
+++ b/spec/features/issues/bulk_assignment_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues > Labels bulk assignment' do
+RSpec.describe 'Issues > Labels bulk assignment' do
   let(:user)      { create(:user) }
   let!(:project)  { create(:project) }
   let!(:issue1)   { create(:issue, project: project, title: "Issue 1") }
@@ -302,7 +302,23 @@ describe 'Issues > Labels bulk assignment' do
         sleep 1 # needed
 
         expect(find("#issue_#{issue1.id}")).to have_content 'bug'
-        expect(find("#issue_#{issue1.id}")).not_to have_content 'feature'
+        expect(find("#issue_#{issue1.id}")).to have_content 'feature'
+      end
+    end
+
+    context 'mark previously toggled label' do
+      before do
+        enable_bulk_update
+      end
+
+      it do
+        open_labels_dropdown ['feature']
+
+        check_issue issue1
+
+        update_issues
+
+        expect(find("#issue_#{issue1.id}")).to have_content 'feature'
       end
     end
 
diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
index a3742af31de..6fc648954b4 100644
--- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Resolving all open threads in a merge request from an issue', :js do
+RSpec.describe 'Resolving all open threads in a merge request from an issue', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
index 1c17b39c03a..55a02dc4255 100644
--- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Resolve an open thread in a merge request by creating an issue', :js do
+RSpec.describe 'Resolve an open thread in a merge request by creating an issue', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, only_allow_merge_if_all_discussions_are_resolved: true) }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/issues/csv_spec.rb b/spec/features/issues/csv_spec.rb
index 193c83d2a40..8d06bf24f8b 100644
--- a/spec/features/issues/csv_spec.rb
+++ b/spec/features/issues/csv_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues csv' do
+RSpec.describe 'Issues csv' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
   let(:milestone) { create(:milestone, title: 'v1.0', project: project) }
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index c207e91f02e..381633b0fc9 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown assignee', :js do
+RSpec.describe 'Dropdown assignee', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project) }
diff --git a/spec/features/issues/filtered_search/dropdown_author_spec.rb b/spec/features/issues/filtered_search/dropdown_author_spec.rb
index 8ded11b3b08..91c85825a17 100644
--- a/spec/features/issues/filtered_search/dropdown_author_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_author_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown author', :js do
+RSpec.describe 'Dropdown author', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project) }
diff --git a/spec/features/issues/filtered_search/dropdown_base_spec.rb b/spec/features/issues/filtered_search/dropdown_base_spec.rb
index 14d3f48b8fc..d730525cb8b 100644
--- a/spec/features/issues/filtered_search/dropdown_base_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_base_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown base', :js do
+RSpec.describe 'Dropdown base', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project) }
diff --git a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
index 9ab0f49cd15..c2c933f8a86 100644
--- a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown emoji', :js do
+RSpec.describe 'Dropdown emoji', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project, :public) }
diff --git a/spec/features/issues/filtered_search/dropdown_hint_spec.rb b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
index 10b092c6957..9edc6e0b593 100644
--- a/spec/features/issues/filtered_search/dropdown_hint_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown hint', :js do
+RSpec.describe 'Dropdown hint', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project, :public) }
diff --git a/spec/features/issues/filtered_search/dropdown_label_spec.rb b/spec/features/issues/filtered_search/dropdown_label_spec.rb
index a982053dbcb..c0d5fe0d860 100644
--- a/spec/features/issues/filtered_search/dropdown_label_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_label_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown label', :js do
+RSpec.describe 'Dropdown label', :js do
   include FilteredSearchHelpers
 
   let(:project) { create(:project) }
diff --git a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
index 56beb35a1c5..68afd973f1d 100644
--- a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown milestone', :js do
+RSpec.describe 'Dropdown milestone', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project) }
diff --git a/spec/features/issues/filtered_search/dropdown_release_spec.rb b/spec/features/issues/filtered_search/dropdown_release_spec.rb
index ae1c84d71b4..daf686c2850 100644
--- a/spec/features/issues/filtered_search/dropdown_release_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_release_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dropdown release', :js do
+RSpec.describe 'Dropdown release', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project, :repository) }
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index 3ee5840e1b9..5b5348d4069 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Filter issues', :js do
+RSpec.describe 'Filter issues', :js do
   include FilteredSearchHelpers
 
   let(:project) { create(:project) }
diff --git a/spec/features/issues/filtered_search/recent_searches_spec.rb b/spec/features/issues/filtered_search/recent_searches_spec.rb
index e05c7aa3af5..85b7a093536 100644
--- a/spec/features/issues/filtered_search/recent_searches_spec.rb
+++ b/spec/features/issues/filtered_search/recent_searches_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Recent searches', :js do
+RSpec.describe 'Recent searches', :js do
   include FilteredSearchHelpers
 
   let(:project_1) { create(:project, :public) }
diff --git a/spec/features/issues/filtered_search/search_bar_spec.rb b/spec/features/issues/filtered_search/search_bar_spec.rb
index ad994270218..167fecc5ab1 100644
--- a/spec/features/issues/filtered_search/search_bar_spec.rb
+++ b/spec/features/issues/filtered_search/search_bar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Search bar', :js do
+RSpec.describe 'Search bar', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project) }
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index d34253b3c5e..59588978a8e 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Visual tokens', :js do
+RSpec.describe 'Visual tokens', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project) }
diff --git a/spec/features/issues/form_spec.rb b/spec/features/issues/form_spec.rb
index 8d7b6be5ea2..dac066856c0 100644
--- a/spec/features/issues/form_spec.rb
+++ b/spec/features/issues/form_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New/edit issue', :js do
+RSpec.describe 'New/edit issue', :js do
   include ActionView::Helpers::JavaScriptHelper
   include FormHelper
 
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index 501a2d347d1..4a7e1ba99e9 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'GFM autocomplete', :js do
+RSpec.describe 'GFM autocomplete', :js do
   let(:issue_xss_title) { 'This will execute alert<img src=x onerror=alert(2)&lt;img src=x onerror=alert(1)&gt;' }
   let(:user_xss_title) { 'eve <img src=x onerror=alert(2)&lt;img src=x onerror=alert(1)&gt;' }
   let(:label_xss_title) { 'alert label &lt;img src=x onerror="alert(\'Hello xss\');" a' }
diff --git a/spec/features/issues/group_label_sidebar_spec.rb b/spec/features/issues/group_label_sidebar_spec.rb
index fe6d95e1039..e6a173f4589 100644
--- a/spec/features/issues/group_label_sidebar_spec.rb
+++ b/spec/features/issues/group_label_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Group label on issue' do
+RSpec.describe 'Group label on issue' do
   it 'renders link to the project issues page' do
     group = create(:group)
     project = create(:project, :public, namespace: group)
diff --git a/spec/features/issues/issue_detail_spec.rb b/spec/features/issues/issue_detail_spec.rb
index 3bb70fdf376..ab319daec71 100644
--- a/spec/features/issues/issue_detail_spec.rb
+++ b/spec/features/issues/issue_detail_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue Detail', :js do
+RSpec.describe 'Issue Detail', :js do
   let(:user)     { create(:user) }
   let(:project)  { create(:project, :public) }
   let(:issue)    { create(:issue, project: project, author: user) }
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index e7c675bf6bf..9e4362bf0e5 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -2,12 +2,12 @@
 
 require 'spec_helper'
 
-describe 'Issue Sidebar' do
+RSpec.describe 'Issue Sidebar' do
   include MobileHelpers
 
   let(:group) { create(:group, :nested) }
   let(:project) { create(:project, :public, namespace: group) }
-  let!(:user) { create(:user)}
+  let!(:user) { create(:user) }
   let!(:label) { create(:label, project: project, title: 'bug') }
   let(:issue) { create(:labeled_issue, project: project, labels: [label]) }
   let!(:xss_label) { create(:label, project: project, title: '&lt;script&gt;alert("xss");&lt;&#x2F;script&gt;') }
@@ -20,62 +20,125 @@ describe 'Issue Sidebar' do
     let(:user2) { create(:user) }
     let(:issue2) { create(:issue, project: project, author: user2) }
 
-    before do
-      project.add_developer(user)
-      visit_issue(project, issue2)
+    context 'when invite_members_version_a experiment is enabled' do
+      before do
+        stub_experiment_for_user(invite_members_version_a: true)
+      end
 
-      find('.block.assignee .edit-link').click
+      context 'when user can not see invite members' do
+        before do
+          project.add_developer(user)
+          visit_issue(project, issue2)
 
-      wait_for_requests
-    end
+          find('.block.assignee .edit-link').click
 
-    it 'shows author in assignee dropdown' do
-      page.within '.dropdown-menu-user' do
-        expect(page).to have_content(user2.name)
+          wait_for_requests
+        end
+
+        it 'does not see link to invite members' do
+          page.within '.dropdown-menu-user' do
+            expect(page).not_to have_link('Invite Members')
+          end
+        end
       end
-    end
 
-    it 'shows author when filtering assignee dropdown' do
-      page.within '.dropdown-menu-user' do
-        find('.dropdown-input-field').native.send_keys user2.name
-        sleep 1 # Required to wait for end of input delay
+      context 'when user can see invite members' do
+        before do
+          project.add_maintainer(user)
+          visit_issue(project, issue2)
+
+          find('.block.assignee .edit-link').click
 
-        wait_for_requests
+          wait_for_requests
+        end
 
-        expect(page).to have_content(user2.name)
+        it 'sees link to invite members' do
+          page.within '.dropdown-menu-user' do
+            expect(page).to have_link('Invite Members', href: project_project_members_path(project))
+            expect(page).to have_selector('[data-track-event="click_invite_members"]')
+            expect(page).to have_selector("[data-track-label='edit_assignee']")
+          end
+        end
       end
     end
 
-    it 'assigns yourself' do
-      find('.block.assignee .dropdown-menu-toggle').click
+    context 'when invite_members_version_a experiment is not enabled' do
+      context 'when user is a developer' do
+        before do
+          project.add_developer(user)
+          visit_issue(project, issue2)
 
-      click_button 'assign yourself'
+          find('.block.assignee .edit-link').click
 
-      wait_for_requests
+          wait_for_requests
+        end
 
-      find('.block.assignee .edit-link').click
+        it 'shows author in assignee dropdown' do
+          page.within '.dropdown-menu-user' do
+            expect(page).to have_content(user2.name)
+          end
+        end
 
-      page.within '.dropdown-menu-user' do
-        expect(page.find('.dropdown-header')).to be_visible
-        expect(page.find('.dropdown-menu-user-link.is-active')).to have_content(user.name)
-      end
-    end
+        it 'shows author when filtering assignee dropdown' do
+          page.within '.dropdown-menu-user' do
+            find('.dropdown-input-field').native.send_keys user2.name
+            sleep 1 # Required to wait for end of input delay
 
-    it 'keeps your filtered term after filtering and dismissing the dropdown' do
-      find('.dropdown-input-field').native.send_keys user2.name
+            wait_for_requests
 
-      wait_for_requests
+            expect(page).to have_content(user2.name)
+          end
+        end
+
+        it 'assigns yourself' do
+          find('.block.assignee .dropdown-menu-toggle').click
+
+          click_button 'assign yourself'
+
+          wait_for_requests
+
+          find('.block.assignee .edit-link').click
+
+          page.within '.dropdown-menu-user' do
+            expect(page.find('.dropdown-header')).to be_visible
+            expect(page.find('.dropdown-menu-user-link.is-active')).to have_content(user.name)
+          end
+        end
+
+        it 'keeps your filtered term after filtering and dismissing the dropdown' do
+          find('.dropdown-input-field').native.send_keys user2.name
+
+          wait_for_requests
 
-      page.within '.dropdown-menu-user' do
-        expect(page).not_to have_content 'Unassigned'
-        click_link user2.name
+          page.within '.dropdown-menu-user' do
+            expect(page).not_to have_content 'Unassigned'
+            click_link user2.name
+          end
+
+          find('.js-right-sidebar').click
+          find('.block.assignee .edit-link').click
+
+          expect(page.all('.dropdown-menu-user li').length).to eq(1)
+          expect(find('.dropdown-input-field').value).to eq(user2.name)
+        end
       end
 
-      find('.js-right-sidebar').click
-      find('.block.assignee .edit-link').click
+      context 'when user is a maintainer' do
+        before do
+          project.add_maintainer(user)
+          visit_issue(project, issue2)
+
+          find('.block.assignee .edit-link').click
 
-      expect(page.all('.dropdown-menu-user li').length).to eq(1)
-      expect(find('.dropdown-input-field').value).to eq(user2.name)
+          wait_for_requests
+        end
+
+        it 'shows author in assignee dropdown and no invite link' do
+          page.within '.dropdown-menu-user' do
+            expect(page).not_to have_link('Invite Members')
+          end
+        end
+      end
     end
   end
 
diff --git a/spec/features/issues/keyboard_shortcut_spec.rb b/spec/features/issues/keyboard_shortcut_spec.rb
index c5d53cd1cd0..ab40f124257 100644
--- a/spec/features/issues/keyboard_shortcut_spec.rb
+++ b/spec/features/issues/keyboard_shortcut_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues shortcut', :js do
+RSpec.describe 'Issues shortcut', :js do
   context 'New Issue shortcut' do
     context 'issues are enabled' do
       let(:project) { create(:project) }
diff --git a/spec/features/issues/markdown_toolbar_spec.rb b/spec/features/issues/markdown_toolbar_spec.rb
index d174fdcb25e..aab9d1026f9 100644
--- a/spec/features/issues/markdown_toolbar_spec.rb
+++ b/spec/features/issues/markdown_toolbar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue markdown toolbar', :js do
+RSpec.describe 'Issue markdown toolbar', :js do
   let(:project) { create(:project, :public) }
   let(:issue)   { create(:issue, project: project) }
   let(:user)    { create(:user) }
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 831bcf8931e..f3a6655f397 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'issue move to another project' do
+RSpec.describe 'issue move to another project' do
   let(:user) { create(:user) }
   let(:old_project) { create(:project, :repository) }
   let(:text) { 'Some issue description' }
diff --git a/spec/features/issues/note_polling_spec.rb b/spec/features/issues/note_polling_spec.rb
index 04ad012d57e..bc4c67fdd79 100644
--- a/spec/features/issues/note_polling_spec.rb
+++ b/spec/features/issues/note_polling_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue notes polling', :js do
+RSpec.describe 'Issue notes polling', :js do
   include NoteInteractionHelpers
 
   let(:project) { create(:project, :public) }
diff --git a/spec/features/issues/notes_on_issues_spec.rb b/spec/features/issues/notes_on_issues_spec.rb
index 74eb699c7ef..be85d73d777 100644
--- a/spec/features/issues/notes_on_issues_spec.rb
+++ b/spec/features/issues/notes_on_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Create notes on issues', :js do
+RSpec.describe 'Create notes on issues', :js do
   let(:user) { create(:user) }
 
   def submit_comment(text)
diff --git a/spec/features/issues/resource_label_events_spec.rb b/spec/features/issues/resource_label_events_spec.rb
index b367bbe2c99..f2c978c525e 100644
--- a/spec/features/issues/resource_label_events_spec.rb
+++ b/spec/features/issues/resource_label_events_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'List issue resource label events', :js do
+RSpec.describe 'List issue resource label events', :js do
   let(:user)     { create(:user) }
   let(:project)  { create(:project, :public) }
   let(:issue)    { create(:issue, project: project, author: user) }
diff --git a/spec/features/issues/rss_spec.rb b/spec/features/issues/rss_spec.rb
index 7577df3bc7d..6c4498ea711 100644
--- a/spec/features/issues/rss_spec.rb
+++ b/spec/features/issues/rss_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Issues RSS' do
+RSpec.describe 'Project Issues RSS' do
   let!(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, group: group, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
diff --git a/spec/features/issues/spam_issues_spec.rb b/spec/features/issues/spam_issues_spec.rb
index 47e7022011d..aec806c566d 100644
--- a/spec/features/issues/spam_issues_spec.rb
+++ b/spec/features/issues/spam_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New issue', :js do
+RSpec.describe 'New issue', :js do
   include StubENV
 
   let(:project) { create(:project, :public) }
@@ -81,7 +81,7 @@ describe 'New issue', :js do
 
     before do
       allow_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
-        allow(verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+        allow(verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
       end
 
       visit new_project_issue_path(project)
@@ -164,6 +164,8 @@ describe 'New issue', :js do
   end
 
   context 'when the SpamVerdictService allows' do
+    include_context 'includes Spam constants'
+
     before do
       allow_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
         allow(verdict_service).to receive(:execute).and_return(ALLOW)
diff --git a/spec/features/issues/todo_spec.rb b/spec/features/issues/todo_spec.rb
index 4bb96ad069c..3de33049db0 100644
--- a/spec/features/issues/todo_spec.rb
+++ b/spec/features/issues/todo_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Manually create a todo item from issue', :js do
+RSpec.describe 'Manually create a todo item from issue', :js do
   let!(:project) { create(:project) }
   let!(:issue)   { create(:issue, project: project) }
   let!(:user)    { create(:user)}
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index 98f70df1c8b..f8385f183d2 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Multiple issue updating from issues#index', :js do
+RSpec.describe 'Multiple issue updating from issues#index', :js do
   let!(:project)   { create(:project) }
   let!(:issue)     { create(:issue, project: project) }
   let!(:user)      { create(:user)}
diff --git a/spec/features/issues/user_comments_on_issue_spec.rb b/spec/features/issues/user_comments_on_issue_spec.rb
index 363906b017a..005d45d9c92 100644
--- a/spec/features/issues/user_comments_on_issue_spec.rb
+++ b/spec/features/issues/user_comments_on_issue_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User comments on issue", :js do
+RSpec.describe "User comments on issue", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
 
   let(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
index 848dbbb85a6..a546fb3e85b 100644
--- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
+++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User creates branch and merge request on issue page', :js do
+RSpec.describe 'User creates branch and merge request on issue page', :js do
   let(:membership_level) { :developer }
   let(:user) { create(:user) }
   let!(:project) { create(:project, :repository, :public) }
diff --git a/spec/features/issues/user_creates_confidential_merge_request_spec.rb b/spec/features/issues/user_creates_confidential_merge_request_spec.rb
index 84f358061e6..ea96165d7b7 100644
--- a/spec/features/issues/user_creates_confidential_merge_request_spec.rb
+++ b/spec/features/issues/user_creates_confidential_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User creates confidential merge request on issue page', :js do
+RSpec.describe 'User creates confidential merge request on issue page', :js do
   include ProjectForksHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/issues/user_creates_issue_by_email_spec.rb b/spec/features/issues/user_creates_issue_by_email_spec.rb
index c73a65849cc..5a0036170ab 100644
--- a/spec/features/issues/user_creates_issue_by_email_spec.rb
+++ b/spec/features/issues/user_creates_issue_by_email_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues > User creates issue by email' do
+RSpec.describe 'Issues > User creates issue by email' do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public) }
 
diff --git a/spec/features/issues/user_creates_issue_spec.rb b/spec/features/issues/user_creates_issue_spec.rb
index efcaa8247df..a2c868d0256 100644
--- a/spec/features/issues/user_creates_issue_spec.rb
+++ b/spec/features/issues/user_creates_issue_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User creates issue" do
+RSpec.describe "User creates issue" do
   include DropzoneHelper
 
   let_it_be(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/issues/user_edits_issue_spec.rb b/spec/features/issues/user_edits_issue_spec.rb
index d50cf16d8ef..39bf535c715 100644
--- a/spec/features/issues/user_edits_issue_spec.rb
+++ b/spec/features/issues/user_edits_issue_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Issues > User edits issue", :js do
+RSpec.describe "Issues > User edits issue", :js do
   let_it_be(:project) { create(:project_empty_repo, :public) }
   let_it_be(:user) { create(:user) }
   let_it_be(:issue) { create(:issue, project: project, author: user, assignees: [user]) }
diff --git a/spec/features/issues/user_filters_issues_spec.rb b/spec/features/issues/user_filters_issues_spec.rb
index 9ce47e68926..20ad47b111a 100644
--- a/spec/features/issues/user_filters_issues_spec.rb
+++ b/spec/features/issues/user_filters_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User filters issues' do
+RSpec.describe 'User filters issues' do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project_empty_repo, :public) }
 
diff --git a/spec/features/issues/user_interacts_with_awards_spec.rb b/spec/features/issues/user_interacts_with_awards_spec.rb
index 095ae9f276c..7b7e087a6d6 100644
--- a/spec/features/issues/user_interacts_with_awards_spec.rb
+++ b/spec/features/issues/user_interacts_with_awards_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User interacts with awards' do
+RSpec.describe 'User interacts with awards' do
   let(:user) { create(:user) }
 
   describe 'User interacts with awards in an issue', :js do
diff --git a/spec/features/issues/user_resets_their_incoming_email_token_spec.rb b/spec/features/issues/user_resets_their_incoming_email_token_spec.rb
index 108b6f550db..a20f65abebf 100644
--- a/spec/features/issues/user_resets_their_incoming_email_token_spec.rb
+++ b/spec/features/issues/user_resets_their_incoming_email_token_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues > User resets their incoming email token' do
+RSpec.describe 'Issues > User resets their incoming email token' do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public, namespace: user.namespace) }
   let_it_be(:issue) { create(:issue, project: project) }
diff --git a/spec/features/issues/user_sees_breadcrumb_links_spec.rb b/spec/features/issues/user_sees_breadcrumb_links_spec.rb
index 8a120a0a0b2..2660101c330 100644
--- a/spec/features/issues/user_sees_breadcrumb_links_spec.rb
+++ b/spec/features/issues/user_sees_breadcrumb_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New issue breadcrumb' do
+RSpec.describe 'New issue breadcrumb' do
   let_it_be(:project, reload: true) { create(:project) }
   let(:user) { project.creator }
 
diff --git a/spec/features/issues/user_sees_empty_state_spec.rb b/spec/features/issues/user_sees_empty_state_spec.rb
index 114d119aca8..047c5ca2189 100644
--- a/spec/features/issues/user_sees_empty_state_spec.rb
+++ b/spec/features/issues/user_sees_empty_state_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues > User sees empty state' do
+RSpec.describe 'Issues > User sees empty state' do
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:user) { project.creator }
 
diff --git a/spec/features/issues/user_sees_live_update_spec.rb b/spec/features/issues/user_sees_live_update_spec.rb
index 98c7d289fb0..c9b751715bc 100644
--- a/spec/features/issues/user_sees_live_update_spec.rb
+++ b/spec/features/issues/user_sees_live_update_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues > User sees live update', :js do
+RSpec.describe 'Issues > User sees live update', :js do
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:user) { project.creator }
 
diff --git a/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb b/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb
index c3f17227701..7a2b637e48e 100644
--- a/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb
+++ b/spec/features/issues/user_sees_sidebar_updates_in_realtime_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issues > Real-time sidebar', :js do
+RSpec.describe 'Issues > Real-time sidebar', :js do
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:issue) { create(:issue, project: project) }
   let_it_be(:user) { create(:user) }
diff --git a/spec/features/issues/user_sorts_issue_comments_spec.rb b/spec/features/issues/user_sorts_issue_comments_spec.rb
index e1c0acc32f1..555f8827374 100644
--- a/spec/features/issues/user_sorts_issue_comments_spec.rb
+++ b/spec/features/issues/user_sorts_issue_comments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Comment sort direction' do
+RSpec.describe 'Comment sort direction' do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:issue) { create(:issue, project: project) }
   let_it_be(:comment_1) { create(:note_on_issue, noteable: issue, project: project, note: 'written first') }
diff --git a/spec/features/issues/user_sorts_issues_spec.rb b/spec/features/issues/user_sorts_issues_spec.rb
index 66110f55435..ec38bf99035 100644
--- a/spec/features/issues/user_sorts_issues_spec.rb
+++ b/spec/features/issues/user_sorts_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User sorts issues" do
+RSpec.describe "User sorts issues" do
   include SortingHelper
   include IssueHelpers
 
diff --git a/spec/features/issues/user_toggles_subscription_spec.rb b/spec/features/issues/user_toggles_subscription_spec.rb
index ba167362511..971c8a3b431 100644
--- a/spec/features/issues/user_toggles_subscription_spec.rb
+++ b/spec/features/issues/user_toggles_subscription_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User toggles subscription", :js do
+RSpec.describe "User toggles subscription", :js do
   let(:project) { create(:project_empty_repo, :public) }
   let(:user) { create(:user) }
   let(:issue) { create(:issue, project: project, author: user) }
diff --git a/spec/features/issues/user_uses_quick_actions_spec.rb b/spec/features/issues/user_uses_quick_actions_spec.rb
index 09f07f8c908..c5eb3f415ff 100644
--- a/spec/features/issues/user_uses_quick_actions_spec.rb
+++ b/spec/features/issues/user_uses_quick_actions_spec.rb
@@ -7,7 +7,7 @@ require 'spec_helper'
 # for example, adding quick actions when creating the issue and checking DateTime formats on UI.
 # Because this kind of spec takes more time to run there is no need to add new ones
 # for each existing quick action unless they test something not tested by existing tests.
-describe 'Issues > User uses quick actions', :js do
+RSpec.describe 'Issues > User uses quick actions', :js do
   include Spec::Support::Helpers::Features::NotesHelpers
 
   context "issuable common quick actions" do
diff --git a/spec/features/issues/user_views_issue_spec.rb b/spec/features/issues/user_views_issue_spec.rb
index dd04ac94105..2b610bab9f0 100644
--- a/spec/features/issues/user_views_issue_spec.rb
+++ b/spec/features/issues/user_views_issue_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User views issue" do
+RSpec.describe "User views issue" do
   let(:project) { create(:project_empty_repo, :public) }
   let(:user) { create(:user) }
   let(:issue) { create(:issue, project: project, description: "# Description header", author: user) }
@@ -35,18 +35,38 @@ describe "User views issue" do
   describe 'user status' do
     subject { visit(project_issue_path(project, issue)) }
 
-    describe 'showing status of the author of the issue' do
+    context 'when showing status of the author of the issue' do
       it_behaves_like 'showing user status' do
         let(:user_with_status) { issue.author }
       end
     end
 
-    describe 'showing status of a user who commented on an issue', :js do
+    context 'when showing status of a user who commented on an issue', :js do
       let!(:note) { create(:note, noteable: issue, project: project, author: user_with_status) }
 
       it_behaves_like 'showing user status' do
         let(:user_with_status) { create(:user) }
       end
     end
+
+    context 'when status message has an emoji', :js do
+      let(:message) { 'My status with an emoji' }
+      let(:message_emoji) { 'basketball' }
+
+      let!(:note) { create(:note, noteable: issue, project: project, author: user) }
+      let!(:status) { create(:user_status, user: user, emoji: 'smirk', message: "#{message} :#{message_emoji}:") }
+
+      it 'correctly renders the emoji' do
+        tooltip_span = page.first(".user-status-emoji[title^='#{message}']")
+
+        tooltip_span.hover
+
+        tooltip = page.find('.tooltip .tooltip-inner')
+
+        page.within(tooltip) do
+          expect(page).to have_emoji(message_emoji)
+        end
+      end
+    end
   end
 end
diff --git a/spec/features/issues/user_views_issues_spec.rb b/spec/features/issues/user_views_issues_spec.rb
index 796e618c7c8..91de813e414 100644
--- a/spec/features/issues/user_views_issues_spec.rb
+++ b/spec/features/issues/user_views_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User views issues" do
+RSpec.describe "User views issues" do
   let!(:closed_issue) { create(:closed_issue, project: project) }
   let!(:open_issue1) { create(:issue, project: project) }
   let!(:open_issue2) { create(:issue, project: project) }
diff --git a/spec/features/labels_hierarchy_spec.rb b/spec/features/labels_hierarchy_spec.rb
index c66d858a019..3ab7fbea198 100644
--- a/spec/features/labels_hierarchy_spec.rb
+++ b/spec/features/labels_hierarchy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Labels Hierarchy', :js do
+RSpec.describe 'Labels Hierarchy', :js do
   include FilteredSearchHelpers
 
   let!(:user) { create(:user) }
diff --git a/spec/features/markdown/copy_as_gfm_spec.rb b/spec/features/markdown/copy_as_gfm_spec.rb
index d40c2b8bafd..80dcdd08f74 100644
--- a/spec/features/markdown/copy_as_gfm_spec.rb
+++ b/spec/features/markdown/copy_as_gfm_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Copy as GFM', :js do
+RSpec.describe 'Copy as GFM', :js do
   include MarkupHelper
   include RepoHelpers
   include ActionView::Helpers::JavaScriptHelper
@@ -157,7 +157,7 @@ describe 'Copy as GFM', :js do
         GFM
 
         pipeline: :wiki,
-        project_wiki: @project.wiki
+        wiki: @project.wiki
       )
 
       verify(
diff --git a/spec/features/markdown/gitlab_flavored_markdown_spec.rb b/spec/features/markdown/gitlab_flavored_markdown_spec.rb
index f34af268630..da4208318eb 100644
--- a/spec/features/markdown/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/markdown/gitlab_flavored_markdown_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "GitLab Flavored Markdown" do
+RSpec.describe "GitLab Flavored Markdown" do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:issue) { create(:issue, project: project) }
diff --git a/spec/features/markdown/markdown_spec.rb b/spec/features/markdown/markdown_spec.rb
index 9ebd85acb81..d9d3f566bce 100644
--- a/spec/features/markdown/markdown_spec.rb
+++ b/spec/features/markdown/markdown_spec.rb
@@ -26,7 +26,7 @@ require 'erb'
 #
 # See the MarkdownFeature class for setup details.
 
-describe 'GitLab Markdown', :aggregate_failures do
+RSpec.describe 'GitLab Markdown', :aggregate_failures do
   include Capybara::Node::Matchers
   include MarkupHelper
   include MarkdownMatchers
@@ -269,15 +269,15 @@ describe 'GitLab Markdown', :aggregate_failures do
 
   context 'wiki pipeline' do
     before do
-      @project_wiki = @feat.project_wiki
-      @project_wiki_page = @feat.project_wiki_page
+      @wiki = @feat.wiki
+      @wiki_page = @feat.wiki_page
 
       path = 'images/example.jpg'
       gitaly_wiki_file = Gitlab::GitalyClient::WikiFile.new(path: path)
-      expect(@project_wiki).to receive(:find_file).with(path).and_return(Gitlab::Git::WikiFile.new(gitaly_wiki_file))
-      allow(@project_wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' }
+      expect(@wiki).to receive(:find_file).with(path).and_return(Gitlab::Git::WikiFile.new(gitaly_wiki_file))
+      allow(@wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' }
 
-      @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki, page_slug: @project_wiki_page.slug })
+      @html = markdown(@feat.raw_markdown, { pipeline: :wiki, wiki: @wiki, page_slug: @wiki_page.slug })
     end
 
     it_behaves_like 'all pipelines'
diff --git a/spec/features/markdown/math_spec.rb b/spec/features/markdown/math_spec.rb
index 76eef66c517..e5fb9131ce0 100644
--- a/spec/features/markdown/math_spec.rb
+++ b/spec/features/markdown/math_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Math rendering', :js do
+RSpec.describe 'Math rendering', :js do
   let!(:project) { create(:project, :public) }
 
   it 'renders inline and display math correctly' do
diff --git a/spec/features/markdown/mermaid_spec.rb b/spec/features/markdown/mermaid_spec.rb
index 4bf7edf98ca..256dfdc26e9 100644
--- a/spec/features/markdown/mermaid_spec.rb
+++ b/spec/features/markdown/mermaid_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Mermaid rendering', :js do
+RSpec.describe 'Mermaid rendering', :js do
   it 'renders Mermaid diagrams correctly' do
     description = <<~MERMAID
       ```mermaid
@@ -118,10 +118,7 @@ describe 'Mermaid rendering', :js do
 
     visit project_issue_path(project, issue)
 
-    svg = page.find('svg.mermaid')
-    expect(svg[:style]).to match(/max-width/)
-    expect(svg[:width].to_i).to eq(100)
-    expect(svg[:height].to_i).to eq(0)
+    expect(page).to have_css('svg.mermaid[style*="max-width"][width="100%"]')
   end
 
   it 'display button when diagram exceeds length', :js do
diff --git a/spec/features/markdown/metrics_spec.rb b/spec/features/markdown/metrics_spec.rb
index 7b0eb8959a5..092408c2be0 100644
--- a/spec/features/markdown/metrics_spec.rb
+++ b/spec/features/markdown/metrics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Metrics rendering', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
+RSpec.describe 'Metrics rendering', :js, :use_clean_rails_memory_store_caching, :sidekiq_inline do
   include PrometheusHelpers
   include GrafanaApiHelpers
   include MetricsDashboardUrlHelpers
diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb
new file mode 100644
index 00000000000..60671213d75
--- /dev/null
+++ b/spec/features/merge_request/batch_comments_spec.rb
@@ -0,0 +1,259 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Merge request > Batch comments', :js do
+  include MergeRequestDiffHelpers
+  include RepoHelpers
+
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository) }
+  let(:merge_request) do
+    create(:merge_request_with_diffs, source_project: project, target_project: project, source_branch: 'merge-test')
+  end
+
+  before do
+    project.add_maintainer(user)
+
+    sign_in(user)
+  end
+
+  context 'Feature is enabled' do
+    before do
+      stub_feature_flags(diffs_batch_load: false)
+
+      visit_diffs
+    end
+
+    it 'has review bar' do
+      expect(page).to have_css('.review-bar-component', visible: false)
+    end
+
+    it 'adds draft note' do
+      write_comment
+
+      expect(find('.draft-note-component')).to have_content('Line is wrong')
+
+      expect(page).to have_css('.review-bar-component')
+
+      expect(find('.review-bar-content .btn-success')).to have_content('1')
+    end
+
+    it 'publishes review' do
+      write_comment
+
+      page.within('.review-bar-content') do
+        click_button 'Finish review'
+        click_button 'Submit review'
+      end
+
+      wait_for_requests
+
+      expect(page).not_to have_selector('.draft-note-component', text: 'Line is wrong')
+
+      expect(page).to have_selector('.note:not(.draft-note)', text: 'Line is wrong')
+    end
+
+    it 'publishes single comment' do
+      write_comment
+
+      click_button 'Add comment now'
+
+      wait_for_requests
+
+      expect(page).not_to have_selector('.draft-note-component', text: 'Line is wrong')
+
+      expect(page).to have_selector('.note:not(.draft-note)', text: 'Line is wrong')
+    end
+
+    it 'discards review' do
+      write_comment
+
+      click_button 'Discard review'
+
+      click_button 'Delete all pending comments'
+
+      wait_for_requests
+
+      expect(page).not_to have_selector('.draft-note-component')
+    end
+
+    it 'deletes draft note' do
+      write_comment
+
+      accept_alert { find('.js-note-delete').click }
+
+      wait_for_requests
+
+      expect(page).not_to have_selector('.draft-note-component', text: 'Line is wrong')
+    end
+
+    it 'edits draft note' do
+      write_comment
+
+      find('.js-note-edit').click
+
+      # make sure comment form is in view
+      execute_script("window.scrollBy(0, 200)")
+
+      page.within('.js-discussion-note-form') do
+        fill_in('note_note', with: 'Testing update')
+        click_button('Save comment')
+      end
+
+      wait_for_requests
+
+      expect(page).to have_selector('.draft-note-component', text: 'Testing update')
+    end
+
+    context 'in parallel diff' do
+      before do
+        find('.js-show-diff-settings').click
+        click_button 'Side-by-side'
+      end
+
+      it 'adds draft comments to both sides' do
+        write_parallel_comment('2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9')
+
+        # make sure line 9 is in the view
+        execute_script("window.scrollBy(0, -200)")
+
+        write_parallel_comment('2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9', button_text: 'Add to review', text: 'Another wrong line')
+
+        expect(find('.new .draft-note-component')).to have_content('Line is wrong')
+        expect(find('.old .draft-note-component')).to have_content('Another wrong line')
+
+        expect(find('.review-bar-content .btn-success')).to have_content('2')
+      end
+    end
+
+    context 'thread is unresolved' do
+      let!(:active_discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
+
+      before do
+        visit_diffs
+      end
+
+      it 'publishes comment right away and resolves the thread' do
+        expect(active_discussion.resolved?).to eq(false)
+
+        write_reply_to_discussion(button_text: 'Add comment now', resolve: true)
+
+        page.within '.line-resolve-all-container' do
+          expect(page).to have_content('All threads resolved')
+          expect(page).to have_selector('.line-resolve-btn.is-active')
+        end
+      end
+
+      it 'publishes review and resolves the thread' do
+        expect(active_discussion.resolved?).to eq(false)
+
+        write_reply_to_discussion(resolve: true)
+
+        page.within('.review-bar-content') do
+          click_button 'Finish review'
+          click_button 'Submit review'
+        end
+
+        wait_for_requests
+
+        page.within '.line-resolve-all-container' do
+          expect(page).to have_content('All threads resolved')
+          expect(page).to have_selector('.line-resolve-btn.is-active')
+        end
+      end
+    end
+
+    context 'thread is resolved' do
+      let!(:active_discussion) { create(:diff_note_on_merge_request, :resolved, noteable: merge_request, project: project).to_discussion }
+
+      before do
+        active_discussion.resolve!(@current_user)
+
+        visit_diffs
+
+        page.find('.js-diff-comment-avatar').click
+      end
+
+      it 'publishes comment right away and unresolves the thread' do
+        expect(active_discussion.resolved?).to eq(true)
+
+        write_reply_to_discussion(button_text: 'Add comment now', unresolve: true)
+
+        page.within '.line-resolve-all-container' do
+          expect(page).to have_content('1 unresolved thread')
+          expect(page).not_to have_selector('.line-resolve-btn.is-active')
+        end
+      end
+
+      it 'publishes review and unresolves the thread' do
+        expect(active_discussion.resolved?).to eq(true)
+
+        wait_for_requests
+
+        write_reply_to_discussion(button_text: 'Start a review', unresolve: true)
+
+        page.within('.review-bar-content') do
+          click_button 'Finish review'
+          click_button 'Submit review'
+        end
+
+        wait_for_requests
+
+        page.within '.line-resolve-all-container' do
+          expect(page).to have_content('1 unresolved thread')
+          expect(page).not_to have_selector('.line-resolve-btn.is-active')
+        end
+      end
+    end
+  end
+
+  def visit_diffs
+    visit diffs_project_merge_request_path(merge_request.project, merge_request)
+
+    wait_for_requests
+  end
+
+  def write_comment(button_text: 'Start a review', text: 'Line is wrong')
+    click_diff_line(find("[id='#{sample_compare.changes[0][:line_code]}']"))
+
+    page.within('.js-discussion-note-form') do
+      fill_in('note_note', with: text)
+      click_button(button_text)
+    end
+
+    wait_for_requests
+  end
+
+  def write_parallel_comment(line, button_text: 'Start a review', text: 'Line is wrong')
+    find("td[id='#{line}']").hover
+    find(".is-over button").click
+
+    page.within("form[data-line-code='#{line}']") do
+      fill_in('note_note', with: text)
+      click_button(button_text)
+    end
+
+    wait_for_requests
+  end
+end
+
+def write_reply_to_discussion(button_text: 'Start a review', text: 'Line is wrong', resolve: false, unresolve: false)
+  page.within(first('.diff-files-holder .discussion-reply-holder')) do
+    click_button('Reply...')
+
+    fill_in('note_note', with: text)
+
+    if resolve
+      page.check('Resolve thread')
+    end
+
+    if unresolve
+      page.check('Unresolve thread')
+    end
+
+    click_button(button_text)
+  end
+
+  wait_for_requests
+end
diff --git a/spec/features/merge_request/maintainer_edits_fork_spec.rb b/spec/features/merge_request/maintainer_edits_fork_spec.rb
index 17ff494a6fa..4db1633abe6 100644
--- a/spec/features/merge_request/maintainer_edits_fork_spec.rb
+++ b/spec/features/merge_request/maintainer_edits_fork_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'a maintainer edits files on a source-branch of an MR from a fork', :js, :sidekiq_might_not_need_inline do
+RSpec.describe 'a maintainer edits files on a source-branch of an MR from a fork', :js, :sidekiq_might_not_need_inline do
   include ProjectForksHelper
   let(:user) { create(:user, username: 'the-maintainer') }
   let(:target_project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_request/user_accepts_merge_request_spec.rb b/spec/features/merge_request/user_accepts_merge_request_spec.rb
index 5e1ff232b80..d7c9c8bddb1 100644
--- a/spec/features/merge_request/user_accepts_merge_request_spec.rb
+++ b/spec/features/merge_request/user_accepts_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inline do
+RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inline do
   let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
   let(:user) { create(:user) }
diff --git a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
index 0ecd32565d0..fd13083c185 100644
--- a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
+++ b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'create a merge request, allowing commits from members who can merge to the target branch', :js do
+RSpec.describe 'create a merge request, allowing commits from members who can merge to the target branch', :js do
   include ProjectForksHelper
   let(:user) { create(:user) }
   let(:target_project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_request/user_assigns_themselves_spec.rb b/spec/features/merge_request/user_assigns_themselves_spec.rb
index 549d6e50337..b6cd97dcc5a 100644
--- a/spec/features/merge_request/user_assigns_themselves_spec.rb
+++ b/spec/features/merge_request/user_assigns_themselves_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User assigns themselves' do
+RSpec.describe 'Merge request > User assigns themselves' do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:issue1) { create(:issue, project: project) }
diff --git a/spec/features/merge_request/user_awards_emoji_spec.rb b/spec/features/merge_request/user_awards_emoji_spec.rb
index 8aa90107251..62e4209f386 100644
--- a/spec/features/merge_request/user_awards_emoji_spec.rb
+++ b/spec/features/merge_request/user_awards_emoji_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User awards emoji', :js do
+RSpec.describe 'Merge request > User awards emoji', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project, author: create(:user)) }
diff --git a/spec/features/merge_request/user_clicks_merge_request_tabs_spec.rb b/spec/features/merge_request/user_clicks_merge_request_tabs_spec.rb
new file mode 100644
index 00000000000..f3cbc1ea1f5
--- /dev/null
+++ b/spec/features/merge_request/user_clicks_merge_request_tabs_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User clicks on merge request tabs', :js do
+  let(:project) { create(:project, :public, :repository) }
+  let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
+
+  it 'adds entry to page history' do
+    visit('/')
+    visit(merge_request_path(merge_request))
+    click_link('Changes')
+
+    expect(current_url).to match(/diffs$/)
+
+    page.driver.go_back
+
+    expect(current_url).to match(merge_request_path(merge_request))
+
+    page.driver.go_back
+
+    expect(current_url).to match('/')
+  end
+end
diff --git a/spec/features/merge_request/user_closes_merge_request_spec.rb b/spec/features/merge_request/user_closes_merge_request_spec.rb
index c5125c38ed7..669bd989f4f 100644
--- a/spec/features/merge_request/user_closes_merge_request_spec.rb
+++ b/spec/features/merge_request/user_closes_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User closes a merge requests', :js do
+RSpec.describe 'User closes a merge requests', :js do
   let(:project) { create(:project, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
   let(:user) { create(:user) }
diff --git a/spec/features/merge_request/user_comments_on_commit_spec.rb b/spec/features/merge_request/user_comments_on_commit_spec.rb
index 6b869d93e4c..8fa1fe3812d 100644
--- a/spec/features/merge_request/user_comments_on_commit_spec.rb
+++ b/spec/features/merge_request/user_comments_on_commit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User comments on a commit', :js do
+RSpec.describe 'User comments on a commit', :js do
   include MergeRequestDiffHelpers
   include RepoHelpers
 
diff --git a/spec/features/merge_request/user_comments_on_diff_spec.rb b/spec/features/merge_request/user_comments_on_diff_spec.rb
index 19b8a7f74b7..9cd3c7eaf76 100644
--- a/spec/features/merge_request/user_comments_on_diff_spec.rb
+++ b/spec/features/merge_request/user_comments_on_diff_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User comments on a diff', :js do
+RSpec.describe 'User comments on a diff', :js do
   include MergeRequestDiffHelpers
   include RepoHelpers
 
@@ -27,7 +27,7 @@ describe 'User comments on a diff', :js do
 
           page.within('.js-discussion-note-form') do
             fill_in('note_note', with: 'Line is wrong')
-            click_button('Comment')
+            click_button('Add comment now')
           end
 
           page.within('.diff-files-holder > div:nth-child(3)') do
@@ -46,7 +46,7 @@ describe 'User comments on a diff', :js do
 
           page.within('.js-discussion-note-form') do
             fill_in('note_note', with: 'Line is correct')
-            click_button('Comment')
+            click_button('Add comment now')
           end
 
           wait_for_requests
@@ -59,7 +59,7 @@ describe 'User comments on a diff', :js do
 
           page.within('.js-discussion-note-form') do
             fill_in('note_note', with: 'Line is wrong')
-            click_button('Comment')
+            click_button('Add comment now')
           end
 
           wait_for_requests
@@ -114,13 +114,47 @@ describe 'User comments on a diff', :js do
     include_examples 'comment on merge request file'
   end
 
+  context 'when adding multiline comments' do
+    it 'saves a multiline comment' do
+      click_diff_line(find("[id='#{sample_commit.line_code}']"))
+
+      page.within('.discussion-form') do
+        find('#comment-line-start option', text: '-13').select_option
+      end
+
+      page.within('.js-discussion-note-form') do
+        fill_in(:note_note, with: 'Line is wrong')
+        click_button('Add comment now')
+      end
+
+      wait_for_requests
+
+      page.within('.notes_holder') do
+        expect(page).to have_content('Line is wrong')
+        expect(page).to have_content('Comment on lines -13 to +14')
+      end
+
+      visit(merge_request_path(merge_request))
+
+      page.within('.notes .discussion') do
+        expect(page).to have_content("#{user.name} #{user.to_reference} started a thread")
+        expect(page).to have_content(sample_commit.line_code_path)
+        expect(page).to have_content('Line is wrong')
+      end
+
+      page.within('.notes-tab .badge') do
+        expect(page).to have_content('1')
+      end
+    end
+  end
+
   context 'when editing comments' do
     it 'edits a comment' do
       click_diff_line(find("[id='#{sample_commit.line_code}']"))
 
       page.within('.js-discussion-note-form') do
         fill_in(:note_note, with: 'Line is wrong')
-        click_button('Comment')
+        click_button('Add comment now')
       end
 
       page.within('.diff-file:nth-of-type(5) .discussion .note') do
@@ -146,7 +180,7 @@ describe 'User comments on a diff', :js do
 
       page.within('.js-discussion-note-form') do
         fill_in(:note_note, with: 'Line is wrong')
-        click_button('Comment')
+        click_button('Add comment now')
       end
 
       page.within('.notes-tab .badge') do
diff --git a/spec/features/merge_request/user_comments_on_merge_request_spec.rb b/spec/features/merge_request/user_comments_on_merge_request_spec.rb
index c7845b4cce4..73f2b1a25ce 100644
--- a/spec/features/merge_request/user_comments_on_merge_request_spec.rb
+++ b/spec/features/merge_request/user_comments_on_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User comments on a merge request', :js do
+RSpec.describe 'User comments on a merge request', :js do
   include RepoHelpers
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
index cea9056cd93..34eaca24a01 100644
--- a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User creates image diff notes', :js do
+RSpec.describe 'Merge request > User creates image diff notes', :js do
   include NoteInteractionHelpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb
index 86ee9fa5aa5..37d329d4d5d 100644
--- a/spec/features/merge_request/user_creates_merge_request_spec.rb
+++ b/spec/features/merge_request/user_creates_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User creates a merge request", :js do
+RSpec.describe "User creates a merge request", :js do
   include ProjectForksHelper
 
   let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/features/merge_request/user_creates_mr_spec.rb b/spec/features/merge_request/user_creates_mr_spec.rb
index 665bc352c0f..9d97e57fe3a 100644
--- a/spec/features/merge_request/user_creates_mr_spec.rb
+++ b/spec/features/merge_request/user_creates_mr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User creates MR' do
+RSpec.describe 'Merge request > User creates MR' do
   include ProjectForksHelper
 
   before do
diff --git a/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb b/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb
index 895cbb8f02b..23df7635aa1 100644
--- a/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb
+++ b/spec/features/merge_request/user_customizes_merge_commit_message_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request < User customizes merge commit message', :js do
+RSpec.describe 'Merge request < User customizes merge commit message', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:issue_1) { create(:issue, project: project)}
diff --git a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
index e6b77e28281..affd6f6b7b5 100644
--- a/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
+++ b/spec/features/merge_request/user_edits_assignees_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User edits assignees sidebar', :js do
+RSpec.describe 'Merge request > User edits assignees sidebar', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:protected_branch) { create(:protected_branch, :maintainers_can_push, name: 'master', project: project) }
   let(:merge_request) { create(:merge_request, :simple, source_project: project, target_branch: protected_branch.name) }
@@ -20,49 +20,102 @@ describe 'Merge request > User edits assignees sidebar', :js do
   let(:sidebar_assignee_dropdown_item) { sidebar_assignee_block.find(".dropdown-menu li[data-user-id=\"#{assignee.id}\"]") }
   let(:sidebar_assignee_dropdown_tooltip) { sidebar_assignee_dropdown_item.find('a')['data-title'] || '' }
 
-  before do
-    stub_const('Autocomplete::UsersFinder::LIMIT', users_find_limit)
+  context 'when invite_members_version_a experiment is not enabled' do
+    before do
+      stub_const('Autocomplete::UsersFinder::LIMIT', users_find_limit)
 
-    sign_in(project.owner)
+      sign_in(project.owner)
 
-    merge_request.assignees << assignee
+      merge_request.assignees << assignee
 
-    visit project_merge_request_path(project, merge_request)
+      visit project_merge_request_path(project, merge_request)
 
-    wait_for_requests
-  end
+      wait_for_requests
+    end
+
+    shared_examples 'when assigned' do |expected_tooltip: ''|
+      it 'shows assignee name' do
+        expect(sidebar_assignee_block).to have_text(assignee.name)
+      end
+
+      it "shows assignee tooltip '#{expected_tooltip}'" do
+        expect(sidebar_assignee_tooltip).to eql(expected_tooltip)
+      end
+
+      context 'when edit is clicked' do
+        before do
+          sidebar_assignee_block.click_link('Edit')
+
+          wait_for_requests
+        end
+
+        it "shows assignee tooltip '#{expected_tooltip}" do
+          expect(sidebar_assignee_dropdown_tooltip).to eql(expected_tooltip)
+        end
+
+        it 'does not show invite link' do
+          page.within '.dropdown-menu-user' do
+            expect(page).not_to have_link('Invite Members')
+          end
+        end
+      end
+    end
+
+    context 'when assigned to maintainer' do
+      let(:assignee) { project_maintainers.last }
 
-  shared_examples 'when assigned' do |expected_tooltip: ''|
-    it 'shows assignee name' do
-      expect(sidebar_assignee_block).to have_text(assignee.name)
+      it_behaves_like 'when assigned', expected_tooltip: ''
     end
 
-    it "shows assignee tooltip '#{expected_tooltip}'" do
-      expect(sidebar_assignee_tooltip).to eql(expected_tooltip)
+    context 'when assigned to developer' do
+      let(:assignee) { project_developers.last }
+
+      it_behaves_like 'when assigned', expected_tooltip: 'Cannot merge'
     end
+  end
 
-    context 'when edit is clicked' do
+  context 'when invite_members_version_a experiment is enabled' do
+    let_it_be(:user) { create(:user) }
+
+    before do
+      stub_experiment_for_user(invite_members_version_a: true)
+      sign_in(user)
+    end
+
+    context 'when user can not see invite members' do
       before do
-        sidebar_assignee_block.click_link('Edit')
+        project.add_developer(user)
+        visit project_merge_request_path(project, merge_request)
+
+        find('.block.assignee .edit-link').click
 
         wait_for_requests
       end
 
-      it "shows assignee tooltip '#{expected_tooltip}" do
-        expect(sidebar_assignee_dropdown_tooltip).to eql(expected_tooltip)
+      it 'does not see link to invite members' do
+        page.within '.dropdown-menu-user' do
+          expect(page).not_to have_link('Invite Members')
+        end
       end
     end
-  end
 
-  context 'when assigned to maintainer' do
-    let(:assignee) { project_maintainers.last }
+    context 'when user can see invite members' do
+      before do
+        project.add_maintainer(user)
+        visit project_merge_request_path(project, merge_request)
 
-    it_behaves_like 'when assigned', expected_tooltip: ''
-  end
+        find('.block.assignee .edit-link').click
 
-  context 'when assigned to developer' do
-    let(:assignee) { project_developers.last }
+        wait_for_requests
+      end
 
-    it_behaves_like 'when assigned', expected_tooltip: 'Cannot merge'
+      it 'sees link to invite members' do
+        page.within '.dropdown-menu-user' do
+          expect(page).to have_link('Invite Members', href: project_project_members_path(project))
+          expect(page).to have_selector('[data-track-event="click_invite_members"]')
+          expect(page).to have_selector("[data-track-label='edit_assignee']")
+        end
+      end
+    end
   end
 end
diff --git a/spec/features/merge_request/user_edits_merge_request_spec.rb b/spec/features/merge_request/user_edits_merge_request_spec.rb
index 821db8a1d5b..84ecd6537dc 100644
--- a/spec/features/merge_request/user_edits_merge_request_spec.rb
+++ b/spec/features/merge_request/user_edits_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User edits a merge request', :js do
+RSpec.describe 'User edits a merge request', :js do
   include Select2Helper
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/features/merge_request/user_edits_mr_spec.rb b/spec/features/merge_request/user_edits_mr_spec.rb
index e6b847c5e7f..2c949ed84f4 100644
--- a/spec/features/merge_request/user_edits_mr_spec.rb
+++ b/spec/features/merge_request/user_edits_mr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User edits MR' do
+RSpec.describe 'Merge request > User edits MR' do
   include ProjectForksHelper
 
   before do
diff --git a/spec/features/merge_request/user_expands_diff_spec.rb b/spec/features/merge_request/user_expands_diff_spec.rb
index 9bce5264817..d3867a91846 100644
--- a/spec/features/merge_request/user_expands_diff_spec.rb
+++ b/spec/features/merge_request/user_expands_diff_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User expands diff', :js do
+RSpec.describe 'User expands diff', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, source_branch: 'expand-collapse-files', source_project: project, target_project: project) }
 
diff --git a/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb b/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb
index 2a4192374bd..1a7baff2fb1 100644
--- a/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb
+++ b/spec/features/merge_request/user_interacts_with_batched_mr_diffs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Batch diffs', :js do
+RSpec.describe 'Batch diffs', :js do
   include MergeRequestDiffHelpers
   include RepoHelpers
 
@@ -22,14 +22,14 @@ describe 'Batch diffs', :js do
     click_diff_line(find('.diff-file.file-holder:first-of-type tr.line_holder.new:first-of-type'))
     page.within('.js-discussion-note-form') do
       fill_in('note_note', with: 'First Line Comment')
-      click_button('Comment')
+      click_button('Add comment now')
     end
 
     # Add discussion to first line of last file
     click_diff_line(find('.diff-file.file-holder:last-of-type tr.line_holder.new:first-of-type'))
     page.within('.js-discussion-note-form') do
       fill_in('note_note', with: 'Last Line Comment')
-      click_button('Comment')
+      click_button('Add comment now')
     end
 
     wait_for_requests
diff --git a/spec/features/merge_request/user_locks_discussion_spec.rb b/spec/features/merge_request/user_locks_discussion_spec.rb
index 0eaaf32dc31..c8a6fdd4007 100644
--- a/spec/features/merge_request/user_locks_discussion_spec.rb
+++ b/spec/features/merge_request/user_locks_discussion_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User locks discussion', :js do
+RSpec.describe 'Merge request > User locks discussion', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/merge_request/user_manages_subscription_spec.rb b/spec/features/merge_request/user_manages_subscription_spec.rb
index 54d27a06bb1..9ed5b67fa0e 100644
--- a/spec/features/merge_request/user_manages_subscription_spec.rb
+++ b/spec/features/merge_request/user_manages_subscription_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User manages subscription', :js do
+RSpec.describe 'User manages subscription', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
   let(:user) { create(:user) }
diff --git a/spec/features/merge_request/user_merges_immediately_spec.rb b/spec/features/merge_request/user_merges_immediately_spec.rb
index 1188d3b2ceb..47dc09ae79f 100644
--- a/spec/features/merge_request/user_merges_immediately_spec.rb
+++ b/spec/features/merge_request/user_merges_immediately_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge requests > User merges immediately', :js do
+RSpec.describe 'Merge requests > User merges immediately', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let!(:merge_request) do
diff --git a/spec/features/merge_request/user_merges_merge_request_spec.rb b/spec/features/merge_request/user_merges_merge_request_spec.rb
index 32e40740a61..7758fa8e666 100644
--- a/spec/features/merge_request/user_merges_merge_request_spec.rb
+++ b/spec/features/merge_request/user_merges_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User merges a merge request", :js do
+RSpec.describe "User merges a merge request", :js do
   let(:user) { project.owner }
 
   before do
diff --git a/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb
index 419f741d0ea..ea3e90a4508 100644
--- a/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User merges only if pipeline succeeds', :js do
+RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js do
   let(:merge_request) { create(:merge_request_with_diffs) }
   let(:project)       { merge_request.target_project }
 
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
index 5cc61333bb4..d5ff31de073 100644
--- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User merges when pipeline succeeds', :js do
+RSpec.describe 'Merge request > User merges when pipeline succeeds', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) do
diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb
index ebfb5ce796f..dbad2f191a1 100644
--- a/spec/features/merge_request/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User posts diff notes', :js do
+RSpec.describe 'Merge request > User posts diff notes', :js do
   include MergeRequestDiffHelpers
 
   let(:merge_request) { create(:merge_request) }
@@ -225,7 +225,7 @@ describe 'Merge request > User posts diff notes', :js do
   def should_allow_commenting(line_holder, diff_side = nil, asset_form_reset: true)
     write_comment_on_line(line_holder, diff_side)
 
-    click_button 'Comment'
+    click_button 'Add comment now'
 
     wait_for_requests
 
diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb
index 0548d958322..3c70819319d 100644
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User posts notes', :js do
+RSpec.describe 'Merge request > User posts notes', :js do
   include NoteInteractionHelpers
 
   let_it_be(:project) { create(:project, :repository) }
@@ -105,7 +105,7 @@ describe 'Merge request > User posts notes', :js do
 
       page.within('.discussion-reply-holder') do
         fill_in 'note[note]', with: 'A reply'
-        click_button 'Comment'
+        click_button 'Add comment now'
         wait_for_requests
         expect(page).to have_content('Your comment could not be submitted because discussion to reply to cannot be found')
       end
diff --git a/spec/features/merge_request/user_rebases_merge_request_spec.rb b/spec/features/merge_request/user_rebases_merge_request_spec.rb
index 34f009000dc..a3f72a6266b 100644
--- a/spec/features/merge_request/user_rebases_merge_request_spec.rb
+++ b/spec/features/merge_request/user_rebases_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User rebases a merge request", :js do
+RSpec.describe "User rebases a merge request", :js do
   let(:merge_request) { create(:merge_request, :simple, source_project: project) }
   let(:user) { project.owner }
 
diff --git a/spec/features/merge_request/user_reopens_merge_request_spec.rb b/spec/features/merge_request/user_reopens_merge_request_spec.rb
index 6dee5770d0c..020929dc416 100644
--- a/spec/features/merge_request/user_reopens_merge_request_spec.rb
+++ b/spec/features/merge_request/user_reopens_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User reopens a merge requests', :js do
+RSpec.describe 'User reopens a merge requests', :js do
   let(:project) { create(:project, :public, :repository) }
   let!(:merge_request) { create(:closed_merge_request, source_project: project, target_project: project) }
   let(:user) { create(:user) }
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 41a7456aed5..f96408fb10b 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User resolves conflicts', :js do
+RSpec.describe 'Merge request > User resolves conflicts', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { project.creator }
 
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
index 0e30df518d7..aa3840b4376 100644
--- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
+++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User resolves diff notes and threads', :js do
+RSpec.describe 'Merge request > User resolves diff notes and threads', :js do
   let(:project)       { create(:project, :public, :repository) }
   let(:user)          { project.creator }
   let(:guest)         { create(:user) }
@@ -146,17 +146,16 @@ describe 'Merge request > User resolves diff notes and threads', :js do
         describe 'reply form' do
           before do
             click_button 'Toggle thread'
-
-            page.within '.diff-content' do
-              click_button 'Reply...'
-            end
           end
 
           it 'allows user to comment' do
             page.within '.diff-content' do
+              click_button 'Reply...'
+
+              find(".js-unresolve-checkbox").set false
               find('.js-note-text').set 'testing'
 
-              click_button 'Comment'
+              click_button 'Add comment now'
 
               wait_for_requests
             end
@@ -181,9 +180,11 @@ describe 'Merge request > User resolves diff notes and threads', :js do
 
           it 'allows user to comment & unresolve thread' do
             page.within '.diff-content' do
+              click_button 'Reply...'
+
               find('.js-note-text').set 'testing'
 
-              click_button 'Comment & unresolve thread'
+              click_button 'Add comment now'
 
               wait_for_requests
             end
@@ -197,8 +198,6 @@ describe 'Merge request > User resolves diff notes and threads', :js do
 
       it 'allows user to resolve from reply form without a comment' do
         page.within '.diff-content' do
-          click_button 'Reply...'
-
           click_button 'Resolve thread'
         end
 
@@ -214,7 +213,9 @@ describe 'Merge request > User resolves diff notes and threads', :js do
 
           find('.js-note-text').set 'testing'
 
-          click_button 'Comment & resolve thread'
+          find('.js-resolve-checkbox').set(true)
+
+          click_button 'Add comment now'
         end
 
         page.within '.line-resolve-all-container' do
@@ -445,7 +446,9 @@ describe 'Merge request > User resolves diff notes and threads', :js do
 
           find('.js-note-text').set 'testing'
 
-          click_button 'Comment & resolve thread'
+          find('.js-resolve-checkbox').set(true)
+
+          click_button 'Add comment now'
         end
 
         page.within '.line-resolve-all-container' do
@@ -462,7 +465,7 @@ describe 'Merge request > User resolves diff notes and threads', :js do
 
           find('.js-note-text').set 'testing'
 
-          click_button 'Comment & unresolve thread'
+          click_button 'Add comment now'
         end
 
         page.within '.line-resolve-all-container' do
diff --git a/spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb b/spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb
index 9f7c97e510c..f8f3467f6fb 100644
--- a/spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb
+++ b/spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User resolves outdated diff discussions', :js do
+RSpec.describe 'Merge request > User resolves outdated diff discussions', :js do
   let(:project) { create(:project, :repository, :public) }
 
   let(:merge_request) do
diff --git a/spec/features/merge_request/user_resolves_wip_mr_spec.rb b/spec/features/merge_request/user_resolves_wip_mr_spec.rb
index 93ef0801791..34a3490a152 100644
--- a/spec/features/merge_request/user_resolves_wip_mr_spec.rb
+++ b/spec/features/merge_request/user_resolves_wip_mr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User resolves Work in Progress', :js do
+RSpec.describe 'Merge request > User resolves Work in Progress', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) do
diff --git a/spec/features/merge_request/user_reverts_merge_request_spec.rb b/spec/features/merge_request/user_reverts_merge_request_spec.rb
index 906ff1d61b2..5e9611de460 100644
--- a/spec/features/merge_request/user_reverts_merge_request_spec.rb
+++ b/spec/features/merge_request/user_reverts_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User reverts a merge request', :js do
+RSpec.describe 'User reverts a merge request', :js do
   let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
   let(:user) { create(:user) }
diff --git a/spec/features/merge_request/user_reviews_image_spec.rb b/spec/features/merge_request/user_reviews_image_spec.rb
new file mode 100644
index 00000000000..533f3c9c91a
--- /dev/null
+++ b/spec/features/merge_request/user_reviews_image_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Merge request > image review', :js do
+  include MergeRequestDiffHelpers
+  include RepoHelpers
+
+  let(:user) { project.owner }
+  let(:project) { create(:project, :repository) }
+  let(:merge_request) { create(:merge_request_with_diffs, :with_image_diffs, source_project: project, author: user) }
+
+  before do
+    sign_in(user)
+
+    allow_any_instance_of(DiffHelper).to receive(:diff_file_blob_raw_url).and_return('/apple-touch-icon.png')
+    allow_any_instance_of(DiffHelper).to receive(:diff_file_old_blob_raw_url).and_return('/favicon.png')
+
+    visit diffs_project_merge_request_path(merge_request.project, merge_request)
+
+    wait_for_requests
+  end
+
+  it 'leaves review' do
+    find('.js-add-image-diff-note-button', match: :first).click
+
+    find('.diff-content .note-textarea').native.send_keys('image diff test comment')
+
+    click_button('Start a review')
+
+    wait_for_requests
+
+    page.within(find('.draft-note-component')) do
+      expect(page).to have_content('image diff test comment')
+    end
+  end
+end
diff --git a/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb b/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb
index 48c3ed7178d..d9950f5504b 100644
--- a/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb
+++ b/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User scrolls to note on load', :js do
+RSpec.describe 'Merge request > User scrolls to note on load', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project, author: user) }
diff --git a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
index 21599164ac3..415e6b29d5a 100644
--- a/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees avatars on diff notes', :js do
+RSpec.describe 'Merge request > User sees avatars on diff notes', :js do
   include NoteInteractionHelpers
 
   let(:project)       { create(:project, :public, :repository) }
@@ -42,7 +42,7 @@ describe 'Merge request > User sees avatars on diff notes', :js do
       page.within('.js-discussion-note-form') do
         find('.note-textarea').native.send_keys('Test comment')
 
-        click_button 'Comment'
+        click_button 'Add comment now'
       end
 
       expect(page).to have_content('Test comment')
@@ -137,7 +137,7 @@ describe 'Merge request > User sees avatars on diff notes', :js do
         page.within '.js-discussion-note-form' do
           find('.js-note-text').native.send_keys('Test')
 
-          click_button 'Comment'
+          click_button 'Add comment now'
 
           wait_for_requests
         end
@@ -155,7 +155,7 @@ describe 'Merge request > User sees avatars on diff notes', :js do
 
           page.within '.js-discussion-note-form' do
             find('.js-note-text').native.send_keys('Test')
-            find('.js-comment-button').click
+            click_button 'Add comment now'
 
             wait_for_requests
           end
diff --git a/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb b/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb
index 592ad3aae9b..95e435a333e 100644
--- a/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb
+++ b/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New merge request breadcrumb' do
+RSpec.describe 'New merge request breadcrumb' do
   let(:project) { create(:project, :repository) }
   let(:user) { project.creator }
 
diff --git a/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb b/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
index f54161fbaec..e47f9ff2660 100644
--- a/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
+++ b/spec/features/merge_request/user_sees_check_out_branch_modal_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees check out branch modal', :js do
+RSpec.describe 'Merge request > User sees check out branch modal', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb b/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
index d7675cd06a8..ec2fb856be5 100644
--- a/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
+++ b/spec/features/merge_request/user_sees_cherry_pick_modal_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User cherry-picks', :js do
+RSpec.describe 'Merge request > User cherry-picks', :js do
   let(:group) { create(:group) }
   let(:project) { create(:project, :repository, namespace: group) }
   let(:user) { project.creator }
diff --git a/spec/features/merge_request/user_sees_closing_issues_message_spec.rb b/spec/features/merge_request/user_sees_closing_issues_message_spec.rb
index f77ea82649c..baef547a480 100644
--- a/spec/features/merge_request/user_sees_closing_issues_message_spec.rb
+++ b/spec/features/merge_request/user_sees_closing_issues_message_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees closing issues message', :js do
+RSpec.describe 'Merge request > User sees closing issues message', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:issue_1) { create(:issue, project: project)}
diff --git a/spec/features/merge_request/user_sees_deleted_target_branch_spec.rb b/spec/features/merge_request/user_sees_deleted_target_branch_spec.rb
index 9ef6847f7f5..7c93952ee99 100644
--- a/spec/features/merge_request/user_sees_deleted_target_branch_spec.rb
+++ b/spec/features/merge_request/user_sees_deleted_target_branch_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees deleted target branch', :js do
+RSpec.describe 'Merge request > User sees deleted target branch', :js do
   let(:merge_request) { create(:merge_request) }
   let(:project) { merge_request.project }
   let(:user) { project.creator }
diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
index 9670bd798bf..1e547d504ef 100644
--- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees deployment widget', :js do
+RSpec.describe 'Merge request > User sees deployment widget', :js do
   describe 'when merge request has associated environments' do
     let(:user) { create(:user) }
     let(:project) { create(:project, :repository) }
diff --git a/spec/features/merge_request/user_sees_diff_spec.rb b/spec/features/merge_request/user_sees_diff_spec.rb
index 868451883d8..2229b242d5b 100644
--- a/spec/features/merge_request/user_sees_diff_spec.rb
+++ b/spec/features/merge_request/user_sees_diff_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees diff', :js do
+RSpec.describe 'Merge request > User sees diff', :js do
   include ProjectForksHelper
   include RepoHelpers
 
diff --git a/spec/features/merge_request/user_sees_discussions_spec.rb b/spec/features/merge_request/user_sees_discussions_spec.rb
index b4afd8c6332..ca8c4f84677 100644
--- a/spec/features/merge_request/user_sees_discussions_spec.rb
+++ b/spec/features/merge_request/user_sees_discussions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees threads', :js do
+RSpec.describe 'Merge request > User sees threads', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/merge_request/user_sees_empty_state_spec.rb b/spec/features/merge_request/user_sees_empty_state_spec.rb
index 88eba976d62..ac07b31731d 100644
--- a/spec/features/merge_request/user_sees_empty_state_spec.rb
+++ b/spec/features/merge_request/user_sees_empty_state_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees empty state' do
+RSpec.describe 'Merge request > User sees empty state' do
   let(:project) { create(:project, :public, :repository) }
   let(:user)    { project.creator }
 
diff --git a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
index 4cc129e5d5f..cae04dd1693 100644
--- a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees merge button depending on unresolved threads', :js do
+RSpec.describe 'Merge request > User sees merge button depending on unresolved threads', :js do
   let(:project)        { create(:project, :repository) }
   let(:user)           { project.creator }
   let!(:merge_request) { create(:merge_request_with_diff_notes, source_project: project, author: user) }
diff --git a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb
index 5b14450a289..e2aa10d80dd 100644
--- a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees pipelines triggered by merge request', :js do
+RSpec.describe 'Merge request > User sees pipelines triggered by merge request', :js do
   include ProjectForksHelper
   include TestReportsHelper
 
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index eca011bc786..bd140a0643d 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees merge widget', :js do
+RSpec.describe 'Merge request > User sees merge widget', :js do
   include ProjectForksHelper
   include TestReportsHelper
   include ReactiveCachingHelpers
diff --git a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb
index 29b8dc19860..04d8c52df61 100644
--- a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request < User sees mini pipeline graph', :js do
+RSpec.describe 'Merge request < User sees mini pipeline graph', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project, head_pipeline: pipeline) }
diff --git a/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb b/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb
index b4fb844b943..cbd68025b50 100644
--- a/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb
+++ b/spec/features/merge_request/user_sees_mr_from_deleted_forked_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees MR from deleted forked project', :js do
+RSpec.describe 'Merge request > User sees MR from deleted forked project', :js do
   include ProjectForksHelper
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb
index 59e5f5c847d..e997fb3e853 100644
--- a/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb
+++ b/spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 # This test serves as a regression test for a bug that caused an error
 # message to be shown by JavaScript when the source branch was deleted.
 # Please do not remove ":js".
-describe 'Merge request > User sees MR with deleted source branch', :js do
+RSpec.describe 'Merge request > User sees MR with deleted source branch', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
   let(:user) { project.creator }
diff --git a/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb b/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb
index 029f55c2cd6..20c45a1d652 100644
--- a/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb
+++ b/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees notes from forked project', :js do
+RSpec.describe 'Merge request > User sees notes from forked project', :js do
   include ProjectForksHelper
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb b/spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb
index d258b98f4a9..56092da5136 100644
--- a/spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb
+++ b/spec/features/merge_request/user_sees_pipelines_from_forked_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees pipelines from forked project', :js do
+RSpec.describe 'Merge request > User sees pipelines from forked project', :js do
   include ProjectForksHelper
 
   let(:target_project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb
index f3d8f2b42f8..2d125087cb6 100644
--- a/spec/features/merge_request/user_sees_pipelines_spec.rb
+++ b/spec/features/merge_request/user_sees_pipelines_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees pipelines', :js do
+RSpec.describe 'Merge request > User sees pipelines', :js do
   describe 'pipeline tab' do
     let(:merge_request) { create(:merge_request) }
     let(:project) { merge_request.target_project }
diff --git a/spec/features/merge_request/user_sees_system_notes_spec.rb b/spec/features/merge_request/user_sees_system_notes_spec.rb
index 0482458d5ac..9f8d4c6d63f 100644
--- a/spec/features/merge_request/user_sees_system_notes_spec.rb
+++ b/spec/features/merge_request/user_sees_system_notes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees system notes', :js do
+RSpec.describe 'Merge request > User sees system notes', :js do
   let(:public_project) { create(:project, :public, :repository) }
   let(:private_project) { create(:project, :private, :repository) }
   let(:user)            { private_project.creator }
diff --git a/spec/features/merge_request/user_sees_versions_spec.rb b/spec/features/merge_request/user_sees_versions_spec.rb
index 5b43fe407eb..75319c8a22d 100644
--- a/spec/features/merge_request/user_sees_versions_spec.rb
+++ b/spec/features/merge_request/user_sees_versions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees versions', :js do
+RSpec.describe 'Merge request > User sees versions', :js do
   let(:merge_request) do
     create(:merge_request).tap do |mr|
       mr.merge_request_diff.destroy
@@ -34,7 +34,7 @@ describe 'Merge request > User sees versions', :js do
 
         page.within("form[data-line-code='#{line_code}']") do
           fill_in "note[note]", with: comment
-          find(".js-comment-button").click
+          click_button('Add comment now')
         end
 
         wait_for_requests
diff --git a/spec/features/merge_request/user_sees_wip_help_message_spec.rb b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
index 1179303171c..42fe18cfc93 100644
--- a/spec/features/merge_request/user_sees_wip_help_message_spec.rb
+++ b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees WIP help message' do
+RSpec.describe 'Merge request > User sees WIP help message' do
   let(:project) { create(:project, :public, :repository) }
   let(:user)    { project.creator }
 
diff --git a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
index 22b2ea81b32..bf445de44ba 100644
--- a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
+++ b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User selects branches for new MR', :js do
+RSpec.describe 'Merge request > User selects branches for new MR', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
 
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
index 62e0e4d76ed..b81c0e49538 100644
--- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
+++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User comments on a diff', :js do
+RSpec.describe 'User comments on a diff', :js do
   include MergeRequestDiffHelpers
   include RepoHelpers
 
@@ -49,7 +49,7 @@ describe 'User comments on a diff', :js do
 
       page.within('.js-discussion-note-form') do
         fill_in('note_note', with: "```suggestion\n# change to a comment\n```")
-        click_button('Comment')
+        click_button('Add comment now')
       end
 
       wait_for_requests
@@ -77,7 +77,7 @@ describe 'User comments on a diff', :js do
 
       page.within('.js-discussion-note-form') do
         fill_in('note_note', with: "```suggestion\n# change to a comment\n```")
-        click_button('Comment')
+        click_button('Add comment now')
       end
 
       wait_for_requests
@@ -93,6 +93,100 @@ describe 'User comments on a diff', :js do
     end
   end
 
+  context 'applying suggestions in batches' do
+    def hash(path)
+      diff_file = merge_request.diffs(paths: [path]).diff_files.first
+      Digest::SHA1.hexdigest(diff_file.file_path)
+    end
+
+    file1 = 'files/ruby/popen.rb'
+    file2 = 'files/ruby/regex.rb'
+
+    let(:files) do
+      [
+        {
+          hash: hash(file1),
+          line_code: "#{hash(file1)}_12_12"
+        },
+        {
+          hash: hash(file2),
+          line_code: "#{hash(file2)}_21_21"
+        }
+      ]
+    end
+
+    it 'can add and remove suggestions from a batch' do
+      files.each_with_index do |file, index|
+        page.within("[id='#{file[:hash]}']") do
+          find("button[title='Show full file']").click
+          wait_for_requests
+
+          click_diff_line(find("[id='#{file[:line_code]}']"))
+
+          page.within('.js-discussion-note-form') do
+            fill_in('note_note', with: "```suggestion\n# change to a comment\n```")
+            click_button('Add comment now')
+            wait_for_requests
+          end
+        end
+
+        page.within("[id='#{file[:hash]}']") do
+          expect(page).not_to have_content('Applied')
+
+          click_button('Add suggestion to batch')
+          wait_for_requests
+
+          expect(page).to have_content('Remove from batch')
+          expect(page).to have_content("Apply suggestions #{index + 1}")
+        end
+      end
+
+      page.within("[id='#{files[0][:hash]}']") do
+        click_button('Remove from batch')
+        wait_for_requests
+
+        expect(page).to have_content('Apply suggestion')
+        expect(page).to have_content('Add suggestion to batch')
+      end
+
+      page.within("[id='#{files[1][:hash]}']") do
+        expect(page).to have_content('Remove from batch')
+        expect(page).to have_content('Apply suggestions 1')
+      end
+    end
+
+    it 'can apply multiple suggestions as a batch' do
+      files.each_with_index do |file, index|
+        page.within("[id='#{file[:hash]}']") do
+          find("button[title='Show full file']").click
+          wait_for_requests
+
+          click_diff_line(find("[id='#{file[:line_code]}']"))
+
+          page.within('.js-discussion-note-form') do
+            fill_in('note_note', with: "```suggestion\n# change to a comment\n```")
+            click_button('Add comment now')
+            wait_for_requests
+          end
+        end
+
+        page.within("[id='#{file[:hash]}']") do
+          click_button('Add suggestion to batch')
+          wait_for_requests
+        end
+      end
+
+      expect(page).not_to have_content('Applied')
+
+      page.within("[id='#{files[0][:hash]}']") do
+        click_button('Apply suggestions 2')
+        wait_for_requests
+      end
+
+      expect(page).to have_content('Applied').twice
+    end
+  end
+
   context 'multiple suggestions in expanded lines' do
     # https://gitlab.com/gitlab-org/gitlab/issues/38277
     it 'suggestions are appliable', :quarantine do
@@ -119,7 +213,7 @@ describe 'User comments on a diff', :js do
 
         page.within('.js-discussion-note-form') do
           fill_in('note_note', with: "```suggestion\n# change to a comment\n```")
-          click_button('Comment')
+          click_button('Add comment now')
           wait_for_requests
         end
 
@@ -127,7 +221,7 @@ describe 'User comments on a diff', :js do
 
         page.within('.js-discussion-note-form') do
           fill_in('note_note', with: "```suggestion\n# 2nd change to a comment\n```")
-          click_button('Comment')
+          click_button('Add comment now')
           wait_for_requests
         end
 
@@ -158,7 +252,7 @@ describe 'User comments on a diff', :js do
 
       page.within('.js-discussion-note-form') do
         fill_in('note_note', with: "```suggestion\n# change to a comment\n```\n```suggestion:-2\n# or that\n# heh\n```")
-        click_button('Comment')
+        click_button('Add comment now')
       end
 
       wait_for_requests
@@ -201,7 +295,7 @@ describe 'User comments on a diff', :js do
 
       page.within('.js-discussion-note-form') do
         fill_in('note_note', with: "```suggestion:-3+5\n# change to a\n# comment\n# with\n# broken\n# lines\n```")
-        click_button('Comment')
+        click_button('Add comment now')
       end
 
       wait_for_requests
diff --git a/spec/features/merge_request/user_toggles_whitespace_changes_spec.rb b/spec/features/merge_request/user_toggles_whitespace_changes_spec.rb
index 4db067a4e41..fab500f47bf 100644
--- a/spec/features/merge_request/user_toggles_whitespace_changes_spec.rb
+++ b/spec/features/merge_request/user_toggles_whitespace_changes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User toggles whitespace changes', :js do
+RSpec.describe 'Merge request > User toggles whitespace changes', :js do
   let(:merge_request) { create(:merge_request) }
   let(:project) { merge_request.project }
   let(:user) { project.creator }
diff --git a/spec/features/merge_request/user_tries_to_access_private_project_info_through_new_mr_spec.rb b/spec/features/merge_request/user_tries_to_access_private_project_info_through_new_mr_spec.rb
index 1ebe9e2e409..b864cb55785 100644
--- a/spec/features/merge_request/user_tries_to_access_private_project_info_through_new_mr_spec.rb
+++ b/spec/features/merge_request/user_tries_to_access_private_project_info_through_new_mr_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge Request > User tries to access private project information through the new mr page' do
+RSpec.describe 'Merge Request > User tries to access private project information through the new mr page' do
   let(:current_user) { create(:user) }
   let(:private_project) do
     create(:project, :public, :repository,
diff --git a/spec/features/merge_request/user_uses_quick_actions_spec.rb b/spec/features/merge_request/user_uses_quick_actions_spec.rb
index 318f8812263..04a2e046f42 100644
--- a/spec/features/merge_request/user_uses_quick_actions_spec.rb
+++ b/spec/features/merge_request/user_uses_quick_actions_spec.rb
@@ -7,7 +7,7 @@ require 'spec_helper'
 # for example, adding quick actions when creating the issue and checking DateTime formats on UI.
 # Because this kind of spec takes more time to run there is no need to add new ones
 # for each existing quick action unless they test something not tested by existing tests.
-describe 'Merge request > User uses quick actions', :js do
+RSpec.describe 'Merge request > User uses quick actions', :js do
   include Spec::Support::Helpers::Features::NotesHelpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_request/user_views_diffs_spec.rb b/spec/features/merge_request/user_views_diffs_spec.rb
index cd0cf1cc78a..14d10fc1c9f 100644
--- a/spec/features/merge_request/user_views_diffs_spec.rb
+++ b/spec/features/merge_request/user_views_diffs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views diffs', :js do
+RSpec.describe 'User views diffs', :js do
   let(:merge_request) do
     create(:merge_request_with_diffs, source_project: project, target_project: project, source_branch: 'merge-test')
   end
diff --git a/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb b/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb
index a38bc4f702b..370341a43f9 100644
--- a/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb
+++ b/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb
@@ -6,7 +6,7 @@ require 'spec_helper'
 # updated.
 # This can occur when the fork a merge request is created from is in the process
 # of being destroyed.
-describe 'User views merged merge request from deleted fork' do
+RSpec.describe 'User views merged merge request from deleted fork' do
   include ProjectForksHelper
 
   let(:project) { create(:project, :repository) }
diff --git a/spec/features/merge_request/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb
index a788fc71286..448844ae57d 100644
--- a/spec/features/merge_request/user_views_open_merge_request_spec.rb
+++ b/spec/features/merge_request/user_views_open_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views an open merge request' do
+RSpec.describe 'User views an open merge request' do
   let(:merge_request) do
     create(:merge_request, source_project: project, target_project: project, description: '# Description header')
   end
diff --git a/spec/features/merge_request/user_views_user_status_on_merge_request_spec.rb b/spec/features/merge_request/user_views_user_status_on_merge_request_spec.rb
index 78d9c6c6db1..a6de443e96f 100644
--- a/spec/features/merge_request/user_views_user_status_on_merge_request_spec.rb
+++ b/spec/features/merge_request/user_views_user_status_on_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Merge request > View user status' do
+RSpec.describe 'Project > Merge request > View user status' do
   let(:project) { create(:project, :public, :repository) }
   let(:merge_request) do
     create(:merge_request, source_project: project, target_project: project, author: create(:user))
diff --git a/spec/features/merge_requests/filters_generic_behavior_spec.rb b/spec/features/merge_requests/filters_generic_behavior_spec.rb
index 2bea819cc33..80009cca2fb 100644
--- a/spec/features/merge_requests/filters_generic_behavior_spec.rb
+++ b/spec/features/merge_requests/filters_generic_behavior_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge Requests > Filters generic behavior', :js do
+RSpec.describe 'Merge Requests > Filters generic behavior', :js do
   include FilteredSearchHelpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_requests/user_filters_by_assignees_spec.rb b/spec/features/merge_requests/user_filters_by_assignees_spec.rb
index 12d682bbb15..9827b067649 100644
--- a/spec/features/merge_requests/user_filters_by_assignees_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_assignees_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge Requests > User filters by assignees', :js do
+RSpec.describe 'Merge Requests > User filters by assignees', :js do
   include FilteredSearchHelpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_requests/user_filters_by_labels_spec.rb b/spec/features/merge_requests/user_filters_by_labels_spec.rb
index 6308579d2d9..980046ccd71 100644
--- a/spec/features/merge_requests/user_filters_by_labels_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge Requests > User filters by labels', :js do
+RSpec.describe 'Merge Requests > User filters by labels', :js do
   include FilteredSearchHelpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_requests/user_filters_by_milestones_spec.rb b/spec/features/merge_requests/user_filters_by_milestones_spec.rb
index d2a420be996..41a0b0012d1 100644
--- a/spec/features/merge_requests/user_filters_by_milestones_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_milestones_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge Requests > User filters by milestones', :js do
+RSpec.describe 'Merge Requests > User filters by milestones', :js do
   include FilteredSearchHelpers
 
   let(:project)   { create(:project, :public, :repository) }
diff --git a/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb b/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb
index 5fac31e58ba..3aba023b077 100644
--- a/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge requests > User filters by multiple criteria', :js do
+RSpec.describe 'Merge requests > User filters by multiple criteria', :js do
   include FilteredSearchHelpers
 
   let!(:project)   { create(:project, :public, :repository) }
diff --git a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
index abe97d4c07e..540d87eb969 100644
--- a/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
+++ b/spec/features/merge_requests/user_filters_by_target_branch_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge Requests > User filters by target branch', :js do
+RSpec.describe 'Merge Requests > User filters by target branch', :js do
   include FilteredSearchHelpers
 
   let!(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
index ee0d7307e6c..4531ef40901 100644
--- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge requests > User lists merge requests' do
+RSpec.describe 'Merge requests > User lists merge requests' do
   include MergeRequestHelpers
   include SortingHelper
 
diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb
index fa951dd50d3..df94fe2cbd0 100644
--- a/spec/features/merge_requests/user_mass_updates_spec.rb
+++ b/spec/features/merge_requests/user_mass_updates_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge requests > User mass updates', :js do
+RSpec.describe 'Merge requests > User mass updates', :js do
   let(:project) { create(:project, :repository) }
   let(:user)    { project.creator }
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
diff --git a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb
index 5a84bcb0c44..54c9fbef218 100644
--- a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User sorts merge requests' do
+RSpec.describe 'User sorts merge requests' do
   include CookieHelper
 
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
index ce5ed76dc7a..84964bd0637 100644
--- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb
+++ b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User squashes a merge request', :js do
+RSpec.describe 'User squashes a merge request', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:source_branch) { 'csv' }
diff --git a/spec/features/merge_requests/user_views_all_merge_requests_spec.rb b/spec/features/merge_requests/user_views_all_merge_requests_spec.rb
index 60496d61e87..f8fe2c5ebe2 100644
--- a/spec/features/merge_requests/user_views_all_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_views_all_merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views all merge requests' do
+RSpec.describe 'User views all merge requests' do
   let!(:closed_merge_request) { create(:closed_merge_request, source_project: project, target_project: project) }
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/merge_requests/user_views_closed_merge_requests_spec.rb b/spec/features/merge_requests/user_views_closed_merge_requests_spec.rb
index dc0d35e4fea..abc652c3bbd 100644
--- a/spec/features/merge_requests/user_views_closed_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_views_closed_merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views closed merge requests' do
+RSpec.describe 'User views closed merge requests' do
   let!(:closed_merge_request) { create(:closed_merge_request, source_project: project, target_project: project) }
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/merge_requests/user_views_merged_merge_requests_spec.rb b/spec/features/merge_requests/user_views_merged_merge_requests_spec.rb
index ddb354204c9..3b93fb7e4bf 100644
--- a/spec/features/merge_requests/user_views_merged_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_views_merged_merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views merged merge requests' do
+RSpec.describe 'User views merged merge requests' do
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
   let!(:merged_merge_request) { create(:merged_merge_request, source_project: project, target_project: project) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/merge_requests/user_views_open_merge_requests_spec.rb b/spec/features/merge_requests/user_views_open_merge_requests_spec.rb
index 4aaa20f0455..49509f89a8d 100644
--- a/spec/features/merge_requests/user_views_open_merge_requests_spec.rb
+++ b/spec/features/merge_requests/user_views_open_merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views open merge requests' do
+RSpec.describe 'User views open merge requests' do
   let_it_be(:user) { create(:user) }
 
   shared_examples_for 'shows merge requests' do
diff --git a/spec/features/milestone_spec.rb b/spec/features/milestone_spec.rb
index bfff33f3956..4a7f14d5a1b 100644
--- a/spec/features/milestone_spec.rb
+++ b/spec/features/milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Milestone' do
+RSpec.describe 'Milestone' do
   let(:group) { create(:group, :public) }
   let(:project) { create(:project, :public, namespace: group) }
   let(:user) { create(:user) }
@@ -111,20 +111,6 @@ describe 'Milestone' do
     end
   end
 
-  describe 'deprecation popover', :js do
-    it 'opens deprecation popover' do
-      milestone = create(:milestone, project: project)
-
-      visit group_milestone_path(group, milestone, title: milestone.title)
-
-      expect(page).to have_selector('.milestone-deprecation-message')
-
-      find('.milestone-deprecation-message .js-popover-link').click
-
-      expect(page).to have_selector('.popover')
-    end
-  end
-
   describe 'reopen closed milestones' do
     before do
       create(:milestone, :closed, project: project)
diff --git a/spec/features/milestones/user_creates_milestone_spec.rb b/spec/features/milestones/user_creates_milestone_spec.rb
index 12cb27b0062..d80796b8f9a 100644
--- a/spec/features/milestones/user_creates_milestone_spec.rb
+++ b/spec/features/milestones/user_creates_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User creates milestone", :js do
+RSpec.describe "User creates milestone", :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
 
diff --git a/spec/features/milestones/user_deletes_milestone_spec.rb b/spec/features/milestones/user_deletes_milestone_spec.rb
index fd72f2dfefa..ede9faed876 100644
--- a/spec/features/milestones/user_deletes_milestone_spec.rb
+++ b/spec/features/milestones/user_deletes_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User deletes milestone", :js do
+RSpec.describe "User deletes milestone", :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
diff --git a/spec/features/milestones/user_edits_milestone_spec.rb b/spec/features/milestones/user_edits_milestone_spec.rb
index be05685aff7..3edd50922b6 100644
--- a/spec/features/milestones/user_edits_milestone_spec.rb
+++ b/spec/features/milestones/user_edits_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User edits milestone", :js do
+RSpec.describe "User edits milestone", :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:milestone) { create(:milestone, project: project, start_date: Date.today, due_date: 5.days.from_now) }
diff --git a/spec/features/milestones/user_promotes_milestone_spec.rb b/spec/features/milestones/user_promotes_milestone_spec.rb
index d14097e1ef4..a9c3c9706a0 100644
--- a/spec/features/milestones/user_promotes_milestone_spec.rb
+++ b/spec/features/milestones/user_promotes_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User promotes milestone' do
+RSpec.describe 'User promotes milestone' do
   let_it_be(:group) { create(:group) }
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, namespace: group) }
diff --git a/spec/features/milestones/user_sees_breadcrumb_links_spec.rb b/spec/features/milestones/user_sees_breadcrumb_links_spec.rb
index 92445735328..e9cfa9b20dc 100644
--- a/spec/features/milestones/user_sees_breadcrumb_links_spec.rb
+++ b/spec/features/milestones/user_sees_breadcrumb_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New project milestone breadcrumb' do
+RSpec.describe 'New project milestone breadcrumb' do
   let(:project) { create(:project) }
   let(:milestone) { create(:milestone, project: project) }
   let(:user) { project.creator }
diff --git a/spec/features/milestones/user_views_milestone_spec.rb b/spec/features/milestones/user_views_milestone_spec.rb
index ca13e226432..420f8d49483 100644
--- a/spec/features/milestones/user_views_milestone_spec.rb
+++ b/spec/features/milestones/user_views_milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User views milestone" do
+RSpec.describe "User views milestone" do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:milestone) { create(:milestone, project: project) }
diff --git a/spec/features/milestones/user_views_milestones_spec.rb b/spec/features/milestones/user_views_milestones_spec.rb
index e17797a8165..3f606577121 100644
--- a/spec/features/milestones/user_views_milestones_spec.rb
+++ b/spec/features/milestones/user_views_milestones_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "User views milestones" do
+RSpec.describe "User views milestones" do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:milestone) { create(:milestone, project: project) }
@@ -65,7 +65,7 @@ describe "User views milestones" do
   end
 end
 
-describe "User views milestones with no MR" do
+RSpec.describe "User views milestones with no MR" do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :merge_requests_disabled) }
   let_it_be(:milestone) { create(:milestone, project: project) }
diff --git a/spec/features/oauth_login_spec.rb b/spec/features/oauth_login_spec.rb
index 29e9b0c313a..dc27bfbef50 100644
--- a/spec/features/oauth_login_spec.rb
+++ b/spec/features/oauth_login_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'OAuth Login', :js, :allow_forgery_protection do
+RSpec.describe 'OAuth Login', :js, :allow_forgery_protection do
   include DeviseHelpers
 
   def enter_code(code)
diff --git a/spec/features/oauth_provider_authorize_spec.rb b/spec/features/oauth_provider_authorize_spec.rb
index 284fe3b0af9..f5a1a35b66f 100644
--- a/spec/features/oauth_provider_authorize_spec.rb
+++ b/spec/features/oauth_provider_authorize_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'OAuth Provider' do
+RSpec.describe 'OAuth Provider' do
   describe 'Standard OAuth Authorization' do
     let(:application) { create(:oauth_application, scopes: 'read_user') }
 
diff --git a/spec/features/participants_autocomplete_spec.rb b/spec/features/participants_autocomplete_spec.rb
index fdedd319116..5c29ac870c0 100644
--- a/spec/features/participants_autocomplete_spec.rb
+++ b/spec/features/participants_autocomplete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Member autocomplete', :js do
+RSpec.describe 'Member autocomplete', :js do
   let(:project) { create(:project, :public) }
   let(:user) { create(:user) }
   let(:author) { create(:user) }
diff --git a/spec/features/password_reset_spec.rb b/spec/features/password_reset_spec.rb
index 8ceca1e3175..31b2b2d15aa 100644
--- a/spec/features/password_reset_spec.rb
+++ b/spec/features/password_reset_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Password reset' do
+RSpec.describe 'Password reset' do
   describe 'throttling' do
     it 'sends reset instructions when not previously sent' do
       user = create(:user)
diff --git a/spec/features/populate_new_pipeline_vars_with_params_spec.rb b/spec/features/populate_new_pipeline_vars_with_params_spec.rb
index 5fe80e73e38..f931e8497fc 100644
--- a/spec/features/populate_new_pipeline_vars_with_params_spec.rb
+++ b/spec/features/populate_new_pipeline_vars_with_params_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Populate new pipeline CI variables with url params", :js do
+RSpec.describe "Populate new pipeline CI variables with url params", :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:page_path) { new_project_pipeline_path(project) }
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index 0147963c0a3..4326700bab1 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile account page', :js do
+RSpec.describe 'Profile account page', :js do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/account_spec.rb b/spec/features/profiles/account_spec.rb
index c6db15065f2..620c2f60ba3 100644
--- a/spec/features/profiles/account_spec.rb
+++ b/spec/features/profiles/account_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Account', :js do
+RSpec.describe 'Profile > Account', :js do
   let(:user) { create(:user, username: 'foo') }
 
   before do
@@ -56,6 +56,37 @@ describe 'Profile > Account', :js do
       end
     end
   end
+
+  describe 'Delete account' do
+    before do
+      create_list(:project, number_of_projects, namespace: user.namespace)
+      visit profile_account_path
+    end
+
+    context 'when there are no personal projects' do
+      let(:number_of_projects) { 0 }
+
+      it 'does not show personal projects removal message' do
+        expect(page).not_to have_content(/\d personal projects? will be removed and cannot be restored/)
+      end
+    end
+
+    context 'when one personal project exists' do
+      let(:number_of_projects) { 1 }
+
+      it 'does show personal project removal message' do
+        expect(page).to have_content('1 personal project will be removed and cannot be restored')
+      end
+    end
+
+    context 'when more than one personal projects exists' do
+      let(:number_of_projects) { 3 }
+
+      it 'shows pluralized personal project removal message' do
+        expect(page).to have_content('3 personal projects will be removed and cannot be restored')
+      end
+    end
+  end
 end
 
 def update_username(new_username)
diff --git a/spec/features/profiles/active_sessions_spec.rb b/spec/features/profiles/active_sessions_spec.rb
index 8f63ce2a197..75531d43df2 100644
--- a/spec/features/profiles/active_sessions_spec.rb
+++ b/spec/features/profiles/active_sessions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Active Sessions', :clean_gitlab_redis_shared_state do
+RSpec.describe 'Profile > Active Sessions', :clean_gitlab_redis_shared_state do
   let(:user) do
     create(:user).tap do |user|
       user.current_sign_in_at = Time.current
diff --git a/spec/features/profiles/chat_names_spec.rb b/spec/features/profiles/chat_names_spec.rb
index 4c447faf77e..80b36aa37b8 100644
--- a/spec/features/profiles/chat_names_spec.rb
+++ b/spec/features/profiles/chat_names_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Chat' do
+RSpec.describe 'Profile > Chat' do
   let(:user) { create(:user) }
   let(:service) { create(:service) }
 
diff --git a/spec/features/profiles/emails_spec.rb b/spec/features/profiles/emails_spec.rb
index a41ef9e86ae..fc7de6d8b23 100644
--- a/spec/features/profiles/emails_spec.rb
+++ b/spec/features/profiles/emails_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Emails' do
+RSpec.describe 'Profile > Emails' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/gpg_keys_spec.rb b/spec/features/profiles/gpg_keys_spec.rb
index 07e87f36c65..18ed4e646b3 100644
--- a/spec/features/profiles/gpg_keys_spec.rb
+++ b/spec/features/profiles/gpg_keys_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > GPG Keys' do
+RSpec.describe 'Profile > GPG Keys' do
   let(:user) { create(:user, email: GpgHelpers::User2.emails.first) }
 
   before do
diff --git a/spec/features/profiles/keys_spec.rb b/spec/features/profiles/keys_spec.rb
index 3fc0fd76d2e..b5e784a749f 100644
--- a/spec/features/profiles/keys_spec.rb
+++ b/spec/features/profiles/keys_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > SSH Keys' do
+RSpec.describe 'Profile > SSH Keys' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/oauth_applications_spec.rb b/spec/features/profiles/oauth_applications_spec.rb
index 94c9897a7a9..2735f601307 100644
--- a/spec/features/profiles/oauth_applications_spec.rb
+++ b/spec/features/profiles/oauth_applications_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Applications' do
+RSpec.describe 'Profile > Applications' do
   let(:user) { create(:user) }
   let(:application) { create(:oauth_application, owner: user) }
 
diff --git a/spec/features/profiles/password_spec.rb b/spec/features/profiles/password_spec.rb
index 9dc96080732..a274f2b6d96 100644
--- a/spec/features/profiles/password_spec.rb
+++ b/spec/features/profiles/password_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Password' do
+RSpec.describe 'Profile > Password' do
   let(:user) { create(:user) }
 
   def fill_passwords(password, confirmation)
diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb
index 1fb61eeeb5a..21a0d01a9bf 100644
--- a/spec/features/profiles/personal_access_tokens_spec.rb
+++ b/spec/features/profiles/personal_access_tokens_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Personal Access Tokens', :js do
+RSpec.describe 'Profile > Personal Access Tokens', :js do
   let(:user) { create(:user) }
 
   def active_personal_access_tokens
diff --git a/spec/features/profiles/user_changes_notified_of_own_activity_spec.rb b/spec/features/profiles/user_changes_notified_of_own_activity_spec.rb
index 5af48c4503d..a5b7b1fba9d 100644
--- a/spec/features/profiles/user_changes_notified_of_own_activity_spec.rb
+++ b/spec/features/profiles/user_changes_notified_of_own_activity_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Profile > Notifications > User changes notified_of_own_activity setting', :js do
+RSpec.describe 'Profile > Notifications > User changes notified_of_own_activity setting', :js do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/user_edit_preferences_spec.rb b/spec/features/profiles/user_edit_preferences_spec.rb
index 6e61536d5ff..e1117d2d420 100644
--- a/spec/features/profiles/user_edit_preferences_spec.rb
+++ b/spec/features/profiles/user_edit_preferences_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'User edit preferences profile' do
+RSpec.describe 'User edit preferences profile' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
index 171dfb353f0..2659157d61d 100644
--- a/spec/features/profiles/user_edit_profile_spec.rb
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User edit profile' do
+RSpec.describe 'User edit profile' do
   let(:user) { create(:user) }
 
   before do
@@ -245,6 +245,15 @@ describe 'User edit profile' do
         end
       end
 
+      it 'opens the emoji modal again after closing it' do
+        open_user_status_modal
+        select_emoji('biohazard', true)
+
+        find('.js-toggle-emoji-menu').click
+
+        expect(page).to have_selector('.emoji-menu')
+      end
+
       it 'does not update the awards panel emoji' do
         project.add_maintainer(user)
         visit(project_issue_path(project, issue))
diff --git a/spec/features/profiles/user_manages_applications_spec.rb b/spec/features/profiles/user_manages_applications_spec.rb
index 668c4e8c784..d65365db880 100644
--- a/spec/features/profiles/user_manages_applications_spec.rb
+++ b/spec/features/profiles/user_manages_applications_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User manages applications' do
+RSpec.describe 'User manages applications' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/user_manages_emails_spec.rb b/spec/features/profiles/user_manages_emails_spec.rb
index 09da819a187..373c4f565f2 100644
--- a/spec/features/profiles/user_manages_emails_spec.rb
+++ b/spec/features/profiles/user_manages_emails_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User manages emails' do
+RSpec.describe 'User manages emails' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/user_visits_notifications_tab_spec.rb b/spec/features/profiles/user_visits_notifications_tab_spec.rb
index d788c0574e2..997cc8e3c4b 100644
--- a/spec/features/profiles/user_visits_notifications_tab_spec.rb
+++ b/spec/features/profiles/user_visits_notifications_tab_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User visits the notifications tab', :js do
+RSpec.describe 'User visits the notifications tab', :js do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/profiles/user_visits_profile_account_page_spec.rb b/spec/features/profiles/user_visits_profile_account_page_spec.rb
index f576a2bf9e1..b4d1185412b 100644
--- a/spec/features/profiles/user_visits_profile_account_page_spec.rb
+++ b/spec/features/profiles/user_visits_profile_account_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User visits the profile account page' do
+RSpec.describe 'User visits the profile account page' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/user_visits_profile_authentication_log_spec.rb b/spec/features/profiles/user_visits_profile_authentication_log_spec.rb
index 2f6f8ebee9c..22292eff9a3 100644
--- a/spec/features/profiles/user_visits_profile_authentication_log_spec.rb
+++ b/spec/features/profiles/user_visits_profile_authentication_log_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User visits the authentication log' do
+RSpec.describe 'User visits the authentication log' do
   let(:user) { create(:user) }
 
   context 'when user signed in' do
diff --git a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
index b18f763a968..d9421631b32 100644
--- a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
+++ b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User visits the profile preferences page' do
+RSpec.describe 'User visits the profile preferences page' do
   include Select2Helper
 
   let(:user) { create(:user) }
diff --git a/spec/features/profiles/user_visits_profile_spec.rb b/spec/features/profiles/user_visits_profile_spec.rb
index 1c90a794099..77da1f138c7 100644
--- a/spec/features/profiles/user_visits_profile_spec.rb
+++ b/spec/features/profiles/user_visits_profile_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User visits their profile' do
+RSpec.describe 'User visits their profile' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb b/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb
index 05ad9096f65..0531434f00c 100644
--- a/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb
+++ b/spec/features/profiles/user_visits_profile_ssh_keys_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User visits the profile SSH keys page' do
+RSpec.describe 'User visits the profile SSH keys page' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/project_group_variables_spec.rb b/spec/features/project_group_variables_spec.rb
index 242fc993718..e964a7def14 100644
--- a/spec/features/project_group_variables_spec.rb
+++ b/spec/features/project_group_variables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project group variables', :js do
+RSpec.describe 'Project group variables', :js do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:subgroup) { create(:group, parent: group) }
diff --git a/spec/features/project_variables_spec.rb b/spec/features/project_variables_spec.rb
index 1452317c22b..c67bcbf919b 100644
--- a/spec/features/project_variables_spec.rb
+++ b/spec/features/project_variables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project variables', :js do
+RSpec.describe 'Project variables', :js do
   let(:user)     { create(:user) }
   let(:project)  { create(:project) }
   let(:variable) { create(:ci_variable, key: 'test_key', value: 'test_value', masked: true) }
diff --git a/spec/features/projects/active_tabs_spec.rb b/spec/features/projects/active_tabs_spec.rb
index 815cf3b9c58..349e5f5e177 100644
--- a/spec/features/projects/active_tabs_spec.rb
+++ b/spec/features/projects/active_tabs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project active tab' do
+RSpec.describe 'Project active tab' do
   let(:user) { create :user }
   let(:project) { create(:project, :repository) }
 
@@ -84,7 +84,7 @@ describe 'Project active tab' do
 
   context 'on project Wiki' do
     before do
-      visit project_wiki_path(project, :home)
+      visit wiki_path(project.wiki)
     end
 
     it_behaves_like 'page has active tab', 'Wiki'
diff --git a/spec/features/projects/activity/rss_spec.rb b/spec/features/projects/activity/rss_spec.rb
index e1efe6ca64d..9012b335bf4 100644
--- a/spec/features/projects/activity/rss_spec.rb
+++ b/spec/features/projects/activity/rss_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Activity RSS' do
+RSpec.describe 'Project Activity RSS' do
   let(:project) { create(:project, :public) }
   let(:user) { project.owner }
   let(:path) { activity_project_path(project) }
diff --git a/spec/features/projects/activity/user_sees_activity_spec.rb b/spec/features/projects/activity/user_sees_activity_spec.rb
index 664002d909c..a9cdbd5c342 100644
--- a/spec/features/projects/activity/user_sees_activity_spec.rb
+++ b/spec/features/projects/activity/user_sees_activity_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Activity > User sees activity' do
+RSpec.describe 'Projects > Activity > User sees activity' do
   let(:project) { create(:project, :repository, :public) }
   let(:user) { project.creator }
   let(:issue) { create(:issue, project: project) }
diff --git a/spec/features/projects/activity/user_sees_design_comment_spec.rb b/spec/features/projects/activity/user_sees_design_comment_spec.rb
index 9864e9ce29f..e60deba65f0 100644
--- a/spec/features/projects/activity/user_sees_design_comment_spec.rb
+++ b/spec/features/projects/activity/user_sees_design_comment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Activity > User sees design comment', :js do
+RSpec.describe 'Projects > Activity > User sees design comment', :js do
   include DesignManagementTestHelpers
 
   let_it_be(:project) { create(:project, :repository, :public) }
diff --git a/spec/features/projects/activity/user_sees_private_activity_spec.rb b/spec/features/projects/activity/user_sees_private_activity_spec.rb
index 0ec4752d418..86692bc6b4c 100644
--- a/spec/features/projects/activity/user_sees_private_activity_spec.rb
+++ b/spec/features/projects/activity/user_sees_private_activity_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Activity > User sees private activity', :js do
+RSpec.describe 'Project > Activity > User sees private activity', :js do
   let(:project) { create(:project, :public) }
   let(:author) { create(:user) }
   let(:user) { create(:user) }
diff --git a/spec/features/projects/artifacts/file_spec.rb b/spec/features/projects/artifacts/file_spec.rb
index f7eaae12072..b61ee623fec 100644
--- a/spec/features/projects/artifacts/file_spec.rb
+++ b/spec/features/projects/artifacts/file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Artifact file', :js do
+RSpec.describe 'Artifact file', :js do
   let(:project) { create(:project, :public) }
   let(:pipeline) { create(:ci_empty_pipeline, project: project) }
   let(:build) { create(:ci_build, :artifacts, pipeline: pipeline) }
diff --git a/spec/features/projects/artifacts/raw_spec.rb b/spec/features/projects/artifacts/raw_spec.rb
index 0606ab0ed08..d72a35fddf8 100644
--- a/spec/features/projects/artifacts/raw_spec.rb
+++ b/spec/features/projects/artifacts/raw_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Raw artifact', :js do
+RSpec.describe 'Raw artifact', :js do
   let(:project) { create(:project, :public) }
   let(:pipeline) { create(:ci_empty_pipeline, project: project) }
   let(:job) { create(:ci_build, :artifacts, pipeline: pipeline) }
diff --git a/spec/features/projects/artifacts/user_browses_artifacts_spec.rb b/spec/features/projects/artifacts/user_browses_artifacts_spec.rb
index d8c6ef4755d..77e3c7f972d 100644
--- a/spec/features/projects/artifacts/user_browses_artifacts_spec.rb
+++ b/spec/features/projects/artifacts/user_browses_artifacts_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User browses artifacts" do
+RSpec.describe "User browses artifacts" do
   let(:project) { create(:project, :public) }
   let(:pipeline) { create(:ci_empty_pipeline, project: project) }
   let(:job) { create(:ci_build, :artifacts, pipeline: pipeline) }
diff --git a/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb b/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb
index 78ff89799ad..7d6ae03e08e 100644
--- a/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb
+++ b/spec/features/projects/artifacts/user_downloads_artifacts_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User downloads artifacts" do
+RSpec.describe "User downloads artifacts" do
   let_it_be(:project) { create(:project, :repository, :public) }
   let_it_be(:pipeline) { create(:ci_empty_pipeline, status: :success, sha: project.commit.id, project: project) }
   let_it_be(:job) { create(:ci_build, :artifacts, :success, pipeline: pipeline) }
diff --git a/spec/features/projects/badges/coverage_spec.rb b/spec/features/projects/badges/coverage_spec.rb
index d17588bb7b4..4c144037acd 100644
--- a/spec/features/projects/badges/coverage_spec.rb
+++ b/spec/features/projects/badges/coverage_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'test coverage badge' do
+RSpec.describe 'test coverage badge' do
   let!(:user) { create(:user) }
   let!(:project) { create(:project, :private) }
 
diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb
index 7a90457c942..3382bdcd65f 100644
--- a/spec/features/projects/badges/list_spec.rb
+++ b/spec/features/projects/badges/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'list of badges' do
+RSpec.describe 'list of badges' do
   before do
     user = create(:user)
     project = create(:project, :repository)
diff --git a/spec/features/projects/badges/pipeline_badge_spec.rb b/spec/features/projects/badges/pipeline_badge_spec.rb
index b2f09a9d0b7..c24ab5c4058 100644
--- a/spec/features/projects/badges/pipeline_badge_spec.rb
+++ b/spec/features/projects/badges/pipeline_badge_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Pipeline Badge' do
+RSpec.describe 'Pipeline Badge' do
   let_it_be(:project) { create(:project, :repository, :public) }
   let(:ref) { project.default_branch }
 
diff --git a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
index e54137b9492..6bd6634822c 100644
--- a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
+++ b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
+RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
   include TreeHelper
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 9fc70412975..c738c5ee5fa 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'File blob', :js do
+RSpec.describe 'File blob', :js do
   include MobileHelpers
 
   let(:project) { create(:project, :public, :repository) }
@@ -555,6 +555,53 @@ describe 'File blob', :js do
     end
   end
 
+  describe '.gitlab/dashboards/custom-dashboard.yml' do
+    before do
+      project.add_maintainer(project.creator)
+
+      Files::CreateService.new(
+        project,
+        project.creator,
+        start_branch: 'master',
+        branch_name: 'master',
+        commit_message: "Add .gitlab/dashboards/custom-dashboard.yml",
+        file_path: '.gitlab/dashboards/custom-dashboard.yml',
+        file_content: file_content
+      ).execute
+
+      visit_blob('.gitlab/dashboards/custom-dashboard.yml')
+    end
+
+    context 'valid dashboard file' do
+      let(:file_content) { File.read(Rails.root.join('config/prometheus/common_metrics.yml')) }
+
+      it 'displays an auxiliary viewer' do
+        aggregate_failures do
+          # shows that dashboard yaml is valid
+          expect(page).to have_content('Metrics Dashboard YAML definition is valid.')
+
+          # shows a learn more link
+          expect(page).to have_link('Learn more')
+        end
+      end
+    end
+
+    context 'invalid dashboard file' do
+      let(:file_content) { "dashboard: 'invalid'" }
+
+      it 'displays an auxiliary viewer' do
+        aggregate_failures do
+          # shows that dashboard yaml is invalid
+          expect(page).to have_content('Metrics Dashboard YAML definition is invalid:')
+          expect(page).to have_content("panel_groups: can't be blank")
+
+          # shows a learn more link
+          expect(page).to have_link('Learn more')
+        end
+      end
+    end
+  end
+
   context 'LICENSE' do
     before do
       visit_blob('LICENSE')
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index 5d62b2f87bb..56bf31f24ba 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Editing file blob', :js do
+RSpec.describe 'Editing file blob', :js do
   include TreeHelper
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/projects/blobs/shortcuts_blob_spec.rb b/spec/features/projects/blobs/shortcuts_blob_spec.rb
index bc12a8ff007..64d643aa102 100644
--- a/spec/features/projects/blobs/shortcuts_blob_spec.rb
+++ b/spec/features/projects/blobs/shortcuts_blob_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Blob shortcuts', :js do
+RSpec.describe 'Blob shortcuts', :js do
   include TreeHelper
   let(:project) { create(:project, :public, :repository) }
   let(:path) { project.repository.ls_files(project.repository.root_ref)[0] }
diff --git a/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb b/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
index 30878b7fb64..f54bceec2b3 100644
--- a/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
+++ b/spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User creates blob in new project', :js do
+RSpec.describe 'User creates blob in new project', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :empty_repo) }
 
diff --git a/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb
index 09130d34281..5270774b541 100644
--- a/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb
+++ b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User follows pipeline suggest nudge spec when feature is enabled', :js do
+RSpec.describe 'User follows pipeline suggest nudge spec when feature is enabled', :js do
   include CookieHelper
 
   let(:user) { create(:user, :admin) }
diff --git a/spec/features/projects/branches/download_buttons_spec.rb b/spec/features/projects/branches/download_buttons_spec.rb
index e0b0e22823e..569a93a55fc 100644
--- a/spec/features/projects/branches/download_buttons_spec.rb
+++ b/spec/features/projects/branches/download_buttons_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Download buttons in branches page' do
+RSpec.describe 'Download buttons in branches page' do
   let(:user) { create(:user) }
   let(:role) { :developer }
   let(:status) { 'success' }
diff --git a/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb b/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
index 4b6b07f6cda..5f58e446ed9 100644
--- a/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
+++ b/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New Branch Ref Dropdown', :js do
+RSpec.describe 'New Branch Ref Dropdown', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:toggle) { find('.create-from .dropdown-menu-toggle') }
diff --git a/spec/features/projects/branches/user_creates_branch_spec.rb b/spec/features/projects/branches/user_creates_branch_spec.rb
index 8aac188160b..52c860bfe36 100644
--- a/spec/features/projects/branches/user_creates_branch_spec.rb
+++ b/spec/features/projects/branches/user_creates_branch_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User creates branch", :js do
+RSpec.describe "User creates branch", :js do
   include Spec::Support::Helpers::Features::BranchesHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/branches/user_deletes_branch_spec.rb b/spec/features/projects/branches/user_deletes_branch_spec.rb
index 184954c1c78..21a1d31bad4 100644
--- a/spec/features/projects/branches/user_deletes_branch_spec.rb
+++ b/spec/features/projects/branches/user_deletes_branch_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User deletes branch", :js do
+RSpec.describe "User deletes branch", :js do
   let_it_be(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
diff --git a/spec/features/projects/branches/user_views_branches_spec.rb b/spec/features/projects/branches/user_views_branches_spec.rb
index e127e784b94..19d96579785 100644
--- a/spec/features/projects/branches/user_views_branches_spec.rb
+++ b/spec/features/projects/branches/user_views_branches_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User views branches" do
+RSpec.describe "User views branches" do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { project.owner }
 
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index 9dc0f7c90c2..dbd1cebd515 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Branches' do
+RSpec.describe 'Branches' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:repository) { project.repository }
@@ -231,6 +231,44 @@ describe 'Branches' do
     end
   end
 
+  context 'with one or more pipeline', :js do
+    before do
+      sha = create_file(branch_name: "branch")
+      create(:ci_pipeline,
+        project: project,
+        user: user,
+        ref: "branch",
+        sha: sha,
+        status: :success,
+        created_at: 5.months.ago)
+      visit project_branches_path(project)
+    end
+
+    it 'shows pipeline status when available' do
+      page.within first('.all-branches li') do
+        expect(page).to have_css 'a.ci-status-icon-success'
+      end
+    end
+
+    it 'displays a placeholder when not available' do
+      page.all('.all-branches li') do |li|
+        expect(li).to have_css 'svg.s24'
+      end
+    end
+  end
+
+  context 'with no pipelines', :js do
+    before do
+      visit project_branches_path(project)
+    end
+
+    it 'does not show placeholder or pipeline status' do
+      page.all('.all-branches') do |branches|
+        expect(branches).not_to have_css 'svg.s24'
+      end
+    end
+  end
+
   describe 'comparing branches' do
     before do
       sign_in(user)
diff --git a/spec/features/projects/ci/lint_spec.rb b/spec/features/projects/ci/lint_spec.rb
index 521cfb54cd2..f3845bb8dec 100644
--- a/spec/features/projects/ci/lint_spec.rb
+++ b/spec/features/projects/ci/lint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'CI Lint', :js do
+RSpec.describe 'CI Lint', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/classification_label_on_project_pages_spec.rb b/spec/features/projects/classification_label_on_project_pages_spec.rb
index 92f8aa8eb8d..0f07ca7635b 100644
--- a/spec/features/projects/classification_label_on_project_pages_spec.rb
+++ b/spec/features/projects/classification_label_on_project_pages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Classification label on project pages' do
+RSpec.describe 'Classification label on project pages' do
   let(:project) do
     create(:project, external_authorization_classification_label: 'authorized label')
   end
diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
index ce971b158a3..74b477dd85d 100644
--- a/spec/features/projects/clusters/applications_spec.rb
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative '../../../../spec/features/clusters/installing_applications_shared_examples'
 
-describe 'Project-level Cluster Applications', :js do
+RSpec.describe 'Project-level Cluster Applications', :js do
   include GoogleApi::CloudPlatformHelpers
 
   let(:project) { create(:project) }
diff --git a/spec/features/projects/clusters/eks_spec.rb b/spec/features/projects/clusters/eks_spec.rb
index a856376cb4b..c5feef6c6f3 100644
--- a/spec/features/projects/clusters/eks_spec.rb
+++ b/spec/features/projects/clusters/eks_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'AWS EKS Cluster', :js do
+RSpec.describe 'AWS EKS Cluster', :js do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index b35e79bef43..3e1006920e7 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do
+RSpec.describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do
   include GoogleApi::CloudPlatformHelpers
 
   let(:project) { create(:project) }
diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb
index 5c82d848563..15fed0c2727 100644
--- a/spec/features/projects/clusters/user_spec.rb
+++ b/spec/features/projects/clusters/user_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User Cluster', :js do
+RSpec.describe 'User Cluster', :js do
   include GoogleApi::CloudPlatformHelpers
 
   let(:project) { create(:project) }
diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index fc2de4df5ec..1cf214a5c4e 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Clusters', :js do
+RSpec.describe 'Clusters', :js do
   include GoogleApi::CloudPlatformHelpers
 
   let(:project) { create(:project) }
diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb
index d28ff5d3b5f..13f73b8cf44 100644
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'project commit pipelines', :js do
+RSpec.describe 'project commit pipelines', :js do
   let(:project) { create(:project, :repository) }
 
   before do
diff --git a/spec/features/projects/commit/cherry_pick_spec.rb b/spec/features/projects/commit/cherry_pick_spec.rb
index 34b15aeaa25..9fe3f4cd63e 100644
--- a/spec/features/projects/commit/cherry_pick_spec.rb
+++ b/spec/features/projects/commit/cherry_pick_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Cherry-pick Commits' do
+RSpec.describe 'Cherry-pick Commits' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, :repository, namespace: group) }
diff --git a/spec/features/projects/commit/comments/user_adds_comment_spec.rb b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
index bae8e6dc827..a470215186b 100644
--- a/spec/features/projects/commit/comments/user_adds_comment_spec.rb
+++ b/spec/features/projects/commit/comments/user_adds_comment_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User adds a comment on a commit", :js do
+RSpec.describe "User adds a comment on a commit", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
   include RepoHelpers
 
diff --git a/spec/features/projects/commit/comments/user_deletes_comments_spec.rb b/spec/features/projects/commit/comments/user_deletes_comments_spec.rb
index 2993a402e37..431cbb4ffbb 100644
--- a/spec/features/projects/commit/comments/user_deletes_comments_spec.rb
+++ b/spec/features/projects/commit/comments/user_deletes_comments_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User deletes comments on a commit", :js do
+RSpec.describe "User deletes comments on a commit", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
   include RepoHelpers
 
diff --git a/spec/features/projects/commit/comments/user_edits_comments_spec.rb b/spec/features/projects/commit/comments/user_edits_comments_spec.rb
index 29132173674..787d8cdb02b 100644
--- a/spec/features/projects/commit/comments/user_edits_comments_spec.rb
+++ b/spec/features/projects/commit/comments/user_edits_comments_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User edits a comment on a commit", :js do
+RSpec.describe "User edits a comment on a commit", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
   include RepoHelpers
 
diff --git a/spec/features/projects/commit/diff_notes_spec.rb b/spec/features/projects/commit/diff_notes_spec.rb
index 04bd66df28d..ff86047d812 100644
--- a/spec/features/projects/commit/diff_notes_spec.rb
+++ b/spec/features/projects/commit/diff_notes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Commit diff', :js do
+RSpec.describe 'Commit diff', :js do
   include RepoHelpers
 
   let(:user)          { create(:user) }
diff --git a/spec/features/projects/commit/mini_pipeline_graph_spec.rb b/spec/features/projects/commit/mini_pipeline_graph_spec.rb
index 3d9fcfe0f62..9349f36282d 100644
--- a/spec/features/projects/commit/mini_pipeline_graph_spec.rb
+++ b/spec/features/projects/commit/mini_pipeline_graph_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Mini Pipeline Graph in Commit View', :js do
+RSpec.describe 'Mini Pipeline Graph in Commit View', :js do
   let(:project) { create(:project, :public, :repository) }
 
   context 'when commit has pipelines' do
diff --git a/spec/features/projects/commit/user_comments_on_commit_spec.rb b/spec/features/projects/commit/user_comments_on_commit_spec.rb
index f4fea9b9ae0..87a022d74a3 100644
--- a/spec/features/projects/commit/user_comments_on_commit_spec.rb
+++ b/spec/features/projects/commit/user_comments_on_commit_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User comments on commit", :js do
+RSpec.describe "User comments on commit", :js do
   include Spec::Support::Helpers::Features::NotesHelpers
   include RepoHelpers
 
diff --git a/spec/features/projects/commit/user_reverts_commit_spec.rb b/spec/features/projects/commit/user_reverts_commit_spec.rb
index 39ee72a4a99..ca4e070703b 100644
--- a/spec/features/projects/commit/user_reverts_commit_spec.rb
+++ b/spec/features/projects/commit/user_reverts_commit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User reverts a commit', :js do
+RSpec.describe 'User reverts a commit', :js do
   include RepoHelpers
 
   let(:project) { create(:project, :repository, namespace: user.namespace) }
diff --git a/spec/features/projects/commit/user_views_user_status_on_commit_spec.rb b/spec/features/projects/commit/user_views_user_status_on_commit_spec.rb
index c07f6081d2c..71405cf917d 100644
--- a/spec/features/projects/commit/user_views_user_status_on_commit_spec.rb
+++ b/spec/features/projects/commit/user_views_user_status_on_commit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Commit > View user status' do
+RSpec.describe 'Project > Commit > View user status' do
   include RepoHelpers
 
   let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/features/projects/commits/rss_spec.rb b/spec/features/projects/commits/rss_spec.rb
index 0266df48d4a..b521bb865ae 100644
--- a/spec/features/projects/commits/rss_spec.rb
+++ b/spec/features/projects/commits/rss_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Commits RSS' do
+RSpec.describe 'Project Commits RSS' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
   let(:path) { project_commits_path(project, :master) }
diff --git a/spec/features/projects/commits/user_browses_commits_spec.rb b/spec/features/projects/commits/user_browses_commits_spec.rb
index 7e59e36ccb7..2796156bfbf 100644
--- a/spec/features/projects/commits/user_browses_commits_spec.rb
+++ b/spec/features/projects/commits/user_browses_commits_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User browses commits' do
+RSpec.describe 'User browses commits' do
   include RepoHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/compare_spec.rb b/spec/features/projects/compare_spec.rb
index df5cec80ae4..865ae3ad8cb 100644
--- a/spec/features/projects/compare_spec.rb
+++ b/spec/features/projects/compare_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Compare", :js do
+RSpec.describe "Compare", :js do
   let(:user)    { create(:user) }
   let(:project) { create(:project, :repository) }
 
diff --git a/spec/features/projects/container_registry_spec.rb b/spec/features/projects/container_registry_spec.rb
index a75da5f1080..f561149d2ad 100644
--- a/spec/features/projects/container_registry_spec.rb
+++ b/spec/features/projects/container_registry_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Container Registry', :js do
+RSpec.describe 'Container Registry', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
 
@@ -30,10 +30,10 @@ describe 'Container Registry', :js do
       expect(page).to have_content _('There are no container images stored for this project')
     end
 
-    it 'list page has quickstart' do
+    it 'list page has cli commands' do
       visit_container_registry
 
-      expect(page).to have_content _('Quick Start')
+      expect(page).to have_content _('CLI Commands')
     end
   end
 
@@ -84,7 +84,7 @@ describe 'Container Registry', :js do
         expect(service).to receive(:execute).with(container_repository) { { status: :success } }
         expect(Projects::ContainerRepository::DeleteTagsService).to receive(:new).with(container_repository.project, user, tags: ['1']) { service }
 
-        first('.js-delete-registry').click
+        first('[data-testid="singleDeleteButton"]').click
         expect(find('.modal .modal-title')).to have_content _('Remove tag')
         find('.modal .modal-footer .btn-danger').click
       end
diff --git a/spec/features/projects/deploy_keys_spec.rb b/spec/features/projects/deploy_keys_spec.rb
index 687b6461f05..70d47516246 100644
--- a/spec/features/projects/deploy_keys_spec.rb
+++ b/spec/features/projects/deploy_keys_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project deploy keys', :js do
+RSpec.describe 'Project deploy keys', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project_empty_repo) }
 
diff --git a/spec/features/projects/diffs/diff_show_spec.rb b/spec/features/projects/diffs/diff_show_spec.rb
index df94d6debd6..19f111a727b 100644
--- a/spec/features/projects/diffs/diff_show_spec.rb
+++ b/spec/features/projects/diffs/diff_show_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Diff file viewer', :js do
+RSpec.describe 'Diff file viewer', :js do
   let(:project) { create(:project, :public, :repository) }
 
   def visit_commit(sha, anchor: nil)
diff --git a/spec/features/projects/environments/environment_metrics_spec.rb b/spec/features/projects/environments/environment_metrics_spec.rb
index 150df66bdd7..a3b979d0f42 100644
--- a/spec/features/projects/environments/environment_metrics_spec.rb
+++ b/spec/features/projects/environments/environment_metrics_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Environment > Metrics' do
+RSpec.describe 'Environment > Metrics' do
   include PrometheusHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb
index bbd33225bb9..fa10e429af2 100644
--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Environment' do
+RSpec.describe 'Environment' do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:role) { :developer }
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index cee9b6d50ba..b3f671d57a9 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Environments page', :js do
+RSpec.describe 'Environments page', :js do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:role) { :developer }
diff --git a/spec/features/projects/environments_pod_logs_spec.rb b/spec/features/projects/environments_pod_logs_spec.rb
index 32eaf690950..82dafbc6237 100644
--- a/spec/features/projects/environments_pod_logs_spec.rb
+++ b/spec/features/projects/environments_pod_logs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Environment > Pod Logs', :js, :kubeclient do
+RSpec.describe 'Environment > Pod Logs', :js, :kubeclient do
   include KubernetesHelpers
 
   let(:pod_names) { %w(kube-pod) }
diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb
index 9854335a7ad..d84c39de8d8 100644
--- a/spec/features/projects/features_visibility_spec.rb
+++ b/spec/features/projects/features_visibility_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Edit Project Settings' do
+RSpec.describe 'Edit Project Settings' do
   let(:member) { create(:user) }
   let!(:project) { create(:project, :public, :repository) }
   let!(:issue) { create(:issue, project: project) }
@@ -94,7 +94,7 @@ describe 'Edit Project Settings' do
       {
         builds: project_job_path(project, job),
         issues: project_issues_path(project),
-        wiki: project_wiki_path(project, :home),
+        wiki: wiki_path(project.wiki),
         snippets: project_snippets_path(project),
         merge_requests: project_merge_requests_path(project)
       }
diff --git a/spec/features/projects/files/dockerfile_dropdown_spec.rb b/spec/features/projects/files/dockerfile_dropdown_spec.rb
index 756f2f2d493..a99df8a79d8 100644
--- a/spec/features/projects/files/dockerfile_dropdown_spec.rb
+++ b/spec/features/projects/files/dockerfile_dropdown_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User wants to add a Dockerfile file' do
+RSpec.describe 'Projects > Files > User wants to add a Dockerfile file' do
   before do
     project = create(:project, :repository)
     sign_in project.owner
diff --git a/spec/features/projects/files/download_buttons_spec.rb b/spec/features/projects/files/download_buttons_spec.rb
index 871f5212ddd..a486d7517ac 100644
--- a/spec/features/projects/files/download_buttons_spec.rb
+++ b/spec/features/projects/files/download_buttons_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > Download buttons in files tree' do
+RSpec.describe 'Projects > Files > Download buttons in files tree' do
   let(:project) { create(:project, :repository) }
   let(:user) { project.creator }
 
diff --git a/spec/features/projects/files/edit_file_soft_wrap_spec.rb b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
index 53b1a522a8e..ede22204dbd 100644
--- a/spec/features/projects/files/edit_file_soft_wrap_spec.rb
+++ b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User uses soft wrap while editing file', :js do
+RSpec.describe 'Projects > Files > User uses soft wrap while editing file', :js do
   before do
     project = create(:project, :repository)
     user = project.owner
diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb
index 085276f96a8..819864b3def 100644
--- a/spec/features/projects/files/editing_a_file_spec.rb
+++ b/spec/features/projects/files/editing_a_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User wants to edit a file' do
+RSpec.describe 'Projects > Files > User wants to edit a file' do
   let(:project) { create(:project, :repository) }
   let(:user) { project.owner }
   let(:commit_params) do
diff --git a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
index 622764487d8..94190889ace 100644
--- a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
+++ b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User views files page' do
+RSpec.describe 'Projects > Files > User views files page' do
   let(:project) { create(:forked_project_with_submodules) }
   let(:user) { project.owner }
 
diff --git a/spec/features/projects/files/find_file_keyboard_spec.rb b/spec/features/projects/files/find_file_keyboard_spec.rb
index b680be09444..4293183fd9a 100644
--- a/spec/features/projects/files/find_file_keyboard_spec.rb
+++ b/spec/features/projects/files/find_file_keyboard_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > Find file keyboard shortcuts', :js do
+RSpec.describe 'Projects > Files > Find file keyboard shortcuts', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { project.owner }
 
diff --git a/spec/features/projects/files/gitignore_dropdown_spec.rb b/spec/features/projects/files/gitignore_dropdown_spec.rb
index a8c6e780d47..dae1164f7f2 100644
--- a/spec/features/projects/files/gitignore_dropdown_spec.rb
+++ b/spec/features/projects/files/gitignore_dropdown_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User wants to add a .gitignore file' do
+RSpec.describe 'Projects > Files > User wants to add a .gitignore file' do
   before do
     project = create(:project, :repository)
     sign_in project.owner
diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
index 107d426a893..879cb6a65c8 100644
--- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
+++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User wants to add a .gitlab-ci.yml file' do
+RSpec.describe 'Projects > Files > User wants to add a .gitlab-ci.yml file' do
   before do
     project = create(:project, :repository)
     sign_in project.owner
diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
index 9fccb3441d6..ab62e8aabc0 100644
--- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb
+++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > Project owner creates a license file', :js do
+RSpec.describe 'Projects > Files > Project owner creates a license file', :js do
   let(:project) { create(:project, :repository) }
   let(:project_maintainer) { project.owner }
 
diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
index ad6c565c8f9..eed1e7aaf1b 100644
--- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
+++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > Project owner sees a link to create a license file in empty project', :js do
+RSpec.describe 'Projects > Files > Project owner sees a link to create a license file in empty project', :js do
   let(:project) { create(:project_empty_repo) }
   let(:project_maintainer) { project.owner }
 
diff --git a/spec/features/projects/files/template_selector_menu_spec.rb b/spec/features/projects/files/template_selector_menu_spec.rb
index 838a484d62e..51ae6616d4a 100644
--- a/spec/features/projects/files/template_selector_menu_spec.rb
+++ b/spec/features/projects/files/template_selector_menu_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Template selector menu', :js do
+RSpec.describe 'Template selector menu', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/files/template_type_dropdown_spec.rb b/spec/features/projects/files/template_type_dropdown_spec.rb
index 5ea0b9b015f..ca9ce841a92 100644
--- a/spec/features/projects/files/template_type_dropdown_spec.rb
+++ b/spec/features/projects/files/template_type_dropdown_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > Template type dropdown selector', :js do
+RSpec.describe 'Projects > Files > Template type dropdown selector', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { project.owner }
 
diff --git a/spec/features/projects/files/undo_template_spec.rb b/spec/features/projects/files/undo_template_spec.rb
index 887214e1dbf..09ae595490a 100644
--- a/spec/features/projects/files/undo_template_spec.rb
+++ b/spec/features/projects/files/undo_template_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > Template Undo Button', :js do
+RSpec.describe 'Projects > Files > Template Undo Button', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { project.owner }
 
diff --git a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
index e88fad9d3f7..4d9da783f98 100644
--- a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
+++ b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # This is a regression test for https://gitlab.com/gitlab-org/gitlab-foss/issues/37569
-describe 'Projects > Files > User browses a tree with a folder containing only a folder', :js do
+RSpec.describe 'Projects > Files > User browses a tree with a folder containing only a folder', :js do
   let(:project) { create(:project, :empty_repo) }
   let(:user) { project.owner }
 
diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb
index 7e3d8e5c1c5..44b5833a8c8 100644
--- a/spec/features/projects/files/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User browses files" do
+RSpec.describe "User browses files" do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb
index dbeec973865..ecc56b794b2 100644
--- a/spec/features/projects/files/user_browses_lfs_files_spec.rb
+++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User browses LFS files' do
+RSpec.describe 'Projects > Files > User browses LFS files' do
   let(:project) { create(:project, :repository) }
   let(:user) { project.owner }
 
diff --git a/spec/features/projects/files/user_creates_directory_spec.rb b/spec/features/projects/files/user_creates_directory_spec.rb
index 4291f0a74f8..47c5d667f4f 100644
--- a/spec/features/projects/files/user_creates_directory_spec.rb
+++ b/spec/features/projects/files/user_creates_directory_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User creates a directory', :js do
+RSpec.describe 'Projects > Files > User creates a directory', :js do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
diff --git a/spec/features/projects/files/user_creates_files_spec.rb b/spec/features/projects/files/user_creates_files_spec.rb
index 2d4f22e299e..7d412730115 100644
--- a/spec/features/projects/files/user_creates_files_spec.rb
+++ b/spec/features/projects/files/user_creates_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User creates files', :js do
+RSpec.describe 'Projects > Files > User creates files', :js do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb
index 5e36407d9cb..70f125560e0 100644
--- a/spec/features/projects/files/user_deletes_files_spec.rb
+++ b/spec/features/projects/files/user_deletes_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User deletes files', :js do
+RSpec.describe 'Projects > Files > User deletes files', :js do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb
index cc428dce2a8..1bb931e35ec 100644
--- a/spec/features/projects/files/user_edits_files_spec.rb
+++ b/spec/features/projects/files/user_edits_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User edits files', :js do
+RSpec.describe 'Projects > Files > User edits files', :js do
   include ProjectForksHelper
   let(:project) { create(:project, :repository, name: 'Shop') }
   let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
diff --git a/spec/features/projects/files/user_find_file_spec.rb b/spec/features/projects/files/user_find_file_spec.rb
index 72f6ccb20d6..69ea8b0eb5f 100644
--- a/spec/features/projects/files/user_find_file_spec.rb
+++ b/spec/features/projects/files/user_find_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User find project file' do
+RSpec.describe 'User find project file' do
   let(:user)    { create :user }
   let(:project) { create :project, :repository }
 
diff --git a/spec/features/projects/files/user_reads_pipeline_status_spec.rb b/spec/features/projects/files/user_reads_pipeline_status_spec.rb
index 9d38c44b6ef..294a03813cd 100644
--- a/spec/features/projects/files/user_reads_pipeline_status_spec.rb
+++ b/spec/features/projects/files/user_reads_pipeline_status_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'user reads pipeline status', :js do
+RSpec.describe 'user reads pipeline status', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:v110_pipeline) { create_pipeline('v1.1.0', 'success') }
diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
index e1eefdcc40f..1d4085ef21c 100644
--- a/spec/features/projects/files/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User replaces files', :js do
+RSpec.describe 'Projects > Files > User replaces files', :js do
   include DropzoneHelper
 
   let(:fork_message) do
diff --git a/spec/features/projects/files/user_searches_for_files_spec.rb b/spec/features/projects/files/user_searches_for_files_spec.rb
index ff7547bce83..7fd7dfff279 100644
--- a/spec/features/projects/files/user_searches_for_files_spec.rb
+++ b/spec/features/projects/files/user_searches_for_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User searches for files' do
+RSpec.describe 'Projects > Files > User searches for files' do
   let(:user) { project.owner }
 
   before do
diff --git a/spec/features/projects/files/user_uploads_files_spec.rb b/spec/features/projects/files/user_uploads_files_spec.rb
index ecf40969541..944d08df3f3 100644
--- a/spec/features/projects/files/user_uploads_files_spec.rb
+++ b/spec/features/projects/files/user_uploads_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Files > User uploads files' do
+RSpec.describe 'Projects > Files > User uploads files' do
   include DropzoneHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/fork_spec.rb b/spec/features/projects/fork_spec.rb
index bfab4387688..f0ed4013230 100644
--- a/spec/features/projects/fork_spec.rb
+++ b/spec/features/projects/fork_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project fork' do
+RSpec.describe 'Project fork' do
   include ProjectForksHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/forks/fork_list_spec.rb b/spec/features/projects/forks/fork_list_spec.rb
index 3b63d9a4c2d..b48c46ef8cb 100644
--- a/spec/features/projects/forks/fork_list_spec.rb
+++ b/spec/features/projects/forks/fork_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'listing forks of a project' do
+RSpec.describe 'listing forks of a project' do
   include ProjectForksHelper
   include ExternalAuthorizationServiceHelpers
 
diff --git a/spec/features/projects/gfm_autocomplete_load_spec.rb b/spec/features/projects/gfm_autocomplete_load_spec.rb
index ad39dec0a43..b02483be489 100644
--- a/spec/features/projects/gfm_autocomplete_load_spec.rb
+++ b/spec/features/projects/gfm_autocomplete_load_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'GFM autocomplete loading', :js do
+RSpec.describe 'GFM autocomplete loading', :js do
   let(:project) { create(:project) }
 
   before do
diff --git a/spec/features/projects/graph_spec.rb b/spec/features/projects/graph_spec.rb
index 25efb7b28a7..7b9f79c9f7f 100644
--- a/spec/features/projects/graph_spec.rb
+++ b/spec/features/projects/graph_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Graph', :js do
+RSpec.describe 'Project Graph', :js do
   let(:user) { create :user }
   let(:project) { create(:project, :repository, namespace: user.namespace) }
   let(:branch_name) { 'master' }
diff --git a/spec/features/projects/hook_logs/user_reads_log_spec.rb b/spec/features/projects/hook_logs/user_reads_log_spec.rb
index 8c666f5d67a..8513a9374d1 100644
--- a/spec/features/projects/hook_logs/user_reads_log_spec.rb
+++ b/spec/features/projects/hook_logs/user_reads_log_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Hook logs' do
+RSpec.describe 'Hook logs' do
   let(:web_hook_log) { create(:web_hook_log, response_body: '<script>') }
   let(:project) { web_hook_log.web_hook.project }
   let(:user) { create(:user) }
diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb
index 1d6d5ae1b4d..86aeb2bc80c 100644
--- a/spec/features/projects/import_export/export_file_spec.rb
+++ b/spec/features/projects/import_export/export_file_spec.rb
@@ -6,7 +6,7 @@ require 'spec_helper'
 # It looks up for any sensitive word inside the JSON, so if a sensitive word is found
 # we'll have to either include it adding the model that includes it to the +safe_list+
 # or make sure the attribute is blacklisted in the +import_export.yml+ configuration
-describe 'Import/Export - project export integration test', :js do
+RSpec.describe 'Import/Export - project export integration test', :js do
   include Select2Helper
   include ExportFileHelper
 
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 33c7182c084..83ceffa621c 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Import/Export - project import integration test', :js do
+RSpec.describe 'Import/Export - project import integration test', :js do
   include GitHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index 4b6f1672f08..8f1c31f229f 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'issuable templates', :js do
+RSpec.describe 'issuable templates', :js do
   include ProjectForksHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/issues/design_management/user_links_to_designs_in_issue_spec.rb b/spec/features/projects/issues/design_management/user_links_to_designs_in_issue_spec.rb
new file mode 100644
index 00000000000..8d5e99d7e2b
--- /dev/null
+++ b/spec/features/projects/issues/design_management/user_links_to_designs_in_issue_spec.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'viewing issues with design references' do
+  include DesignManagementTestHelpers
+
+  let_it_be(:public_project) { create(:project_empty_repo, :public) }
+  let_it_be(:private_project) { create(:project_empty_repo) }
+
+  let(:user) { create(:user) }
+  let(:design_issue) { create(:issue, project: project) }
+  let(:design_a) { create(:design, :with_file, issue: design_issue) }
+  let(:design_b) { create(:design, :with_file, issue: design_issue) }
+  let(:issue_ref) { design_issue.to_reference(public_project) }
+  let(:design_ref_a) { design_a.to_reference(public_project) }
+  let(:design_ref_b) { design_b.to_reference(public_project) }
+  let(:design_tab_ref) { "#{issue_ref} (designs)" }
+
+  let(:description) do
+    <<~MD
+    The designs I mentioned:
+
+    * #{url_for_designs(design_issue)}
+    * #{url_for_design(design_a)}
+    * #{url_for_design(design_b)}
+    MD
+  end
+
+  def visit_page_with_design_references
+    public_issue = create(:issue, project: public_project, description: description)
+    visit project_issue_path(public_issue.project, public_issue)
+  end
+
+  shared_examples 'successful use of design link references' do
+    before do
+      enable_design_management
+    end
+
+    it 'shows the issue description and design references', :aggregate_failures do
+      visit_page_with_design_references
+
+      expect(page).to have_text('The designs I mentioned')
+      expect(page).to have_link(design_tab_ref)
+      expect(page).to have_link(design_ref_a)
+      expect(page).to have_link(design_ref_b)
+    end
+  end
+
+  context 'the user has access to a public project' do
+    let(:project) { public_project }
+
+    it_behaves_like 'successful use of design link references'
+  end
+
+  context 'the user does not have access to a private project' do
+    let(:project) { private_project }
+
+    it 'redacts inaccessible design references', :aggregate_failures do
+      visit_page_with_design_references
+
+      expect(page).to have_text('The designs I mentioned')
+      expect(page).not_to have_link(issue_ref)
+      expect(page).not_to have_link(design_tab_ref)
+      expect(page).not_to have_link(design_ref_a)
+      expect(page).not_to have_link(design_ref_b)
+    end
+  end
+
+  context 'the user has access to a private project' do
+    let(:project) { private_project }
+
+    before do
+      project.add_developer(user)
+      sign_in(user)
+    end
+
+    it_behaves_like 'successful use of design link references'
+
+    context 'design management is entirely disabled' do
+      it 'processes design links as issue references', :aggregate_failures do
+        enable_design_management(false)
+
+        visit_page_with_design_references
+
+        expect(page).to have_text('The designs I mentioned')
+        expect(page).to have_link(issue_ref)
+        expect(page).not_to have_link(design_tab_ref)
+        expect(page).not_to have_link(design_ref_a)
+        expect(page).not_to have_link(design_ref_b)
+      end
+    end
+
+    context 'design management is enabled, but the filter is disabled globally' do
+      before do
+        enable_design_management
+        stub_feature_flags(
+          Banzai::Filter::DesignReferenceFilter::FEATURE_FLAG => false
+        )
+      end
+
+      it 'processes design tab links successfully, and design references as issue references', :aggregate_failures do
+        visit_page_with_design_references
+
+        expect(page).to have_text('The designs I mentioned')
+        expect(page).to have_link(design_tab_ref)
+        expect(page).to have_link(issue_ref)
+        expect(page).not_to have_link(design_ref_a)
+        expect(page).not_to have_link(design_ref_b)
+      end
+    end
+
+    context 'design management is enabled, and the filter is enabled for the current project' do
+      before do
+        stub_feature_flags(
+          Banzai::Filter::DesignReferenceFilter::FEATURE_FLAG => public_project
+        )
+      end
+
+      it_behaves_like 'successful use of design link references'
+    end
+  end
+end
diff --git a/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb b/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb
index d9a72f2d5c5..f871ca60596 100644
--- a/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb
+++ b/spec/features/projects/issues/design_management/user_paginates_designs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User paginates issue designs', :js do
+RSpec.describe 'User paginates issue designs', :js do
   include DesignManagementTestHelpers
 
   let(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/projects/issues/design_management/user_permissions_upload_spec.rb b/spec/features/projects/issues/design_management/user_permissions_upload_spec.rb
index 2238e86a47f..902a84afc83 100644
--- a/spec/features/projects/issues/design_management/user_permissions_upload_spec.rb
+++ b/spec/features/projects/issues/design_management/user_permissions_upload_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User design permissions', :js do
+RSpec.describe 'User design permissions', :js do
   include DesignManagementTestHelpers
 
   let(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb b/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
index d160ab95a65..66b449a9de5 100644
--- a/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
+++ b/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User uploads new design', :js do
+RSpec.describe 'User uploads new design', :js do
   include DesignManagementTestHelpers
 
   let_it_be(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/projects/issues/design_management/user_views_design_images_spec.rb b/spec/features/projects/issues/design_management/user_views_design_images_spec.rb
index 3d0f4df55c4..4a4c33cb881 100644
--- a/spec/features/projects/issues/design_management/user_views_design_images_spec.rb
+++ b/spec/features/projects/issues/design_management/user_views_design_images_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Users views raw design image files' do
+RSpec.describe 'Users views raw design image files' do
   include DesignManagementTestHelpers
 
   let_it_be(:project) { create(:project, :public) }
diff --git a/spec/features/projects/issues/design_management/user_views_design_spec.rb b/spec/features/projects/issues/design_management/user_views_design_spec.rb
index 707049b0068..527442d5339 100644
--- a/spec/features/projects/issues/design_management/user_views_design_spec.rb
+++ b/spec/features/projects/issues/design_management/user_views_design_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views issue designs', :js do
+RSpec.describe 'User views issue designs', :js do
   include DesignManagementTestHelpers
 
   let_it_be(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/projects/issues/design_management/user_views_designs_spec.rb b/spec/features/projects/issues/design_management/user_views_designs_spec.rb
index a4fb7456922..d371ae1aad7 100644
--- a/spec/features/projects/issues/design_management/user_views_designs_spec.rb
+++ b/spec/features/projects/issues/design_management/user_views_designs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views issue designs', :js do
+RSpec.describe 'User views issue designs', :js do
   include DesignManagementTestHelpers
 
   let_it_be(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb b/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb
index a9e4aa899a7..5bc1271309c 100644
--- a/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb
+++ b/spec/features/projects/issues/design_management/user_views_designs_with_svg_xss_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views an SVG design that contains XSS', :js do
+RSpec.describe 'User views an SVG design that contains XSS', :js do
   include DesignManagementTestHelpers
 
   let(:project) { create(:project_empty_repo, :public) }
diff --git a/spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb b/spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb
index 6c8f4b51ea0..6feefff9207 100644
--- a/spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb
+++ b/spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'viewing an issue with cross project references' do
+RSpec.describe 'viewing an issue with cross project references' do
   include ExternalAuthorizationServiceHelpers
   include Gitlab::Routing.url_helpers
 
diff --git a/spec/features/projects/jobs/permissions_spec.rb b/spec/features/projects/jobs/permissions_spec.rb
index d78cf674dc6..7f46a369dd6 100644
--- a/spec/features/projects/jobs/permissions_spec.rb
+++ b/spec/features/projects/jobs/permissions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Jobs Permissions' do
+RSpec.describe 'Project Jobs Permissions' do
   let(:user) { create(:user) }
   let(:group) { create(:group, name: 'some group') }
   let(:project) { create(:project, :repository, namespace: group) }
diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb
index 16ba1c1b73d..67299e852b3 100644
--- a/spec/features/projects/jobs/user_browses_job_spec.rb
+++ b/spec/features/projects/jobs/user_browses_job_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User browses a job', :js do
+RSpec.describe 'User browses a job', :js do
   let(:user) { create(:user) }
   let(:user_access_level) { :developer }
   let(:project) { create(:project, :repository, namespace: user.namespace) }
diff --git a/spec/features/projects/jobs/user_browses_jobs_spec.rb b/spec/features/projects/jobs/user_browses_jobs_spec.rb
index 44709cb1230..c768b0e281c 100644
--- a/spec/features/projects/jobs/user_browses_jobs_spec.rb
+++ b/spec/features/projects/jobs/user_browses_jobs_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User browses jobs' do
+RSpec.describe 'User browses jobs' do
   let!(:build) { create(:ci_build, :coverage, pipeline: pipeline) }
   let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.sha, ref: 'master') }
   let(:project) { create(:project, :repository, namespace: user.namespace) }
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index a17793bc6d6..e78e8989575 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'tempfile'
 
-describe 'Jobs', :clean_gitlab_redis_shared_state do
+RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state do
   include Gitlab::Routing
   include ProjectForksHelper
 
@@ -940,7 +940,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
 
         it 'renders message about job being stuck because of no runners with the specified tags' do
           expect(page).to have_css('.js-stuck-with-tags')
-          expect(page).to have_content("This job is stuck because you don't have any active runners online with any of these tags assigned to them:")
+          expect(page).to have_content("This job is stuck because you don't have any active runners online or available with any of these tags assigned to them:")
         end
       end
 
@@ -950,7 +950,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
 
         it 'renders message about job being stuck because of no runners with the specified tags' do
           expect(page).to have_css('.js-stuck-with-tags')
-          expect(page).to have_content("This job is stuck because you don't have any active runners online with any of these tags assigned to them:")
+          expect(page).to have_content("This job is stuck because you don't have any active runners online or available with any of these tags assigned to them:")
         end
       end
 
diff --git a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
index 503ac8caddf..66d61e629df 100644
--- a/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
+++ b/spec/features/projects/labels/issues_sorted_by_priority_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Issue prioritization' do
+RSpec.describe 'Issue prioritization' do
   let(:user)    { create(:user) }
   let(:project) { create(:project, name: 'test', namespace: user.namespace) }
 
diff --git a/spec/features/projects/labels/search_labels_spec.rb b/spec/features/projects/labels/search_labels_spec.rb
index e2eec7400ff..04dfd4ca5f1 100644
--- a/spec/features/projects/labels/search_labels_spec.rb
+++ b/spec/features/projects/labels/search_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Search for labels', :js do
+RSpec.describe 'Search for labels', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let!(:label1) { create(:label, title: 'Foo', description: 'Lorem ipsum', project: project) }
diff --git a/spec/features/projects/labels/sort_labels_spec.rb b/spec/features/projects/labels/sort_labels_spec.rb
index 01c3f251173..83559b816d2 100644
--- a/spec/features/projects/labels/sort_labels_spec.rb
+++ b/spec/features/projects/labels/sort_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Sort labels', :js do
+RSpec.describe 'Sort labels', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let!(:label1) { create(:label, title: 'Foo', description: 'Lorem ipsum', project: project) }
diff --git a/spec/features/projects/labels/subscription_spec.rb b/spec/features/projects/labels/subscription_spec.rb
index 1d0f9e73a1b..7ca8a542c21 100644
--- a/spec/features/projects/labels/subscription_spec.rb
+++ b/spec/features/projects/labels/subscription_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Labels subscription' do
+RSpec.describe 'Labels subscription' do
   let(:user)     { create(:user) }
   let(:group)    { create(:group) }
   let(:project)  { create(:project, :public, namespace: group) }
diff --git a/spec/features/projects/labels/update_prioritization_spec.rb b/spec/features/projects/labels/update_prioritization_spec.rb
index 3a37ee6623d..706ea92c086 100644
--- a/spec/features/projects/labels/update_prioritization_spec.rb
+++ b/spec/features/projects/labels/update_prioritization_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Prioritize labels' do
+RSpec.describe 'Prioritize labels' do
   include DragTo
 
   let(:user)     { create(:user) }
diff --git a/spec/features/projects/labels/user_creates_labels_spec.rb b/spec/features/projects/labels/user_creates_labels_spec.rb
index 180cd8eff14..001d23cd2c9 100644
--- a/spec/features/projects/labels/user_creates_labels_spec.rb
+++ b/spec/features/projects/labels/user_creates_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User creates labels" do
+RSpec.describe "User creates labels" do
   let_it_be(:project) { create(:project_empty_repo, :public) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/features/projects/labels/user_edits_labels_spec.rb b/spec/features/projects/labels/user_edits_labels_spec.rb
index add959ccda6..8300a1a8542 100644
--- a/spec/features/projects/labels/user_edits_labels_spec.rb
+++ b/spec/features/projects/labels/user_edits_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User edits labels" do
+RSpec.describe "User edits labels" do
   let_it_be(:project) { create(:project_empty_repo, :public) }
   let_it_be(:label) { create(:label, project: project) }
   let_it_be(:user) { create(:user) }
diff --git a/spec/features/projects/labels/user_promotes_label_spec.rb b/spec/features/projects/labels/user_promotes_label_spec.rb
index cf7320d3cf9..4cb22c2e48c 100644
--- a/spec/features/projects/labels/user_promotes_label_spec.rb
+++ b/spec/features/projects/labels/user_promotes_label_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User promotes label' do
+RSpec.describe 'User promotes label' do
   let_it_be(:group) { create(:group) }
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, namespace: group) }
diff --git a/spec/features/projects/labels/user_removes_labels_spec.rb b/spec/features/projects/labels/user_removes_labels_spec.rb
index 459adeeec30..217f86b92cf 100644
--- a/spec/features/projects/labels/user_removes_labels_spec.rb
+++ b/spec/features/projects/labels/user_removes_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User removes labels" do
+RSpec.describe "User removes labels" do
   let(:project) { create(:project_empty_repo, :public) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/labels/user_sees_breadcrumb_links_spec.rb b/spec/features/projects/labels/user_sees_breadcrumb_links_spec.rb
index 68a924e4fad..f9c65c08ec0 100644
--- a/spec/features/projects/labels/user_sees_breadcrumb_links_spec.rb
+++ b/spec/features/projects/labels/user_sees_breadcrumb_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New project label breadcrumb' do
+RSpec.describe 'New project label breadcrumb' do
   let(:project) { create(:project) }
   let(:user) { project.creator }
 
diff --git a/spec/features/projects/labels/user_sees_links_to_issuables_spec.rb b/spec/features/projects/labels/user_sees_links_to_issuables_spec.rb
index f60e7e9703f..11aa53fd963 100644
--- a/spec/features/projects/labels/user_sees_links_to_issuables_spec.rb
+++ b/spec/features/projects/labels/user_sees_links_to_issuables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Labels > User sees links to issuables' do
+RSpec.describe 'Projects > Labels > User sees links to issuables' do
   let_it_be(:user) { create(:user) }
 
   before do
diff --git a/spec/features/projects/labels/user_views_labels_spec.rb b/spec/features/projects/labels/user_views_labels_spec.rb
index 7f70ac903d6..da8520ca8fb 100644
--- a/spec/features/projects/labels/user_views_labels_spec.rb
+++ b/spec/features/projects/labels/user_views_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User views labels" do
+RSpec.describe "User views labels" do
   let_it_be(:project) { create(:project_empty_repo, :public) }
   let_it_be(:user) { create(:user) }
   let(:label_titles) { %w[bug enhancement feature] }
diff --git a/spec/features/projects/members/anonymous_user_sees_members_spec.rb b/spec/features/projects/members/anonymous_user_sees_members_spec.rb
index 096cf97551a..3b0f00c5494 100644
--- a/spec/features/projects/members/anonymous_user_sees_members_spec.rb
+++ b/spec/features/projects/members/anonymous_user_sees_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Anonymous user sees members' do
+RSpec.describe 'Projects > Members > Anonymous user sees members' do
   let(:user) { create(:user) }
   let(:group) { create(:group, :public) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
index b6f6e2ca85f..c8a9f959188 100644
--- a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
+++ b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Group member cannot leave group project' do
+RSpec.describe 'Projects > Members > Group member cannot leave group project' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
diff --git a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
index cf9441bcd55..34c870b8a96 100644
--- a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
+++ b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Group member cannot request access to their group project' do
+RSpec.describe 'Projects > Members > Group member cannot request access to their group project' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
diff --git a/spec/features/projects/members/group_members_spec.rb b/spec/features/projects/members/group_members_spec.rb
index d37f912a2bc..3060d2c6a43 100644
--- a/spec/features/projects/members/group_members_spec.rb
+++ b/spec/features/projects/members/group_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects members' do
+RSpec.describe 'Projects members' do
   let(:user) { create(:user) }
   let(:developer) { create(:user) }
   let(:group) { create(:group, :public) }
@@ -21,7 +21,7 @@ describe 'Projects members' do
   context 'with a group invitee' do
     before do
       group_invitee
-      visit project_settings_members_path(project)
+      visit project_project_members_path(project)
     end
 
     it 'does not appear in the project members page' do
@@ -70,7 +70,7 @@ describe 'Projects members' do
     before do
       group_invitee
       project_invitee
-      visit project_settings_members_path(project)
+      visit project_project_members_path(project)
     end
 
     it 'shows the project invitee, the project developer, and the group owner' do
@@ -91,7 +91,7 @@ describe 'Projects members' do
   context 'with a group requester' do
     before do
       group.request_access(group_requester)
-      visit project_settings_members_path(project)
+      visit project_project_members_path(project)
     end
 
     it 'does not appear in the project members page' do
@@ -105,7 +105,7 @@ describe 'Projects members' do
     before do
       group.request_access(group_requester)
       project.request_access(project_requester)
-      visit project_settings_members_path(project)
+      visit project_project_members_path(project)
     end
 
     it 'shows the project requester, the project developer, and the group owner' do
@@ -129,7 +129,7 @@ describe 'Projects members' do
     it_behaves_like 'showing user status' do
       let(:user_with_status) { developer }
 
-      subject { visit project_settings_members_path(project) }
+      subject { visit project_project_members_path(project) }
     end
   end
 end
diff --git a/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb b/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb
index ecd55f71c84..ec86b7db4fa 100644
--- a/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb
+++ b/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Group requester cannot request access to project', :js do
+RSpec.describe 'Projects > Members > Group requester cannot request access to project', :js do
   let(:user) { create(:user) }
   let(:owner) { create(:user) }
   let(:group) { create(:group, :public) }
diff --git a/spec/features/projects/members/groups_with_access_list_spec.rb b/spec/features/projects/members/groups_with_access_list_spec.rb
index 6e8d1a945e1..2ee6bc103e9 100644
--- a/spec/features/projects/members/groups_with_access_list_spec.rb
+++ b/spec/features/projects/members/groups_with_access_list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Groups with access list', :js do
+RSpec.describe 'Projects > Members > Groups with access list', :js do
   let(:user) { create(:user) }
   let(:group) { create(:group, :public) }
   let(:project) { create(:project, :public) }
@@ -12,7 +12,7 @@ describe 'Projects > Members > Groups with access list', :js do
     @group_link = create(:project_group_link, project: project, group: group)
 
     sign_in(user)
-    visit project_settings_members_path(project)
+    visit project_project_members_path(project)
   end
 
   it 'updates group access level' do
@@ -24,7 +24,7 @@ describe 'Projects > Members > Groups with access list', :js do
 
     wait_for_requests
 
-    visit project_settings_members_path(project)
+    visit project_project_members_path(project)
 
     expect(first('.group_member')).to have_content('Guest')
   end
diff --git a/spec/features/projects/members/invite_group_spec.rb b/spec/features/projects/members/invite_group_spec.rb
index e76637039c6..058cbfff662 100644
--- a/spec/features/projects/members/invite_group_spec.rb
+++ b/spec/features/projects/members/invite_group_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Members > Invite group', :js do
+RSpec.describe 'Project > Members > Invite group', :js do
   include Select2Helper
   include ActionView::Helpers::DateHelper
 
@@ -11,14 +11,14 @@ describe 'Project > Members > Invite group', :js do
   describe 'Share with group lock' do
     shared_examples 'the project can be shared with groups' do
       it 'the "Invite group" tab exists' do
-        visit project_settings_members_path(project)
+        visit project_project_members_path(project)
         expect(page).to have_selector('#invite-group-tab')
       end
     end
 
     shared_examples 'the project cannot be shared with groups' do
       it 'the "Invite group" tab does not exist' do
-        visit project_settings_members_path(project)
+        visit project_project_members_path(project)
         expect(page).not_to have_selector('#invite-group-tab')
       end
     end
@@ -37,7 +37,9 @@ describe 'Project > Members > Invite group', :js do
         it_behaves_like 'the project can be shared with groups'
 
         it 'the project can be shared with another group' do
-          visit project_settings_members_path(project)
+          visit project_project_members_path(project)
+
+          expect(page).not_to have_css('.project-members-groups')
 
           click_on 'invite-group-tab'
 
@@ -118,7 +120,7 @@ describe 'Project > Members > Invite group', :js do
       group.add_guest(maintainer)
       sign_in(maintainer)
 
-      visit project_settings_members_path(project)
+      visit project_project_members_path(project)
 
       click_on 'invite-group-tab'
 
@@ -151,7 +153,7 @@ describe 'Project > Members > Invite group', :js do
         create(:group).add_owner(maintainer)
         create(:group).add_owner(maintainer)
 
-        visit project_settings_members_path(project)
+        visit project_project_members_path(project)
 
         click_link 'Invite group'
 
@@ -184,7 +186,7 @@ describe 'Project > Members > Invite group', :js do
       end
 
       it 'the groups dropdown does not show ancestors' do
-        visit project_settings_members_path(project)
+        visit project_project_members_path(project)
 
         click_on 'invite-group-tab'
         click_link 'Search for a group'
diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb
index f404699b2f6..f51ebde8f80 100644
--- a/spec/features/projects/members/list_spec.rb
+++ b/spec/features/projects/members/list_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project members list' do
+RSpec.describe 'Project members list' do
   include Select2Helper
   include Spec::Support::Helpers::Features::ListRowsHelpers
 
@@ -113,6 +113,6 @@ describe 'Project members list' do
   end
 
   def visit_members_page
-    visit project_settings_members_path(project)
+    visit project_project_members_path(project)
   end
 end
diff --git 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
index cbcd03b33ce..979bbd57aa3 100644
--- 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
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Maintainer adds member with expiration date', :js do
+RSpec.describe 'Projects > Members > Maintainer adds member with expiration date', :js do
   include Select2Helper
   include ActiveSupport::Testing::TimeHelpers
 
diff --git a/spec/features/projects/members/master_manages_access_requests_spec.rb b/spec/features/projects/members/master_manages_access_requests_spec.rb
index f113fb643f8..4c3eaa93352 100644
--- a/spec/features/projects/members/master_manages_access_requests_spec.rb
+++ b/spec/features/projects/members/master_manages_access_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Maintainer manages access requests' do
+RSpec.describe 'Projects > Members > Maintainer manages access requests' do
   it_behaves_like 'Maintainer manages access requests' do
     let(:entity) { create(:project, :public) }
     let(:members_page_path) { project_project_members_path(entity) }
diff --git a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
index e2b57472b2e..fa02e815867 100644
--- a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
+++ b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Member cannot request access to their project' do
+RSpec.describe 'Projects > Members > Member cannot request access to their project' do
   let(:member) { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/features/projects/members/member_leaves_project_spec.rb b/spec/features/projects/members/member_leaves_project_spec.rb
index cb7a405e821..aa7633c3b28 100644
--- a/spec/features/projects/members/member_leaves_project_spec.rb
+++ b/spec/features/projects/members/member_leaves_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Member leaves project' do
+RSpec.describe 'Projects > Members > Member leaves project' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
diff --git a/spec/features/projects/members/owner_cannot_leave_project_spec.rb b/spec/features/projects/members/owner_cannot_leave_project_spec.rb
index 781c584796d..fbe8583b236 100644
--- a/spec/features/projects/members/owner_cannot_leave_project_spec.rb
+++ b/spec/features/projects/members/owner_cannot_leave_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Owner cannot leave project' do
+RSpec.describe 'Projects > Members > Owner cannot leave project' do
   let(:project) { create(:project) }
 
   before do
diff --git a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
index 5643a29b4e4..5e6e3d4d7f2 100644
--- a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
+++ b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Owner cannot request access to their own project' do
+RSpec.describe 'Projects > Members > Owner cannot request access to their own project' do
   let(:project) { create(:project) }
 
   before do
diff --git a/spec/features/projects/members/sorting_spec.rb b/spec/features/projects/members/sorting_spec.rb
index 12f485317d8..be27cbc0d66 100644
--- a/spec/features/projects/members/sorting_spec.rb
+++ b/spec/features/projects/members/sorting_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Sorting' do
+RSpec.describe 'Projects > Members > Sorting' do
   let(:maintainer) { create(:user, name: 'John Doe') }
   let(:developer) { create(:user, name: 'Mary Jane', last_sign_in_at: 5.days.ago) }
   let(:project) { create(:project, namespace: maintainer.namespace, creator: maintainer) }
diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb
index 7e7faca9741..a339130ee3c 100644
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > User requests access', :js do
+RSpec.describe 'Projects > Members > User requests access', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, :repository) }
   let(:maintainer) { project.owner }
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb
index 950af8b0ae0..e3d8534ace9 100644
--- a/spec/features/projects/merge_request_button_spec.rb
+++ b/spec/features/projects/merge_request_button_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge Request button' do
+RSpec.describe 'Merge Request button' do
   shared_examples 'Merge request button only shown when allowed' do
     let(:user) { create(:user) }
     let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/projects/milestones/milestone_spec.rb b/spec/features/projects/milestones/milestone_spec.rb
index fb9667cd67d..9ffb1746f3e 100644
--- a/spec/features/projects/milestones/milestone_spec.rb
+++ b/spec/features/projects/milestones/milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project milestone' do
+RSpec.describe 'Project milestone' do
   let(:user) { create(:user) }
   let(:project) { create(:project, name: 'test', namespace: user.namespace) }
   let(:milestone) { create(:milestone, project: project) }
diff --git a/spec/features/projects/milestones/milestones_sorting_spec.rb b/spec/features/projects/milestones/milestones_sorting_spec.rb
index 77cf696fb7c..565c61cfaa0 100644
--- a/spec/features/projects/milestones/milestones_sorting_spec.rb
+++ b/spec/features/projects/milestones/milestones_sorting_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Milestones sorting', :js do
+RSpec.describe 'Milestones sorting', :js do
   let(:user)    { create(:user) }
   let(:project) { create(:project, name: 'test', namespace: user.namespace) }
 
diff --git a/spec/features/projects/milestones/new_spec.rb b/spec/features/projects/milestones/new_spec.rb
index b1b74bed59d..170268297cd 100644
--- a/spec/features/projects/milestones/new_spec.rb
+++ b/spec/features/projects/milestones/new_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Creating a new project milestone', :js do
+RSpec.describe 'Creating a new project milestone', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, name: 'test', namespace: user.namespace) }
 
diff --git a/spec/features/projects/milestones/user_interacts_with_labels_spec.rb b/spec/features/projects/milestones/user_interacts_with_labels_spec.rb
index 0177871599a..d658599c52b 100644
--- a/spec/features/projects/milestones/user_interacts_with_labels_spec.rb
+++ b/spec/features/projects/milestones/user_interacts_with_labels_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User interacts with labels' do
+RSpec.describe 'User interacts with labels' do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let(:milestone) { create(:milestone, project: project, title: 'v2.2', description: '# Description header') }
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index 1797ca8aa7d..94d79d60aeb 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project navbar' do
+RSpec.describe 'Project navbar' do
   include NavbarStructureHelper
   include WaitForRequests
 
diff --git a/spec/features/projects/network_graph_spec.rb b/spec/features/projects/network_graph_spec.rb
index 2f6a2e90ab9..4ae809399b6 100644
--- a/spec/features/projects/network_graph_spec.rb
+++ b/spec/features/projects/network_graph_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Network Graph', :js do
+RSpec.describe 'Project Network Graph', :js do
   let(:user) { create :user }
   let(:project) { create :project, :repository, namespace: user.namespace }
 
diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb
index 22a0d268243..6a2ec9aa4a8 100644
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'New project' do
+RSpec.describe 'New project' do
   include Select2Helper
 
   context 'as a user' do
diff --git a/spec/features/projects/pages_lets_encrypt_spec.rb b/spec/features/projects/pages_lets_encrypt_spec.rb
index da9b191271a..302e9f5e533 100644
--- a/spec/features/projects/pages_lets_encrypt_spec.rb
+++ b/spec/features/projects/pages_lets_encrypt_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe "Pages with Let's Encrypt", :https_pages_enabled do
+RSpec.describe "Pages with Let's Encrypt", :https_pages_enabled do
   include LetsEncryptHelpers
 
   let(:project) { create(:project, pages_https_only: false) }
diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb
index faa2b3c9424..e1ace817c72 100644
--- a/spec/features/projects/pages_spec.rb
+++ b/spec/features/projects/pages_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-shared_examples 'pages settings editing' do
+RSpec.shared_examples 'pages settings editing' do
   let_it_be(:project) { create(:project, pages_https_only: false) }
   let(:user) { create(:user) }
   let(:role) { :maintainer }
@@ -394,7 +394,7 @@ shared_examples 'pages settings editing' do
   end
 end
 
-describe 'Pages', :js do
+RSpec.describe 'Pages', :js do
   include LetsEncryptHelpers
 
   context 'when editing normally' do
diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb
index c21b1e36f9a..921bbbfbe7d 100644
--- a/spec/features/projects/pipeline_schedules_spec.rb
+++ b/spec/features/projects/pipeline_schedules_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Pipeline Schedules', :js do
+RSpec.describe 'Pipeline Schedules', :js do
   include PipelineSchedulesHelper
 
   let!(:project) { create(:project, :repository) }
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index de81547887b..c6a002ad18b 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Pipeline', :js do
+RSpec.describe 'Pipeline', :js do
   include RoutesHelpers
   include ProjectForksHelper
   include ::ExclusiveLeaseHelpers
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 7634100347e..0e33204f851 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Pipelines', :js do
+RSpec.describe 'Pipelines', :js do
   include ProjectForksHelper
 
   let(:project) { create(:project) }
@@ -453,10 +453,12 @@ describe 'Pipelines', :js do
       context 'downloadable pipelines' do
         context 'with artifacts' do
           let!(:with_artifacts) do
-            create(:ci_build, :artifacts, :success,
+            build = create(:ci_build, :success,
               pipeline: pipeline,
               name: 'rspec tests',
               stage: 'test')
+
+            create(:ci_job_artifact, :codequality, job: build)
           end
 
           before do
@@ -470,7 +472,7 @@ describe 'Pipelines', :js do
           it 'has artifacts download dropdown' do
             find('.js-pipeline-dropdown-download').click
 
-            expect(page).to have_link(with_artifacts.name)
+            expect(page).to have_link(with_artifacts.file_type)
           end
 
           it 'has download attribute on download links' do
diff --git a/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb b/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb
index 673766073a2..6745eb1a3fb 100644
--- a/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb
+++ b/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Raw > User interacts with raw endpoint' do
+RSpec.describe 'Projects > Raw > User interacts with raw endpoint' do
   include RepoHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/releases/user_views_edit_release_spec.rb b/spec/features/projects/releases/user_views_edit_release_spec.rb
index 217d6a25a23..4ed1be6db6b 100644
--- a/spec/features/projects/releases/user_views_edit_release_spec.rb
+++ b/spec/features/projects/releases/user_views_edit_release_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User edits Release', :js do
+RSpec.describe 'User edits Release', :js do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:release) { create(:release, project: project, name: 'The first release' ) }
   let_it_be(:user) { create(:user) }
diff --git a/spec/features/projects/releases/user_views_release_spec.rb b/spec/features/projects/releases/user_views_release_spec.rb
index 6120acb4f1f..c82588746a8 100644
--- a/spec/features/projects/releases/user_views_release_spec.rb
+++ b/spec/features/projects/releases/user_views_release_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views Release', :js do
+RSpec.describe 'User views Release', :js do
   let(:project) { create(:project, :repository) }
   let(:release) { create(:release, project: project, name: 'The first release' ) }
   let(:user) { create(:user) }
diff --git a/spec/features/projects/releases/user_views_releases_spec.rb b/spec/features/projects/releases/user_views_releases_spec.rb
index e21d8ec16e1..962d5551631 100644
--- a/spec/features/projects/releases/user_views_releases_spec.rb
+++ b/spec/features/projects/releases/user_views_releases_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views releases', :js do
+RSpec.describe 'User views releases', :js do
   let_it_be(:project) { create(:project, :repository, :private) }
   let_it_be(:release) { create(:release, project: project, name: 'The first release' ) }
   let_it_be(:maintainer) { create(:user) }
@@ -26,47 +26,65 @@ describe 'User views releases', :js do
       expect(page).not_to have_content('Upcoming Release')
     end
 
-    context 'when there is a link as an asset' do
-      let!(:release_link) { create(:release_link, release: release, url: url ) }
-      let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
-      let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release) << release_link.filepath }
-
-      it 'sees the link' do
-        visit project_releases_path(project)
-
-        page.within('.js-assets-list') do
-          expect(page).to have_link release_link.name, href: direct_asset_link
-          expect(page).not_to have_content('(external source)')
-        end
-      end
-
-      context 'when there is a link redirect' do
-        let!(:release_link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) }
+    shared_examples 'asset link tests' do
+      context 'when there is a link as an asset' do
+        let!(:release_link) { create(:release_link, release: release, url: url ) }
         let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
+        let(:direct_asset_link) { Gitlab::Routing.url_helpers.project_release_url(project, release) << release_link.filepath }
 
         it 'sees the link' do
           visit project_releases_path(project)
 
           page.within('.js-assets-list') do
             expect(page).to have_link release_link.name, href: direct_asset_link
-            expect(page).not_to have_content('(external source)')
+            expect(page).not_to have_css('[data-testid="external-link-indicator"]')
           end
         end
-      end
 
-      context 'when url points to external resource' do
-        let(:url) { 'http://google.com/download' }
+        context 'when there is a link redirect' do
+          let!(:release_link) { create(:release_link, release: release, name: 'linux-amd64 binaries', filepath: '/binaries/linux-amd64', url: url) }
+          let(:url) { "#{project.web_url}/-/jobs/1/artifacts/download" }
 
-        it 'sees that the link is external resource' do
-          visit project_releases_path(project)
+          it 'sees the link' do
+            visit project_releases_path(project)
 
-          page.within('.js-assets-list') do
-            expect(page).to have_content('(external source)')
+            page.within('.js-assets-list') do
+              expect(page).to have_link release_link.name, href: direct_asset_link
+              expect(page).not_to have_css('[data-testid="external-link-indicator"]')
+            end
+          end
+        end
+
+        context 'when url points to external resource' do
+          let(:url) { 'http://google.com/download' }
+
+          it 'sees that the link is external resource' do
+            visit project_releases_path(project)
+
+            page.within('.js-assets-list') do
+              expect(page).to have_css('[data-testid="external-link-indicator"]')
+            end
           end
         end
       end
     end
 
+    context 'when the release_asset_link_type feature flag is enabled' do
+      before do
+        stub_feature_flags(release_asset_link_type: true)
+      end
+
+      it_behaves_like 'asset link tests'
+    end
+
+    context 'when the release_asset_link_type feature flag is disabled' do
+      before do
+        stub_feature_flags(release_asset_link_type: false)
+      end
+
+      it_behaves_like 'asset link tests'
+    end
+
     context 'with an upcoming release' do
       let(:tomorrow) { Time.zone.now + 1.day }
       let!(:release) { create(:release, project: project, released_at: tomorrow ) }
@@ -80,7 +98,7 @@ describe 'User views releases', :js do
 
     context 'with a tag containing a slash' do
       it 'sees the release' do
-        release = create :release, :with_evidence, project: project, tag: 'debian/2.4.0-1'
+        release = create :release, project: project, tag: 'debian/2.4.0-1'
         visit project_releases_path(project)
 
         expect(page).to have_content(release.name)
diff --git a/spec/features/projects/remote_mirror_spec.rb b/spec/features/projects/remote_mirror_spec.rb
index d357aabead7..26d27c914cc 100644
--- a/spec/features/projects/remote_mirror_spec.rb
+++ b/spec/features/projects/remote_mirror_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project remote mirror', :feature do
+RSpec.describe 'Project remote mirror', :feature do
   let(:project) { create(:project, :repository, :remote_mirror) }
   let(:remote_mirror) { project.remote_mirrors.first }
   let(:user) { create(:user) }
diff --git a/spec/features/projects/serverless/functions_spec.rb b/spec/features/projects/serverless/functions_spec.rb
index 4c89af29339..a0b06d7e2a1 100644
--- a/spec/features/projects/serverless/functions_spec.rb
+++ b/spec/features/projects/serverless/functions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Functions', :js do
+RSpec.describe 'Functions', :js do
   include KubernetesHelpers
   include ReactiveCachingHelpers
 
diff --git a/spec/features/projects/services/disable_triggers_spec.rb b/spec/features/projects/services/disable_triggers_spec.rb
index d07abb94208..8f87d0e7ff1 100644
--- a/spec/features/projects/services/disable_triggers_spec.rb
+++ b/spec/features/projects/services/disable_triggers_spec.rb
@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe 'Disable individual triggers' do
+RSpec.describe 'Disable individual triggers', :js do
   include_context 'project service activation'
 
-  let(:checkbox_selector) { 'input[type=checkbox][id$=_events]' }
+  let(:checkbox_selector) { 'input[type=checkbox][name$="_events]"]' }
 
   before do
     visit_project_integration(service_name)
diff --git a/spec/features/projects/services/prometheus_external_alerts_spec.rb b/spec/features/projects/services/prometheus_external_alerts_spec.rb
index 1a706f20352..4c32905a8c5 100644
--- a/spec/features/projects/services/prometheus_external_alerts_spec.rb
+++ b/spec/features/projects/services/prometheus_external_alerts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Prometheus external alerts', :js do
+RSpec.describe 'Prometheus external alerts', :js do
   include_context 'project service activation'
 
   let(:alerts_section_selector) { '.js-prometheus-alerts' }
diff --git a/spec/features/projects/services/user_activates_alerts_spec.rb b/spec/features/projects/services/user_activates_alerts_spec.rb
index 47de7fab859..95642f49d61 100644
--- a/spec/features/projects/services/user_activates_alerts_spec.rb
+++ b/spec/features/projects/services/user_activates_alerts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Alerts', :js do
+RSpec.describe 'User activates Alerts', :js do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
diff --git a/spec/features/projects/services/user_activates_asana_spec.rb b/spec/features/projects/services/user_activates_asana_spec.rb
index dac60fce6e9..3e24d106be0 100644
--- a/spec/features/projects/services/user_activates_asana_spec.rb
+++ b/spec/features/projects/services/user_activates_asana_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Asana' do
+RSpec.describe 'User activates Asana' do
   include_context 'project service activation'
 
   it 'activates service', :js do
diff --git a/spec/features/projects/services/user_activates_assembla_spec.rb b/spec/features/projects/services/user_activates_assembla_spec.rb
index 999a95e3e23..2e49f4caa82 100644
--- a/spec/features/projects/services/user_activates_assembla_spec.rb
+++ b/spec/features/projects/services/user_activates_assembla_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Assembla' do
+RSpec.describe 'User activates Assembla' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb b/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
index 28ed08f71b6..7b89b9ac4a7 100644
--- a/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
+++ b/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Atlassian Bamboo CI' do
+RSpec.describe 'User activates Atlassian Bamboo CI' do
   include_context 'project service activation'
 
   before do
@@ -23,6 +23,6 @@ describe 'User activates Atlassian Bamboo CI' do
     # Password field should not be filled in.
     click_link('Atlassian Bamboo CI')
 
-    expect(find_field('Enter new password').value).to be_blank
+    expect(find_field('Enter new Password').value).to be_blank
   end
 end
diff --git a/spec/features/projects/services/user_activates_emails_on_push_spec.rb b/spec/features/projects/services/user_activates_emails_on_push_spec.rb
index 42c069eb29e..40947027146 100644
--- a/spec/features/projects/services/user_activates_emails_on_push_spec.rb
+++ b/spec/features/projects/services/user_activates_emails_on_push_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Emails on push' do
+RSpec.describe 'User activates Emails on push' do
   include_context 'project service activation'
 
   it 'activates service', :js do
diff --git a/spec/features/projects/services/user_activates_flowdock_spec.rb b/spec/features/projects/services/user_activates_flowdock_spec.rb
index 4762363b3fe..9581d718400 100644
--- a/spec/features/projects/services/user_activates_flowdock_spec.rb
+++ b/spec/features/projects/services/user_activates_flowdock_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Flowdock' do
+RSpec.describe 'User activates Flowdock' do
   include_context 'project service activation' do
     let(:project) { create(:project, :repository) }
   end
diff --git a/spec/features/projects/services/user_activates_hipchat_spec.rb b/spec/features/projects/services/user_activates_hipchat_spec.rb
index 2fb056f3533..a2820c4bb0f 100644
--- a/spec/features/projects/services/user_activates_hipchat_spec.rb
+++ b/spec/features/projects/services/user_activates_hipchat_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates HipChat', :js do
+RSpec.describe 'User activates HipChat', :js do
   include_context 'project service activation'
 
   context 'with standart settings' do
diff --git a/spec/features/projects/services/user_activates_irker_spec.rb b/spec/features/projects/services/user_activates_irker_spec.rb
index 56df403499c..fad40fa6085 100644
--- a/spec/features/projects/services/user_activates_irker_spec.rb
+++ b/spec/features/projects/services/user_activates_irker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Irker (IRC gateway)' do
+RSpec.describe 'User activates Irker (IRC gateway)' do
   include_context 'project service activation'
 
   it 'activates service', :js do
diff --git a/spec/features/projects/services/user_activates_issue_tracker_spec.rb b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
index 3c5005d0c0c..a2a2604c610 100644
--- a/spec/features/projects/services/user_activates_issue_tracker_spec.rb
+++ b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates issue tracker', :js do
+RSpec.describe 'User activates issue tracker', :js do
   include_context 'project service activation'
 
   let(:url) { 'http://tracker.example.com' }
diff --git a/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb b/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb
index 8c84a81ac89..8ee369eb6ec 100644
--- a/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb
+++ b/spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates JetBrains TeamCity CI' do
+RSpec.describe 'User activates JetBrains TeamCity CI' do
   include_context 'project service activation'
 
   before do
@@ -12,7 +12,7 @@ describe 'User activates JetBrains TeamCity CI' do
   it 'activates service', :js do
     visit_project_integration('JetBrains TeamCity CI')
     check('Push')
-    check('Merge request')
+    check('Merge Request')
     fill_in('Teamcity url', with: 'http://teamcity.example.com')
     fill_in('Build type', with: 'GitlabTest_Build')
     fill_in('Username', with: 'user')
diff --git a/spec/features/projects/services/user_activates_jira_spec.rb b/spec/features/projects/services/user_activates_jira_spec.rb
index a14dbf9c14d..1da8a49699b 100644
--- a/spec/features/projects/services/user_activates_jira_spec.rb
+++ b/spec/features/projects/services/user_activates_jira_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Jira', :js do
+RSpec.describe 'User activates Jira', :js do
   include_context 'project service activation'
 
   let(:url) { 'http://jira.example.com' }
diff --git a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
index c6825ee663a..a6b4aaccfb5 100644
--- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Set up Mattermost slash commands', :js do
+RSpec.describe 'Set up Mattermost slash commands', :js do
   describe 'user visits the mattermost slash command config page' do
     include_context 'project service activation'
 
diff --git a/spec/features/projects/services/user_activates_packagist_spec.rb b/spec/features/projects/services/user_activates_packagist_spec.rb
index 274f293ebf3..70cf612bb2a 100644
--- a/spec/features/projects/services/user_activates_packagist_spec.rb
+++ b/spec/features/projects/services/user_activates_packagist_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Packagist' do
+RSpec.describe 'User activates Packagist' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb b/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
index c81c5081867..8e99c6e303b 100644
--- a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
+++ b/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates PivotalTracker' do
+RSpec.describe 'User activates PivotalTracker' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_prometheus_spec.rb b/spec/features/projects/services/user_activates_prometheus_spec.rb
index 76dc7d1bbc8..89b1f447c32 100644
--- a/spec/features/projects/services/user_activates_prometheus_spec.rb
+++ b/spec/features/projects/services/user_activates_prometheus_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Prometheus' do
+RSpec.describe 'User activates Prometheus' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_pushover_spec.rb b/spec/features/projects/services/user_activates_pushover_spec.rb
index 62e03e68aee..789cc30a42e 100644
--- a/spec/features/projects/services/user_activates_pushover_spec.rb
+++ b/spec/features/projects/services/user_activates_pushover_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Pushover' do
+RSpec.describe 'User activates Pushover' do
   include_context 'project service activation'
 
   before do
diff --git a/spec/features/projects/services/user_activates_slack_notifications_spec.rb b/spec/features/projects/services/user_activates_slack_notifications_spec.rb
index 12f15699e26..20e2bd3f085 100644
--- a/spec/features/projects/services/user_activates_slack_notifications_spec.rb
+++ b/spec/features/projects/services/user_activates_slack_notifications_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User activates Slack notifications' do
+RSpec.describe 'User activates Slack notifications', :js do
   include_context 'project service activation'
 
   context 'when service is not configured yet' do
@@ -10,7 +10,7 @@ describe 'User activates Slack notifications' do
       visit_project_integration('Slack notifications')
     end
 
-    it 'activates service', :js do
+    it 'activates service' do
       fill_in('Webhook', with: 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685')
 
       click_test_then_save_integration
@@ -38,13 +38,13 @@ describe 'User activates Slack notifications' do
     end
 
     it 'filters events by channel' do
-      expect(page.find_field('service_push_channel').value).to have_content('1')
-      expect(page.find_field('service_issue_channel').value).to have_content('2')
-      expect(page.find_field('service_merge_request_channel').value).to have_content('3')
-      expect(page.find_field('service_note_channel').value).to have_content('4')
-      expect(page.find_field('service_tag_push_channel').value).to have_content('5')
-      expect(page.find_field('service_pipeline_channel').value).to have_content('6')
-      expect(page.find_field('service_wiki_page_channel').value).to have_content('7')
+      expect(page.find_field(name: 'service[push_channel]').value).to have_content('1')
+      expect(page.find_field(name: 'service[issue_channel]').value).to have_content('2')
+      expect(page.find_field(name: 'service[merge_request_channel]').value).to have_content('3')
+      expect(page.find_field(name: 'service[note_channel]').value).to have_content('4')
+      expect(page.find_field(name: 'service[tag_push_channel]').value).to have_content('5')
+      expect(page.find_field(name: 'service[pipeline_channel]').value).to have_content('6')
+      expect(page.find_field(name: 'service[wiki_page_channel]').value).to have_content('7')
     end
   end
 end
diff --git a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
index 05f1a0c6b17..360e462b935 100644
--- a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
+++ b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Slack slash commands' do
+RSpec.describe 'Slack slash commands', :js do
   include_context 'project service activation'
 
   before do
@@ -10,7 +10,7 @@ describe 'Slack slash commands' do
   end
 
   it 'shows a token placeholder' do
-    token_placeholder = find_field('service_token')['placeholder']
+    token_placeholder = find_field('Token')['placeholder']
 
     expect(token_placeholder).to eq('XXxxXXxxXXxxXXxxXXxxXXxx')
   end
@@ -19,8 +19,8 @@ describe 'Slack slash commands' do
     expect(page).to have_content('This service allows users to perform common')
   end
 
-  it 'redirects to the integrations page after saving but not activating', :js do
-    fill_in 'service_token', with: 'token'
+  it 'redirects to the integrations page after saving but not activating' do
+    fill_in 'Token', with: 'token'
     click_active_toggle
     click_on 'Save'
 
@@ -28,8 +28,8 @@ describe 'Slack slash commands' do
     expect(page).to have_content('Slack slash commands settings saved, but not activated.')
   end
 
-  it 'redirects to the integrations page after activating', :js do
-    fill_in 'service_token', with: 'token'
+  it 'redirects to the integrations page after activating' do
+    fill_in 'Token', with: 'token'
     click_on 'Save'
 
     expect(current_path).to eq(project_settings_integrations_path(project))
diff --git a/spec/features/projects/services/user_views_services_spec.rb b/spec/features/projects/services/user_views_services_spec.rb
index 6df0123c30a..fef6b7bd991 100644
--- a/spec/features/projects/services/user_views_services_spec.rb
+++ b/spec/features/projects/services/user_views_services_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views services' do
+RSpec.describe 'User views services' do
   include_context 'project service activation'
 
   it 'shows the list of available services' do
diff --git a/spec/features/projects/settings/access_tokens_spec.rb b/spec/features/projects/settings/access_tokens_spec.rb
index 9a8a8e38164..45fe19deb8e 100644
--- a/spec/features/projects/settings/access_tokens_spec.rb
+++ b/spec/features/projects/settings/access_tokens_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Settings > Access Tokens', :js do
+RSpec.describe 'Project > Settings > Access Tokens', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:bot_user) { create(:user, :project_bot) }
   let_it_be(:project) { create(:project) }
diff --git a/spec/features/projects/settings/external_authorization_service_settings_spec.rb b/spec/features/projects/settings/external_authorization_service_settings_spec.rb
index 31b2892cf6f..c236c85b773 100644
--- a/spec/features/projects/settings/external_authorization_service_settings_spec.rb
+++ b/spec/features/projects/settings/external_authorization_service_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > External Authorization Classification Label setting' do
+RSpec.describe 'Projects > Settings > External Authorization Classification Label setting' do
   let(:user) { create(:user) }
   let(:project) { create(:project_empty_repo) }
 
diff --git a/spec/features/projects/settings/forked_project_settings_spec.rb b/spec/features/projects/settings/forked_project_settings_spec.rb
index a2c6dd8e288..f6c25d483ad 100644
--- a/spec/features/projects/settings/forked_project_settings_spec.rb
+++ b/spec/features/projects/settings/forked_project_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > For a forked project', :js do
+RSpec.describe 'Projects > Settings > For a forked project', :js do
   include ProjectForksHelper
   let(:user) { create(:user) }
   let(:original_project) { create(:project) }
diff --git a/spec/features/projects/settings/lfs_settings_spec.rb b/spec/features/projects/settings/lfs_settings_spec.rb
index 5fa3b9bba55..6e1be3c7e51 100644
--- a/spec/features/projects/settings/lfs_settings_spec.rb
+++ b/spec/features/projects/settings/lfs_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > LFS settings' do
+RSpec.describe 'Projects > Settings > LFS settings' do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:role) { :maintainer }
diff --git a/spec/features/projects/settings/operations_settings_spec.rb b/spec/features/projects/settings/operations_settings_spec.rb
index 752353cf2f5..dfbb6342173 100644
--- a/spec/features/projects/settings/operations_settings_spec.rb
+++ b/spec/features/projects/settings/operations_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > For a forked project', :js do
+RSpec.describe 'Projects > Settings > For a forked project', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, create_templates: :issue) }
   let(:role) { :maintainer }
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index 87e467571e6..0358acc8dcc 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Projects > Settings > Pipelines settings" do
+RSpec.describe "Projects > Settings > Pipelines settings" do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:role) { :developer }
diff --git a/spec/features/projects/settings/project_badges_spec.rb b/spec/features/projects/settings/project_badges_spec.rb
index c419bb1868c..2c26168e3c0 100644
--- a/spec/features/projects/settings/project_badges_spec.rb
+++ b/spec/features/projects/settings/project_badges_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Badges' do
+RSpec.describe 'Project Badges' do
   include WaitForRequests
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/settings/project_settings_spec.rb b/spec/features/projects/settings/project_settings_spec.rb
index 171c7920878..7b2b5594c22 100644
--- a/spec/features/projects/settings/project_settings_spec.rb
+++ b/spec/features/projects/settings/project_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects settings' do
+RSpec.describe 'Projects settings' do
   let_it_be(:project) { create(:project) }
   let(:user) { project.owner }
   let(:panel) { find('.general-settings', match: :first) }
diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb
index ba92e8bc516..3dcb7ca54a1 100644
--- a/spec/features/projects/settings/registry_settings_spec.rb
+++ b/spec/features/projects/settings/registry_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Settings > CI/CD > Container registry tag expiration policy', :js do
+RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration policy', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace, container_registry_enabled: container_registry_enabled) }
   let(:container_registry_enabled) { true }
@@ -29,7 +29,7 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy'
           select('7 days until tags are automatically removed', from: 'Expiration interval:')
           select('Every day', from: 'Expiration schedule:')
           select('50 tags per image name', from: 'Number of tags to retain:')
-          fill_in('Tags with names matching this regex pattern will expire:', with: '*-production')
+          fill_in('Tags with names matching this regex pattern will expire:', with: '.*-production')
         end
         submit_button = find('.card-footer .btn.btn-success')
         expect(submit_button).not_to be_disabled
@@ -38,6 +38,19 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy'
       toast = find('.gl-toast')
       expect(toast).to have_content('Expiration policy successfully saved.')
     end
+
+    it 'does not save expiration policy submit form with invalid regex' do
+      within '#js-registry-policies' do
+        within '.card-body' do
+          fill_in('Tags with names matching this regex pattern will expire:', with: '*-production')
+        end
+        submit_button = find('.card-footer .btn.btn-success')
+        expect(submit_button).not_to be_disabled
+        submit_button.click
+      end
+      toast = find('.gl-toast')
+      expect(toast).to have_content('Something went wrong while updating the expiration policy.')
+    end
   end
 
   context 'when registry is disabled' do
diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb
index b8baaa3e963..8beecedf85f 100644
--- a/spec/features/projects/settings/repository_settings_spec.rb
+++ b/spec/features/projects/settings/repository_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > Repository settings' do
+RSpec.describe 'Projects > Settings > Repository settings' do
   let(:project) { create(:project_empty_repo) }
   let(:user) { create(:user) }
   let(:role) { :developer }
diff --git a/spec/features/projects/settings/user_archives_project_spec.rb b/spec/features/projects/settings/user_archives_project_spec.rb
index 7667fad7b03..03ea9e7c580 100644
--- a/spec/features/projects/settings/user_archives_project_spec.rb
+++ b/spec/features/projects/settings/user_archives_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > User archives a project' do
+RSpec.describe 'Projects > Settings > User archives a project' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/projects/settings/user_changes_avatar_spec.rb b/spec/features/projects/settings/user_changes_avatar_spec.rb
index 67789b869da..92d5b4c1fcd 100644
--- a/spec/features/projects/settings/user_changes_avatar_spec.rb
+++ b/spec/features/projects/settings/user_changes_avatar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > User changes avatar' do
+RSpec.describe 'Projects > Settings > User changes avatar' do
   let(:project) { create(:project, :repository) }
   let(:user) { project.creator }
 
diff --git a/spec/features/projects/settings/user_changes_default_branch_spec.rb b/spec/features/projects/settings/user_changes_default_branch_spec.rb
index 411fc0c7e07..84e6c50cf61 100644
--- a/spec/features/projects/settings/user_changes_default_branch_spec.rb
+++ b/spec/features/projects/settings/user_changes_default_branch_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > User changes default branch' do
+RSpec.describe 'Projects > Settings > User changes default branch' do
   include Select2Helper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb
index 45a16fda2cb..ba504624823 100644
--- a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb
+++ b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User interacts with deploy keys", :js do
+RSpec.describe "User interacts with deploy keys", :js do
   let(:project) { create(:project, :repository) }
   let(:user) { project.owner }
 
diff --git a/spec/features/projects/settings/user_manages_group_links_spec.rb b/spec/features/projects/settings/user_manages_group_links_spec.rb
deleted file mode 100644
index 7df0bbb9d02..00000000000
--- a/spec/features/projects/settings/user_manages_group_links_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'Projects > Settings > User manages group links' do
-  include Select2Helper
-
-  let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace) }
-  let(:group_ops) { create(:group, name: 'Ops') }
-  let(:group_market) { create(:group, name: 'Market', path: 'market') }
-
-  before do
-    project.add_maintainer(user)
-    group_market.add_guest(user)
-    sign_in(user)
-
-    share_link = project.project_group_links.new(group_access: Gitlab::Access::MAINTAINER)
-    share_link.group_id = group_ops.id
-    share_link.save!
-
-    visit(project_group_links_path(project))
-  end
-
-  it 'shows a list of groups' do
-    page.within('.project-members-groups') do
-      expect(page).to have_content('Ops')
-      expect(page).not_to have_content('Market')
-    end
-  end
-
-  it 'invites a group to a project', :js do
-    click_link('Invite group')
-
-    select2(group_market.id, from: '#link_group_id')
-    select('Maintainer', from: 'link_group_access')
-
-    click_button('Invite')
-
-    page.within('.project-members-groups') do
-      expect(page).to have_content('Market')
-    end
-  end
-end
diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
index c0089e3c28c..3fc1f47d98a 100644
--- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'Projects > Settings > User manages merge request settings' do
+RSpec.describe 'Projects > Settings > User manages merge request settings' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public, namespace: user.namespace, path: 'gitlab', name: 'sample') }
 
diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb
index 705c60f15ee..d32f4cb8ec7 100644
--- a/spec/features/projects/settings/user_manages_project_members_spec.rb
+++ b/spec/features/projects/settings/user_manages_project_members_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > User manages project members' do
+RSpec.describe 'Projects > Settings > User manages project members' do
   let(:group) { create(:group, name: 'OpenSource') }
   let(:project) { create(:project) }
   let(:project2) { create(:project) }
diff --git a/spec/features/projects/settings/user_renames_a_project_spec.rb b/spec/features/projects/settings/user_renames_a_project_spec.rb
index 789c5e31748..6088ea31661 100644
--- a/spec/features/projects/settings/user_renames_a_project_spec.rb
+++ b/spec/features/projects/settings/user_renames_a_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > User renames a project' do
+RSpec.describe 'Projects > Settings > User renames a project' do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace, path: 'gitlab', name: 'sample') }
 
diff --git a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb
index 0abc4b41a2b..d0f297d2067 100644
--- a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb
+++ b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Repository Settings > User sees revoke deploy token modal', :js do
+RSpec.describe 'Repository Settings > User sees revoke deploy token modal', :js do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:role) { :developer }
diff --git a/spec/features/projects/settings/user_tags_project_spec.rb b/spec/features/projects/settings/user_tags_project_spec.rb
index a919dd0e4af..ff19ed22744 100644
--- a/spec/features/projects/settings/user_tags_project_spec.rb
+++ b/spec/features/projects/settings/user_tags_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > User tags a project' do
+RSpec.describe 'Projects > Settings > User tags a project' do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
 
diff --git a/spec/features/projects/settings/user_transfers_a_project_spec.rb b/spec/features/projects/settings/user_transfers_a_project_spec.rb
index 8989eac77b5..ba4c379ef0a 100644
--- a/spec/features/projects/settings/user_transfers_a_project_spec.rb
+++ b/spec/features/projects/settings/user_transfers_a_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > User transfers a project', :js do
+RSpec.describe 'Projects > Settings > User transfers a project', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, namespace: user.namespace) }
   let(:group) { create(:group) }
diff --git a/spec/features/projects/settings/visibility_settings_spec.rb b/spec/features/projects/settings/visibility_settings_spec.rb
index a2b36874aea..6cecbbdb3d0 100644
--- a/spec/features/projects/settings/visibility_settings_spec.rb
+++ b/spec/features/projects/settings/visibility_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > Visibility settings', :js do
+RSpec.describe 'Projects > Settings > Visibility settings', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace, visibility_level: 20) }
 
diff --git a/spec/features/projects/settings/webhooks_settings_spec.rb b/spec/features/projects/settings/webhooks_settings_spec.rb
index 7e22117c63c..d184f08bd89 100644
--- a/spec/features/projects/settings/webhooks_settings_spec.rb
+++ b/spec/features/projects/settings/webhooks_settings_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Settings > Webhook Settings' do
+RSpec.describe 'Projects > Settings > Webhook Settings' do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:webhooks_path) { project_hooks_path(project) }
diff --git a/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb b/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
index 70dc6c966ba..8d239cb2cbf 100644
--- a/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
+++ b/spec/features/projects/show/developer_views_empty_project_instructions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > Developer views empty project instructions' do
+RSpec.describe 'Projects > Show > Developer views empty project instructions' do
   let(:project) { create(:project, :empty_repo) }
   let(:developer) { create(:user) }
 
diff --git a/spec/features/projects/show/download_buttons_spec.rb b/spec/features/projects/show/download_buttons_spec.rb
index 0d609069426..e73bb3198e6 100644
--- a/spec/features/projects/show/download_buttons_spec.rb
+++ b/spec/features/projects/show/download_buttons_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > Download buttons' do
+RSpec.describe 'Projects > Show > Download buttons' do
   let(:user) { create(:user) }
   let(:role) { :developer }
   let(:status) { 'success' }
diff --git a/spec/features/projects/show/no_password_spec.rb b/spec/features/projects/show/no_password_spec.rb
index 0048b1bf017..79cd65e5406 100644
--- a/spec/features/projects/show/no_password_spec.rb
+++ b/spec/features/projects/show/no_password_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'No Password Alert' do
+RSpec.describe 'No Password Alert' do
   let(:project) { create(:project, :repository, namespace: user.namespace) }
 
   context 'with internal auth enabled' do
diff --git a/spec/features/projects/show/redirects_spec.rb b/spec/features/projects/show/redirects_spec.rb
index 1b579ab0121..659edda5672 100644
--- a/spec/features/projects/show/redirects_spec.rb
+++ b/spec/features/projects/show/redirects_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > Redirects' do
+RSpec.describe 'Projects > Show > Redirects' do
   let(:user) { create :user }
   let(:public_project) { create :project, :public }
   let(:private_project) { create :project, :private }
diff --git a/spec/features/projects/show/rss_spec.rb b/spec/features/projects/show/rss_spec.rb
index 4fe1fde5bdd..0bd6e9cbe3b 100644
--- a/spec/features/projects/show/rss_spec.rb
+++ b/spec/features/projects/show/rss_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > RSS' do
+RSpec.describe 'Projects > Show > RSS' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
   let(:path) { project_path(project) }
diff --git a/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb b/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb
index df63856492e..59f1bc94226 100644
--- a/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb
+++ b/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Show > User interacts with auto devops implicitly enabled banner' do
+RSpec.describe 'Project > Show > User interacts with auto devops implicitly enabled banner' do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/show/user_interacts_with_stars_spec.rb b/spec/features/projects/show/user_interacts_with_stars_spec.rb
index e4cd8294f7a..99f84c19bf3 100644
--- a/spec/features/projects/show/user_interacts_with_stars_spec.rb
+++ b/spec/features/projects/show/user_interacts_with_stars_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User interacts with project stars' do
+RSpec.describe 'Projects > Show > User interacts with project stars' do
   let(:project) { create(:project, :public, :repository) }
 
   context 'when user is signed in', :js do
diff --git a/spec/features/projects/show/user_manages_notifications_spec.rb b/spec/features/projects/show/user_manages_notifications_spec.rb
index 0cd6743304e..58a2c793b7b 100644
--- a/spec/features/projects/show/user_manages_notifications_spec.rb
+++ b/spec/features/projects/show/user_manages_notifications_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User manages notifications', :js do
+RSpec.describe 'Projects > Show > User manages notifications', :js do
   let(:project) { create(:project, :public, :repository) }
 
   before do
diff --git a/spec/features/projects/show/user_sees_collaboration_links_spec.rb b/spec/features/projects/show/user_sees_collaboration_links_spec.rb
index 63fcec4f9b3..ffdfbb9fe81 100644
--- a/spec/features/projects/show/user_sees_collaboration_links_spec.rb
+++ b/spec/features/projects/show/user_sees_collaboration_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > Collaboration links', :js do
+RSpec.describe 'Projects > Show > Collaboration links', :js do
   using RSpec::Parameterized::TableSyntax
 
   let(:project) { create(:project, :repository, :public) }
diff --git a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
index bdd0ab688f0..5e878411f6a 100644
--- a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
+++ b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User sees a deletion failure message' do
+RSpec.describe 'Projects > Show > User sees a deletion failure message' do
   let(:project) { create(:project, :empty_repo, pending_delete: true) }
 
   before do
diff --git a/spec/features/projects/show/user_sees_git_instructions_spec.rb b/spec/features/projects/show/user_sees_git_instructions_spec.rb
index 0c486056329..a35f6420bdc 100644
--- a/spec/features/projects/show/user_sees_git_instructions_spec.rb
+++ b/spec/features/projects/show/user_sees_git_instructions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User sees Git instructions' do
+RSpec.describe 'Projects > Show > User sees Git instructions' do
   let_it_be(:user) { create(:user) }
 
   shared_examples_for 'redirects to the sign in page' do
diff --git a/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb b/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb
index c0fcd10f394..0aa0f7754c6 100644
--- a/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb
+++ b/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User sees last commit CI status' do
+RSpec.describe 'Projects > Show > User sees last commit CI status' do
   let_it_be(:project) { create(:project, :repository, :public) }
 
   it 'shows the project README', :js do
diff --git a/spec/features/projects/show/user_sees_readme_spec.rb b/spec/features/projects/show/user_sees_readme_spec.rb
index 52745b06cd3..250f707948e 100644
--- a/spec/features/projects/show/user_sees_readme_spec.rb
+++ b/spec/features/projects/show/user_sees_readme_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User sees README' do
+RSpec.describe 'Projects > Show > User sees README' do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :repository, :public) }
 
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index 8e20facda15..0f10b0a4010 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User sees setup shortcut buttons' do
+RSpec.describe 'Projects > Show > User sees setup shortcut buttons' do
   # For "New file", "Add license" functionality,
   # see spec/features/projects/files/project_owner_creates_license_file_spec.rb
   # see spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
diff --git a/spec/features/projects/show/user_uploads_files_spec.rb b/spec/features/projects/show/user_uploads_files_spec.rb
index e279cdf92da..053598a528e 100644
--- a/spec/features/projects/show/user_uploads_files_spec.rb
+++ b/spec/features/projects/show/user_uploads_files_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Show > User uploads files' do
+RSpec.describe 'Projects > Show > User uploads files' do
   include DropzoneHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb
index 1e8f9fa0875..73d033cbdb8 100644
--- a/spec/features/projects/snippets/create_snippet_spec.rb
+++ b/spec/features/projects/snippets/create_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples_for 'snippet editor' do
+RSpec.shared_examples_for 'snippet editor' do
   before do
     stub_feature_flags(snippets_edit_vue: false)
   end
@@ -138,7 +138,7 @@ shared_examples_for 'snippet editor' do
   end
 end
 
-describe 'Projects > Snippets > Create Snippet', :js do
+RSpec.describe 'Projects > Snippets > Create Snippet', :js do
   include DropzoneHelper
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/features/projects/snippets/show_spec.rb b/spec/features/projects/snippets/show_spec.rb
index 9be226c017f..0f6429d49f6 100644
--- a/spec/features/projects/snippets/show_spec.rb
+++ b/spec/features/projects/snippets/show_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Snippets > Project snippet', :js do
+RSpec.describe 'Projects > Snippets > Project snippet', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:snippet) { create(:project_snippet, project: project, file_name: file_name, content: content) }
diff --git a/spec/features/projects/snippets/user_comments_on_snippet_spec.rb b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
index a7a220b926d..2784fec3dc1 100644
--- a/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Snippets > User comments on a snippet', :js do
+RSpec.describe 'Projects > Snippets > User comments on a snippet', :js do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
   let_it_be(:snippet) { create(:project_snippet, :repository, project: project, author: user) }
diff --git a/spec/features/projects/snippets/user_deletes_snippet_spec.rb b/spec/features/projects/snippets/user_deletes_snippet_spec.rb
index 7e337710e19..44fe9834484 100644
--- a/spec/features/projects/snippets/user_deletes_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_deletes_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Snippets > User deletes a snippet' do
+RSpec.describe 'Projects > Snippets > User deletes a snippet' do
   let(:project) { create(:project) }
   let!(:snippet) { create(:project_snippet, project: project, author: user) }
   let(:user) { create(:user) }
diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb
index d19fe9e8d38..a40113bd93e 100644
--- a/spec/features/projects/snippets/user_updates_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Snippets > User updates a snippet', :js do
+RSpec.describe 'Projects > Snippets > User updates a snippet', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, namespace: user.namespace) }
   let_it_be(:snippet, reload: true) { create(:project_snippet, :repository, project: project, author: user) }
diff --git a/spec/features/projects/snippets/user_views_snippets_spec.rb b/spec/features/projects/snippets/user_views_snippets_spec.rb
index 22910029ee5..bc8cba1dc31 100644
--- a/spec/features/projects/snippets/user_views_snippets_spec.rb
+++ b/spec/features/projects/snippets/user_views_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Snippets > User views snippets' do
+RSpec.describe 'Projects > Snippets > User views snippets' do
   let_it_be(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/sourcegraph_csp_spec.rb b/spec/features/projects/sourcegraph_csp_spec.rb
index f252d3cd027..25d27462aa9 100644
--- a/spec/features/projects/sourcegraph_csp_spec.rb
+++ b/spec/features/projects/sourcegraph_csp_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Sourcegraph Content Security Policy' do
+RSpec.describe 'Sourcegraph Content Security Policy' do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :repository, namespace: user.namespace) }
 
diff --git a/spec/features/projects/sub_group_issuables_spec.rb b/spec/features/projects/sub_group_issuables_spec.rb
index d6faec2078d..8c1d88276df 100644
--- a/spec/features/projects/sub_group_issuables_spec.rb
+++ b/spec/features/projects/sub_group_issuables_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Subgroup Issuables', :js do
+RSpec.describe 'Subgroup Issuables', :js do
   let!(:group)    { create(:group, name: 'group') }
   let!(:subgroup) { create(:group, parent: group, name: 'subgroup') }
   let!(:project)  { create(:project, namespace: subgroup, name: 'project') }
diff --git a/spec/features/projects/tags/download_buttons_spec.rb b/spec/features/projects/tags/download_buttons_spec.rb
index 64141cf5dc9..0f1f72fd039 100644
--- a/spec/features/projects/tags/download_buttons_spec.rb
+++ b/spec/features/projects/tags/download_buttons_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Download buttons in tags page' do
+RSpec.describe 'Download buttons in tags page' do
   let(:user) { create(:user) }
   let(:role) { :developer }
   let(:status) { 'success' }
diff --git a/spec/features/projects/tags/user_edits_tags_spec.rb b/spec/features/projects/tags/user_edits_tags_spec.rb
index 6388875a619..7a8a685f3d9 100644
--- a/spec/features/projects/tags/user_edits_tags_spec.rb
+++ b/spec/features/projects/tags/user_edits_tags_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project > Tags', :js do
+RSpec.describe 'Project > Tags', :js do
   include DropzoneHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/tags/user_views_tags_spec.rb b/spec/features/projects/tags/user_views_tags_spec.rb
index 7b49b0d0f65..ef363ab6158 100644
--- a/spec/features/projects/tags/user_views_tags_spec.rb
+++ b/spec/features/projects/tags/user_views_tags_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'User views tags', :feature do
+RSpec.describe 'User views tags', :feature do
   context 'rss' do
     shared_examples 'has access to the tags RSS feed' do
       it do
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb
index 829b01832df..54b081161e5 100644
--- a/spec/features/projects/tree/create_directory_spec.rb
+++ b/spec/features/projects/tree/create_directory_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Multi-file editor new directory', :js do
+RSpec.describe 'Multi-file editor new directory', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
index 58ff623c9ae..cefb84e6f5e 100644
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Multi-file editor new file', :js do
+RSpec.describe 'Multi-file editor new file', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
 
diff --git a/spec/features/projects/tree/rss_spec.rb b/spec/features/projects/tree/rss_spec.rb
index 4300574210f..efbfc329c9f 100644
--- a/spec/features/projects/tree/rss_spec.rb
+++ b/spec/features/projects/tree/rss_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project Tree RSS' do
+RSpec.describe 'Project Tree RSS' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
   let(:path) { project_tree_path(project, :master) }
diff --git a/spec/features/projects/tree/tree_show_spec.rb b/spec/features/projects/tree/tree_show_spec.rb
index 2407a9e6ea3..388fa39874d 100644
--- a/spec/features/projects/tree/tree_show_spec.rb
+++ b/spec/features/projects/tree/tree_show_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects tree', :js do
+RSpec.describe 'Projects tree', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:gravatar_enabled) { true }
@@ -24,7 +24,7 @@ describe 'Projects tree', :js do
     expect(page).to have_selector('.tree-item')
     expect(page).to have_content('add tests for .gitattributes custom highlighting')
     expect(page).not_to have_selector('.flash-alert')
-    expect(page).not_to have_selector('.label-lfs', text: 'LFS')
+    expect(page).not_to have_selector('[data-qa-selector="label-lfs"]', text: 'LFS')
   end
 
   it 'renders tree table for a subtree without errors' do
@@ -33,7 +33,7 @@ describe 'Projects tree', :js do
 
     expect(page).to have_selector('.tree-item')
     expect(page).to have_content('add spaces in whitespace file')
-    expect(page).not_to have_selector('.label-lfs', text: 'LFS')
+    expect(page).not_to have_selector('[data-qa-selector="label-lfs"]', text: 'LFS')
     expect(page).not_to have_selector('.flash-alert')
   end
 
@@ -86,7 +86,7 @@ describe 'Projects tree', :js do
     it 'renders LFS badge on blob item' do
       visit project_tree_path(project, File.join('master', 'files/lfs'))
 
-      expect(page).to have_selector('.label-lfs', text: 'LFS')
+      expect(page).to have_selector('[data-qa-selector="label-lfs"]', text: 'LFS')
     end
   end
 
diff --git a/spec/features/projects/tree/upload_file_spec.rb b/spec/features/projects/tree/upload_file_spec.rb
index 38c29263b1e..ce00483bc91 100644
--- a/spec/features/projects/tree/upload_file_spec.rb
+++ b/spec/features/projects/tree/upload_file_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Multi-file editor upload file', :js do
+RSpec.describe 'Multi-file editor upload file', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:txt_file) { File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt') }
diff --git a/spec/features/projects/user_changes_project_visibility_spec.rb b/spec/features/projects/user_changes_project_visibility_spec.rb
index 31da4140d35..6935ad4be02 100644
--- a/spec/features/projects/user_changes_project_visibility_spec.rb
+++ b/spec/features/projects/user_changes_project_visibility_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User changes public project visibility', :js do
+RSpec.describe 'User changes public project visibility', :js do
   include ProjectForksHelper
 
   before do
diff --git a/spec/features/projects/user_creates_project_spec.rb b/spec/features/projects/user_creates_project_spec.rb
index 361367f1a3d..b204ae76e07 100644
--- a/spec/features/projects/user_creates_project_spec.rb
+++ b/spec/features/projects/user_creates_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User creates a project', :js do
+RSpec.describe 'User creates a project', :js do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/projects/user_sees_sidebar_spec.rb b/spec/features/projects/user_sees_sidebar_spec.rb
index 4226cdcc759..cc2a9eacbad 100644
--- a/spec/features/projects/user_sees_sidebar_spec.rb
+++ b/spec/features/projects/user_sees_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > User sees sidebar' do
+RSpec.describe 'Projects > User sees sidebar' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :private, public_builds: false, namespace: user.namespace) }
 
diff --git a/spec/features/projects/user_sees_user_popover_spec.rb b/spec/features/projects/user_sees_user_popover_spec.rb
index 6197460776d..851ce79e1c6 100644
--- a/spec/features/projects/user_sees_user_popover_spec.rb
+++ b/spec/features/projects/user_sees_user_popover_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User sees user popover', :js do
+RSpec.describe 'User sees user popover', :js do
   include Spec::Support::Helpers::Features::NotesHelpers
 
   let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index 2d629ef538a..8fa5f741a95 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User uses shortcuts', :js do
+RSpec.describe 'User uses shortcuts', :js do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/user_views_empty_project_spec.rb b/spec/features/projects/user_views_empty_project_spec.rb
index cb6b63d4dd5..9202d18b86f 100644
--- a/spec/features/projects/user_views_empty_project_spec.rb
+++ b/spec/features/projects/user_views_empty_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views an empty project' do
+RSpec.describe 'User views an empty project' do
   let(:project) { create(:project, :empty_repo) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb
index 845c7b89a71..6f78f888c12 100644
--- a/spec/features/projects/view_on_env_spec.rb
+++ b/spec/features/projects/view_on_env_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'View on environment', :js do
+RSpec.describe 'View on environment', :js do
   let(:branch_name) { 'feature' }
   let(:file_path) { 'files/ruby/feature.rb' }
   let(:project) { create(:project, :repository) }
diff --git a/spec/features/projects/wiki/markdown_preview_spec.rb b/spec/features/projects/wiki/markdown_preview_spec.rb
index bc567d4db42..8eba2c98595 100644
--- a/spec/features/projects/wiki/markdown_preview_spec.rb
+++ b/spec/features/projects/wiki/markdown_preview_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Wiki > User previews markdown changes', :js do
+RSpec.describe 'Projects > Wiki > User previews markdown changes', :js do
   let_it_be(:user) { create(:user) }
   let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
   let(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'home', content: '[some link](other-page)') }
diff --git a/spec/features/projects/wiki/shortcuts_spec.rb b/spec/features/projects/wiki/shortcuts_spec.rb
index c51af2526c9..170e7afb51f 100644
--- a/spec/features/projects/wiki/shortcuts_spec.rb
+++ b/spec/features/projects/wiki/shortcuts_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Wiki shortcuts', :js do
+RSpec.describe 'Wiki shortcuts', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
   let(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'home', content: 'Home page') }
diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
index 5678ebcb72a..eba1b63765a 100644
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "User creates wiki page" do
+RSpec.describe "User creates wiki page" do
   include WikiHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
index 38e5e292064..a5d865d581b 100644
--- a/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User deletes wiki page', :js do
+RSpec.describe 'User deletes wiki page', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
   let(:wiki_page) { create(:wiki_page, wiki: project.wiki) }
diff --git a/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb b/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb
index 6c6af1c41d2..83679c6bd1d 100644
--- a/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_git_access_wiki_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Wiki > User views Git access wiki page' do
+RSpec.describe 'Projects > Wiki > User views Git access wiki page' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :wiki_repo, :public) }
   let(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'home', content: '[some link](other-page)') }
diff --git a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
index 55509ddfa10..05d8989d88a 100644
--- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User updates wiki page' do
+RSpec.describe 'User updates wiki page' do
   include WikiHelpers
 
   let(:user) { create(:user) }
@@ -29,7 +29,7 @@ describe 'User updates wiki page' do
           click_on('Cancel')
         end
 
-        expect(current_path).to eq project_wiki_path(project, :home)
+        expect(current_path).to eq wiki_path(project.wiki)
       end
 
       it 'updates a page that has a path', :js do
diff --git a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb
index ab0f9b750d2..d9f79162c19 100644
--- a/spec/features/projects/wiki/user_views_wiki_empty_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_empty_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views empty wiki' do
+RSpec.describe 'User views empty wiki' do
   let(:user) { create(:user) }
 
   shared_examples 'empty wiki and accessible issues' do
@@ -12,6 +12,8 @@ describe 'User views empty wiki' do
       element = page.find('.row.empty-state')
 
       expect(element).to have_content('This project has no wiki pages')
+      expect(element).to have_content('You must be a project member')
+      expect(element).to have_content('improve the wiki for this project')
       expect(element).to have_link("issue tracker", href: project_issues_path(project))
       expect(element).to have_link("Suggest wiki improvement", href: new_project_issue_path(project))
     end
@@ -24,6 +26,7 @@ describe 'User views empty wiki' do
       element = page.find('.row.empty-state')
 
       expect(element).to have_content('This project has no wiki pages')
+      expect(element).to have_content('You must be a project member')
       expect(element).to have_no_link('Suggest wiki improvement')
     end
   end
@@ -66,9 +69,10 @@ describe 'User views empty wiki' do
 
     it 'show "create first page" message' do
       visit(project_wikis_path(project))
-
       element = page.find('.row.empty-state')
 
+      expect(element).to have_content('your project', count: 2)
+
       element.click_link 'Create your first page'
 
       expect(page).to have_button('Create page')
diff --git a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
index cb425e8b704..30b94495e3d 100644
--- a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Wiki > User views wiki in project page' do
+RSpec.describe 'Projects > Wiki > User views wiki in project page' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/projects/wiki/user_views_wiki_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
index e379e7466db..59ccb83a9bb 100644
--- a/spec/features/projects/wiki/user_views_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views a wiki page' do
+RSpec.describe 'User views a wiki page' do
   include WikiHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/wiki/user_views_wiki_pages_spec.rb b/spec/features/projects/wiki/user_views_wiki_pages_spec.rb
index 584b2a76143..fea913b8212 100644
--- a/spec/features/projects/wiki/user_views_wiki_pages_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_pages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views wiki pages' do
+RSpec.describe 'User views wiki pages' do
   include WikiHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb b/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb
index 014b63fa154..5c45e34595f 100644
--- a/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb
+++ b/spec/features/projects/wiki/users_views_asciidoc_page_with_includes_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User views AsciiDoc page with includes', :js do
+RSpec.describe 'User views AsciiDoc page with includes', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:wiki_content_selector) { '[data-qa-selector=wiki_page_content]' }
   let(:project) { create(:project, :public, :wiki_repo) }
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index 47f32e0113c..ab0b6725491 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Project' do
+RSpec.describe 'Project' do
   include ProjectForksHelper
   include MobileHelpers
 
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index 36c5a116b66..f0707610c3f 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Protected Branches', :js do
+RSpec.describe 'Protected Branches', :js do
   include ProtectedBranchHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb
index 3322a747cf5..12e4bbde293 100644
--- a/spec/features/protected_tags_spec.rb
+++ b/spec/features/protected_tags_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Protected Tags', :js do
+RSpec.describe 'Protected Tags', :js do
   include ProtectedTagHelpers
 
   let(:user) { create(:user, :admin) }
diff --git a/spec/features/read_only_spec.rb b/spec/features/read_only_spec.rb
index a33535a7b0b..eb043d2193a 100644
--- a/spec/features/read_only_spec.rb
+++ b/spec/features/read_only_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'read-only message' do
+RSpec.describe 'read-only message' do
   let_it_be(:user) { create(:user) }
 
   before do
diff --git a/spec/features/reportable_note/commit_spec.rb b/spec/features/reportable_note/commit_spec.rb
index 3502401095e..fc0df9d6113 100644
--- a/spec/features/reportable_note/commit_spec.rb
+++ b/spec/features/reportable_note/commit_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Reportable note on commit', :js do
+RSpec.describe 'Reportable note on commit', :js do
   include RepoHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/reportable_note/issue_spec.rb b/spec/features/reportable_note/issue_spec.rb
index c45ef77df55..80c321d0f5a 100644
--- a/spec/features/reportable_note/issue_spec.rb
+++ b/spec/features/reportable_note/issue_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Reportable note on issue', :js do
+RSpec.describe 'Reportable note on issue', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:issue) { create(:issue, project: project) }
diff --git a/spec/features/reportable_note/merge_request_spec.rb b/spec/features/reportable_note/merge_request_spec.rb
index 2e4d032754b..58a39bac707 100644
--- a/spec/features/reportable_note/merge_request_spec.rb
+++ b/spec/features/reportable_note/merge_request_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Reportable note on merge request', :js do
+RSpec.describe 'Reportable note on merge request', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/reportable_note/snippets_spec.rb b/spec/features/reportable_note/snippets_spec.rb
index a4e609ce40c..4d61e5d8285 100644
--- a/spec/features/reportable_note/snippets_spec.rb
+++ b/spec/features/reportable_note/snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Reportable note on snippets', :js do
+RSpec.describe 'Reportable note on snippets', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
 
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 0049d3ca7c9..8806a363ca4 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Runners' do
+RSpec.describe 'Runners' do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/search/user_searches_for_code_spec.rb b/spec/features/search/user_searches_for_code_spec.rb
index 0fdc7346535..227e75088d2 100644
--- a/spec/features/search/user_searches_for_code_spec.rb
+++ b/spec/features/search/user_searches_for_code_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for code' do
+RSpec.describe 'User searches for code' do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, namespace: user.namespace) }
 
diff --git a/spec/features/search/user_searches_for_comments_spec.rb b/spec/features/search/user_searches_for_comments_spec.rb
index 0a203a5bf2d..2a12b22b457 100644
--- a/spec/features/search/user_searches_for_comments_spec.rb
+++ b/spec/features/search/user_searches_for_comments_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for comments' do
+RSpec.describe 'User searches for comments' do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/search/user_searches_for_commits_spec.rb b/spec/features/search/user_searches_for_commits_spec.rb
index 958f12d3b84..b860cd08e64 100644
--- a/spec/features/search/user_searches_for_commits_spec.rb
+++ b/spec/features/search/user_searches_for_commits_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for commits' do
+RSpec.describe 'User searches for commits' do
   let(:project) { create(:project, :repository) }
   let(:sha) { '6d394385cf567f80a8fd85055db1ab4c5295806f' }
   let(:user) { create(:user) }
diff --git a/spec/features/search/user_searches_for_issues_spec.rb b/spec/features/search/user_searches_for_issues_spec.rb
index ae718cec7af..e9943347522 100644
--- a/spec/features/search/user_searches_for_issues_spec.rb
+++ b/spec/features/search/user_searches_for_issues_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for issues', :js do
+RSpec.describe 'User searches for issues', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let!(:issue1) { create(:issue, title: 'Foo', project: project) }
diff --git a/spec/features/search/user_searches_for_merge_requests_spec.rb b/spec/features/search/user_searches_for_merge_requests_spec.rb
index 0139ac26816..40583664958 100644
--- a/spec/features/search/user_searches_for_merge_requests_spec.rb
+++ b/spec/features/search/user_searches_for_merge_requests_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for merge requests', :js do
+RSpec.describe 'User searches for merge requests', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let!(:merge_request1) { create(:merge_request, title: 'Foo', source_project: project, target_project: project) }
diff --git a/spec/features/search/user_searches_for_milestones_spec.rb b/spec/features/search/user_searches_for_milestones_spec.rb
index 0714cfcc309..64e756db180 100644
--- a/spec/features/search/user_searches_for_milestones_spec.rb
+++ b/spec/features/search/user_searches_for_milestones_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for milestones', :js do
+RSpec.describe 'User searches for milestones', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let!(:milestone1) { create(:milestone, title: 'Foo', project: project) }
diff --git a/spec/features/search/user_searches_for_projects_spec.rb b/spec/features/search/user_searches_for_projects_spec.rb
index b194ac32ff6..7bb5a4da7d0 100644
--- a/spec/features/search/user_searches_for_projects_spec.rb
+++ b/spec/features/search/user_searches_for_projects_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for projects' do
+RSpec.describe 'User searches for projects' do
   let!(:project) { create(:project, :public, name: 'Shop') }
 
   context 'when signed out' do
diff --git a/spec/features/search/user_searches_for_users_spec.rb b/spec/features/search/user_searches_for_users_spec.rb
index 6f2c5d48018..826ed73c9bf 100644
--- a/spec/features/search/user_searches_for_users_spec.rb
+++ b/spec/features/search/user_searches_for_users_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for users' do
+RSpec.describe 'User searches for users' do
   let(:user1) { create(:user, username: 'gob_bluth', name: 'Gob Bluth') }
   let(:user2) { create(:user, username: 'michael_bluth', name: 'Michael Bluth') }
   let(:user3) { create(:user, username: 'gob_2018', name: 'George Oscar Bluth') }
diff --git a/spec/features/search/user_searches_for_wiki_pages_spec.rb b/spec/features/search/user_searches_for_wiki_pages_spec.rb
index 10c3032da8b..fc60b6244d9 100644
--- a/spec/features/search/user_searches_for_wiki_pages_spec.rb
+++ b/spec/features/search/user_searches_for_wiki_pages_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User searches for wiki pages', :js do
+RSpec.describe 'User searches for wiki pages', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, :wiki_repo, namespace: user.namespace) }
   let!(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'directory/title', content: 'Some Wiki content') }
diff --git a/spec/features/search/user_uses_header_search_field_spec.rb b/spec/features/search/user_uses_header_search_field_spec.rb
index 7b969aea547..5567dcb30ec 100644
--- a/spec/features/search/user_uses_header_search_field_spec.rb
+++ b/spec/features/search/user_uses_header_search_field_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User uses header search field', :js do
+RSpec.describe 'User uses header search field', :js do
   include FilteredSearchHelpers
 
   let(:project) { create(:project) }
@@ -95,14 +95,6 @@ describe 'User uses header search field', :js do
 
         expect(page).not_to have_selector('.dropdown-header', text: /#{scope_name}/i)
       end
-
-      it 'hides the dropdown when there are no results' do
-        page.within('.search-input-wrap') do
-          fill_in('search', with: 'a_search_term_with_no_results')
-        end
-
-        expect(page).not_to have_selector('.dropdown-menu')
-      end
     end
   end
 
diff --git a/spec/features/search/user_uses_search_filters_spec.rb b/spec/features/search/user_uses_search_filters_spec.rb
index fbd7da3c643..f39a1f8fe37 100644
--- a/spec/features/search/user_uses_search_filters_spec.rb
+++ b/spec/features/search/user_uses_search_filters_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User uses search filters', :js do
+RSpec.describe 'User uses search filters', :js do
   let(:group) { create(:group) }
   let!(:group_project) { create(:project, group: group) }
   let(:project) { create(:project, namespace: user.namespace) }
diff --git a/spec/features/security/admin_access_spec.rb b/spec/features/security/admin_access_spec.rb
index 9b2c873b2aa..38f00f399f3 100644
--- a/spec/features/security/admin_access_spec.rb
+++ b/spec/features/security/admin_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Admin::Projects" do
+RSpec.describe "Admin::Projects" do
   include AccessMatchers
 
   describe "GET /admin/projects" do
diff --git a/spec/features/security/dashboard_access_spec.rb b/spec/features/security/dashboard_access_spec.rb
index 13fafd88a4c..5ac4a5c1840 100644
--- a/spec/features/security/dashboard_access_spec.rb
+++ b/spec/features/security/dashboard_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Dashboard access" do
+RSpec.describe "Dashboard access" do
   include AccessMatchers
 
   describe "GET /dashboard" do
diff --git a/spec/features/security/group/internal_access_spec.rb b/spec/features/security/group/internal_access_spec.rb
index 114bc1a1f0c..c146ac1e8ee 100644
--- a/spec/features/security/group/internal_access_spec.rb
+++ b/spec/features/security/group/internal_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Internal Group access' do
+RSpec.describe 'Internal Group access' do
   include AccessMatchers
 
   let(:group)   { create(:group, :internal) }
diff --git a/spec/features/security/group/private_access_spec.rb b/spec/features/security/group/private_access_spec.rb
index 3362b9a9e9e..de05b4d3d16 100644
--- a/spec/features/security/group/private_access_spec.rb
+++ b/spec/features/security/group/private_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Private Group access' do
+RSpec.describe 'Private Group access' do
   include AccessMatchers
 
   let(:group)   { create(:group, :private) }
diff --git a/spec/features/security/group/public_access_spec.rb b/spec/features/security/group/public_access_spec.rb
index bf05f276cc6..ee72b84616a 100644
--- a/spec/features/security/group/public_access_spec.rb
+++ b/spec/features/security/group/public_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Public Group access' do
+RSpec.describe 'Public Group access' do
   include AccessMatchers
 
   let(:group)   { create(:group, :public) }
diff --git a/spec/features/security/profile_access_spec.rb b/spec/features/security/profile_access_spec.rb
index 044a47567be..3aa8278866c 100644
--- a/spec/features/security/profile_access_spec.rb
+++ b/spec/features/security/profile_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Profile access" do
+RSpec.describe "Profile access" do
   include AccessMatchers
 
   describe "GET /profile/keys" do
diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb
index f29aa8de928..99f30d2f904 100644
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Internal Project Access" do
+RSpec.describe "Internal Project Access" do
   include AccessMatchers
 
   let_it_be(:project, reload: true) { create(:project, :internal, :repository) }
@@ -85,8 +85,8 @@ describe "Internal Project Access" do
     it { is_expected.to be_denied_for(:visitor) }
   end
 
-  describe "GET /:project_path/-/settings/members" do
-    subject { project_settings_members_path(project) }
+  describe "GET /:project_path/-/project_members" do
+    subject { project_project_members_path(project) }
 
     it { is_expected.to be_allowed_for(:admin) }
     it { is_expected.to be_allowed_for(:owner).of(project) }
diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb
index ac8596d89bc..e891e79db70 100644
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Private Project Access" do
+RSpec.describe "Private Project Access" do
   include AccessMatchers
 
   let_it_be(:project, reload: true) { create(:project, :private, :repository, public_builds: false) }
@@ -85,8 +85,8 @@ describe "Private Project Access" do
     it { is_expected.to be_denied_for(:visitor) }
   end
 
-  describe "GET /:project_path/-/settings/members" do
-    subject { project_settings_members_path(project) }
+  describe "GET /:project_path/-/project_members" do
+    subject { project_project_members_path(project) }
 
     it { is_expected.to be_allowed_for(:admin) }
     it { is_expected.to be_allowed_for(:owner).of(project) }
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 11e9bff10a1..ea00a59dee4 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Public Project Access" do
+RSpec.describe "Public Project Access" do
   include AccessMatchers
 
   let_it_be(:project, reload: true) { create(:project, :public, :repository) }
@@ -85,8 +85,8 @@ describe "Public Project Access" do
     it { is_expected.to be_allowed_for(:visitor) }
   end
 
-  describe "GET /:project_path/-/settings/members" do
-    subject { project_settings_members_path(project) }
+  describe "GET /:project_path/-/project_members" do
+    subject { project_project_members_path(project) }
 
     it { is_expected.to be_allowed_for(:admin) }
     it { is_expected.to be_allowed_for(:owner).of(project) }
diff --git a/spec/features/security/project/snippet/internal_access_spec.rb b/spec/features/security/project/snippet/internal_access_spec.rb
index 4b6c7d2c8fb..52ae1022a4e 100644
--- a/spec/features/security/project/snippet/internal_access_spec.rb
+++ b/spec/features/security/project/snippet/internal_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Internal Project Snippets Access" do
+RSpec.describe "Internal Project Snippets Access" do
   include AccessMatchers
 
   let(:project) { create(:project, :internal) }
diff --git a/spec/features/security/project/snippet/private_access_spec.rb b/spec/features/security/project/snippet/private_access_spec.rb
index 3135d25cc10..0c97b012ad1 100644
--- a/spec/features/security/project/snippet/private_access_spec.rb
+++ b/spec/features/security/project/snippet/private_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Private Project Snippets Access" do
+RSpec.describe "Private Project Snippets Access" do
   include AccessMatchers
 
   let(:project) { create(:project, :private) }
diff --git a/spec/features/security/project/snippet/public_access_spec.rb b/spec/features/security/project/snippet/public_access_spec.rb
index 81689a7bcb5..dfe78aa7ebc 100644
--- a/spec/features/security/project/snippet/public_access_spec.rb
+++ b/spec/features/security/project/snippet/public_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "Public Project Snippets Access" do
+RSpec.describe "Public Project Snippets Access" do
   include AccessMatchers
 
   let(:project) { create(:project, :public) }
diff --git a/spec/features/sentry_js_spec.rb b/spec/features/sentry_js_spec.rb
index b39c4f0a0ae..1d277ba7b3c 100644
--- a/spec/features/sentry_js_spec.rb
+++ b/spec/features/sentry_js_spec.rb
@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-describe 'Sentry' do
-  let(:sentry_path) { '/sentry.chunk.js' }
+RSpec.describe 'Sentry' do
+  let(:sentry_regex_path) { '\/sentry.*\.chunk\.js' }
 
   it 'does not load sentry if sentry is disabled' do
     allow(Gitlab.config.sentry).to receive(:enabled).and_return(false)
@@ -22,7 +22,7 @@ describe 'Sentry' do
 
   def has_requested_sentry
     page.all('script', visible: false).one? do |elm|
-      elm[:src] =~ /#{sentry_path}$/
+      elm[:src] =~ /#{sentry_regex_path}$/
     end
   end
 end
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb
index 3c7a31ac11b..04ca8a09ca8 100644
--- a/spec/features/signed_commits_spec.rb
+++ b/spec/features/signed_commits_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'GPG signed commits' do
+RSpec.describe 'GPG signed commits' do
   let(:project) { create(:project, :public, :repository) }
 
   it 'changes from unverified to verified when the user changes their email to match the gpg key', :sidekiq_might_not_need_inline do
diff --git a/spec/features/snippets/embedded_snippet_spec.rb b/spec/features/snippets/embedded_snippet_spec.rb
index d6275b5a265..4f2ab598a6f 100644
--- a/spec/features/snippets/embedded_snippet_spec.rb
+++ b/spec/features/snippets/embedded_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Embedded Snippets' do
+RSpec.describe 'Embedded Snippets' do
   let(:snippet) { create(:personal_snippet, :public, file_name: 'random_dir.rb', content: content) }
   let(:content) { "require 'fileutils'\nFileUtils.mkdir_p 'some/random_dir'\n" }
 
diff --git a/spec/features/snippets/explore_spec.rb b/spec/features/snippets/explore_spec.rb
index 2075742eafb..b62c35bf96e 100644
--- a/spec/features/snippets/explore_spec.rb
+++ b/spec/features/snippets/explore_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Explore Snippets' do
+RSpec.describe 'Explore Snippets' do
   let!(:public_snippet) { create(:personal_snippet, :public) }
   let!(:internal_snippet) { create(:personal_snippet, :internal) }
   let!(:private_snippet) { create(:personal_snippet, :private) }
diff --git a/spec/features/snippets/internal_snippet_spec.rb b/spec/features/snippets/internal_snippet_spec.rb
index fd7ef71db15..3ce297ab22d 100644
--- a/spec/features/snippets/internal_snippet_spec.rb
+++ b/spec/features/snippets/internal_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Internal Snippets', :js do
+RSpec.describe 'Internal Snippets', :js do
   let(:internal_snippet) { create(:personal_snippet, :internal) }
 
   before do
diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb
index 57264f97ddc..aaaa61fec62 100644
--- a/spec/features/snippets/notes_on_personal_snippets_spec.rb
+++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Comments on personal snippets', :js do
+RSpec.describe 'Comments on personal snippets', :js do
   include NoteInteractionHelpers
 
   let!(:user)    { create(:user) }
diff --git a/spec/features/snippets/private_snippets_spec.rb b/spec/features/snippets/private_snippets_spec.rb
index 37f45f22a27..6b45f3485e7 100644
--- a/spec/features/snippets/private_snippets_spec.rb
+++ b/spec/features/snippets/private_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Private Snippets', :js do
+RSpec.describe 'Private Snippets', :js do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/snippets/public_snippets_spec.rb b/spec/features/snippets/public_snippets_spec.rb
index 295e61ffb56..4b72b33245d 100644
--- a/spec/features/snippets/public_snippets_spec.rb
+++ b/spec/features/snippets/public_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Public Snippets', :js do
+RSpec.describe 'Public Snippets', :js do
   before do
     stub_feature_flags(snippets_vue: false)
   end
diff --git a/spec/features/snippets/search_snippets_spec.rb b/spec/features/snippets/search_snippets_spec.rb
index d3e02d43813..4f299edc9da 100644
--- a/spec/features/snippets/search_snippets_spec.rb
+++ b/spec/features/snippets/search_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Search Snippets' do
+RSpec.describe 'Search Snippets' do
   it 'User searches for snippets by title' do
     public_snippet = create(:personal_snippet, :public, title: 'Beginning and Middle')
     private_snippet = create(:personal_snippet, :private, title: 'Middle and End')
diff --git a/spec/features/snippets/show_spec.rb b/spec/features/snippets/show_spec.rb
index 9c686be012b..9125ed74273 100644
--- a/spec/features/snippets/show_spec.rb
+++ b/spec/features/snippets/show_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Snippet', :js do
+RSpec.describe 'Snippet', :js do
   let(:project) { create(:project, :repository) }
   let(:snippet) { create(:personal_snippet, :public, file_name: file_name, content: content) }
 
diff --git a/spec/features/snippets/spam_snippets_spec.rb b/spec/features/snippets/spam_snippets_spec.rb
index d7b181dc678..e6a9467a3d7 100644
--- a/spec/features/snippets/spam_snippets_spec.rb
+++ b/spec/features/snippets/spam_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples_for 'snippet editor' do
+RSpec.shared_examples_for 'snippet editor' do
   include_context 'includes Spam constants'
 
   def description_field
@@ -68,7 +68,7 @@ shared_examples_for 'snippet editor' do
   context 'when SpamVerdictService requires recaptcha' do
     before do
       expect_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
-        expect(verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+        expect(verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
       end
     end
 
@@ -122,7 +122,7 @@ shared_examples_for 'snippet editor' do
   end
 end
 
-describe 'User creates snippet', :js do
+RSpec.describe 'User creates snippet', :js do
   let_it_be(:user) { create(:user) }
 
   it_behaves_like "snippet editor"
diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb
index 62054c1f491..b100e035d38 100644
--- a/spec/features/snippets/user_creates_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
@@ -2,12 +2,11 @@
 
 require 'spec_helper'
 
-shared_examples_for 'snippet editor' do
+RSpec.shared_examples_for 'snippet editor' do
   before do
     stub_feature_flags(snippets_vue: false)
     stub_feature_flags(snippets_edit_vue: false)
     sign_in(user)
-    visit new_snippet_path
   end
 
   def description_field
@@ -28,6 +27,8 @@ shared_examples_for 'snippet editor' do
   end
 
   it 'Authenticated user creates a snippet' do
+    visit new_snippet_path
+
     fill_form
 
     click_button('Create snippet')
@@ -42,6 +43,8 @@ shared_examples_for 'snippet editor' do
   end
 
   it 'previews a snippet with file' do
+    visit new_snippet_path
+
     # Click placeholder first to expand full description field
     description_field.click
     fill_in 'personal_snippet_description', with: 'My Snippet'
@@ -62,6 +65,8 @@ shared_examples_for 'snippet editor' do
   end
 
   it 'uploads a file when dragging into textarea' do
+    visit new_snippet_path
+
     fill_form
 
     dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
@@ -86,6 +91,8 @@ shared_examples_for 'snippet editor' do
         allow(instance).to receive(:create_commit).and_raise(StandardError, error)
       end
 
+      visit new_snippet_path
+
       fill_form
 
       click_button('Create snippet')
@@ -107,6 +114,8 @@ shared_examples_for 'snippet editor' do
   end
 
   it 'validation fails for the first time' do
+    visit new_snippet_path
+
     fill_in 'personal_snippet_title', with: 'My Snippet Title'
     click_button('Create snippet')
 
@@ -132,6 +141,8 @@ shared_examples_for 'snippet editor' do
   end
 
   it 'Authenticated user creates a snippet with + in filename' do
+    visit new_snippet_path
+
     fill_in 'personal_snippet_title', with: 'My Snippet Title'
     page.within('.file-editor') do
       find(:xpath, "//input[@id='personal_snippet_file_name']").set 'snippet+file+name'
@@ -146,9 +157,32 @@ shared_examples_for 'snippet editor' do
     expect(page).to have_content('snippet+file+name')
     expect(page).to have_content('Hello World!')
   end
+
+  context 'when snippets default visibility level is restricted' do
+    before do
+      stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PRIVATE],
+                              default_snippet_visibility: Gitlab::VisibilityLevel::PRIVATE)
+    end
+
+    it 'creates a snippet using the lowest available visibility level as default' do
+      visit new_snippet_path
+
+      fill_form
+
+      click_button('Create snippet')
+      wait_for_requests
+
+      visit snippets_path
+      click_link('Internal')
+
+      expect(page).to have_content('My Snippet Title')
+      created_snippet = Snippet.last
+      expect(created_snippet.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
+    end
+  end
 end
 
-describe 'User creates snippet', :js do
+RSpec.describe 'User creates snippet', :js do
   include DropzoneHelper
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/features/snippets/user_deletes_snippet_spec.rb b/spec/features/snippets/user_deletes_snippet_spec.rb
index 35619b92561..d7cfc67df13 100644
--- a/spec/features/snippets/user_deletes_snippet_spec.rb
+++ b/spec/features/snippets/user_deletes_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User deletes snippet' do
+RSpec.describe 'User deletes snippet' do
   let(:user) { create(:user) }
   let(:content) { 'puts "test"' }
   let(:snippet) { create(:personal_snippet, :public, content: content, author: user) }
diff --git a/spec/features/snippets/user_edits_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb
index 40b0113cf39..3692b0d1ad8 100644
--- a/spec/features/snippets/user_edits_snippet_spec.rb
+++ b/spec/features/snippets/user_edits_snippet_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User edits snippet', :js do
+RSpec.describe 'User edits snippet', :js do
   include DropzoneHelper
 
   let_it_be(:file_name) { 'test.rb' }
diff --git a/spec/features/snippets/user_snippets_spec.rb b/spec/features/snippets/user_snippets_spec.rb
index d9faea55b29..a313dc3b26a 100644
--- a/spec/features/snippets/user_snippets_spec.rb
+++ b/spec/features/snippets/user_snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User Snippets' do
+RSpec.describe 'User Snippets' do
   let(:author) { create(:user) }
   let!(:public_snippet) { create(:personal_snippet, :public, author: author, title: "This is a public snippet") }
   let!(:internal_snippet) { create(:personal_snippet, :internal, author: author, title: "This is an internal snippet") }
diff --git a/spec/features/snippets_spec.rb b/spec/features/snippets_spec.rb
index bc7fa161e87..75309ca3e7c 100644
--- a/spec/features/snippets_spec.rb
+++ b/spec/features/snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Snippets' do
+RSpec.describe 'Snippets' do
   context 'when the project has snippets' do
     let(:project) { create(:project, :public) }
     let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) }
diff --git a/spec/features/static_site_editor_spec.rb b/spec/features/static_site_editor_spec.rb
index de000ee2b9f..9ae23b4bdec 100644
--- a/spec/features/static_site_editor_spec.rb
+++ b/spec/features/static_site_editor_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Static Site Editor' do
+RSpec.describe 'Static Site Editor' do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :public, :repository) }
 
diff --git a/spec/features/tags/developer_creates_tag_spec.rb b/spec/features/tags/developer_creates_tag_spec.rb
index a2d53b04c9d..f982d403ce1 100644
--- a/spec/features/tags/developer_creates_tag_spec.rb
+++ b/spec/features/tags/developer_creates_tag_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Developer creates tag' do
+RSpec.describe 'Developer creates tag' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, :repository, namespace: group) }
diff --git a/spec/features/tags/developer_deletes_tag_spec.rb b/spec/features/tags/developer_deletes_tag_spec.rb
index 50eac8ddaed..de9296bc08e 100644
--- a/spec/features/tags/developer_deletes_tag_spec.rb
+++ b/spec/features/tags/developer_deletes_tag_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Developer deletes tag' do
+RSpec.describe 'Developer deletes tag' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, :repository, namespace: group) }
diff --git a/spec/features/tags/developer_updates_tag_spec.rb b/spec/features/tags/developer_updates_tag_spec.rb
index 167079c3f31..93a275131bd 100644
--- a/spec/features/tags/developer_updates_tag_spec.rb
+++ b/spec/features/tags/developer_updates_tag_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Developer updates tag' do
+RSpec.describe 'Developer updates tag' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, :repository, namespace: group) }
diff --git a/spec/features/tags/developer_views_tags_spec.rb b/spec/features/tags/developer_views_tags_spec.rb
index b892b2b4d12..4888611472c 100644
--- a/spec/features/tags/developer_views_tags_spec.rb
+++ b/spec/features/tags/developer_views_tags_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Developer views tags' do
+RSpec.describe 'Developer views tags' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
 
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 24a183017c9..fa87c4bb1c4 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Task Lists' do
+RSpec.describe 'Task Lists' do
   include Warden::Test::Helpers
 
   let(:project) { create(:project, :public, :repository) }
diff --git a/spec/features/triggers_spec.rb b/spec/features/triggers_spec.rb
index af406961bbc..577134fe722 100644
--- a/spec/features/triggers_spec.rb
+++ b/spec/features/triggers_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Triggers', :js do
+RSpec.describe 'Triggers', :js do
   let(:trigger_title) { 'trigger desc' }
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
index bb18703f90e..8dbedc0a7ee 100644
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
+RSpec.describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
   def manage_two_factor_authentication
     click_on 'Manage two-factor authentication'
     expect(page).to have_content("Set up new U2F device")
@@ -257,7 +257,7 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
       expect(page).to have_button('Verify code')
       expect(page).to have_css('#user_otp_attempt')
       expect(page).not_to have_link('Sign in via 2FA code')
-      expect(page).not_to have_css('#js-authenticate-u2f')
+      expect(page).not_to have_css('#js-authenticate-token-2fa')
     end
 
     before do
diff --git a/spec/features/unsubscribe_links_spec.rb b/spec/features/unsubscribe_links_spec.rb
index cf30776786b..966d90ab16b 100644
--- a/spec/features/unsubscribe_links_spec.rb
+++ b/spec/features/unsubscribe_links_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Unsubscribe links', :sidekiq_might_not_need_inline do
+RSpec.describe 'Unsubscribe links', :sidekiq_might_not_need_inline do
   include Warden::Test::Helpers
 
   let(:recipient) { create(:user) }
diff --git a/spec/features/uploads/user_uploads_avatar_to_group_spec.rb b/spec/features/uploads/user_uploads_avatar_to_group_spec.rb
index d9d9d7e4b04..8daa869a6e3 100644
--- a/spec/features/uploads/user_uploads_avatar_to_group_spec.rb
+++ b/spec/features/uploads/user_uploads_avatar_to_group_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User uploads avatar to group' do
+RSpec.describe 'User uploads avatar to group' do
   it 'they see the new avatar' do
     user = create(:user)
     group = create(:group)
diff --git a/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
index fc31d7aa3d1..31e29810c65 100644
--- a/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
+++ b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User uploads avatar to profile' do
+RSpec.describe 'User uploads avatar to profile' do
   let!(:user) { create(:user) }
   let(:avatar_file_path) { Rails.root.join('spec', 'fixtures', 'dk.png') }
 
diff --git a/spec/features/uploads/user_uploads_file_to_note_spec.rb b/spec/features/uploads/user_uploads_file_to_note_spec.rb
index 570ecad41fa..7f55ddc1d64 100644
--- a/spec/features/uploads/user_uploads_file_to_note_spec.rb
+++ b/spec/features/uploads/user_uploads_file_to_note_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User uploads file to note' do
+RSpec.describe 'User uploads file to note' do
   include DropzoneHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/usage_stats_consent_spec.rb b/spec/features/usage_stats_consent_spec.rb
index 14232b1b370..04bdf25acc0 100644
--- a/spec/features/usage_stats_consent_spec.rb
+++ b/spec/features/usage_stats_consent_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Usage stats consent' do
+RSpec.describe 'Usage stats consent' do
   context 'when signed in' do
     let(:user) { create(:admin, created_at: 8.days.ago) }
     let(:message) { 'To help improve GitLab, we would like to periodically collect usage information.' }
diff --git a/spec/features/user_can_display_performance_bar_spec.rb b/spec/features/user_can_display_performance_bar_spec.rb
index 8b3f193f418..9c67523f88f 100644
--- a/spec/features/user_can_display_performance_bar_spec.rb
+++ b/spec/features/user_can_display_performance_bar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User can display performance bar', :js do
+RSpec.describe 'User can display performance bar', :js do
   shared_examples 'performance bar cannot be displayed' do
     it 'does not show the performance bar by default' do
       expect(page).not_to have_css('#js-peek')
diff --git a/spec/features/user_opens_link_to_comment_spec.rb b/spec/features/user_opens_link_to_comment_spec.rb
index 9533a4fe40d..ae84f69f432 100644
--- a/spec/features/user_opens_link_to_comment_spec.rb
+++ b/spec/features/user_opens_link_to_comment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User opens link to comment', :js do
+RSpec.describe 'User opens link to comment', :js do
   let(:project) { create(:project, :public) }
   let(:note) { create(:note_on_issue, project: project) }
 
diff --git a/spec/features/user_sees_revert_modal_spec.rb b/spec/features/user_sees_revert_modal_spec.rb
index c0cffe885de..331f51dad95 100644
--- a/spec/features/user_sees_revert_modal_spec.rb
+++ b/spec/features/user_sees_revert_modal_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Merge request > User sees revert modal', :js, :sidekiq_might_not_need_inline do
+RSpec.describe 'Merge request > User sees revert modal', :js, :sidekiq_might_not_need_inline do
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/user_sorts_things_spec.rb b/spec/features/user_sorts_things_spec.rb
index 8397854df27..6eaa620b538 100644
--- a/spec/features/user_sorts_things_spec.rb
+++ b/spec/features/user_sorts_things_spec.rb
@@ -6,7 +6,7 @@ require "spec_helper"
 # to check if the sorting option set by user is being kept persisted while going through pages.
 # The `it`s are named here by convention `starting point -> some pages -> final point`.
 # All those specs are moved out to this spec intentionally to keep them all in one place.
-describe "User sorts things" do
+RSpec.describe "User sorts things" do
   include Spec::Support::Helpers::Features::SortingHelpers
   include DashboardHelper
 
diff --git a/spec/features/users/active_sessions_spec.rb b/spec/features/users/active_sessions_spec.rb
index c717e89eafb..8e2e16e555e 100644
--- a/spec/features/users/active_sessions_spec.rb
+++ b/spec/features/users/active_sessions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Active user sessions', :clean_gitlab_redis_shared_state do
+RSpec.describe 'Active user sessions', :clean_gitlab_redis_shared_state do
   it 'Successful login adds a new active user login' do
     now = Time.zone.parse('2018-03-12 09:06')
     Timecop.freeze(now) do
diff --git a/spec/features/users/add_email_to_existing_account_spec.rb b/spec/features/users/add_email_to_existing_account_spec.rb
index 42e352399a8..9130b96b0e3 100644
--- a/spec/features/users/add_email_to_existing_account_spec.rb
+++ b/spec/features/users/add_email_to_existing_account_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'AdditionalEmailToExistingAccount' do
+RSpec.describe 'AdditionalEmailToExistingAccount' do
   describe 'add secondary email associated with account' do
     let(:user) { create(:user) }
 
diff --git a/spec/features/users/anonymous_sessions_spec.rb b/spec/features/users/anonymous_sessions_spec.rb
index e87ee39a3f4..420fb225f94 100644
--- a/spec/features/users/anonymous_sessions_spec.rb
+++ b/spec/features/users/anonymous_sessions_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Session TTLs', :clean_gitlab_redis_shared_state do
+RSpec.describe 'Session TTLs', :clean_gitlab_redis_shared_state do
   it 'creates a session with a short TTL when login fails' do
     visit new_user_session_path
     # The session key only gets created after a post
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index 5a8db3c070d..7ba663d08d4 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Login' do
+RSpec.describe 'Login' do
   include TermsHelper
   include UserLoginHelper
 
diff --git a/spec/features/users/logout_spec.rb b/spec/features/users/logout_spec.rb
index a72a42c738d..ffb8785b277 100644
--- a/spec/features/users/logout_spec.rb
+++ b/spec/features/users/logout_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Logout/Sign out', :js do
+RSpec.describe 'Logout/Sign out', :js do
   let(:user) { create(:user) }
 
   before do
diff --git a/spec/features/users/overview_spec.rb b/spec/features/users/overview_spec.rb
index b3531d040e4..549087e5950 100644
--- a/spec/features/users/overview_spec.rb
+++ b/spec/features/users/overview_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Overview tab on a user profile', :js do
+RSpec.describe 'Overview tab on a user profile', :js do
   let(:user) { create(:user) }
   let(:contributed_project) { create(:project, :public, :repository) }
 
diff --git a/spec/features/users/rss_spec.rb b/spec/features/users/rss_spec.rb
index ecdbf032623..aba1ff63fab 100644
--- a/spec/features/users/rss_spec.rb
+++ b/spec/features/users/rss_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User RSS' do
+RSpec.describe 'User RSS' do
   let(:user) { create(:user) }
   let(:path) { user_path(create(:user)) }
 
diff --git a/spec/features/users/show_spec.rb b/spec/features/users/show_spec.rb
index a45389a7ed5..dd5c2442d00 100644
--- a/spec/features/users/show_spec.rb
+++ b/spec/features/users/show_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'User page' do
+RSpec.describe 'User page' do
   include ExternalAuthorizationServiceHelpers
 
   let(:user) { create(:user) }
diff --git a/spec/features/users/signup_spec.rb b/spec/features/users/signup_spec.rb
index 0ef86dde030..66a26493339 100644
--- a/spec/features/users/signup_spec.rb
+++ b/spec/features/users/signup_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples 'Signup' do
+RSpec.shared_examples 'Signup' do
   include TermsHelper
 
   let(:new_user) { build_stubbed(:user) }
@@ -420,7 +420,7 @@ shared_examples 'Signup' do
   end
 end
 
-shared_examples 'Signup name validation' do |field, max_length|
+RSpec.shared_examples 'Signup name validation' do |field, max_length|
   before do
     visit new_user_registration_path
   end
@@ -458,7 +458,7 @@ shared_examples 'Signup name validation' do |field, max_length|
   end
 end
 
-describe 'With original flow' do
+RSpec.describe 'With original flow' do
   before do
     stub_experiment(signup_flow: false)
     stub_experiment_for_user(signup_flow: false)
@@ -468,7 +468,7 @@ describe 'With original flow' do
   it_behaves_like 'Signup name validation', 'new_user_name', 255
 end
 
-describe 'With experimental flow' do
+RSpec.describe 'With experimental flow' do
   before do
     stub_experiment(signup_flow: true)
     stub_experiment_for_user(signup_flow: true)
diff --git a/spec/features/users/snippets_spec.rb b/spec/features/users/snippets_spec.rb
index 8b6bf54b642..ce19e491a7c 100644
--- a/spec/features/users/snippets_spec.rb
+++ b/spec/features/users/snippets_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Snippets tab on a user profile', :js do
+RSpec.describe 'Snippets tab on a user profile', :js do
   context 'when the user has snippets' do
     let(:user) { create(:user) }
 
diff --git a/spec/features/users/terms_spec.rb b/spec/features/users/terms_spec.rb
index ec2210faa80..5275845fe5b 100644
--- a/spec/features/users/terms_spec.rb
+++ b/spec/features/users/terms_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Users > Terms' do
+RSpec.describe 'Users > Terms' do
   include TermsHelper
 
   let!(:term) { create(:term, terms: 'By accepting, you promise to be nice!') }
diff --git a/spec/features/users/user_browses_projects_on_user_page_spec.rb b/spec/features/users/user_browses_projects_on_user_page_spec.rb
index 9a1ee7715d6..7d05b2ae27a 100644
--- a/spec/features/users/user_browses_projects_on_user_page_spec.rb
+++ b/spec/features/users/user_browses_projects_on_user_page_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Users > User browses projects on user page', :js do
+RSpec.describe 'Users > User browses projects on user page', :js do
   let!(:user) { create :user }
   let!(:private_project) do
     create :project, :private, name: 'private', namespace: user.namespace do |project|
diff --git a/spec/finders/abuse_reports_finder_spec.rb b/spec/finders/abuse_reports_finder_spec.rb
index c84a645ca08..52620b3e421 100644
--- a/spec/finders/abuse_reports_finder_spec.rb
+++ b/spec/finders/abuse_reports_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AbuseReportsFinder, '#execute' do
+RSpec.describe AbuseReportsFinder, '#execute' do
   let(:params) { {} }
   let!(:user1) { create(:user) }
   let!(:user2) { create(:user) }
diff --git a/spec/finders/access_requests_finder_spec.rb b/spec/finders/access_requests_finder_spec.rb
index fbfc8035bcc..f4fda1f3dd2 100644
--- a/spec/finders/access_requests_finder_spec.rb
+++ b/spec/finders/access_requests_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AccessRequestsFinder do
+RSpec.describe AccessRequestsFinder do
   let(:user) { create(:user) }
   let(:access_requester) { create(:user) }
 
diff --git a/spec/finders/admin/projects_finder_spec.rb b/spec/finders/admin/projects_finder_spec.rb
index eb5d0bba183..03eb41ddfb6 100644
--- a/spec/finders/admin/projects_finder_spec.rb
+++ b/spec/finders/admin/projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ProjectsFinder do
+RSpec.describe Admin::ProjectsFinder do
   describe '#execute' do
     let(:user) { create(:user) }
     let(:group) { create(:group, :public) }
diff --git a/spec/finders/admin/runners_finder_spec.rb b/spec/finders/admin/runners_finder_spec.rb
deleted file mode 100644
index 94ccb398801..00000000000
--- a/spec/finders/admin/runners_finder_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Admin::RunnersFinder do
-  describe '#execute' do
-    context 'with empty params' do
-      it 'returns all runners' do
-        runner1 = create :ci_runner, active: true
-        runner2 = create :ci_runner, active: false
-
-        expect(described_class.new(params: {}).execute).to match_array [runner1, runner2]
-      end
-    end
-
-    context 'filter by search term' do
-      it 'calls Ci::Runner.search' do
-        expect(Ci::Runner).to receive(:search).with('term').and_call_original
-
-        described_class.new(params: { search: 'term' }).execute
-      end
-    end
-
-    context 'filter by status' do
-      it 'calls the corresponding scope on Ci::Runner' do
-        expect(Ci::Runner).to receive(:paused).and_call_original
-
-        described_class.new(params: { status_status: 'paused' }).execute
-      end
-    end
-
-    context 'filter by runner type' do
-      it 'calls the corresponding scope on Ci::Runner' do
-        expect(Ci::Runner).to receive(:project_type).and_call_original
-
-        described_class.new(params: { type_type: 'project_type' }).execute
-      end
-    end
-
-    context 'filter by tag_name' do
-      it 'calls the corresponding scope on Ci::Runner' do
-        expect(Ci::Runner).to receive(:tagged_with).with(%w[tag1 tag2]).and_call_original
-
-        described_class.new(params: { tag_name: %w[tag1 tag2] }).execute
-      end
-    end
-
-    context 'sort' do
-      context 'without sort param' do
-        it 'sorts by created_at' do
-          runner1 = create :ci_runner, created_at: '2018-07-12 07:00'
-          runner2 = create :ci_runner, created_at: '2018-07-12 08:00'
-          runner3 = create :ci_runner, created_at: '2018-07-12 09:00'
-
-          expect(described_class.new(params: {}).execute).to eq [runner3, runner2, runner1]
-        end
-      end
-
-      context 'with sort param' do
-        it 'sorts by specified attribute' do
-          runner1 = create :ci_runner, contacted_at: 1.minute.ago
-          runner2 = create :ci_runner, contacted_at: 3.minutes.ago
-          runner3 = create :ci_runner, contacted_at: 2.minutes.ago
-
-          expect(described_class.new(params: { sort: 'contacted_asc' }).execute).to eq [runner2, runner3, runner1]
-        end
-      end
-    end
-
-    context 'paginate' do
-      it 'returns the runners for the specified page' do
-        stub_const('Admin::RunnersFinder::NUMBER_OF_RUNNERS_PER_PAGE', 1)
-        runner1 = create :ci_runner, created_at: '2018-07-12 07:00'
-        runner2 = create :ci_runner, created_at: '2018-07-12 08:00'
-
-        expect(described_class.new(params: { page: 1 }).execute).to eq [runner2]
-        expect(described_class.new(params: { page: 2 }).execute).to eq [runner1]
-      end
-    end
-  end
-end
diff --git a/spec/finders/alert_management/alerts_finder_spec.rb b/spec/finders/alert_management/alerts_finder_spec.rb
index c6d2d0ad4ef..5920d579ba6 100644
--- a/spec/finders/alert_management/alerts_finder_spec.rb
+++ b/spec/finders/alert_management/alerts_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AlertManagement::AlertsFinder, '#execute' do
+RSpec.describe AlertManagement::AlertsFinder, '#execute' do
   let_it_be(:current_user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:alert_1) { create(:alert_management_alert, :all_fields, :resolved, project: project, ended_at: 1.year.ago, events: 2, severity: :high) }
@@ -100,13 +100,13 @@ describe AlertManagement::AlertsFinder, '#execute' do
 
         context 'when sorting by start time' do
           context 'sorts alerts ascending' do
-            let(:params) { { sort: 'start_time_asc' } }
+            let(:params) { { sort: 'started_at_asc' } }
 
             it { is_expected.to eq [alert_1, alert_2] }
           end
 
           context 'sorts alerts descending' do
-            let(:params) { { sort: 'start_time_desc' } }
+            let(:params) { { sort: 'started_at_desc' } }
 
             it { is_expected.to eq [alert_2, alert_1] }
           end
@@ -114,13 +114,13 @@ describe AlertManagement::AlertsFinder, '#execute' do
 
         context 'when sorting by end time' do
           context 'sorts alerts ascending' do
-            let(:params) { { sort: 'end_time_asc' } }
+            let(:params) { { sort: 'ended_at_asc' } }
 
             it { is_expected.to eq [alert_1, alert_2] }
           end
 
           context 'sorts alerts descending' do
-            let(:params) { { sort: 'end_time_desc' } }
+            let(:params) { { sort: 'ended_at_desc' } }
 
             it { is_expected.to eq [alert_2, alert_1] }
           end
@@ -131,13 +131,13 @@ describe AlertManagement::AlertsFinder, '#execute' do
           let_it_be(:alert_count_3) { create(:alert_management_alert, project: project, events: 3) }
 
           context 'sorts alerts ascending' do
-            let(:params) { { sort: 'events_count_asc' } }
+            let(:params) { { sort: 'event_count_asc' } }
 
             it { is_expected.to eq [alert_2, alert_1, alert_count_3, alert_count_6] }
           end
 
           context 'sorts alerts descending' do
-            let(:params) { { sort: 'events_count_desc' } }
+            let(:params) { { sort: 'event_count_desc' } }
 
             it { is_expected.to eq [alert_count_6, alert_count_3, alert_1, alert_2] }
           end
diff --git a/spec/finders/applications_finder_spec.rb b/spec/finders/applications_finder_spec.rb
index 14d6b35cc27..dc615144b88 100644
--- a/spec/finders/applications_finder_spec.rb
+++ b/spec/finders/applications_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ApplicationsFinder do
+RSpec.describe ApplicationsFinder do
   let(:application1) { create(:application, name: 'some_application', owner: nil, redirect_uri: 'http://some_application.url', scopes: '') }
   let(:application2) { create(:application, name: 'another_application', owner: nil, redirect_uri: 'http://other_application.url', scopes: '') }
 
diff --git a/spec/finders/autocomplete/acts_as_taggable_on/tags_finder_spec.rb b/spec/finders/autocomplete/acts_as_taggable_on/tags_finder_spec.rb
index c4e6c9cc9f5..9e91de32d0b 100644
--- a/spec/finders/autocomplete/acts_as_taggable_on/tags_finder_spec.rb
+++ b/spec/finders/autocomplete/acts_as_taggable_on/tags_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Autocomplete::ActsAsTaggableOn::TagsFinder do
+RSpec.describe Autocomplete::ActsAsTaggableOn::TagsFinder do
   describe '#execute' do
     context 'with empty params' do
       it 'returns all tags' do
diff --git a/spec/finders/autocomplete/group_finder_spec.rb b/spec/finders/autocomplete/group_finder_spec.rb
index d7cb2c3bbe2..8cbb8cdbee8 100644
--- a/spec/finders/autocomplete/group_finder_spec.rb
+++ b/spec/finders/autocomplete/group_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Autocomplete::GroupFinder do
+RSpec.describe Autocomplete::GroupFinder do
   let(:user) { create(:user) }
 
   describe '#execute' do
diff --git a/spec/finders/autocomplete/move_to_project_finder_spec.rb b/spec/finders/autocomplete/move_to_project_finder_spec.rb
index f2da82bb9be..61328a5335a 100644
--- a/spec/finders/autocomplete/move_to_project_finder_spec.rb
+++ b/spec/finders/autocomplete/move_to_project_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Autocomplete::MoveToProjectFinder do
+RSpec.describe Autocomplete::MoveToProjectFinder do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
 
diff --git a/spec/finders/autocomplete/project_finder_spec.rb b/spec/finders/autocomplete/project_finder_spec.rb
index 207d0598c28..0c9b4989ed1 100644
--- a/spec/finders/autocomplete/project_finder_spec.rb
+++ b/spec/finders/autocomplete/project_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Autocomplete::ProjectFinder do
+RSpec.describe Autocomplete::ProjectFinder do
   let(:user) { create(:user) }
 
   describe '#execute' do
diff --git a/spec/finders/autocomplete/users_finder_spec.rb b/spec/finders/autocomplete/users_finder_spec.rb
index 5d340c46114..357b6dfcea2 100644
--- a/spec/finders/autocomplete/users_finder_spec.rb
+++ b/spec/finders/autocomplete/users_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Autocomplete::UsersFinder do
+RSpec.describe Autocomplete::UsersFinder do
   describe '#execute' do
     let!(:user1) { create(:user, username: 'johndoe') }
     let!(:user2) { create(:user, :blocked, username: 'notsorandom') }
diff --git a/spec/finders/award_emojis_finder_spec.rb b/spec/finders/award_emojis_finder_spec.rb
index 975722e780b..7a75ad716d0 100644
--- a/spec/finders/award_emojis_finder_spec.rb
+++ b/spec/finders/award_emojis_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AwardEmojisFinder do
+RSpec.describe AwardEmojisFinder do
   let_it_be(:issue_1) { create(:issue) }
   let_it_be(:issue_1_thumbsup) { create(:award_emoji, name: 'thumbsup', awardable: issue_1) }
   let_it_be(:issue_1_thumbsdown) { create(:award_emoji, name: 'thumbsdown', awardable: issue_1) }
diff --git a/spec/finders/boards/visits_finder_spec.rb b/spec/finders/boards/visits_finder_spec.rb
index 7e3ad8aa9f0..3811c99cc59 100644
--- a/spec/finders/boards/visits_finder_spec.rb
+++ b/spec/finders/boards/visits_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Boards::VisitsFinder do
+RSpec.describe Boards::VisitsFinder do
   describe '#latest' do
     let(:user) { create(:user) }
 
diff --git a/spec/finders/branches_finder_spec.rb b/spec/finders/branches_finder_spec.rb
index 5f75ff8c6ff..2e52093342d 100644
--- a/spec/finders/branches_finder_spec.rb
+++ b/spec/finders/branches_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe BranchesFinder do
+RSpec.describe BranchesFinder do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
diff --git a/spec/finders/ci/daily_build_group_report_results_finder_spec.rb b/spec/finders/ci/daily_build_group_report_results_finder_spec.rb
index 3000ef650d3..bdb0bc9b561 100644
--- a/spec/finders/ci/daily_build_group_report_results_finder_spec.rb
+++ b/spec/finders/ci/daily_build_group_report_results_finder_spec.rb
@@ -2,23 +2,12 @@
 
 require 'spec_helper'
 
-describe Ci::DailyBuildGroupReportResultsFinder do
+RSpec.describe Ci::DailyBuildGroupReportResultsFinder do
   describe '#execute' do
     let(:project) { create(:project, :private) }
     let(:ref_path) { 'refs/heads/master' }
     let(:limit) { nil }
 
-    def create_daily_coverage(group_name, coverage, date)
-      create(
-        :ci_daily_build_group_report_result,
-        project: project,
-        ref_path: ref_path,
-        group_name: group_name,
-        data: { 'coverage' => coverage },
-        date: date
-      )
-    end
-
     let!(:rspec_coverage_1) { create_daily_coverage('rspec', 79.0, '2020-03-09') }
     let!(:karma_coverage_1) { create_daily_coverage('karma', 89.0, '2020-03-09') }
     let!(:rspec_coverage_2) { create_daily_coverage('rspec', 95.0, '2020-03-10') }
@@ -37,7 +26,7 @@ describe Ci::DailyBuildGroupReportResultsFinder do
       ).execute
     end
 
-    context 'when current user is allowed to download project code' do
+    context 'when current user is allowed to read build report results' do
       let(:current_user) { project.owner }
 
       it 'returns all matching results within the given date range' do
@@ -61,7 +50,7 @@ describe Ci::DailyBuildGroupReportResultsFinder do
       end
     end
 
-    context 'when current user is not allowed to download project code' do
+    context 'when current user is not allowed to read build report results' do
       let(:current_user) { create(:user) }
 
       it 'returns an empty result' do
@@ -69,4 +58,15 @@ describe Ci::DailyBuildGroupReportResultsFinder do
       end
     end
   end
+
+  def create_daily_coverage(group_name, coverage, date)
+    create(
+      :ci_daily_build_group_report_result,
+      project: project,
+      ref_path: ref_path,
+      group_name: group_name,
+      data: { 'coverage' => coverage },
+      date: date
+    )
+  end
 end
diff --git a/spec/finders/ci/job_artifacts_finder_spec.rb b/spec/finders/ci/job_artifacts_finder_spec.rb
index 3e701ba87fa..74875ab8b06 100644
--- a/spec/finders/ci/job_artifacts_finder_spec.rb
+++ b/spec/finders/ci/job_artifacts_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::JobArtifactsFinder do
+RSpec.describe Ci::JobArtifactsFinder do
   let(:project) { create(:project) }
 
   describe '#execute' do
diff --git a/spec/finders/ci/jobs_finder_spec.rb b/spec/finders/ci/jobs_finder_spec.rb
index 7083e8fbf43..e6680afa15c 100644
--- a/spec/finders/ci/jobs_finder_spec.rb
+++ b/spec/finders/ci/jobs_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::JobsFinder, '#execute' do
+RSpec.describe Ci::JobsFinder, '#execute' do
   let_it_be(:user) { create(:user) }
   let_it_be(:admin) { create(:user, :admin) }
   let_it_be(:project) { create(:project, :private, public_builds: false) }
diff --git a/spec/finders/ci/pipeline_schedules_finder_spec.rb b/spec/finders/ci/pipeline_schedules_finder_spec.rb
index 5b5154ce834..57842bbecd7 100644
--- a/spec/finders/ci/pipeline_schedules_finder_spec.rb
+++ b/spec/finders/ci/pipeline_schedules_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::PipelineSchedulesFinder do
+RSpec.describe Ci::PipelineSchedulesFinder do
   let(:project) { create(:project) }
 
   let!(:active_schedule) { create(:ci_pipeline_schedule, project: project) }
diff --git a/spec/finders/ci/pipelines_finder_spec.rb b/spec/finders/ci/pipelines_finder_spec.rb
index 6528093731e..680955ff9f9 100644
--- a/spec/finders/ci/pipelines_finder_spec.rb
+++ b/spec/finders/ci/pipelines_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::PipelinesFinder do
+RSpec.describe Ci::PipelinesFinder do
   let(:project) { create(:project, :public, :repository) }
   let(:current_user) { nil }
   let(:params) { {} }
diff --git a/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb b/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
index c49ac487519..543c289d366 100644
--- a/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
+++ b/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::PipelinesForMergeRequestFinder do
+RSpec.describe Ci::PipelinesForMergeRequestFinder do
   describe '#all' do
     let(:merge_request) { create(:merge_request) }
     let(:project) { merge_request.source_project }
diff --git a/spec/finders/ci/runner_jobs_finder_spec.rb b/spec/finders/ci/runner_jobs_finder_spec.rb
index a3245119291..7c9f762c000 100644
--- a/spec/finders/ci/runner_jobs_finder_spec.rb
+++ b/spec/finders/ci/runner_jobs_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Ci::RunnerJobsFinder do
+RSpec.describe Ci::RunnerJobsFinder do
   let(:project) { create(:project) }
   let(:runner) { create(:ci_runner, :instance) }
 
diff --git a/spec/finders/ci/runners_finder_spec.rb b/spec/finders/ci/runners_finder_spec.rb
new file mode 100644
index 00000000000..d4795d786bc
--- /dev/null
+++ b/spec/finders/ci/runners_finder_spec.rb
@@ -0,0 +1,304 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::RunnersFinder do
+  context 'admin' do
+    let_it_be(:admin) { create(:user, :admin) }
+
+    describe '#execute' do
+      context 'with empty params' do
+        it 'returns all runners' do
+          runner1 = create :ci_runner, active: true
+          runner2 = create :ci_runner, active: false
+
+          expect(described_class.new(current_user: admin, params: {}).execute).to match_array [runner1, runner2]
+        end
+      end
+
+      context 'filter by search term' do
+        it 'calls Ci::Runner.search' do
+          expect(Ci::Runner).to receive(:search).with('term').and_call_original
+
+          described_class.new(current_user: admin, params: { search: 'term' }).execute
+        end
+      end
+
+      context 'filter by status' do
+        it 'calls the corresponding scope on Ci::Runner' do
+          expect(Ci::Runner).to receive(:paused).and_call_original
+
+          described_class.new(current_user: admin, params: { status_status: 'paused' }).execute
+        end
+      end
+
+      context 'filter by runner type' do
+        it 'calls the corresponding scope on Ci::Runner' do
+          expect(Ci::Runner).to receive(:project_type).and_call_original
+
+          described_class.new(current_user: admin, params: { type_type: 'project_type' }).execute
+        end
+      end
+
+      context 'filter by tag_name' do
+        it 'calls the corresponding scope on Ci::Runner' do
+          expect(Ci::Runner).to receive(:tagged_with).with(%w[tag1 tag2]).and_call_original
+
+          described_class.new(current_user: admin, params: { tag_name: %w[tag1 tag2] }).execute
+        end
+      end
+
+      context 'sort' do
+        context 'without sort param' do
+          it 'sorts by created_at' do
+            runner1 = create :ci_runner, created_at: '2018-07-12 07:00'
+            runner2 = create :ci_runner, created_at: '2018-07-12 08:00'
+            runner3 = create :ci_runner, created_at: '2018-07-12 09:00'
+
+            expect(described_class.new(current_user: admin, params: {}).execute).to eq [runner3, runner2, runner1]
+          end
+        end
+
+        context 'with sort param' do
+          it 'sorts by specified attribute' do
+            runner1 = create :ci_runner, contacted_at: 1.minute.ago
+            runner2 = create :ci_runner, contacted_at: 3.minutes.ago
+            runner3 = create :ci_runner, contacted_at: 2.minutes.ago
+
+            expect(described_class.new(current_user: admin, params: { sort: 'contacted_asc' }).execute).to eq [runner2, runner3, runner1]
+          end
+        end
+      end
+
+      context 'paginate' do
+        it 'returns the runners for the specified page' do
+          stub_const('Ci::RunnersFinder::NUMBER_OF_RUNNERS_PER_PAGE', 1)
+          runner1 = create :ci_runner, created_at: '2018-07-12 07:00'
+          runner2 = create :ci_runner, created_at: '2018-07-12 08:00'
+
+          expect(described_class.new(current_user: admin, params: { page: 1 }).execute).to eq [runner2]
+          expect(described_class.new(current_user: admin, params: { page: 2 }).execute).to eq [runner1]
+        end
+      end
+
+      context 'non admin user' do
+        it 'returns no runners' do
+          user = create :user
+          create :ci_runner, active: true
+          create :ci_runner, active: false
+
+          expect(described_class.new(current_user: user, params: {}).execute).to be_empty
+        end
+      end
+
+      context 'user is nil' do
+        it 'returns no runners' do
+          user = nil
+          create :ci_runner, active: true
+          create :ci_runner, active: false
+
+          expect(described_class.new(current_user: user, params: {}).execute).to be_empty
+        end
+      end
+    end
+  end
+
+  context 'group' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:group) { create(:group) }
+    let_it_be(:sub_group_1) { create(:group, parent: group) }
+    let_it_be(:sub_group_2) { create(:group, parent: group) }
+    let_it_be(:sub_group_3) { create(:group, parent: sub_group_1) }
+    let_it_be(:sub_group_4) { create(:group, parent: sub_group_3) }
+    let_it_be(:project) { create(:project, group: group) }
+    let_it_be(:project_2) { create(:project, group: group) }
+    let_it_be(:project_3) { create(:project, group: sub_group_1) }
+    let_it_be(:project_4) { create(:project, group: sub_group_2) }
+    let_it_be(:project_5) { create(:project, group: sub_group_3) }
+    let_it_be(:project_6) { create(:project, group: sub_group_4) }
+    let_it_be(:runner_group) { create(:ci_runner, :group, contacted_at: 12.minutes.ago) }
+    let_it_be(:runner_sub_group_1) { create(:ci_runner, :group, active: false, contacted_at: 11.minutes.ago) }
+    let_it_be(:runner_sub_group_2) { create(:ci_runner, :group, contacted_at: 10.minutes.ago) }
+    let_it_be(:runner_sub_group_3) { create(:ci_runner, :group, contacted_at: 9.minutes.ago) }
+    let_it_be(:runner_sub_group_4) { create(:ci_runner, :group, contacted_at: 8.minutes.ago) }
+    let_it_be(:runner_project_1) { create(:ci_runner, :project, contacted_at: 7.minutes.ago, projects: [project])}
+    let_it_be(:runner_project_2) { create(:ci_runner, :project, contacted_at: 6.minutes.ago, projects: [project_2])}
+    let_it_be(:runner_project_3) { create(:ci_runner, :project, contacted_at: 5.minutes.ago, description: 'runner_project_search', projects: [project, project_2])}
+    let_it_be(:runner_project_4) { create(:ci_runner, :project, contacted_at: 4.minutes.ago, projects: [project_3])}
+    let_it_be(:runner_project_5) { create(:ci_runner, :project, contacted_at: 3.minutes.ago, tag_list: %w[runner_tag], projects: [project_4])}
+    let_it_be(:runner_project_6) { create(:ci_runner, :project, contacted_at: 2.minutes.ago, projects: [project_5])}
+    let_it_be(:runner_project_7) { create(:ci_runner, :project, contacted_at: 1.minute.ago, projects: [project_6])}
+
+    let(:params) { {} }
+
+    before do
+      group.runners << runner_group
+      sub_group_1.runners << runner_sub_group_1
+      sub_group_2.runners << runner_sub_group_2
+      sub_group_3.runners << runner_sub_group_3
+      sub_group_4.runners << runner_sub_group_4
+    end
+
+    describe '#execute' do
+      subject { described_class.new(current_user: user, group: group, params: params).execute }
+
+      context 'no params' do
+        before do
+          group.add_owner(user)
+        end
+
+        it 'returns all runners' do
+          expect(subject).to eq([runner_project_7, runner_project_6, runner_project_5,
+                                 runner_project_4, runner_project_3, runner_project_2,
+                                 runner_project_1, runner_sub_group_4, runner_sub_group_3,
+                                 runner_sub_group_2, runner_sub_group_1, runner_group])
+        end
+      end
+
+      context 'with sort param' do
+        let(:params) { { sort: 'contacted_asc' } }
+
+        before do
+          group.add_owner(user)
+        end
+
+        it 'sorts by specified attribute' do
+          expect(subject).to eq([runner_group, runner_sub_group_1, runner_sub_group_2,
+                                 runner_sub_group_3, runner_sub_group_4, runner_project_1,
+                                 runner_project_2, runner_project_3, runner_project_4,
+                                 runner_project_5, runner_project_6, runner_project_7])
+        end
+      end
+
+      context 'paginate' do
+        using RSpec::Parameterized::TableSyntax
+
+        let(:runners) do
+          [[runner_project_7, runner_project_6, runner_project_5],
+           [runner_project_4, runner_project_3, runner_project_2],
+           [runner_project_1, runner_sub_group_4, runner_sub_group_3],
+           [runner_sub_group_2, runner_sub_group_1, runner_group]]
+        end
+
+        where(:page, :index) do
+          1 | 0
+          2 | 1
+          3 | 2
+          4 | 3
+        end
+
+        before do
+          stub_const('Ci::RunnersFinder::NUMBER_OF_RUNNERS_PER_PAGE', 3)
+
+          group.add_owner(user)
+        end
+
+        with_them do
+          let(:params) { { page: page } }
+
+          it 'returns the runners for the specified page' do
+            expect(subject).to eq(runners[index])
+          end
+        end
+      end
+
+      context 'filter by search term' do
+        let(:params) { { search: 'runner_project_search' } }
+
+        before do
+          group.add_owner(user)
+        end
+
+        it 'returns correct runner' do
+          expect(subject).to eq([runner_project_3])
+        end
+      end
+
+      context 'filter by status' do
+        let(:params) { { status_status: 'paused' } }
+
+        before do
+          group.add_owner(user)
+        end
+
+        it 'returns correct runner' do
+          expect(subject).to eq([runner_sub_group_1])
+        end
+      end
+
+      context 'filter by tag_name' do
+        let(:params) { { tag_name: %w[runner_tag] } }
+
+        before do
+          group.add_owner(user)
+        end
+
+        it 'returns correct runner' do
+          expect(subject).to eq([runner_project_5])
+        end
+      end
+
+      context 'filter by runner type' do
+        let(:params) { { type_type: 'project_type' } }
+
+        before do
+          group.add_owner(user)
+        end
+
+        it 'returns correct runners' do
+          expect(subject).to eq([runner_project_7, runner_project_6,
+                                 runner_project_5, runner_project_4,
+                                 runner_project_3, runner_project_2, runner_project_1])
+        end
+      end
+
+      context 'user has no access to runners' do
+        where(:user_permission) do
+          [:maintainer, :developer, :reporter, :guest]
+        end
+
+        with_them do
+          before do
+            create(:group_member, user_permission, group: group, user: user)
+          end
+
+          it 'returns no runners' do
+            expect(subject).to be_empty
+          end
+        end
+      end
+
+      context 'user with no access' do
+        it 'returns no runners' do
+          expect(subject).to be_empty
+        end
+      end
+
+      context 'user is nil' do
+        let_it_be(:user) { nil }
+
+        it 'returns no runners' do
+          expect(subject).to be_empty
+        end
+      end
+    end
+
+    describe '#sort_key' do
+      subject { described_class.new(current_user: user, group: group, params: params).sort_key }
+
+      context 'no params' do
+        it 'returns created_date' do
+          expect(subject).to eq('created_date')
+        end
+      end
+
+      context 'with params' do
+        let(:params) { { sort: 'contacted_asc' } }
+
+        it 'returns contacted_asc' do
+          expect(subject).to eq('contacted_asc')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/finders/cluster_ancestors_finder_spec.rb b/spec/finders/cluster_ancestors_finder_spec.rb
index 4aedb41d446..ea1dbea4cfe 100644
--- a/spec/finders/cluster_ancestors_finder_spec.rb
+++ b/spec/finders/cluster_ancestors_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ClusterAncestorsFinder, '#execute' do
+RSpec.describe ClusterAncestorsFinder, '#execute' do
   let(:group) { create(:group) }
   let(:project) { create(:project, group: group) }
   let(:user) { create(:user) }
diff --git a/spec/finders/clusters/knative_services_finder_spec.rb b/spec/finders/clusters/knative_services_finder_spec.rb
index 57dbead7921..c61fac27bd9 100644
--- a/spec/finders/clusters/knative_services_finder_spec.rb
+++ b/spec/finders/clusters/knative_services_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Clusters::KnativeServicesFinder do
+RSpec.describe Clusters::KnativeServicesFinder do
   include KubernetesHelpers
   include ReactiveCachingHelpers
 
diff --git a/spec/finders/clusters_finder_spec.rb b/spec/finders/clusters_finder_spec.rb
index 3bad88573f7..fc6616f4a28 100644
--- a/spec/finders/clusters_finder_spec.rb
+++ b/spec/finders/clusters_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ClustersFinder do
+RSpec.describe ClustersFinder do
   let(:project) { create(:project) }
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/finders/concerns/finder_methods_spec.rb b/spec/finders/concerns/finder_methods_spec.rb
index 2e44df8b044..3e299c93eda 100644
--- a/spec/finders/concerns/finder_methods_spec.rb
+++ b/spec/finders/concerns/finder_methods_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FinderMethods do
+RSpec.describe FinderMethods do
   let(:finder_class) do
     Class.new do
       include FinderMethods
diff --git a/spec/finders/concerns/finder_with_cross_project_access_spec.rb b/spec/finders/concerns/finder_with_cross_project_access_spec.rb
index d11d4da25a8..116b523bd99 100644
--- a/spec/finders/concerns/finder_with_cross_project_access_spec.rb
+++ b/spec/finders/concerns/finder_with_cross_project_access_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FinderWithCrossProjectAccess do
+RSpec.describe FinderWithCrossProjectAccess do
   let(:finder_class) do
     Class.new do
       prepend FinderWithCrossProjectAccess
diff --git a/spec/finders/container_repositories_finder_spec.rb b/spec/finders/container_repositories_finder_spec.rb
index d0c91a8f734..b6305e3f5b7 100644
--- a/spec/finders/container_repositories_finder_spec.rb
+++ b/spec/finders/container_repositories_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContainerRepositoriesFinder do
+RSpec.describe ContainerRepositoriesFinder do
   let_it_be(:reporter) { create(:user) }
   let_it_be(:guest) { create(:user) }
 
diff --git a/spec/finders/context_commits_finder_spec.rb b/spec/finders/context_commits_finder_spec.rb
index 13cfa32ecfc..95c685aea24 100644
--- a/spec/finders/context_commits_finder_spec.rb
+++ b/spec/finders/context_commits_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContextCommitsFinder do
+RSpec.describe ContextCommitsFinder do
   describe "#execute" do
     let(:project) { create(:project, :repository) }
     let(:merge_request) { create(:merge_request) }
diff --git a/spec/finders/contributed_projects_finder_spec.rb b/spec/finders/contributed_projects_finder_spec.rb
index 1d907261fe9..86d3e7f8f19 100644
--- a/spec/finders/contributed_projects_finder_spec.rb
+++ b/spec/finders/contributed_projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ContributedProjectsFinder do
+RSpec.describe ContributedProjectsFinder do
   let(:source_user) { create(:user) }
   let(:current_user) { create(:user) }
 
diff --git a/spec/finders/deployments_finder_spec.rb b/spec/finders/deployments_finder_spec.rb
index b20c7e5a8a5..e4e0f366eeb 100644
--- a/spec/finders/deployments_finder_spec.rb
+++ b/spec/finders/deployments_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DeploymentsFinder do
+RSpec.describe DeploymentsFinder do
   subject { described_class.new(project, params).execute }
 
   let(:project) { create(:project, :public, :test_repo) }
diff --git a/spec/finders/design_management/designs_finder_spec.rb b/spec/finders/design_management/designs_finder_spec.rb
index 04bd0ad0a45..696327cc49c 100644
--- a/spec/finders/design_management/designs_finder_spec.rb
+++ b/spec/finders/design_management/designs_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DesignManagement::DesignsFinder do
+RSpec.describe DesignManagement::DesignsFinder do
   include DesignManagementTestHelpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/finders/design_management/versions_finder_spec.rb b/spec/finders/design_management/versions_finder_spec.rb
index 11d53d0d630..6a56ccb10b8 100644
--- a/spec/finders/design_management/versions_finder_spec.rb
+++ b/spec/finders/design_management/versions_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe DesignManagement::VersionsFinder do
+RSpec.describe DesignManagement::VersionsFinder do
   include DesignManagementTestHelpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/finders/environments_finder_spec.rb b/spec/finders/environments_finder_spec.rb
index 66e404f5236..fd714ab9a8f 100644
--- a/spec/finders/environments_finder_spec.rb
+++ b/spec/finders/environments_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EnvironmentsFinder do
+RSpec.describe EnvironmentsFinder do
   let(:project) { create(:project, :repository) }
   let(:user) { project.creator }
   let(:environment) { create(:environment, :available, project: project) }
diff --git a/spec/finders/events_finder_spec.rb b/spec/finders/events_finder_spec.rb
index 443e9ab4bc4..45a049f9442 100644
--- a/spec/finders/events_finder_spec.rb
+++ b/spec/finders/events_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe EventsFinder do
+RSpec.describe EventsFinder do
   let_it_be(:user) { create(:user) }
   let(:other_user) { create(:user) }
 
@@ -11,18 +11,18 @@ describe EventsFinder do
 
   let(:closed_issue) { create(:closed_issue, project: project1, author: user) }
   let(:opened_merge_request) { create(:merge_request, source_project: project2, author: user) }
-  let!(:closed_issue_event) { create(:event, project: project1, author: user, target: closed_issue, action: Event::CLOSED, created_at: Date.new(2016, 12, 30)) }
-  let!(:opened_merge_request_event) { create(:event, project: project2, author: user, target: opened_merge_request, action: Event::CREATED, created_at: Date.new(2017, 1, 31)) }
+  let!(:closed_issue_event) { create(:event, :closed, project: project1, author: user, target: closed_issue, created_at: Date.new(2016, 12, 30)) }
+  let!(:opened_merge_request_event) { create(:event, :created, project: project2, author: user, target: opened_merge_request, created_at: Date.new(2017, 1, 31)) }
   let(:closed_issue2) { create(:closed_issue, project: project1, author: user) }
   let(:opened_merge_request2) { create(:merge_request, source_project: project2, author: user) }
-  let!(:closed_issue_event2) { create(:event, project: project1, author: user, target: closed_issue, action: Event::CLOSED, created_at: Date.new(2016, 2, 2)) }
-  let!(:opened_merge_request_event2) { create(:event, project: project2, author: user, target: opened_merge_request, action: Event::CREATED, created_at: Date.new(2017, 2, 2)) }
+  let!(:closed_issue_event2) { create(:event, :closed, project: project1, author: user, target: closed_issue, created_at: Date.new(2016, 2, 2)) }
+  let!(:opened_merge_request_event2) { create(:event, :created, project: project2, author: user, target: opened_merge_request, created_at: Date.new(2017, 2, 2)) }
   let(:opened_merge_request3) { create(:merge_request, source_project: project1, author: other_user) }
-  let!(:other_developer_event) { create(:event, project: project1, author: other_user, target: opened_merge_request3, action: Event::CREATED) }
+  let!(:other_developer_event) { create(:event, :created, project: project1, author: other_user, target: opened_merge_request3 ) }
 
   let_it_be(:public_project) { create(:project, :public, creator_id: user.id, namespace: user.namespace) }
   let(:confidential_issue) { create(:closed_issue, confidential: true, project: public_project, author: user) }
-  let!(:confidential_event) { create(:event, project: public_project, author: user, target: confidential_issue, action: Event::CLOSED) }
+  let!(:confidential_event) { create(:event, :closed, project: public_project, author: user, target: confidential_issue) }
 
   context 'when targeting a user' do
     it 'returns events between specified dates filtered on action and type' do
diff --git a/spec/finders/fork_projects_finder_spec.rb b/spec/finders/fork_projects_finder_spec.rb
index 02ce17ac907..9e58378b953 100644
--- a/spec/finders/fork_projects_finder_spec.rb
+++ b/spec/finders/fork_projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ForkProjectsFinder do
+RSpec.describe ForkProjectsFinder do
   include ProjectForksHelper
 
   let(:source_project) { create(:project, :public, :empty_repo) }
diff --git a/spec/finders/fork_targets_finder_spec.rb b/spec/finders/fork_targets_finder_spec.rb
index f8c03cdf9b3..3c66f4e5757 100644
--- a/spec/finders/fork_targets_finder_spec.rb
+++ b/spec/finders/fork_targets_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ForkTargetsFinder do
+RSpec.describe ForkTargetsFinder do
   subject(:finder) { described_class.new(project, user) }
 
   let(:project) { create(:project, namespace: create(:group)) }
diff --git a/spec/finders/freeze_periods_finder_spec.rb b/spec/finders/freeze_periods_finder_spec.rb
index 4ff356b85b7..53cc07d91b0 100644
--- a/spec/finders/freeze_periods_finder_spec.rb
+++ b/spec/finders/freeze_periods_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FreezePeriodsFinder do
+RSpec.describe FreezePeriodsFinder do
   subject(:finder) { described_class.new(project, user).execute }
 
   let(:project) { create(:project, :private) }
diff --git a/spec/finders/group_descendants_finder_spec.rb b/spec/finders/group_descendants_finder_spec.rb
index a08772c6e7e..77ef546e083 100644
--- a/spec/finders/group_descendants_finder_spec.rb
+++ b/spec/finders/group_descendants_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupDescendantsFinder do
+RSpec.describe GroupDescendantsFinder do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:params) { {} }
diff --git a/spec/finders/group_labels_finder_spec.rb b/spec/finders/group_labels_finder_spec.rb
index 7bdd312eff0..d65a8fb4fed 100644
--- a/spec/finders/group_labels_finder_spec.rb
+++ b/spec/finders/group_labels_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupLabelsFinder, '#execute' do
+RSpec.describe GroupLabelsFinder, '#execute' do
   let!(:group) { create(:group) }
   let!(:user)  { create(:user) }
   let!(:label1) { create(:group_label, title: 'Foo', description: 'Lorem ipsum', group: group) }
diff --git a/spec/finders/group_members_finder_spec.rb b/spec/finders/group_members_finder_spec.rb
index d1d97f6f9f0..68b120db227 100644
--- a/spec/finders/group_members_finder_spec.rb
+++ b/spec/finders/group_members_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupMembersFinder, '#execute' do
+RSpec.describe GroupMembersFinder, '#execute' do
   let(:group) { create(:group) }
   let(:nested_group) { create(:group, parent: group) }
   let(:deeper_nested_group) { create(:group, parent: nested_group) }
diff --git a/spec/finders/group_projects_finder_spec.rb b/spec/finders/group_projects_finder_spec.rb
index 89fc1e380dc..7499461ad8f 100644
--- a/spec/finders/group_projects_finder_spec.rb
+++ b/spec/finders/group_projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupProjectsFinder do
+RSpec.describe GroupProjectsFinder do
   include_context 'GroupProjectsFinder context'
 
   subject { finder.execute }
diff --git a/spec/finders/groups_finder_spec.rb b/spec/finders/groups_finder_spec.rb
index 939b818f165..78764f79a6c 100644
--- a/spec/finders/groups_finder_spec.rb
+++ b/spec/finders/groups_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GroupsFinder do
+RSpec.describe GroupsFinder do
   describe '#execute' do
     let(:user) { create(:user) }
 
@@ -74,6 +74,12 @@ describe GroupsFinder do
       let!(:internal_subgroup) { create(:group, :internal, parent: parent_group) }
       let!(:private_subgroup) { create(:group, :private, parent: parent_group) }
 
+      context 'with [nil] parent' do
+        it 'returns only top-level groups' do
+          expect(described_class.new(user, parent: [nil]).execute).to contain_exactly(parent_group)
+        end
+      end
+
       context 'without a user' do
         it 'only returns parent and public subgroups' do
           expect(described_class.new(nil).execute).to contain_exactly(parent_group, public_subgroup)
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 7493fafb5cc..672318c292e 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe IssuesFinder do
+RSpec.describe IssuesFinder do
   include_context 'IssuesFinder context'
 
   describe '#execute' do
diff --git a/spec/finders/joined_groups_finder_spec.rb b/spec/finders/joined_groups_finder_spec.rb
index b01bd44470a..8f826ef67ec 100644
--- a/spec/finders/joined_groups_finder_spec.rb
+++ b/spec/finders/joined_groups_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe JoinedGroupsFinder do
+RSpec.describe JoinedGroupsFinder do
   describe '#execute' do
     let!(:profile_owner)    { create(:user) }
     let!(:profile_visitor)  { create(:user) }
diff --git a/spec/finders/keys_finder_spec.rb b/spec/finders/keys_finder_spec.rb
index bae4a542484..277c852c953 100644
--- a/spec/finders/keys_finder_spec.rb
+++ b/spec/finders/keys_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe KeysFinder do
+RSpec.describe KeysFinder do
   subject { described_class.new(params).execute }
 
   let(:user) { create(:user) }
diff --git a/spec/finders/labels_finder_spec.rb b/spec/finders/labels_finder_spec.rb
index 7590c399cf9..851b9e64db6 100644
--- a/spec/finders/labels_finder_spec.rb
+++ b/spec/finders/labels_finder_spec.rb
@@ -2,37 +2,37 @@
 
 require 'spec_helper'
 
-describe LabelsFinder do
+RSpec.describe LabelsFinder do
   describe '#execute' do
-    let(:group_1) { create(:group) }
-    let(:group_2) { create(:group) }
-    let(:group_3) { create(:group) }
-    let(:private_group_1) { create(:group, :private) }
-    let(:private_subgroup_1) { create(:group, :private, parent: private_group_1) }
-
-    let(:project_1) { create(:project, namespace: group_1) }
-    let(:project_2) { create(:project, namespace: group_2) }
-    let(:project_3) { create(:project) }
-    let(:project_4) { create(:project, :public) }
-    let(:project_5) { create(:project, namespace: group_1) }
-
-    let!(:project_label_1) { create(:label, project: project_1, title: 'Label 1', description: 'awesome label') }
-    let!(:project_label_2) { create(:label, project: project_2, title: 'Label 2') }
-    let!(:project_label_4) { create(:label, project: project_4, title: 'Label 4') }
-    let!(:project_label_5) { create(:label, project: project_5, title: 'Label 5') }
-
-    let!(:group_label_1) { create(:group_label, group: group_1, title: 'Label 1 (group)') }
-    let!(:group_label_2) { create(:group_label, group: group_1, title: 'Group Label 2') }
-    let!(:group_label_3) { create(:group_label, group: group_2, title: 'Group Label 3') }
-    let!(:private_group_label_1) { create(:group_label, group: private_group_1, title: 'Private Group Label 1') }
-    let!(:private_subgroup_label_1) { create(:group_label, group: private_subgroup_1, title: 'Private Sub Group Label 1') }
-
-    let(:user) { create(:user) }
+    let_it_be(:group_1) { create(:group) }
+    let_it_be(:group_2) { create(:group) }
+    let_it_be(:group_3) { create(:group) }
+    let_it_be(:private_group_1) { create(:group, :private) }
+    let_it_be(:private_subgroup_1) { create(:group, :private, parent: private_group_1) }
+
+    let_it_be(:project_1, reload: true) { create(:project, namespace: group_1) }
+    let_it_be(:project_2) { create(:project, namespace: group_2) }
+    let_it_be(:project_3) { create(:project) }
+    let_it_be(:project_4) { create(:project, :public) }
+    let_it_be(:project_5) { create(:project, namespace: group_1) }
+
+    let_it_be(:project_label_1) { create(:label, project: project_1, title: 'Label 1', description: 'awesome label') }
+    let_it_be(:project_label_2) { create(:label, project: project_2, title: 'Label 2') }
+    let_it_be(:project_label_4) { create(:label, project: project_4, title: 'Label 4') }
+    let_it_be(:project_label_5) { create(:label, project: project_5, title: 'Label 5') }
+
+    let_it_be(:group_label_1) { create(:group_label, group: group_1, title: 'Label 1 (group)') }
+    let_it_be(:group_label_2) { create(:group_label, group: group_1, title: 'Group Label 2') }
+    let_it_be(:group_label_3) { create(:group_label, group: group_2, title: 'Group Label 3') }
+    let_it_be(:private_group_label_1) { create(:group_label, group: private_group_1, title: 'Private Group Label 1') }
+    let_it_be(:private_subgroup_label_1) { create(:group_label, group: private_subgroup_1, title: 'Private Sub Group Label 1') }
+
+    let_it_be(:unused_label) { create(:label, project: project_3, title: 'Label 3') }
+    let_it_be(:unused_group_label) { create(:group_label, group: group_3, title: 'Group Label 4') }
+
+    let_it_be(:user) { create(:user) }
 
     before do
-      create(:label, project: project_3, title: 'Label 3')
-      create(:group_label, group: group_3, title: 'Group Label 4')
-
       project_1.add_developer(user)
     end
 
@@ -54,11 +54,11 @@ describe LabelsFinder do
       end
     end
 
-    context 'filtering by group_id' do
+    shared_examples 'filtering by group' do
       it 'returns labels available for any non-archived project within the group' do
         group_1.add_developer(user)
         ::Projects::UpdateService.new(project_1, user, archived: true).execute
-        finder = described_class.new(user, group_id: group_1.id)
+        finder = described_class.new(user, **group_params(group_1))
 
         expect(finder.execute).to eq [group_label_2, group_label_1, project_label_5]
       end
@@ -67,7 +67,7 @@ describe LabelsFinder do
         it 'returns only group labels' do
           group_1.add_developer(user)
 
-          finder = described_class.new(user, group_id: group_1.id, only_group_labels: true)
+          finder = described_class.new(user, only_group_labels: true, **group_params(group_1))
 
           expect(finder.execute).to eq [group_label_2, group_label_1]
         end
@@ -84,7 +84,7 @@ describe LabelsFinder do
 
         context 'when only group labels is false' do
           it 'returns group labels' do
-            finder = described_class.new(user, group_id: empty_group.id)
+            finder = described_class.new(user, **group_params(empty_group))
 
             expect(finder.execute).to eq [empty_group_label_1, empty_group_label_2]
           end
@@ -96,7 +96,7 @@ describe LabelsFinder do
           private_group_1.add_developer(user)
           private_subgroup_1.add_developer(user)
 
-          finder = described_class.new(user, group_id: private_subgroup_1.id, only_group_labels: true, include_ancestor_groups: true)
+          finder = described_class.new(user, **group_params(private_subgroup_1), only_group_labels: true, include_ancestor_groups: true)
 
           expect(finder.execute).to eq [private_group_label_1, private_subgroup_label_1]
         end
@@ -104,7 +104,7 @@ describe LabelsFinder do
         it 'ignores labels from groups which user can not read' do
           private_subgroup_1.add_developer(user)
 
-          finder = described_class.new(user, group_id: private_subgroup_1.id, only_group_labels: true, include_ancestor_groups: true)
+          finder = described_class.new(user, **group_params(private_subgroup_1), only_group_labels: true, include_ancestor_groups: true)
 
           expect(finder.execute).to eq [private_subgroup_label_1]
         end
@@ -115,7 +115,7 @@ describe LabelsFinder do
           private_group_1.add_developer(user)
           private_subgroup_1.add_developer(user)
 
-          finder = described_class.new(user, group_id: private_group_1.id, only_group_labels: true, include_descendant_groups: true)
+          finder = described_class.new(user, **group_params(private_group_1), only_group_labels: true, include_descendant_groups: true)
 
           expect(finder.execute).to eq [private_group_label_1, private_subgroup_label_1]
         end
@@ -123,14 +123,14 @@ describe LabelsFinder do
         it 'ignores labels from groups which user can not read' do
           private_subgroup_1.add_developer(user)
 
-          finder = described_class.new(user, group_id: private_group_1.id, only_group_labels: true, include_descendant_groups: true)
+          finder = described_class.new(user, **group_params(private_group_1), only_group_labels: true, include_descendant_groups: true)
 
           expect(finder.execute).to eq [private_subgroup_label_1]
         end
       end
 
       context 'when including labels from group projects with limited visibility' do
-        let(:finder)                     { described_class.new(user, group_id: group_4.id) }
+        let(:finder)                     { described_class.new(user, **group_params(group_4)) }
         let(:group_4)                    { create(:group) }
         let(:limited_visibility_project) { create(:project, :public, group: group_4) }
         let(:visible_project)            { create(:project, :public, group: group_4) }
@@ -213,6 +213,24 @@ describe LabelsFinder do
       end
     end
 
+    it_behaves_like 'filtering by group' do
+      def group_params(group)
+        { group: group }
+      end
+    end
+
+    it_behaves_like 'filtering by group' do
+      def group_params(group)
+        { group_id: group.id }
+      end
+    end
+
+    it_behaves_like 'filtering by group' do
+      def group_params(group)
+        { group: '', group_id: group.id }
+      end
+    end
+
     context 'filtering by project_id' do
       context 'when include_ancestor_groups is true' do
         let!(:sub_project) { create(:project, namespace: private_subgroup_1 ) }
diff --git a/spec/finders/license_template_finder_spec.rb b/spec/finders/license_template_finder_spec.rb
index 183ee67d801..93f13632b6f 100644
--- a/spec/finders/license_template_finder_spec.rb
+++ b/spec/finders/license_template_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe LicenseTemplateFinder do
+RSpec.describe LicenseTemplateFinder do
   describe '#execute' do
     subject(:result) { described_class.new(nil, params).execute }
 
diff --git a/spec/finders/members_finder_spec.rb b/spec/finders/members_finder_spec.rb
index d77548c6fd0..b14ad84a96e 100644
--- a/spec/finders/members_finder_spec.rb
+++ b/spec/finders/members_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MembersFinder, '#execute' do
+RSpec.describe MembersFinder, '#execute' do
   let_it_be(:group) { create(:group) }
   let_it_be(:nested_group) { create(:group, parent: group) }
   let_it_be(:project, reload: true) { create(:project, namespace: nested_group) }
diff --git a/spec/finders/merge_request_target_project_finder_spec.rb b/spec/finders/merge_request_target_project_finder_spec.rb
index 4d2e4c5318c..dfb4d86fbb6 100644
--- a/spec/finders/merge_request_target_project_finder_spec.rb
+++ b/spec/finders/merge_request_target_project_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MergeRequestTargetProjectFinder do
+RSpec.describe MergeRequestTargetProjectFinder do
   include ProjectForksHelper
 
   let(:user) { create(:user) }
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index b6f2c7bb992..f76110e3d85 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -2,10 +2,28 @@
 
 require 'spec_helper'
 
-describe MergeRequestsFinder do
+RSpec.describe MergeRequestsFinder do
   context "multiple projects with merge requests" do
     include_context 'MergeRequestsFinder multiple projects with merge requests context'
 
+    shared_examples 'scalar or array parameter' do
+      let(:values) { merge_requests.pluck(attribute) }
+      let(:params) { {} }
+      let(:key) { attribute }
+
+      it 'takes scalar values' do
+        found = described_class.new(user, params.merge(key => values.first)).execute
+
+        expect(found).to contain_exactly(merge_requests.first)
+      end
+
+      it 'takes array values' do
+        found = described_class.new(user, params.merge(key => values)).execute
+
+        expect(found).to match_array(merge_requests)
+      end
+    end
+
     describe '#execute' do
       it 'filters by scope' do
         params = { scope: 'authored', state: 'opened' }
@@ -91,28 +109,56 @@ describe MergeRequestsFinder do
         expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3, merge_request5)
       end
 
-      it 'filters by iid' do
-        params = { project_id: project1.id, iids: merge_request1.iid }
+      describe ':iid parameter' do
+        it_behaves_like 'scalar or array parameter' do
+          let(:params) { { project_id: project1.id } }
+          let(:merge_requests) { [merge_request1, merge_request2] }
+          let(:key) { :iids }
+          let(:attribute) { :iid }
+        end
+      end
 
-        merge_requests = described_class.new(user, params).execute
+      [:source_branch, :target_branch].each do |param|
+        describe "#{param} parameter" do
+          let(:merge_requests) { create_list(:merge_request, 2, :unique_branches, source_project: project4, target_project: project4, author: user) }
+          let(:attribute) { param }
 
-        expect(merge_requests).to contain_exactly(merge_request1)
+          it_behaves_like 'scalar or array parameter'
+        end
       end
 
-      it 'filters by source branch' do
-        params = { source_branch: merge_request2.source_branch }
+      describe ':label_name parameter' do
+        let(:common_labels) { create_list(:label, 3) }
+        let(:distinct_labels) { create_list(:label, 3) }
+        let(:merge_requests) do
+          common_attrs = {
+            source_project: project1, target_project: project1, author: user
+          }
+          distinct_labels.map do |label|
+            labels = [label, *common_labels]
+            create(:labeled_merge_request, :closed, labels: labels, **common_attrs)
+          end
+        end
 
-        merge_requests = described_class.new(user, params).execute
+        def find(label_name)
+          described_class.new(user, label_name: label_name).execute
+        end
 
-        expect(merge_requests).to contain_exactly(merge_request2)
-      end
+        it 'accepts a single label' do
+          found = find(distinct_labels.first.title)
+          common = find(common_labels.first.title)
 
-      it 'filters by target branch' do
-        params = { target_branch: merge_request2.target_branch }
+          expect(found).to contain_exactly(merge_requests.first)
+          expect(common).to match_array(merge_requests)
+        end
 
-        merge_requests = described_class.new(user, params).execute
+        it 'accepts an array of labels, all of which must match' do
+          all_distinct = find(distinct_labels.pluck(:title))
+          all_common = find(common_labels.pluck(:title))
 
-        expect(merge_requests).to contain_exactly(merge_request2)
+          expect(all_distinct).to be_empty
+          expect(all_common).to match_array(merge_requests)
+        end
       end
 
       it 'filters by source project id' do
@@ -158,7 +204,10 @@ describe MergeRequestsFinder do
 
           merge_requests = described_class.new(user, params).execute
 
-          expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3, merge_request4, merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3, wip_merge_request4)
+          expect(merge_requests).to contain_exactly(
+            merge_request1, merge_request2, merge_request3, merge_request4,
+            merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3,
+            wip_merge_request4)
         end
 
         it 'adds wip to scalar params' do
diff --git a/spec/finders/metrics/dashboards/annotations_finder_spec.rb b/spec/finders/metrics/dashboards/annotations_finder_spec.rb
index 222875ba2e2..223fd2c047c 100644
--- a/spec/finders/metrics/dashboards/annotations_finder_spec.rb
+++ b/spec/finders/metrics/dashboards/annotations_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Metrics::Dashboards::AnnotationsFinder do
+RSpec.describe Metrics::Dashboards::AnnotationsFinder do
   describe '#execute' do
     subject(:annotations) { described_class.new(dashboard: dashboard, params: params).execute }
 
diff --git a/spec/finders/metrics/users_starred_dashboards_finder_spec.rb b/spec/finders/metrics/users_starred_dashboards_finder_spec.rb
index c32b8c2d335..61dadb5239c 100644
--- a/spec/finders/metrics/users_starred_dashboards_finder_spec.rb
+++ b/spec/finders/metrics/users_starred_dashboards_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Metrics::UsersStarredDashboardsFinder do
+RSpec.describe Metrics::UsersStarredDashboardsFinder do
   describe '#execute' do
     subject(:starred_dashboards) { described_class.new(user: user, project: project, params: params).execute }
 
diff --git a/spec/finders/milestones_finder_spec.rb b/spec/finders/milestones_finder_spec.rb
index 3402eb39b3b..5920c185c64 100644
--- a/spec/finders/milestones_finder_spec.rb
+++ b/spec/finders/milestones_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MilestonesFinder do
+RSpec.describe MilestonesFinder do
   let(:now) { Time.now }
   let(:group) { create(:group) }
   let(:project_1) { create(:project, namespace: group) }
diff --git a/spec/finders/notes_finder_spec.rb b/spec/finders/notes_finder_spec.rb
index 44636a22ef9..5610f5889e6 100644
--- a/spec/finders/notes_finder_spec.rb
+++ b/spec/finders/notes_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe NotesFinder do
+RSpec.describe NotesFinder do
   let(:user) { create :user }
   let(:project) { create(:project) }
 
diff --git a/spec/finders/pending_todos_finder_spec.rb b/spec/finders/pending_todos_finder_spec.rb
index b41b1b46a93..10d3c2905be 100644
--- a/spec/finders/pending_todos_finder_spec.rb
+++ b/spec/finders/pending_todos_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PendingTodosFinder do
+RSpec.describe PendingTodosFinder do
   let(:user) { create(:user) }
 
   describe '#execute' do
diff --git a/spec/finders/personal_access_tokens_finder_spec.rb b/spec/finders/personal_access_tokens_finder_spec.rb
index ce8ef80bb99..dde4f010e41 100644
--- a/spec/finders/personal_access_tokens_finder_spec.rb
+++ b/spec/finders/personal_access_tokens_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PersonalAccessTokensFinder do
+RSpec.describe PersonalAccessTokensFinder do
   def finder(options = {})
     described_class.new(options)
   end
diff --git a/spec/finders/personal_projects_finder_spec.rb b/spec/finders/personal_projects_finder_spec.rb
index 7686dd3dc9d..62e9999fdd6 100644
--- a/spec/finders/personal_projects_finder_spec.rb
+++ b/spec/finders/personal_projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PersonalProjectsFinder do
+RSpec.describe PersonalProjectsFinder do
   let(:source_user)     { create(:user) }
   let(:current_user)    { create(:user) }
   let(:finder)          { described_class.new(source_user) }
diff --git a/spec/finders/projects/export_job_finder_spec.rb b/spec/finders/projects/export_job_finder_spec.rb
index 31b68717d13..1cc39e35e4d 100644
--- a/spec/finders/projects/export_job_finder_spec.rb
+++ b/spec/finders/projects/export_job_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ExportJobFinder do
+RSpec.describe Projects::ExportJobFinder do
   let(:project) { create(:project) }
   let(:project_export_job1) { create(:project_export_job, project: project) }
   let(:project_export_job2) { create(:project_export_job, project: project) }
diff --git a/spec/finders/projects/prometheus/alerts_finder_spec.rb b/spec/finders/projects/prometheus/alerts_finder_spec.rb
index bb59e77cca8..f47f8addbe9 100644
--- a/spec/finders/projects/prometheus/alerts_finder_spec.rb
+++ b/spec/finders/projects/prometheus/alerts_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Prometheus::AlertsFinder do
+RSpec.describe Projects::Prometheus::AlertsFinder do
   let(:finder) { described_class.new(params) }
   let(:params) { {} }
 
diff --git a/spec/finders/projects/serverless/functions_finder_spec.rb b/spec/finders/projects/serverless/functions_finder_spec.rb
index 1f0e3cd2eda..3d3e4183d4e 100644
--- a/spec/finders/projects/serverless/functions_finder_spec.rb
+++ b/spec/finders/projects/serverless/functions_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::Serverless::FunctionsFinder do
+RSpec.describe Projects::Serverless::FunctionsFinder do
   include KubernetesHelpers
   include PrometheusHelpers
   include ReactiveCachingHelpers
diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb
index 379cbe83a08..929927ec1c4 100644
--- a/spec/finders/projects_finder_spec.rb
+++ b/spec/finders/projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProjectsFinder, :do_not_mock_admin_mode do
+RSpec.describe ProjectsFinder, :do_not_mock_admin_mode do
   include AdminModeHelper
 
   describe '#execute' do
diff --git a/spec/finders/prometheus_metrics_finder_spec.rb b/spec/finders/prometheus_metrics_finder_spec.rb
index 41b2e700e1e..10ef9f76637 100644
--- a/spec/finders/prometheus_metrics_finder_spec.rb
+++ b/spec/finders/prometheus_metrics_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe PrometheusMetricsFinder do
+RSpec.describe PrometheusMetricsFinder do
   describe '#execute' do
     let(:finder) { described_class.new(params) }
     let(:params) { {} }
diff --git a/spec/finders/protected_branches_finder_spec.rb b/spec/finders/protected_branches_finder_spec.rb
index c6b9964b6c5..487d1be697a 100644
--- a/spec/finders/protected_branches_finder_spec.rb
+++ b/spec/finders/protected_branches_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ProtectedBranchesFinder do
+RSpec.describe ProtectedBranchesFinder do
   let(:project) { create(:project) }
   let!(:protected_branch) { create(:protected_branch, project: project) }
   let!(:another_protected_branch) { create(:protected_branch, project: project) }
diff --git a/spec/finders/releases_finder_spec.rb b/spec/finders/releases_finder_spec.rb
index cb4e5fed816..3dc01570d64 100644
--- a/spec/finders/releases_finder_spec.rb
+++ b/spec/finders/releases_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ReleasesFinder do
+RSpec.describe ReleasesFinder do
   let(:user)       { create(:user) }
   let(:project)    { create(:project, :repository) }
   let(:params)     { {} }
diff --git a/spec/finders/resource_label_event_finder_spec.rb b/spec/finders/resource_label_event_finder_spec.rb
deleted file mode 100644
index 5068ea19d63..00000000000
--- a/spec/finders/resource_label_event_finder_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe ResourceLabelEventFinder do
-  let_it_be(:user) { create(:user) }
-  let_it_be(:issue_project) { create(:project) }
-  let_it_be(:issue) { create(:issue, project: issue_project) }
-
-  describe '#execute' do
-    subject { described_class.new(user, issue).execute }
-
-    it 'returns events with labels accessible by user' do
-      label = create(:label, project: issue_project)
-      event = create_event(label)
-      issue_project.add_guest(user)
-
-      expect(subject).to eq [event]
-    end
-
-    it 'filters events with public project labels if issues and MRs are private' do
-      project = create(:project, :public, :issues_private, :merge_requests_private)
-      label = create(:label, project: project)
-      create_event(label)
-
-      expect(subject).to be_empty
-    end
-
-    it 'filters events with project labels not accessible by user' do
-      project = create(:project, :private)
-      label = create(:label, project: project)
-      create_event(label)
-
-      expect(subject).to be_empty
-    end
-
-    it 'filters events with group labels not accessible by user' do
-      group = create(:group, :private)
-      label = create(:group_label, group: group)
-      create_event(label)
-
-      expect(subject).to be_empty
-    end
-
-    it 'paginates results' do
-      label = create(:label, project: issue_project)
-      create_event(label)
-      create_event(label)
-      issue_project.add_guest(user)
-
-      paginated = described_class.new(user, issue, per_page: 1).execute
-
-      expect(subject.count).to eq 2
-      expect(paginated.count).to eq 1
-    end
-
-    def create_event(label)
-      create(:resource_label_event, issue: issue, label: label)
-    end
-  end
-end
diff --git a/spec/finders/resource_milestone_event_finder_spec.rb b/spec/finders/resource_milestone_event_finder_spec.rb
new file mode 100644
index 00000000000..ff4508996e2
--- /dev/null
+++ b/spec/finders/resource_milestone_event_finder_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ResourceMilestoneEventFinder do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:issue_project) { create(:project) }
+  let_it_be(:issue) { create(:issue, project: issue_project) }
+
+  describe '#execute' do
+    subject { described_class.new(user, issue).execute }
+
+    it 'returns events with milestones accessible by user' do
+      milestone = create(:milestone, project: issue_project)
+      event = create_event(milestone)
+      issue_project.add_guest(user)
+
+      expect(subject).to eq [event]
+    end
+
+    it 'filters events with public project milestones if issues and MRs are private' do
+      project = create(:project, :public, :issues_private, :merge_requests_private)
+      milestone = create(:milestone, project: project)
+      create_event(milestone)
+
+      expect(subject).to be_empty
+    end
+
+    it 'filters events with project milestones not accessible by user' do
+      project = create(:project, :private)
+      milestone = create(:milestone, project: project)
+      create_event(milestone)
+
+      expect(subject).to be_empty
+    end
+
+    it 'filters events with group milestones not accessible by user' do
+      group = create(:group, :private)
+      milestone = create(:milestone, group: group)
+      create_event(milestone)
+
+      expect(subject).to be_empty
+    end
+
+    it 'paginates results' do
+      milestone = create(:milestone, project: issue_project)
+      create_event(milestone)
+      create_event(milestone)
+      issue_project.add_guest(user)
+
+      paginated = described_class.new(user, issue, per_page: 1).execute
+
+      expect(subject.count).to eq 2
+      expect(paginated.count).to eq 1
+    end
+
+    context 'when multiple events share the same milestone' do
+      it 'avoids N+1 queries' do
+        issue_project.add_developer(user)
+
+        milestone1 = create(:milestone, project: issue_project)
+        milestone2 = create(:milestone, project: issue_project)
+
+        control_count = ActiveRecord::QueryRecorder.new { described_class.new(user, issue).execute }.count
+        expect(control_count).to eq(1) # 1 events query
+
+        create_event(milestone1, :add)
+        create_event(milestone1, :remove)
+        create_event(milestone1, :add)
+        create_event(milestone1, :remove)
+        create_event(milestone2, :add)
+        create_event(milestone2, :remove)
+
+        # 1 events + 1 milestones + 1 project + 1 user + 4 ability
+        expect { described_class.new(user, issue).execute }.not_to exceed_query_limit(control_count + 7)
+      end
+    end
+
+    def create_event(milestone, action = :add)
+      create(:resource_milestone_event, issue: issue, milestone: milestone, action: action)
+    end
+  end
+end
diff --git a/spec/finders/sentry_issue_finder_spec.rb b/spec/finders/sentry_issue_finder_spec.rb
index 520f690a134..b6d62965cb9 100644
--- a/spec/finders/sentry_issue_finder_spec.rb
+++ b/spec/finders/sentry_issue_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SentryIssueFinder do
+RSpec.describe SentryIssueFinder do
   let(:user)          { create(:user) }
   let(:project)       { create(:project, :repository) }
   let(:issue)         { create(:issue, project: project) }
diff --git a/spec/finders/serverless_domain_finder_spec.rb b/spec/finders/serverless_domain_finder_spec.rb
index c41f09535d3..4e6b9f07544 100644
--- a/spec/finders/serverless_domain_finder_spec.rb
+++ b/spec/finders/serverless_domain_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ServerlessDomainFinder do
+RSpec.describe ServerlessDomainFinder do
   let(:function_name) { 'test-function' }
   let(:pages_domain_name) { 'serverless.gitlab.io' }
   let(:valid_cluster_uuid) { 'aba1cdef123456f278' }
diff --git a/spec/finders/snippets_finder_spec.rb b/spec/finders/snippets_finder_spec.rb
index fdcc73f6e92..0affc832b30 100644
--- a/spec/finders/snippets_finder_spec.rb
+++ b/spec/finders/snippets_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SnippetsFinder do
+RSpec.describe SnippetsFinder do
   include ExternalAuthorizationServiceHelpers
   include Gitlab::Allowable
 
diff --git a/spec/finders/starred_projects_finder_spec.rb b/spec/finders/starred_projects_finder_spec.rb
index 7aa8251c3ab..15d4ae52ddd 100644
--- a/spec/finders/starred_projects_finder_spec.rb
+++ b/spec/finders/starred_projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe StarredProjectsFinder do
+RSpec.describe StarredProjectsFinder do
   let(:project1) { create(:project, :public, :empty_repo) }
   let(:project2) { create(:project, :public, :empty_repo) }
   let(:other_project) { create(:project, :public, :empty_repo) }
diff --git a/spec/finders/tags_finder_spec.rb b/spec/finders/tags_finder_spec.rb
index b9de2d29895..08978a32e50 100644
--- a/spec/finders/tags_finder_spec.rb
+++ b/spec/finders/tags_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TagsFinder do
+RSpec.describe TagsFinder do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
diff --git a/spec/finders/template_finder_spec.rb b/spec/finders/template_finder_spec.rb
index ed47752cf60..34f81e249e2 100644
--- a/spec/finders/template_finder_spec.rb
+++ b/spec/finders/template_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TemplateFinder do
+RSpec.describe TemplateFinder do
   using RSpec::Parameterized::TableSyntax
 
   describe '#build' do
diff --git a/spec/finders/todos_finder_spec.rb b/spec/finders/todos_finder_spec.rb
index 87650835b05..4123783d828 100644
--- a/spec/finders/todos_finder_spec.rb
+++ b/spec/finders/todos_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TodosFinder do
+RSpec.describe TodosFinder do
   describe '#execute' do
     let(:user) { create(:user) }
     let(:group) { create(:group) }
diff --git a/spec/finders/uploader_finder_spec.rb b/spec/finders/uploader_finder_spec.rb
new file mode 100644
index 00000000000..814d4b88b57
--- /dev/null
+++ b/spec/finders/uploader_finder_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe UploaderFinder do
+  describe '#execute' do
+    let(:project) { build(:project) }
+    let(:upload) { create(:upload, :issuable_upload, :with_file) }
+    let(:secret) { upload.secret }
+    let(:file_name) { upload.path }
+
+    subject { described_class.new(project, secret, file_name).execute }
+
+    before do
+      upload.save
+    end
+
+    context 'when successful' do
+      before do
+        allow_next_instance_of(FileUploader) do |uploader|
+          allow(uploader).to receive(:retrieve_from_store!).with(upload.path).and_return(uploader)
+        end
+      end
+
+      it 'gets the file-like uploader' do
+        expect(subject).to be_an_instance_of(FileUploader)
+        expect(subject.model).to eq(project)
+        expect(subject.secret).to eq(secret)
+      end
+    end
+
+    context 'when path traversal in file name' do
+      before do
+        upload.path = '/uploads/11111111111111111111111111111111/../../../../../../../../../../../../../../etc/passwd)'
+        upload.save
+      end
+
+      it 'returns nil' do
+        expect(subject).to be(nil)
+      end
+    end
+
+    context 'when unexpected failure' do
+      before do
+        allow_next_instance_of(FileUploader) do |uploader|
+          allow(uploader).to receive(:retrieve_from_store!).and_raise(StandardError)
+        end
+      end
+
+      it 'returns nil when unexpected error is raised' do
+        expect { subject }.to raise_error(StandardError)
+      end
+    end
+  end
+end
diff --git a/spec/finders/user_finder_spec.rb b/spec/finders/user_finder_spec.rb
index b89b422aa2c..e9ba2f48164 100644
--- a/spec/finders/user_finder_spec.rb
+++ b/spec/finders/user_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserFinder do
+RSpec.describe UserFinder do
   let_it_be(:user) { create(:user) }
 
   describe '#find_by_id' do
diff --git a/spec/finders/user_recent_events_finder_spec.rb b/spec/finders/user_recent_events_finder_spec.rb
index eef6448a4a2..04ba05c68e4 100644
--- a/spec/finders/user_recent_events_finder_spec.rb
+++ b/spec/finders/user_recent_events_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UserRecentEventsFinder do
+RSpec.describe UserRecentEventsFinder do
   let(:current_user)     { create(:user) }
   let(:project_owner)    { create(:user) }
   let(:private_project)  { create(:project, :private, creator: project_owner) }
diff --git a/spec/finders/users_finder_spec.rb b/spec/finders/users_finder_spec.rb
index 7f1fc1cc1c5..17b36247b05 100644
--- a/spec/finders/users_finder_spec.rb
+++ b/spec/finders/users_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UsersFinder do
+RSpec.describe UsersFinder do
   describe '#execute' do
     include_context 'UsersFinder#execute filter by project context'
 
@@ -21,6 +21,12 @@ describe UsersFinder do
         expect(users).to contain_exactly(normal_user)
       end
 
+      it 'filters by id' do
+        users = described_class.new(user, id: normal_user.id).execute
+
+        expect(users).to contain_exactly(normal_user)
+      end
+
       it 'filters by username (case insensitive)' do
         users = described_class.new(user, username: 'joHNdoE').execute
 
@@ -70,6 +76,12 @@ describe UsersFinder do
 
         expect(users).to contain_exactly(user, normal_user, blocked_user, omniauth_user)
       end
+
+      it 'orders returned results' do
+        users = described_class.new(user, sort: 'id_asc').execute
+
+        expect(users).to eq([normal_user, blocked_user, omniauth_user, user])
+      end
     end
 
     context 'with an admin user' do
diff --git a/spec/finders/users_star_projects_finder_spec.rb b/spec/finders/users_star_projects_finder_spec.rb
index fb1d8088f44..038506cc93f 100644
--- a/spec/finders/users_star_projects_finder_spec.rb
+++ b/spec/finders/users_star_projects_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UsersStarProjectsFinder do
+RSpec.describe UsersStarProjectsFinder do
   let(:project) { create(:project, :public, :empty_repo) }
 
   let(:user) { create(:user) }
diff --git a/spec/finders/users_with_pending_todos_finder_spec.rb b/spec/finders/users_with_pending_todos_finder_spec.rb
index fa15355531c..565b65fbefe 100644
--- a/spec/finders/users_with_pending_todos_finder_spec.rb
+++ b/spec/finders/users_with_pending_todos_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe UsersWithPendingTodosFinder do
+RSpec.describe UsersWithPendingTodosFinder do
   describe '#execute' do
     it 'returns the users for all pending todos of a target' do
       issue = create(:issue)
diff --git a/spec/fixtures/api/schemas/entities/merge_request_noteable.json b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
index c0eb320e67f..4ef19ed32c2 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
@@ -32,7 +32,8 @@
     },
     "is_project_archived": { "type":  "boolean" },
     "locked_discussion_docs_path": { "type":  "string" },
-    "archived_project_docs_path": { "type":  "string" }
+    "archived_project_docs_path": { "type":  "string" },
+    "project_id": { "type": "integer"}
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/evidences/issue.json b/spec/fixtures/api/schemas/evidences/issue.json
index fd9daf17ab8..628c4c89312 100644
--- a/spec/fixtures/api/schemas/evidences/issue.json
+++ b/spec/fixtures/api/schemas/evidences/issue.json
@@ -4,7 +4,6 @@
     "id",
     "title",
     "description",
-    "author",
     "state",
     "iid",
     "confidential",
diff --git a/spec/fixtures/api/schemas/evidences/milestone.json b/spec/fixtures/api/schemas/evidences/milestone.json
index 3ce0644225b..ab27fdecde2 100644
--- a/spec/fixtures/api/schemas/evidences/milestone.json
+++ b/spec/fixtures/api/schemas/evidences/milestone.json
@@ -7,7 +7,8 @@
     "state",
     "iid",
     "created_at",
-    "due_date"
+    "due_date",
+    "issues"
   ],
   "properties": {
     "id": { "type": "integer" },
@@ -16,7 +17,11 @@
     "state": { "type": "string" },
     "iid": { "type": "integer" },
     "created_at": { "type": "date" },
-    "due_date": { "type": ["date", "null"] }
+    "due_date": { "type": ["date", "null"] },
+    "issues": {
+      "type": "array",
+      "items": { "$ref": "issue.json" }
+    }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/public_api/v4/board.json b/spec/fixtures/api/schemas/public_api/v4/board.json
index e4933ee0b93..89a21c29969 100644
--- a/spec/fixtures/api/schemas/public_api/v4/board.json
+++ b/spec/fixtures/api/schemas/public_api/v4/board.json
@@ -78,7 +78,8 @@
           },
           "position": { "type": ["integer", "null"] },
           "max_issue_count": { "type": "integer" },
-          "max_issue_weight": { "type": "integer" }
+          "max_issue_weight": { "type": "integer" },
+          "limit_metric": { "type": ["string", "null"] }
         },
         "additionalProperties": false
       }
diff --git a/spec/fixtures/api/schemas/registry/repository.json b/spec/fixtures/api/schemas/registry/repository.json
index f7469aad235..1f84e787b19 100644
--- a/spec/fixtures/api/schemas/registry/repository.json
+++ b/spec/fixtures/api/schemas/registry/repository.json
@@ -1,13 +1,7 @@
 {
   "type": "object",
-  "required" : [
-    "id",
-    "name",
-    "path",
-    "location",
-    "created_at"
-  ],
-  "properties" : {
+  "required": ["id", "name", "path", "location", "created_at"],
+  "properties": {
     "id": {
       "type": "integer"
     },
@@ -38,7 +32,10 @@
         { "type": "string", "enum": ["delete_scheduled", "delete_failed"] }
       ]
     },
-    "tags": { "$ref": "tags.json" }
+    "tags": { "$ref": "tags.json" },
+    "tags_count": {
+      "type": "integer"
+    }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/api/schemas/release/link.json b/spec/fixtures/api/schemas/release/link.json
index bf175be2bc0..b3aebfa131e 100644
--- a/spec/fixtures/api/schemas/release/link.json
+++ b/spec/fixtures/api/schemas/release/link.json
@@ -7,7 +7,8 @@
     "filepath": { "type": "string" },
     "url": { "type": "string" },
     "direct_asset_url": { "type": "string" },
-    "external": { "type": "boolean" }
+    "external": { "type": "boolean" },
+    "link_type": { "type": "string" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/gitlab/database/structure_example.sql b/spec/fixtures/gitlab/database/structure_example.sql
index 9f288e6067e..06db67b725a 100644
--- a/spec/fixtures/gitlab/database/structure_example.sql
+++ b/spec/fixtures/gitlab/database/structure_example.sql
@@ -48,7 +48,6 @@ CREATE TABLE public.abuse_reports (
 --
 
 CREATE SEQUENCE public.abuse_reports_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
diff --git a/spec/fixtures/gitlab/database/structure_example_cleaned.sql b/spec/fixtures/gitlab/database/structure_example_cleaned.sql
index 78120fa6ce0..5618fb694a0 100644
--- a/spec/fixtures/gitlab/database/structure_example_cleaned.sql
+++ b/spec/fixtures/gitlab/database/structure_example_cleaned.sql
@@ -1,7 +1,5 @@
 SET search_path=public;
 
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
 CREATE EXTENSION IF NOT EXISTS pg_trgm WITH SCHEMA public;
 
 CREATE TABLE public.abuse_reports (
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml b/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
index b460a031486..5177de66fcf 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
@@ -1,5 +1,18 @@
 dashboard: 'Test Dashboard'
 priority: 1
+links:
+- title: Link 1
+  url: https://gitlab.com
+- title: Link 2
+  url: https://docs.gitlab.com
+templating:
+  variables:
+    text_variable_full_syntax:
+      label: 'Variable 1'
+      type: text
+      options:
+        default_value: 'default'
+    text_variable_simple_syntax: 'default value'
 panel_groups:
 - group: Group A
   priority: 1
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
index 5d779a323c2..259c41bf091 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
@@ -11,7 +11,9 @@
     "panel_groups": {
       "type": "array",
       "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json" }
-    }
+    },
+    "templating": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json" },
+    "links": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json
new file mode 100644
index 00000000000..be180114052
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json
@@ -0,0 +1,9 @@
+{
+  "type": "array",
+  "required": ["url"],
+  "properties": {
+    "url": { "type": "string" },
+    "title": { "type": "string" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
new file mode 100644
index 00000000000..c82d2fcb02c
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
@@ -0,0 +1,8 @@
+{
+  "type": "object",
+  "required": ["variables"],
+  "properties": {
+    "variables": { "$ref": "variables.json" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
new file mode 100644
index 00000000000..f5090dc8c88
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "required": [
+    "type", "options"
+  ],
+  "properties": {
+    "type": { "type": "string" },
+    "label": { "type": "string" },
+    "options": { "$ref": "text_variable_options.json" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json
new file mode 100644
index 00000000000..ccb2e168fd1
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json
@@ -0,0 +1,7 @@
+{
+  "type": "object",
+  "properties": {
+    "default_value": { "type": "string" }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
new file mode 100644
index 00000000000..f3e0dd555a6
--- /dev/null
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "patternProperties": {
+    "^[a-zA-Z0-9_]*$": {
+        "anyOf": [
+          { "$ref": "text_variable_full_syntax.json" },
+          { "type": "string" }
+        ]
+      }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/lsif.json.gz b/spec/fixtures/lsif.json.gz
deleted file mode 100644
index 3f74588cd7e..00000000000
--- a/spec/fixtures/lsif.json.gz
+++ /dev/null
diff --git a/spec/fixtures/packages/conan/package_files/conan_package.tgz b/spec/fixtures/packages/conan/package_files/conan_package.tgz
new file mode 100644
index 00000000000..6163364f3f9
--- /dev/null
+++ b/spec/fixtures/packages/conan/package_files/conan_package.tgz
diff --git a/spec/fixtures/packages/conan/package_files/conaninfo.txt b/spec/fixtures/packages/conan/package_files/conaninfo.txt
new file mode 100644
index 00000000000..2a02515a19b
--- /dev/null
+++ b/spec/fixtures/packages/conan/package_files/conaninfo.txt
@@ -0,0 +1,33 @@
+[settings]
+    arch=x86_64
+    build_type=Release
+    compiler=apple-clang
+    compiler.libcxx=libc++
+    compiler.version=10.0
+    os=Macos
+
+[requires]
+
+
+[options]
+    shared=False
+
+[full_settings]
+    arch=x86_64
+    build_type=Release
+    compiler=apple-clang
+    compiler.libcxx=libc++
+    compiler.version=10.0
+    os=Macos
+
+[full_requires]
+
+
+[full_options]
+    shared=False
+
+[recipe_hash]
+    b4b91125b36b40a7076a98310588f820
+
+[env]
+
diff --git a/spec/fixtures/packages/conan/package_files/conanmanifest.txt b/spec/fixtures/packages/conan/package_files/conanmanifest.txt
new file mode 100644
index 00000000000..bc34b81b050
--- /dev/null
+++ b/spec/fixtures/packages/conan/package_files/conanmanifest.txt
@@ -0,0 +1,4 @@
+1565723794
+conaninfo.txt: 2774ebe649804c1cd9430f26ab0ead14
+include/hello.h: 8727846905bd09baecf8bdc1edb1f46e
+lib/libhello.a: 7f2aaa8b6f3bc316bba59e47b6a0bd43
diff --git a/spec/fixtures/packages/conan/recipe_files/conanfile.py b/spec/fixtures/packages/conan/recipe_files/conanfile.py
new file mode 100644
index 00000000000..910bd5a0b51
--- /dev/null
+++ b/spec/fixtures/packages/conan/recipe_files/conanfile.py
@@ -0,0 +1,47 @@
+from conans import ConanFile, CMake, tools
+
+
+class HelloConan(ConanFile):
+    name = "Hello"
+    version = "0.1"
+    license = "<Put the package license here>"
+    author = "<Put your name here> <And your email here>"
+    url = "<Package recipe repository url here, for issues about the package>"
+    description = "<Description of Hello here>"
+    topics = ("<Put some tag here>", "<here>", "<and here>")
+    settings = "os", "compiler", "build_type", "arch"
+    options = {"shared": [True, False]}
+    default_options = "shared=False"
+    generators = "cmake"
+
+    def source(self):
+        self.run("git clone https://github.com/conan-io/hello.git")
+        # This small hack might be useful to guarantee proper /MT /MD linkage
+        # in MSVC if the packaged project doesn't have variables to set it
+        # properly
+        tools.replace_in_file("hello/CMakeLists.txt", "PROJECT(HelloWorld)",
+                              '''PROJECT(HelloWorld)
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()''')
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure(source_folder="hello")
+        cmake.build()
+
+        # Explicit way:
+        # self.run('cmake %s/hello %s'
+        #          % (self.source_folder, cmake.command_line))
+        # self.run("cmake --build . %s" % cmake.build_config)
+
+    def package(self):
+        self.copy("*.h", dst="include", src="hello")
+        self.copy("*hello.lib", dst="lib", keep_path=False)
+        self.copy("*.dll", dst="bin", keep_path=False)
+        self.copy("*.so", dst="lib", keep_path=False)
+        self.copy("*.dylib", dst="lib", keep_path=False)
+        self.copy("*.a", dst="lib", keep_path=False)
+
+    def package_info(self):
+        self.cpp_info.libs = ["hello"]
+
diff --git a/spec/fixtures/packages/conan/recipe_files/conanmanifest.txt b/spec/fixtures/packages/conan/recipe_files/conanmanifest.txt
new file mode 100644
index 00000000000..432b12f39fa
--- /dev/null
+++ b/spec/fixtures/packages/conan/recipe_files/conanmanifest.txt
@@ -0,0 +1,2 @@
+1565723790
+conanfile.py: 7c042b95312cc4c4ee89199dc51aebf9
diff --git a/spec/fixtures/packages/maven/maven-metadata.xml b/spec/fixtures/packages/maven/maven-metadata.xml
new file mode 100644
index 00000000000..7d7549df227
--- /dev/null
+++ b/spec/fixtures/packages/maven/maven-metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>com.mycompany.app</groupId>
+  <artifactId>my-app</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <timestamp>20180724.124855</timestamp>
+      <buildNumber>1</buildNumber>
+    </snapshot>
+    <lastUpdated>20180724124855</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>1.0-20180724.124855-1</value>
+        <updated>20180724124855</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>1.0-20180724.124855-1</value>
+        <updated>20180724124855</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>
diff --git a/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar
new file mode 100644
index 00000000000..ea3903cf6d9
--- /dev/null
+++ b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar
diff --git a/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom
new file mode 100644
index 00000000000..6b6015314aa
--- /dev/null
+++ b/spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.mycompany.app</groupId>
+  <artifactId>my-app</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>my-app</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <snapshotRepository>
+      <id>local</id>
+      <url>file:///tmp/maven</url>
+    </snapshotRepository>
+  </distributionManagement>
+  <repositories>
+    <repository>
+      <id>local</id>
+      <url>file:///tmp/maven</url>
+    </repository>
+  </repositories>
+  <properties>
+    <maven.compiler.source>1.6</maven.compiler.source>
+    <maven.compiler.target>1.6</maven.compiler.target>
+  </properties>
+</project>
diff --git a/spec/fixtures/packages/npm/foo-1.0.1.tgz b/spec/fixtures/packages/npm/foo-1.0.1.tgz
new file mode 100644
index 00000000000..a2bcdb8d492
--- /dev/null
+++ b/spec/fixtures/packages/npm/foo-1.0.1.tgz
diff --git a/spec/fixtures/packages/npm/payload.json b/spec/fixtures/packages/npm/payload.json
new file mode 100644
index 00000000000..664aa636001
--- /dev/null
+++ b/spec/fixtures/packages/npm/payload.json
@@ -0,0 +1,30 @@
+{
+   "_id":"@root/npm-test",
+   "name":"@root/npm-test",
+   "description":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+   "dist-tags":{
+      "latest":"1.0.1"
+   },
+   "versions":{
+      "1.0.1":{
+         "name":"@root/npm-test",
+         "version":"1.0.1",
+         "main":"app.js",
+         "dependencies":{
+            "express":"^4.16.4"
+         },
+         "dist":{
+            "shasum":"f572d396fae9206628714fb2ce00f72e94f2258f"
+         }
+      }
+   },
+   "_attachments":{
+      "@root/npm-test-1.0.1.tgz":{
+         "content_type":"application/octet-stream",
+         "data":"aGVsbG8K",
+         "length":8
+      }
+   },
+   "id":"10",
+   "package_name":"@root/npm-test"
+}
diff --git a/spec/fixtures/packages/npm/payload_with_duplicated_packages.json b/spec/fixtures/packages/npm/payload_with_duplicated_packages.json
new file mode 100644
index 00000000000..a6ea8760bd5
--- /dev/null
+++ b/spec/fixtures/packages/npm/payload_with_duplicated_packages.json
@@ -0,0 +1,44 @@
+{
+  "_id":"@root/npm-test",
+  "name":"@root/npm-test",
+  "description":"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+  "dist-tags":{
+     "latest":"1.0.1"
+  },
+  "versions":{
+     "1.0.1":{
+        "name":"@root/npm-test",
+        "version":"1.0.1",
+        "main":"app.js",
+        "dependencies":{
+           "express":"^4.16.4",
+           "dagre-d3": "~0.3.2"
+        },
+        "devDependencies": {
+           "dagre-d3": "~0.3.2",
+           "d3": "~3.4.13"
+        },
+        "bundleDependencies": {
+           "d3": "~3.4.13"
+        },
+        "peerDependencies": {
+           "d3": "~3.3.0"
+        },
+        "deprecated": {
+           "express":"^4.16.4"
+        },
+        "dist":{
+           "shasum":"f572d396fae9206628714fb2ce00f72e94f2258f"
+        }
+     }
+  },
+  "_attachments":{
+     "@root/npm-test-1.0.1.tgz":{
+        "content_type":"application/octet-stream",
+        "data":"aGVsbG8K",
+        "length":8
+     }
+  },
+  "id":"10",
+  "package_name":"@root/npm-test"
+}
diff --git a/spec/fixtures/packages/nuget/package.nupkg b/spec/fixtures/packages/nuget/package.nupkg
new file mode 100644
index 00000000000..b36856ee569
--- /dev/null
+++ b/spec/fixtures/packages/nuget/package.nupkg
diff --git a/spec/fixtures/packages/nuget/with_dependencies.nuspec b/spec/fixtures/packages/nuget/with_dependencies.nuspec
new file mode 100644
index 00000000000..753037cd05b
--- /dev/null
+++ b/spec/fixtures/packages/nuget/with_dependencies.nuspec
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>Test.Package</id>
+    <version>3.5.2</version>
+    <authors>Test Author</authors>
+    <owners>Test Owner</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Package Description</description>
+    <dependencies>
+      <dependency id="Moqi" version="2.5.6" include="Runtime,Compile" />
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="Test.Dependency" version="2.3.7" exclude="Build,Analyzers" include="Runtime,Compile" />
+        <dependency id="Newtonsoft.Json" version="12.0.3" exclude="Build,Analyzers" />
+      </group>
+      <dependency id="Castle.Core" />
+    </dependencies>
+  </metadata>
+</package>
diff --git a/spec/fixtures/packages/nuget/with_metadata.nuspec b/spec/fixtures/packages/nuget/with_metadata.nuspec
new file mode 100644
index 00000000000..0043bc89527
--- /dev/null
+++ b/spec/fixtures/packages/nuget/with_metadata.nuspec
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>DummyProject.WithMetadata</id>
+    <version>1.2.3</version>
+    <title>nuspec with metadata</title>
+    <authors>Author Test</authors>
+    <owners>Author Test</owners>
+    <developmentDependency>true</developmentDependency>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>https://gitlab.com/gitlab-org/gitlab</projectUrl>
+    <iconUrl>https://opensource.org/files/osi_keyhole_300X300_90ppi_0.png</iconUrl>
+    <description>Description Test</description>
+    <releaseNotes>Release Notes Test</releaseNotes>
+    <copyright>Copyright Test</copyright>
+    <tags>foo bar test tag1 tag2 tag3 tag4 tag5</tags>
+  </metadata>
+</package>
diff --git a/spec/fixtures/packages/pypi/sample-project.tar.gz b/spec/fixtures/packages/pypi/sample-project.tar.gz
new file mode 100644
index 00000000000..c71b1fef23d
--- /dev/null
+++ b/spec/fixtures/packages/pypi/sample-project.tar.gz
diff --git a/spec/fixtures/trace/sample_trace b/spec/fixtures/trace/sample_trace
index e9d1e79fc71..ebd2853e558 100644
--- a/spec/fixtures/trace/sample_trace
+++ b/spec/fixtures/trace/sample_trace
@@ -2736,9 +2736,6 @@ Service
       when repository is empty
         test runs execute
   Template
-    .build_from_template
-      when template is invalid
-        sets service template to inactive when template is invalid
     for pushover service
       is prefilled for projects pushover service
         has all fields prefilled
diff --git a/spec/frontend/.eslintrc.yml b/spec/frontend/.eslintrc.yml
index b9159191114..8e6faa90c58 100644
--- a/spec/frontend/.eslintrc.yml
+++ b/spec/frontend/.eslintrc.yml
@@ -10,7 +10,7 @@ settings:
     - path
   import/resolver:
     jest:
-      jestConfigFile: 'jest.config.unit.js'
+      jestConfigFile: 'jest.config.js'
 globals:
   getJSONFixture: false
   loadFixtures: false
diff --git a/spec/frontend/__mocks__/lodash/throttle.js b/spec/frontend/__mocks__/lodash/throttle.js
new file mode 100644
index 00000000000..aef391afd0c
--- /dev/null
+++ b/spec/frontend/__mocks__/lodash/throttle.js
@@ -0,0 +1,4 @@
+// Similar to `lodash/debounce`, `lodash/throttle` also causes flaky specs.
+// See `./debounce.js` for more details.
+
+export default fn => fn;
diff --git a/spec/frontend/__mocks__/monaco-editor/index.js b/spec/frontend/__mocks__/monaco-editor/index.js
index 18cc3a7c377..7c53cfb5174 100644
--- a/spec/frontend/__mocks__/monaco-editor/index.js
+++ b/spec/frontend/__mocks__/monaco-editor/index.js
@@ -9,5 +9,8 @@ import 'monaco-editor/esm/vs/language/json/monaco.contribution';
 import 'monaco-editor/esm/vs/language/html/monaco.contribution';
 import 'monaco-editor/esm/vs/basic-languages/monaco.contribution';
 
+// This language starts trying to spin up web workers which obviously breaks in Jest environment
+jest.mock('monaco-editor/esm/vs/language/typescript/tsMode');
+
 export * from 'monaco-editor/esm/vs/editor/editor.api';
 export default global.monaco;
diff --git a/spec/frontend/alert_management/components/alert_management_detail_spec.js b/spec/frontend/alert_management/components/alert_management_detail_spec.js
index 1e4c2e24ccb..14e45a4f563 100644
--- a/spec/frontend/alert_management/components/alert_management_detail_spec.js
+++ b/spec/frontend/alert_management/components/alert_management_detail_spec.js
@@ -1,39 +1,37 @@
 import { mount, shallowMount } from '@vue/test-utils';
-import { GlAlert, GlLoadingIcon, GlDropdownItem, GlTable } from '@gitlab/ui';
+import { GlAlert, GlLoadingIcon, GlTable } from '@gitlab/ui';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import AlertDetails from '~/alert_management/components/alert_details.vue';
-import updateAlertStatus from '~/alert_management/graphql/mutations/update_alert_status.graphql';
-import createFlash from '~/flash';
-
+import createIssueQuery from '~/alert_management/graphql/mutations/create_issue_from_alert.graphql';
+import { joinPaths } from '~/lib/utils/url_utility';
+import {
+  trackAlertsDetailsViewsOptions,
+  ALERTS_SEVERITY_LABELS,
+} from '~/alert_management/constants';
+import Tracking from '~/tracking';
 import mockAlerts from '../mocks/alerts.json';
 
 const mockAlert = mockAlerts[0];
-jest.mock('~/flash');
 
 describe('AlertDetails', () => {
   let wrapper;
-  const newIssuePath = 'root/alerts/-/issues/new';
-  const findStatusDropdownItem = () => wrapper.find(GlDropdownItem);
+  let mock;
+  const projectPath = 'root/alerts';
+  const projectIssuesPath = 'root/alerts/-/issues';
+
   const findDetailsTable = () => wrapper.find(GlTable);
 
-  function mountComponent({
-    data,
-    createIssueFromAlertEnabled = false,
-    loading = false,
-    mountMethod = shallowMount,
-    stubs = {},
-  } = {}) {
+  function mountComponent({ data, loading = false, mountMethod = shallowMount, stubs = {} } = {}) {
     wrapper = mountMethod(AlertDetails, {
       propsData: {
         alertId: 'alertId',
-        projectPath: 'projectPath',
-        newIssuePath,
+        projectPath,
+        projectIssuesPath,
       },
       data() {
         return { alert: { ...mockAlert }, ...data };
       },
-      provide: {
-        glFeatures: { createIssueFromAlertEnabled },
-      },
       mocks: {
         $apollo: {
           mutate: jest.fn(),
@@ -48,13 +46,22 @@ describe('AlertDetails', () => {
     });
   }
 
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+  });
+
   afterEach(() => {
     if (wrapper) {
-      wrapper.destroy();
+      if (wrapper) {
+        wrapper.destroy();
+      }
     }
+    mock.restore();
   });
 
-  const findCreatedIssueBtn = () => wrapper.find('[data-testid="createIssueBtn"]');
+  const findCreateIssueBtn = () => wrapper.find('[data-testid="createIssueBtn"]');
+  const findViewIssueBtn = () => wrapper.find('[data-testid="viewIssueBtn"]');
+  const findIssueCreationAlert = () => wrapper.find('[data-testid="issueCreationError"]');
 
   describe('Alert details', () => {
     describe('when alert is null', () => {
@@ -80,6 +87,12 @@ describe('AlertDetails', () => {
         expect(wrapper.find('[data-testid="fullDetailsTab"]').exists()).toBe(true);
       });
 
+      it('renders severity', () => {
+        expect(wrapper.find('[data-testid="severity"]').text()).toBe(
+          ALERTS_SEVERITY_LABELS[mockAlert.severity],
+        );
+      });
+
       it('renders a title', () => {
         expect(wrapper.find('[data-testid="title"]').text()).toBe(mockAlert.title);
       });
@@ -117,18 +130,54 @@ describe('AlertDetails', () => {
     });
 
     describe('Create issue from alert', () => {
-      describe('createIssueFromAlertEnabled feature flag enabled', () => {
-        it('should display a button that links to new issue page', () => {
-          mountComponent({ createIssueFromAlertEnabled: true });
-          expect(findCreatedIssueBtn().exists()).toBe(true);
-          expect(findCreatedIssueBtn().attributes('href')).toBe(newIssuePath);
+      it('should display "View issue" button that links the issue page when issue exists', () => {
+        const issueIid = '3';
+        mountComponent({
+          data: { alert: { ...mockAlert, issueIid } },
         });
+        expect(findViewIssueBtn().exists()).toBe(true);
+        expect(findViewIssueBtn().attributes('href')).toBe(joinPaths(projectIssuesPath, issueIid));
+        expect(findCreateIssueBtn().exists()).toBe(false);
       });
 
-      describe('createIssueFromAlertEnabled feature flag disabled', () => {
-        it('should display a button that links to a new issue page', () => {
-          mountComponent({ createIssueFromAlertEnabled: false });
-          expect(findCreatedIssueBtn().exists()).toBe(false);
+      it('should display "Create issue" button when issue doesn\'t exist yet', () => {
+        const issueIid = null;
+        mountComponent({
+          mountMethod: mount,
+          data: { alert: { ...mockAlert, issueIid } },
+        });
+        expect(findViewIssueBtn().exists()).toBe(false);
+        expect(findCreateIssueBtn().exists()).toBe(true);
+      });
+
+      it('calls `$apollo.mutate` with `createIssueQuery`', () => {
+        const issueIid = '10';
+        jest
+          .spyOn(wrapper.vm.$apollo, 'mutate')
+          .mockResolvedValue({ data: { createAlertIssue: { issue: { iid: issueIid } } } });
+
+        findCreateIssueBtn().trigger('click');
+        expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
+          mutation: createIssueQuery,
+          variables: {
+            iid: mockAlert.iid,
+            projectPath,
+          },
+        });
+      });
+
+      it('shows error alert when issue creation fails ', () => {
+        const errorMsg = 'Something went wrong';
+        mountComponent({
+          mountMethod: mount,
+          data: { alert: { ...mockAlert, alertIid: 1 } },
+        });
+
+        jest.spyOn(wrapper.vm.$apollo, 'mutate').mockRejectedValue(errorMsg);
+        findCreateIssueBtn().trigger('click');
+
+        setImmediate(() => {
+          expect(findIssueCreationAlert().text()).toBe(errorMsg);
         });
       });
     });
@@ -171,15 +220,15 @@ describe('AlertDetails', () => {
 
       describe('individual header fields', () => {
         describe.each`
-          severity    | createdAt                     | monitoringTool | result
-          ${'MEDIUM'} | ${'2020-04-17T23:18:14.996Z'} | ${null}        | ${'Medium • Reported now'}
-          ${'INFO'}   | ${'2020-04-17T23:18:14.996Z'} | ${'Datadog'}   | ${'Info • Reported now by Datadog'}
+          createdAt                     | monitoringTool | result
+          ${'2020-04-17T23:18:14.996Z'} | ${null}        | ${'Alert Reported now'}
+          ${'2020-04-17T23:18:14.996Z'} | ${'Datadog'}   | ${'Alert Reported now by Datadog'}
         `(
-          `When severity=$severity, createdAt=$createdAt, monitoringTool=$monitoringTool`,
-          ({ severity, createdAt, monitoringTool, result }) => {
+          `When createdAt=$createdAt, monitoringTool=$monitoringTool`,
+          ({ createdAt, monitoringTool, result }) => {
             beforeEach(() => {
               mountComponent({
-                data: { alert: { ...mockAlert, severity, createdAt, monitoringTool } },
+                data: { alert: { ...mockAlert, createdAt, monitoringTool } },
                 mountMethod: mount,
                 stubs,
               });
@@ -194,19 +243,9 @@ describe('AlertDetails', () => {
     });
   });
 
-  describe('updating the alert status', () => {
-    const mockUpdatedMutationResult = {
-      data: {
-        updateAlertStatus: {
-          errors: [],
-          alert: {
-            status: 'acknowledged',
-          },
-        },
-      },
-    };
-
+  describe('Snowplow tracking', () => {
     beforeEach(() => {
+      jest.spyOn(Tracking, 'event');
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
         data: { alert: mockAlert },
@@ -214,29 +253,9 @@ describe('AlertDetails', () => {
       });
     });
 
-    it('calls `$apollo.mutate` with `updateAlertStatus` mutation and variables containing `iid`, `status`, & `projectPath`', () => {
-      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult);
-      findStatusDropdownItem().vm.$emit('click');
-
-      expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
-        mutation: updateAlertStatus,
-        variables: {
-          iid: 'alertId',
-          status: 'TRIGGERED',
-          projectPath: 'projectPath',
-        },
-      });
-    });
-
-    it('calls `createFlash` when request fails', () => {
-      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockReturnValue(Promise.reject(new Error()));
-      findStatusDropdownItem().vm.$emit('click');
-
-      setImmediate(() => {
-        expect(createFlash).toHaveBeenCalledWith(
-          'There was an error while updating the status of the alert. Please try again.',
-        );
-      });
+    it('should track alert details page views', () => {
+      const { category, action } = trackAlertsDetailsViewsOptions;
+      expect(Tracking.event).toHaveBeenCalledWith(category, action);
     });
   });
 });
diff --git a/spec/frontend/alert_management/components/alert_management_list_spec.js b/spec/frontend/alert_management/components/alert_management_list_spec.js
index c4630ac57fe..0154e5fa112 100644
--- a/spec/frontend/alert_management/components/alert_management_list_spec.js
+++ b/spec/frontend/alert_management/components/alert_management_list_spec.js
@@ -7,15 +7,23 @@ import {
   GlDropdown,
   GlDropdownItem,
   GlIcon,
+  GlTabs,
   GlTab,
+  GlBadge,
+  GlPagination,
 } from '@gitlab/ui';
 import { visitUrl } from '~/lib/utils/url_utility';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import createFlash from '~/flash';
 import AlertManagementList from '~/alert_management/components/alert_management_list.vue';
-import { ALERTS_STATUS_TABS } from '../../../../app/assets/javascripts/alert_management/constants';
+import {
+  ALERTS_STATUS_TABS,
+  trackAlertListViewsOptions,
+  trackAlertStatusUpdateOptions,
+} from '~/alert_management/constants';
 import updateAlertStatus from '~/alert_management/graphql/mutations/update_alert_status.graphql';
 import mockAlerts from '../mocks/alerts.json';
+import Tracking from '~/tracking';
 
 jest.mock('~/flash');
 
@@ -33,9 +41,21 @@ describe('AlertManagementList', () => {
   const findLoader = () => wrapper.find(GlLoadingIcon);
   const findStatusDropdown = () => wrapper.find(GlDropdown);
   const findStatusFilterTabs = () => wrapper.findAll(GlTab);
+  const findStatusTabs = () => wrapper.find(GlTabs);
+  const findStatusFilterBadge = () => wrapper.findAll(GlBadge);
   const findDateFields = () => wrapper.findAll(TimeAgo);
   const findFirstStatusOption = () => findStatusDropdown().find(GlDropdownItem);
+  const findAssignees = () => wrapper.findAll('[data-testid="assigneesField"]');
   const findSeverityFields = () => wrapper.findAll('[data-testid="severityField"]');
+  const findSeverityColumnHeader = () => wrapper.findAll('th').at(0);
+  const findPagination = () => wrapper.find(GlPagination);
+  const alertsCount = {
+    open: 14,
+    triggered: 10,
+    acknowledged: 6,
+    resolved: 1,
+    all: 16,
+  };
 
   function mountComponent({
     props = {
@@ -44,7 +64,6 @@ describe('AlertManagementList', () => {
     },
     data = {},
     loading = false,
-    alertListStatusFilteringEnabled = false,
     stubs = {},
   } = {}) {
     wrapper = mount(AlertManagementList, {
@@ -54,17 +73,13 @@ describe('AlertManagementList', () => {
         emptyAlertSvgPath: 'illustration/path',
         ...props,
       },
-      provide: {
-        glFeatures: {
-          alertListStatusFilteringEnabled,
-        },
-      },
       data() {
         return data;
       },
       mocks: {
         $apollo: {
           mutate: jest.fn(),
+          query: jest.fn(),
           queries: {
             alerts: {
               loading,
@@ -86,49 +101,32 @@ describe('AlertManagementList', () => {
     }
   });
 
-  describe('alert management feature renders empty state', () => {
+  describe('Empty state', () => {
     it('shows empty state', () => {
       expect(wrapper.find(GlEmptyState).exists()).toBe(true);
     });
   });
 
   describe('Status Filter Tabs', () => {
-    describe('alertListStatusFilteringEnabled feature flag enabled', () => {
-      beforeEach(() => {
-        mountComponent({
-          props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-          data: { alerts: mockAlerts },
-          loading: false,
-          alertListStatusFilteringEnabled: true,
-          stubs: {
-            GlTab: true,
-          },
-        });
-      });
-
-      it('should display filter tabs for all statuses', () => {
-        const tabs = findStatusFilterTabs().wrappers;
-        tabs.forEach((tab, i) => {
-          expect(tab.text()).toContain(ALERTS_STATUS_TABS[i].title);
-        });
+    beforeEach(() => {
+      mountComponent({
+        props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
+        data: { alerts: mockAlerts, alertsCount },
+        loading: false,
+        stubs: {
+          GlTab: true,
+        },
       });
     });
 
-    describe('alertListStatusFilteringEnabled feature flag disabled', () => {
-      beforeEach(() => {
-        mountComponent({
-          props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-          data: { alerts: mockAlerts },
-          loading: false,
-          alertListStatusFilteringEnabled: false,
-          stubs: {
-            GlTab: true,
-          },
-        });
-      });
+    it('should display filter tabs with alerts count badge for each status', () => {
+      const tabs = findStatusFilterTabs().wrappers;
+      const badges = findStatusFilterBadge();
 
-      it('should NOT display tabs', () => {
-        expect(findStatusFilterTabs()).not.toExist();
+      tabs.forEach((tab, i) => {
+        const status = ALERTS_STATUS_TABS[i].status.toLowerCase();
+        expect(tab.text()).toContain(ALERTS_STATUS_TABS[i].title);
+        expect(badges.at(i).text()).toContain(alertsCount[status]);
       });
     });
   });
@@ -137,52 +135,72 @@ describe('AlertManagementList', () => {
     it('loading state', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: null },
+        data: { alerts: {}, alertsCount: null },
         loading: true,
       });
       expect(findAlertsTable().exists()).toBe(true);
       expect(findLoader().exists()).toBe(true);
+      expect(
+        findAlerts()
+          .at(0)
+          .classes(),
+      ).not.toContain('gl-hover-bg-blue-50');
     });
 
     it('error state', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: null, errored: true },
+        data: { alerts: { errors: ['error'] }, alertsCount: null, errored: true },
         loading: false,
       });
       expect(findAlertsTable().exists()).toBe(true);
       expect(findAlertsTable().text()).toContain('No alerts to display');
       expect(findLoader().exists()).toBe(false);
       expect(findAlert().props().variant).toBe('danger');
+      expect(
+        findAlerts()
+          .at(0)
+          .classes(),
+      ).not.toContain('gl-hover-bg-blue-50');
     });
 
     it('empty state', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: [], errored: false },
+        data: { alerts: { list: [], pageInfo: {} }, alertsCount: { all: 0 }, errored: false },
         loading: false,
       });
       expect(findAlertsTable().exists()).toBe(true);
       expect(findAlertsTable().text()).toContain('No alerts to display');
       expect(findLoader().exists()).toBe(false);
       expect(findAlert().props().variant).toBe('info');
+      expect(
+        findAlerts()
+          .at(0)
+          .classes(),
+      ).not.toContain('gl-hover-bg-blue-50');
     });
 
     it('has data state', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: mockAlerts, errored: false },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
         loading: false,
       });
       expect(findLoader().exists()).toBe(false);
       expect(findAlertsTable().exists()).toBe(true);
       expect(findAlerts()).toHaveLength(mockAlerts.length);
+      expect(
+        findAlerts()
+          .at(0)
+          .classes(),
+      ).toContain('gl-hover-bg-blue-50');
     });
 
     it('displays status dropdown', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: mockAlerts, errored: false },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
         loading: false,
       });
       expect(findStatusDropdown().exists()).toBe(true);
@@ -191,7 +209,7 @@ describe('AlertManagementList', () => {
     it('shows correct severity icons', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: mockAlerts, errored: false },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
         loading: false,
       });
 
@@ -208,7 +226,7 @@ describe('AlertManagementList', () => {
     it('renders severity text', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: mockAlerts, errored: false },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
         loading: false,
       });
 
@@ -219,10 +237,38 @@ describe('AlertManagementList', () => {
       ).toBe('Critical');
     });
 
+    it('renders Unassigned when no assignee(s) present', () => {
+      mountComponent({
+        props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
+        loading: false,
+      });
+
+      expect(
+        findAssignees()
+          .at(0)
+          .text(),
+      ).toBe('Unassigned');
+    });
+
+    it('renders username(s) when assignee(s) present', () => {
+      mountComponent({
+        props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
+        loading: false,
+      });
+
+      expect(
+        findAssignees()
+          .at(1)
+          .text(),
+      ).toBe(mockAlerts[1].assignees.nodes[0].username);
+    });
+
     it('navigates to the detail page when alert row is clicked', () => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: mockAlerts, errored: false },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
         loading: false,
       });
 
@@ -237,15 +283,19 @@ describe('AlertManagementList', () => {
         mountComponent({
           props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
           data: {
-            alerts: [
-              {
-                iid: 1,
-                status: 'acknowledged',
-                startedAt: '2020-03-17T23:18:14.996Z',
-                endedAt: '2020-04-17T23:18:14.996Z',
-                severity: 'high',
-              },
-            ],
+            alerts: {
+              list: [
+                {
+                  iid: 1,
+                  status: 'acknowledged',
+                  startedAt: '2020-03-17T23:18:14.996Z',
+                  endedAt: '2020-04-17T23:18:14.996Z',
+                  severity: 'high',
+                  assignees: { nodes: [] },
+                },
+              ],
+            },
+            alertsCount,
             errored: false,
           },
           loading: false,
@@ -266,6 +316,7 @@ describe('AlertManagementList', () => {
                 severity: 'high',
               },
             ],
+            alertsCount,
             errored: false,
           },
           loading: false,
@@ -275,6 +326,32 @@ describe('AlertManagementList', () => {
     });
   });
 
+  describe('sorting the alert list by column', () => {
+    beforeEach(() => {
+      mountComponent({
+        props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
+        data: {
+          alerts: { list: mockAlerts },
+          errored: false,
+          sort: 'STARTED_AT_DESC',
+          alertsCount,
+        },
+        loading: false,
+        stubs: { GlTable },
+      });
+    });
+
+    it('updates sort with new direction and column key', () => {
+      findSeverityColumnHeader().trigger('click');
+
+      expect(wrapper.vm.$data.sort).toBe('SEVERITY_DESC');
+
+      findSeverityColumnHeader().trigger('click');
+
+      expect(wrapper.vm.$data.sort).toBe('SEVERITY_ASC');
+    });
+  });
+
   describe('updating the alert status', () => {
     const iid = '1527542';
     const mockUpdatedMutationResult = {
@@ -292,7 +369,7 @@ describe('AlertManagementList', () => {
     beforeEach(() => {
       mountComponent({
         props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
-        data: { alerts: mockAlerts, errored: false },
+        data: { alerts: { list: mockAlerts }, alertsCount, errored: false },
         loading: false,
       });
     });
@@ -322,4 +399,91 @@ describe('AlertManagementList', () => {
       });
     });
   });
+
+  describe('Snowplow tracking', () => {
+    beforeEach(() => {
+      jest.spyOn(Tracking, 'event');
+      mountComponent({
+        props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
+        data: { alerts: { list: mockAlerts }, alertsCount },
+        loading: false,
+      });
+    });
+
+    it('should track alert list page views', () => {
+      const { category, action } = trackAlertListViewsOptions;
+      expect(Tracking.event).toHaveBeenCalledWith(category, action);
+    });
+
+    it('should track alert status updates', () => {
+      Tracking.event.mockClear();
+      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue({});
+      findFirstStatusOption().vm.$emit('click');
+      const status = findFirstStatusOption().text();
+      setImmediate(() => {
+        const { category, action, label } = trackAlertStatusUpdateOptions;
+        expect(Tracking.event).toHaveBeenCalledWith(category, action, { label, property: status });
+      });
+    });
+  });
+
+  describe('Pagination', () => {
+    beforeEach(() => {
+      mountComponent({
+        props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
+        data: { alerts: { list: mockAlerts, pageInfo: {} }, alertsCount, errored: false },
+        loading: false,
+      });
+    });
+
+    it('does NOT show pagination control when list is smaller than default page size', () => {
+      findStatusTabs().vm.$emit('input', 3);
+      wrapper.vm.$nextTick(() => {
+        expect(findPagination().exists()).toBe(false);
+      });
+    });
+
+    it('shows pagination control when list is larger than default page size', () => {
+      findStatusTabs().vm.$emit('input', 0);
+      wrapper.vm.$nextTick(() => {
+        expect(findPagination().exists()).toBe(true);
+      });
+    });
+
+    describe('prevPage', () => {
+      it('returns prevPage number', () => {
+        findPagination().vm.$emit('input', 3);
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.prevPage).toBe(2);
+        });
+      });
+
+      it('returns 0 when it is the first page', () => {
+        findPagination().vm.$emit('input', 1);
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.prevPage).toBe(0);
+        });
+      });
+    });
+
+    describe('nextPage', () => {
+      it('returns nextPage number', () => {
+        findPagination().vm.$emit('input', 1);
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.nextPage).toBe(2);
+        });
+      });
+
+      it('returns `null` when currentPage is already last page', () => {
+        findStatusTabs().vm.$emit('input', 3);
+        findPagination().vm.$emit('input', 1);
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.nextPage).toBeNull();
+        });
+      });
+    });
+  });
 });
diff --git a/spec/frontend/alert_management/components/alert_management_system_note_spec.js b/spec/frontend/alert_management/components/alert_management_system_note_spec.js
new file mode 100644
index 00000000000..87dc36cc7cb
--- /dev/null
+++ b/spec/frontend/alert_management/components/alert_management_system_note_spec.js
@@ -0,0 +1,34 @@
+import { shallowMount } from '@vue/test-utils';
+import SystemNote from '~/alert_management/components/system_notes/system_note.vue';
+import mockAlerts from '../mocks/alerts.json';
+
+const mockAlert = mockAlerts[1];
+
+describe('Alert Details System Note', () => {
+  let wrapper;
+
+  function mountComponent({ stubs = {} } = {}) {
+    wrapper = shallowMount(SystemNote, {
+      propsData: {
+        note: { ...mockAlert.notes.nodes[0] },
+      },
+      stubs,
+    });
+  }
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+    }
+  });
+
+  describe('System notes', () => {
+    beforeEach(() => {
+      mountComponent({});
+    });
+
+    it('renders the correct system note', () => {
+      expect(wrapper.find('.note-wrapper').attributes('id')).toBe('note_1628');
+    });
+  });
+});
diff --git a/spec/frontend/alert_management/components/alert_managment_sidebar_assignees_spec.js b/spec/frontend/alert_management/components/alert_managment_sidebar_assignees_spec.js
new file mode 100644
index 00000000000..5dbd83dbdac
--- /dev/null
+++ b/spec/frontend/alert_management/components/alert_managment_sidebar_assignees_spec.js
@@ -0,0 +1,133 @@
+import { shallowMount } from '@vue/test-utils';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+import { GlDropdownItem } from '@gitlab/ui';
+import SidebarAssignee from '~/alert_management/components/sidebar/sidebar_assignee.vue';
+import SidebarAssignees from '~/alert_management/components/sidebar/sidebar_assignees.vue';
+import AlertSetAssignees from '~/alert_management/graphql/mutations/alert_set_assignees.graphql';
+import mockAlerts from '../mocks/alerts.json';
+
+const mockAlert = mockAlerts[0];
+
+describe('Alert Details Sidebar Assignees', () => {
+  let wrapper;
+  let mock;
+
+  function mountComponent({
+    data,
+    users = [],
+    isDropdownSearching = false,
+    sidebarCollapsed = true,
+    loading = false,
+    stubs = {},
+  } = {}) {
+    wrapper = shallowMount(SidebarAssignees, {
+      data() {
+        return {
+          users,
+          isDropdownSearching,
+        };
+      },
+      propsData: {
+        alert: { ...mockAlert },
+        ...data,
+        sidebarCollapsed,
+        projectPath: 'projectPath',
+      },
+      mocks: {
+        $apollo: {
+          mutate: jest.fn(),
+          queries: {
+            alert: {
+              loading,
+            },
+          },
+        },
+      },
+      stubs,
+    });
+  }
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+    }
+    mock.restore();
+  });
+
+  describe('updating the alert status', () => {
+    const mockUpdatedMutationResult = {
+      data: {
+        updateAlertStatus: {
+          errors: [],
+          alert: {
+            assigneeUsernames: ['root'],
+          },
+        },
+      },
+    };
+
+    beforeEach(() => {
+      mock = new MockAdapter(axios);
+      const path = '/autocomplete/users.json';
+      const users = [
+        {
+          avatar_url:
+            'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
+          id: 1,
+          name: 'User 1',
+          username: 'root',
+        },
+        {
+          avatar_url:
+            'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
+          id: 2,
+          name: 'User 2',
+          username: 'not-root',
+        },
+      ];
+
+      mock.onGet(path).replyOnce(200, users);
+      mountComponent({
+        data: { alert: mockAlert },
+        sidebarCollapsed: false,
+        loading: false,
+        users,
+        stubs: {
+          SidebarAssignee,
+        },
+      });
+    });
+
+    it('renders a unassigned option', () => {
+      wrapper.setData({ isDropdownSearching: false });
+      return wrapper.vm.$nextTick().then(() => {
+        expect(wrapper.find(GlDropdownItem).text()).toBe('Unassigned');
+      });
+    });
+
+    it('calls `$apollo.mutate` with `AlertSetAssignees` mutation and variables containing `iid`, `assigneeUsernames`, & `projectPath`', () => {
+      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult);
+      wrapper.setData({ isDropdownSearching: false });
+
+      return wrapper.vm.$nextTick().then(() => {
+        wrapper.find(SidebarAssignee).vm.$emit('update-alert-assignees', 'root');
+
+        expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
+          mutation: AlertSetAssignees,
+          variables: {
+            iid: '1527542',
+            assigneeUsernames: ['root'],
+            projectPath: 'projectPath',
+          },
+        });
+      });
+    });
+
+    it('stops updating and cancels loading when the request fails', () => {
+      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockReturnValue(Promise.reject(new Error()));
+      wrapper.vm.updateAlertAssignees('root');
+      expect(wrapper.find('[data-testid="unassigned-users"]').text()).toBe('assign yourself');
+    });
+  });
+});
diff --git a/spec/frontend/alert_management/components/alert_sidebar_spec.js b/spec/frontend/alert_management/components/alert_sidebar_spec.js
new file mode 100644
index 00000000000..80c4d9e0650
--- /dev/null
+++ b/spec/frontend/alert_management/components/alert_sidebar_spec.js
@@ -0,0 +1,55 @@
+import { shallowMount, mount } from '@vue/test-utils';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+import AlertSidebar from '~/alert_management/components/alert_sidebar.vue';
+import SidebarAssignees from '~/alert_management/components/sidebar/sidebar_assignees.vue';
+import mockAlerts from '../mocks/alerts.json';
+
+const mockAlert = mockAlerts[0];
+
+describe('Alert Details Sidebar', () => {
+  let wrapper;
+  let mock;
+
+  function mountComponent({
+    sidebarCollapsed = true,
+    mountMethod = shallowMount,
+    stubs = {},
+    alert = {},
+  } = {}) {
+    wrapper = mountMethod(AlertSidebar, {
+      propsData: {
+        alert,
+        sidebarCollapsed,
+        projectPath: 'projectPath',
+      },
+      stubs,
+    });
+  }
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+    }
+    mock.restore();
+  });
+
+  describe('the sidebar renders', () => {
+    beforeEach(() => {
+      mock = new MockAdapter(axios);
+      mountComponent();
+    });
+
+    it('open as default', () => {
+      expect(wrapper.props('sidebarCollapsed')).toBe(true);
+    });
+
+    it('should render side bar assignee dropdown', () => {
+      mountComponent({
+        mountMethod: mount,
+        alert: mockAlert,
+      });
+      expect(wrapper.find(SidebarAssignees).exists()).toBe(true);
+    });
+  });
+});
diff --git a/spec/frontend/alert_management/components/alert_sidebar_status_spec.js b/spec/frontend/alert_management/components/alert_sidebar_status_spec.js
new file mode 100644
index 00000000000..94643966a43
--- /dev/null
+++ b/spec/frontend/alert_management/components/alert_sidebar_status_spec.js
@@ -0,0 +1,107 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlDropdownItem, GlLoadingIcon } from '@gitlab/ui';
+import { trackAlertStatusUpdateOptions } from '~/alert_management/constants';
+import AlertSidebarStatus from '~/alert_management/components/sidebar/sidebar_status.vue';
+import updateAlertStatus from '~/alert_management/graphql/mutations/update_alert_status.graphql';
+import Tracking from '~/tracking';
+import mockAlerts from '../mocks/alerts.json';
+
+const mockAlert = mockAlerts[0];
+
+describe('Alert Details Sidebar Status', () => {
+  let wrapper;
+  const findStatusDropdownItem = () => wrapper.find(GlDropdownItem);
+  const findStatusLoadingIcon = () => wrapper.find(GlLoadingIcon);
+
+  function mountComponent({ data, sidebarCollapsed = true, loading = false, stubs = {} } = {}) {
+    wrapper = shallowMount(AlertSidebarStatus, {
+      propsData: {
+        alert: { ...mockAlert },
+        ...data,
+        sidebarCollapsed,
+        projectPath: 'projectPath',
+      },
+      mocks: {
+        $apollo: {
+          mutate: jest.fn(),
+          queries: {
+            alert: {
+              loading,
+            },
+          },
+        },
+      },
+      stubs,
+    });
+  }
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+    }
+  });
+
+  describe('updating the alert status', () => {
+    const mockUpdatedMutationResult = {
+      data: {
+        updateAlertStatus: {
+          errors: [],
+          alert: {
+            status: 'acknowledged',
+          },
+        },
+      },
+    };
+
+    beforeEach(() => {
+      mountComponent({
+        data: { alert: mockAlert },
+        sidebarCollapsed: false,
+        loading: false,
+      });
+    });
+
+    it('calls `$apollo.mutate` with `updateAlertStatus` mutation and variables containing `iid`, `status`, & `projectPath`', () => {
+      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue(mockUpdatedMutationResult);
+      findStatusDropdownItem().vm.$emit('click');
+
+      expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
+        mutation: updateAlertStatus,
+        variables: {
+          iid: '1527542',
+          status: 'TRIGGERED',
+          projectPath: 'projectPath',
+        },
+      });
+    });
+
+    it('stops updating when the request fails', () => {
+      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockReturnValue(Promise.reject(new Error()));
+      findStatusDropdownItem().vm.$emit('click');
+      expect(findStatusLoadingIcon().exists()).toBe(false);
+      expect(wrapper.find('[data-testid="status"]').text()).toBe('Triggered');
+    });
+  });
+
+  describe('Snowplow tracking', () => {
+    beforeEach(() => {
+      jest.spyOn(Tracking, 'event');
+      mountComponent({
+        props: { alertManagementEnabled: true, userCanEnableAlertManagement: true },
+        data: { alert: mockAlert },
+        loading: false,
+      });
+    });
+
+    it('should track alert status updates', () => {
+      Tracking.event.mockClear();
+      jest.spyOn(wrapper.vm.$apollo, 'mutate').mockResolvedValue({});
+      findStatusDropdownItem().vm.$emit('click');
+      const status = findStatusDropdownItem().text();
+      setImmediate(() => {
+        const { category, action, label } = trackAlertStatusUpdateOptions;
+        expect(Tracking.event).toHaveBeenCalledWith(category, action, { label, property: status });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/alert_management/mocks/alerts.json b/spec/frontend/alert_management/mocks/alerts.json
index b67e2cfc52e..312d1756790 100644
--- a/spec/frontend/alert_management/mocks/alerts.json
+++ b/spec/frontend/alert_management/mocks/alerts.json
@@ -1,29 +1,66 @@
 [
-    {
-      "iid": "1527542",
-      "title": "SyntaxError: Invalid or unexpected token",
-      "severity": "CRITICAL",
-      "eventCount": 7,
-      "startedAt": "2020-04-17T23:18:14.996Z",
-      "endedAt": "2020-04-17T23:18:14.996Z",
-      "status": "TRIGGERED"
-    },
-    {
-      "iid": "1527543",
-      "title": "Some other alert Some other alert Some other alert Some other alert Some other alert Some other alert",
-      "severity": "MEDIUM",
-      "eventCount": 1,
-      "startedAt": "2020-04-17T23:18:14.996Z",
-      "endedAt": "2020-04-17T23:18:14.996Z",
-      "status": "ACKNOWLEDGED"
-    },
-    {
-      "iid": "1527544",
-      "title": "SyntaxError: Invalid or unexpected token",
-      "severity": "LOW",
-      "eventCount": 4,
-      "startedAt": "2020-04-17T23:18:14.996Z",
-      "endedAt": "2020-04-17T23:18:14.996Z",
-      "status": "RESOLVED"
+  {
+    "iid": "1527542",
+    "title": "SyntaxError: Invalid or unexpected token",
+    "severity": "CRITICAL",
+    "eventCount": 7,
+    "createdAt": "2020-04-17T23:18:14.996Z",
+    "startedAt": "2020-04-17T23:18:14.996Z",
+    "endedAt": "2020-04-17T23:18:14.996Z",
+    "status": "TRIGGERED",
+    "assignees": { "nodes": [] },
+    "notes": { "nodes": [] }
+  },
+  {
+    "iid": "1527543",
+    "title": "Some other alert Some other alert Some other alert Some other alert Some other alert Some other alert",
+    "severity": "MEDIUM",
+    "eventCount": 1,
+    "startedAt": "2020-04-17T23:18:14.996Z",
+    "endedAt": "2020-04-17T23:18:14.996Z",
+    "status": "ACKNOWLEDGED",
+    "assignees": { "nodes": [{ "username": "root" }] },
+    "notes": {
+      "nodes": [
+        {
+          "id": "gid://gitlab/Note/1628",
+          "author": {
+            "id": "gid://gitlab/User/1",
+            "state": "active",
+            "__typename": "User",
+            "avatarUrl": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon",
+            "name": "Administrator",
+            "username": "root",
+            "webUrl": "http://192.168.1.4:3000/root"
+          }
+        }
+      ]
     }
-  ]
+  },
+  {
+    "iid": "1527544",
+    "title": "SyntaxError: Invalid or unexpected token",
+    "severity": "LOW",
+    "eventCount": 4,
+    "startedAt": "2020-04-17T23:18:14.996Z",
+    "endedAt": "2020-04-17T23:18:14.996Z",
+    "status": "RESOLVED",
+    "assignees": { "nodes": [{ "username": "root" }] },
+    "notes": {
+      "nodes": [
+        {
+          "id": "gid://gitlab/Note/1629",
+          "author": {
+            "id": "gid://gitlab/User/2",
+            "state": "active",
+            "__typename": "User",
+            "avatarUrl": "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon",
+            "name": "Administrator",
+            "username": "root",
+            "webUrl": "http://192.168.1.4:3000/root"
+          }
+        }
+      ]
+    }
+  }
+]
diff --git a/spec/frontend/alerts_service_settings/components/__snapshots__/alerts_service_form_spec.js.snap b/spec/frontend/alerts_service_settings/components/__snapshots__/alerts_service_form_spec.js.snap
index 36ec0badade..0d4171a20b3 100644
--- a/spec/frontend/alerts_service_settings/components/__snapshots__/alerts_service_form_spec.js.snap
+++ b/spec/frontend/alerts_service_settings/components/__snapshots__/alerts_service_form_spec.js.snap
@@ -6,4 +6,4 @@ exports[`AlertsServiceForm with default values renders "url" input 1`] = `"<gl-f
 
 exports[`AlertsServiceForm with default values renders toggle button 1`] = `"<toggle-button-stub id=\\"activated\\"></toggle-button-stub>"`;
 
-exports[`AlertsServiceForm with default values shows description and "Learn More" link 1`] = `"Each alert source must be authorized using the following URL and authorization key. <a href=\\"https://docs.gitlab.com/ee/user/project/integrations/generic_alerts.md\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">Learn more</a> about configuring this endpoint to receive alerts."`;
+exports[`AlertsServiceForm with default values shows description and docs links 1`] = `"<p><gl-sprintf-stub message=\\"You must provide this URL and authorization key to authorize an external service to send alerts to GitLab. You can provide this URL and key to multiple services. After configuring an external service, alerts from your service will display on the GitLab %{linkStart}Alerts%{linkEnd} page.\\"></gl-sprintf-stub></p><p><gl-sprintf-stub message=\\"Review your external service's documentation to learn where to provide this information to your external service, and the %{linkStart}GitLab documentation%{linkEnd} to learn more about configuring your endpoint.\\"></gl-sprintf-stub></p>"`;
diff --git a/spec/frontend/alerts_service_settings/components/alerts_service_form_spec.js b/spec/frontend/alerts_service_settings/components/alerts_service_form_spec.js
index b7a008c78d0..c7c15c8fd44 100644
--- a/spec/frontend/alerts_service_settings/components/alerts_service_form_spec.js
+++ b/spec/frontend/alerts_service_settings/components/alerts_service_form_spec.js
@@ -12,7 +12,8 @@ const defaultProps = {
   initialAuthorizationKey: 'abcedfg123',
   formPath: 'http://invalid',
   url: 'https://gitlab.com/endpoint-url',
-  learnMoreUrl: 'https://docs.gitlab.com/ee/user/project/integrations/generic_alerts.md',
+  alertsSetupUrl: 'http://invalid',
+  alertsUsageUrl: 'http://invalid',
   initialActivated: false,
 };
 
@@ -32,7 +33,7 @@ describe('AlertsServiceForm', () => {
 
   const findUrl = () => wrapper.find('#url');
   const findAuthorizationKey = () => wrapper.find('#authorization-key');
-  const findDescription = () => wrapper.find('p');
+  const findDescription = () => wrapper.find('[data-testid="description"');
   const findActiveStatusIcon = val =>
     document.querySelector(`.js-service-active-status[data-value=${val.toString()}]`);
 
@@ -67,7 +68,7 @@ describe('AlertsServiceForm', () => {
       expect(wrapper.find(ToggleButton).html()).toMatchSnapshot();
     });
 
-    it('shows description and "Learn More" link', () => {
+    it('shows description and docs links', () => {
       expect(findDescription().element.innerHTML).toMatchSnapshot();
     });
   });
diff --git a/spec/frontend/api_spec.js b/spec/frontend/api_spec.js
index d365048ab0b..c1a23d441b3 100644
--- a/spec/frontend/api_spec.js
+++ b/spec/frontend/api_spec.js
@@ -691,4 +691,60 @@ describe('Api', () => {
       });
     });
   });
+
+  describe('updateIssue', () => {
+    it('update an issue with the given payload', done => {
+      const projectId = 8;
+      const issue = 1;
+      const expectedArray = [1, 2, 3];
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/${projectId}/issues/${issue}`;
+      mock.onPut(expectedUrl).reply(200, { assigneeIds: expectedArray });
+
+      Api.updateIssue(projectId, issue, { assigneeIds: expectedArray })
+        .then(({ data }) => {
+          expect(data.assigneeIds).toEqual(expectedArray);
+          done();
+        })
+        .catch(done.fail);
+    });
+  });
+
+  describe('updateMergeRequest', () => {
+    it('update an issue with the given payload', done => {
+      const projectId = 8;
+      const mergeRequest = 1;
+      const expectedArray = [1, 2, 3];
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/${projectId}/merge_requests/${mergeRequest}`;
+      mock.onPut(expectedUrl).reply(200, { assigneeIds: expectedArray });
+
+      Api.updateMergeRequest(projectId, mergeRequest, { assigneeIds: expectedArray })
+        .then(({ data }) => {
+          expect(data.assigneeIds).toEqual(expectedArray);
+          done();
+        })
+        .catch(done.fail);
+    });
+  });
+
+  describe('tags', () => {
+    it('fetches all tags of a particular project', done => {
+      const query = 'dummy query';
+      const options = { unused: 'option' };
+      const projectId = 8;
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/${projectId}/repository/tags`;
+      mock.onGet(expectedUrl).reply(200, [
+        {
+          name: 'test',
+        },
+      ]);
+
+      Api.tags(projectId, query, options)
+        .then(({ data }) => {
+          expect(data.length).toBe(1);
+          expect(data[0].name).toBe('test');
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
 });
diff --git a/spec/frontend/u2f/authenticate_spec.js b/spec/frontend/authentication/u2f/authenticate_spec.js
index 1d39c4857ae..8abef2ae1b2 100644
--- a/spec/frontend/u2f/authenticate_spec.js
+++ b/spec/frontend/authentication/u2f/authenticate_spec.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import U2FAuthenticate from '~/u2f/authenticate';
+import U2FAuthenticate from '~/authentication/u2f/authenticate';
 import 'vendor/u2f';
 import MockU2FDevice from './mock_u2f_device';
 
@@ -13,10 +13,10 @@ describe('U2FAuthenticate', () => {
   beforeEach(() => {
     loadFixtures('u2f/authenticate.html');
     u2fDevice = new MockU2FDevice();
-    container = $('#js-authenticate-u2f');
+    container = $('#js-authenticate-token-2fa');
     component = new U2FAuthenticate(
       container,
-      '#js-login-u2f-form',
+      '#js-login-token-2fa-form',
       {
         sign_requests: [],
       },
@@ -92,7 +92,7 @@ describe('U2FAuthenticate', () => {
         u2fDevice.respondToAuthenticateRequest({
           errorCode: 'error!',
         });
-        const retryButton = container.find('#js-u2f-try-again');
+        const retryButton = container.find('#js-token-2fa-try-again');
         retryButton.trigger('click');
         setupButton = container.find('#js-login-u2f-device');
         setupButton.trigger('click');
diff --git a/spec/frontend/u2f/mock_u2f_device.js b/spec/frontend/authentication/u2f/mock_u2f_device.js
index ec8425a4e3e..ec8425a4e3e 100644
--- a/spec/frontend/u2f/mock_u2f_device.js
+++ b/spec/frontend/authentication/u2f/mock_u2f_device.js
diff --git a/spec/frontend/u2f/register_spec.js b/spec/frontend/authentication/u2f/register_spec.js
index a4395a2123a..3c2ecdbba66 100644
--- a/spec/frontend/u2f/register_spec.js
+++ b/spec/frontend/authentication/u2f/register_spec.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import U2FRegister from '~/u2f/register';
+import U2FRegister from '~/authentication/u2f/register';
 import 'vendor/u2f';
 import MockU2FDevice from './mock_u2f_device';
 
diff --git a/spec/frontend/u2f/util_spec.js b/spec/frontend/authentication/u2f/util_spec.js
index 32cd6891384..67fd4c73243 100644
--- a/spec/frontend/u2f/util_spec.js
+++ b/spec/frontend/authentication/u2f/util_spec.js
@@ -1,4 +1,4 @@
-import { canInjectU2fApi } from '~/u2f/util';
+import { canInjectU2fApi } from '~/authentication/u2f/util';
 
 describe('U2F Utils', () => {
   describe('canInjectU2fApi', () => {
diff --git a/spec/javascripts/awards_handler_spec.js b/spec/frontend/awards_handler_spec.js
index 02200f77ad7..754f0702b84 100644
--- a/spec/javascripts/awards_handler_spec.js
+++ b/spec/frontend/awards_handler_spec.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
 import Cookies from 'js-cookie';
 import loadAwardsHandler from '~/awards_handler';
 import '~/lib/utils/common_utils';
+import waitForPromises from './helpers/wait_for_promises';
 
 window.gl = window.gl || {};
 window.gon = window.gon || {};
@@ -10,28 +11,32 @@ let openAndWaitForEmojiMenu;
 let awardsHandler = null;
 const urlRoot = gon.relative_url_root;
 
-const lazyAssert = function(done, assertFn) {
-  setTimeout(function() {
-    assertFn();
-    done();
-    // Maybe jasmine.clock here?
-  }, 333);
+const lazyAssert = (done, assertFn) => {
+  jest.runOnlyPendingTimers();
+  waitForPromises()
+    .then(() => {
+      assertFn();
+      done();
+    })
+    .catch(e => {
+      throw e;
+    });
 };
 
-describe('AwardsHandler', function() {
+describe('AwardsHandler', () => {
   preloadFixtures('snippets/show.html');
-  beforeEach(function(done) {
+  beforeEach(done => {
     loadFixtures('snippets/show.html');
     loadAwardsHandler(true)
       .then(obj => {
         awardsHandler = obj;
-        spyOn(awardsHandler, 'postEmoji').and.callFake((button, url, emoji, cb) => cb());
+        jest.spyOn(awardsHandler, 'postEmoji').mockImplementation((button, url, emoji, cb) => cb());
         done();
       })
-      .catch(fail);
+      .catch(done.fail);
 
     let isEmojiMenuBuilt = false;
-    openAndWaitForEmojiMenu = function() {
+    openAndWaitForEmojiMenu = () => {
       return new Promise(resolve => {
         if (isEmojiMenuBuilt) {
           resolve();
@@ -49,7 +54,7 @@ describe('AwardsHandler', function() {
     };
   });
 
-  afterEach(function() {
+  afterEach(() => {
     // restore original url root value
     gon.relative_url_root = urlRoot;
 
@@ -59,12 +64,12 @@ describe('AwardsHandler', function() {
     awardsHandler.destroy();
   });
 
-  describe('::showEmojiMenu', function() {
-    it('should show emoji menu when Add emoji button clicked', function(done) {
+  describe('::showEmojiMenu', () => {
+    it('should show emoji menu when Add emoji button clicked', done => {
       $('.js-add-award')
         .eq(0)
         .click();
-      lazyAssert(done, function() {
+      lazyAssert(done, () => {
         const $emojiMenu = $('.emoji-menu');
 
         expect($emojiMenu.length).toBe(1);
@@ -74,20 +79,20 @@ describe('AwardsHandler', function() {
       });
     });
 
-    it('should also show emoji menu for the smiley icon in notes', function(done) {
+    it('should also show emoji menu for the smiley icon in notes', done => {
       $('.js-add-award.note-action-button').click();
-      lazyAssert(done, function() {
+      lazyAssert(done, () => {
         const $emojiMenu = $('.emoji-menu');
 
         expect($emojiMenu.length).toBe(1);
       });
     });
 
-    it('should remove emoji menu when body is clicked', function(done) {
+    it('should remove emoji menu when body is clicked', done => {
       $('.js-add-award')
         .eq(0)
         .click();
-      lazyAssert(done, function() {
+      lazyAssert(done, () => {
         const $emojiMenu = $('.emoji-menu');
         $('body').click();
 
@@ -97,11 +102,11 @@ describe('AwardsHandler', function() {
       });
     });
 
-    it('should not remove emoji menu when search is clicked', function(done) {
+    it('should not remove emoji menu when search is clicked', done => {
       $('.js-add-award')
         .eq(0)
         .click();
-      lazyAssert(done, function() {
+      lazyAssert(done, () => {
         const $emojiMenu = $('.emoji-menu');
         $('.emoji-search').click();
 
@@ -112,8 +117,8 @@ describe('AwardsHandler', function() {
     });
   });
 
-  describe('::addAwardToEmojiBar', function() {
-    it('should add emoji to votes block', function() {
+  describe('::addAwardToEmojiBar', () => {
+    it('should add emoji to votes block', () => {
       const $votesBlock = $('.js-awards-block').eq(0);
       awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
       const $emojiButton = $votesBlock.find('[data-name=heart]');
@@ -123,7 +128,7 @@ describe('AwardsHandler', function() {
       expect($votesBlock.hasClass('hidden')).toBe(false);
     });
 
-    it('should remove the emoji when we click again', function() {
+    it('should remove the emoji when we click again', () => {
       const $votesBlock = $('.js-awards-block').eq(0);
       awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
       awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
@@ -132,7 +137,7 @@ describe('AwardsHandler', function() {
       expect($emojiButton.length).toBe(0);
     });
 
-    it('should decrement the emoji counter', function() {
+    it('should decrement the emoji counter', () => {
       const $votesBlock = $('.js-awards-block').eq(0);
       awardsHandler.addAwardToEmojiBar($votesBlock, 'heart', false);
       const $emojiButton = $votesBlock.find('[data-name=heart]');
@@ -144,8 +149,8 @@ describe('AwardsHandler', function() {
     });
   });
 
-  describe('::userAuthored', function() {
-    it('should update tooltip to user authored title', function() {
+  describe('::userAuthored', () => {
+    it('should update tooltip to user authored title', () => {
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
       $thumbsUpEmoji.attr('data-title', 'sam');
@@ -156,27 +161,25 @@ describe('AwardsHandler', function() {
       );
     });
 
-    it('should restore tooltip back to initial vote list', function() {
-      jasmine.clock().install();
+    it('should restore tooltip back to initial vote list', () => {
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
       $thumbsUpEmoji.attr('data-title', 'sam');
       awardsHandler.userAuthored($thumbsUpEmoji);
-      jasmine.clock().tick(2801);
-      jasmine.clock().uninstall();
+      jest.advanceTimersByTime(2801);
 
       expect($thumbsUpEmoji.data('originalTitle')).toBe('sam');
     });
   });
 
-  describe('::getAwardUrl', function() {
-    it('returns the url for request', function() {
+  describe('::getAwardUrl', () => {
+    it('returns the url for request', () => {
       expect(awardsHandler.getAwardUrl()).toBe('http://test.host/snippets/1/toggle_award_emoji');
     });
   });
 
-  describe('::addAward and ::checkMutuality', function() {
-    it('should handle :+1: and :-1: mutuality', function() {
+  describe('::addAward and ::checkMutuality', () => {
+    it('should handle :+1: and :-1: mutuality', () => {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
@@ -194,8 +197,8 @@ describe('AwardsHandler', function() {
     });
   });
 
-  describe('::removeEmoji', function() {
-    it('should remove emoji', function() {
+  describe('::removeEmoji', () => {
+    it('should remove emoji', () => {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       awardsHandler.addAward($votesBlock, awardUrl, 'fire', false);
@@ -207,8 +210,8 @@ describe('AwardsHandler', function() {
     });
   });
 
-  describe('::addYouToUserList', function() {
-    it('should prepend "You" to the award tooltip', function() {
+  describe('::addYouToUserList', () => {
+    it('should prepend "You" to the award tooltip', () => {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
@@ -219,7 +222,7 @@ describe('AwardsHandler', function() {
       expect($thumbsUpEmoji.data('originalTitle')).toBe('You, sam, jerry, max, and andy');
     });
 
-    it('handles the special case where "You" is not cleanly comma separated', function() {
+    it('handles the special case where "You" is not cleanly comma separated', () => {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
@@ -231,8 +234,8 @@ describe('AwardsHandler', function() {
     });
   });
 
-  describe('::removeYouToUserList', function() {
-    it('removes "You" from the front of the tooltip', function() {
+  describe('::removeYouToUserList', () => {
+    it('removes "You" from the front of the tooltip', () => {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
@@ -244,7 +247,7 @@ describe('AwardsHandler', function() {
       expect($thumbsUpEmoji.data('originalTitle')).toBe('sam, jerry, max, and andy');
     });
 
-    it('handles the special case where "You" is not cleanly comma separated', function() {
+    it('handles the special case where "You" is not cleanly comma separated', () => {
       const awardUrl = awardsHandler.getAwardUrl();
       const $votesBlock = $('.js-awards-block').eq(0);
       const $thumbsUpEmoji = $votesBlock.find('[data-name=thumbsup]').parent();
@@ -258,7 +261,7 @@ describe('AwardsHandler', function() {
   });
 
   describe('::searchEmojis', () => {
-    it('should filter the emoji', function(done) {
+    it('should filter the emoji', done => {
       openAndWaitForEmojiMenu()
         .then(() => {
           expect($('[data-name=angel]').is(':visible')).toBe(true);
@@ -276,7 +279,7 @@ describe('AwardsHandler', function() {
         });
     });
 
-    it('should clear the search when searching for nothing', function(done) {
+    it('should clear the search when searching for nothing', done => {
       openAndWaitForEmojiMenu()
         .then(() => {
           awardsHandler.searchEmojis('ali');
@@ -298,9 +301,9 @@ describe('AwardsHandler', function() {
     });
   });
 
-  describe('emoji menu', function() {
+  describe('emoji menu', () => {
     const emojiSelector = '[data-name="sunglasses"]';
-    const openEmojiMenuAndAddEmoji = function() {
+    const openEmojiMenuAndAddEmoji = () => {
       return openAndWaitForEmojiMenu().then(() => {
         const $menu = $('.emoji-menu');
         const $block = $('.js-awards-block');
@@ -315,7 +318,7 @@ describe('AwardsHandler', function() {
       });
     };
 
-    it('should add selected emoji to awards block', function(done) {
+    it('should add selected emoji to awards block', done => {
       openEmojiMenuAndAddEmoji()
         .then(done)
         .catch(err => {
@@ -323,7 +326,7 @@ describe('AwardsHandler', function() {
         });
     });
 
-    it('should remove already selected emoji', function(done) {
+    it('should remove already selected emoji', done => {
       openEmojiMenuAndAddEmoji()
         .then(() => {
           $('.js-add-award')
@@ -344,13 +347,13 @@ describe('AwardsHandler', function() {
     });
   });
 
-  describe('frequently used emojis', function() {
+  describe('frequently used emojis', () => {
     beforeEach(() => {
       // Clear it out
       Cookies.set('frequently_used_emojis', '');
     });
 
-    it('shouldn\'t have any "Frequently used" heading if no frequently used emojis', function(done) {
+    it('shouldn\'t have any "Frequently used" heading if no frequently used emojis', done => {
       return openAndWaitForEmojiMenu()
         .then(() => {
           const emojiMenu = document.querySelector('.emoji-menu');
@@ -364,7 +367,7 @@ describe('AwardsHandler', function() {
         });
     });
 
-    it('should have any frequently used section when there are frequently used emojis', function(done) {
+    it('should have any frequently used section when there are frequently used emojis', done => {
       awardsHandler.addEmojiToFrequentlyUsedList('8ball');
 
       return openAndWaitForEmojiMenu()
@@ -383,7 +386,7 @@ describe('AwardsHandler', function() {
         });
     });
 
-    it('should disregard invalid frequently used emoji that are being attempted to be added', function() {
+    it('should disregard invalid frequently used emoji that are being attempted to be added', () => {
       awardsHandler.addEmojiToFrequentlyUsedList('8ball');
       awardsHandler.addEmojiToFrequentlyUsedList('invalid_emoji');
       awardsHandler.addEmojiToFrequentlyUsedList('grinning');
@@ -391,7 +394,7 @@ describe('AwardsHandler', function() {
       expect(awardsHandler.getFrequentlyUsedEmojis()).toEqual(['8ball', 'grinning']);
     });
 
-    it('should disregard invalid frequently used emoji already set in cookie', function() {
+    it('should disregard invalid frequently used emoji already set in cookie', () => {
       Cookies.set('frequently_used_emojis', '8ball,invalid_emoji,grinning');
 
       expect(awardsHandler.getFrequentlyUsedEmojis()).toEqual(['8ball', 'grinning']);
diff --git a/spec/frontend/batch_comments/components/diff_file_drafts_spec.js b/spec/frontend/batch_comments/components/diff_file_drafts_spec.js
new file mode 100644
index 00000000000..6e0b61db9fa
--- /dev/null
+++ b/spec/frontend/batch_comments/components/diff_file_drafts_spec.js
@@ -0,0 +1,61 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import DiffFileDrafts from '~/batch_comments/components/diff_file_drafts.vue';
+import DraftNote from '~/batch_comments/components/draft_note.vue';
+
+const localVue = createLocalVue();
+
+localVue.use(Vuex);
+
+describe('Batch comments diff file drafts component', () => {
+  let vm;
+
+  function factory() {
+    const store = new Vuex.Store({
+      modules: {
+        batchComments: {
+          namespaced: true,
+          getters: {
+            draftsForFile: () => () => [{ id: 1 }, { id: 2 }],
+          },
+        },
+      },
+    });
+
+    vm = shallowMount(localVue.extend(DiffFileDrafts), {
+      store,
+      localVue,
+      propsData: { fileHash: 'filehash' },
+    });
+  }
+
+  afterEach(() => {
+    vm.destroy();
+  });
+
+  it('renders list of draft notes', () => {
+    factory();
+
+    expect(vm.findAll(DraftNote).length).toEqual(2);
+  });
+
+  it('renders index of draft note', () => {
+    factory();
+
+    expect(vm.findAll('.js-diff-notes-index').length).toEqual(2);
+
+    expect(
+      vm
+        .findAll('.js-diff-notes-index')
+        .at(0)
+        .text(),
+    ).toEqual('1');
+
+    expect(
+      vm
+        .findAll('.js-diff-notes-index')
+        .at(1)
+        .text(),
+    ).toEqual('2');
+  });
+});
diff --git a/spec/frontend/batch_comments/components/draft_note_spec.js b/spec/frontend/batch_comments/components/draft_note_spec.js
new file mode 100644
index 00000000000..eea7f25dbc1
--- /dev/null
+++ b/spec/frontend/batch_comments/components/draft_note_spec.js
@@ -0,0 +1,125 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import DraftNote from '~/batch_comments/components/draft_note.vue';
+import { createStore } from '~/batch_comments/stores';
+import NoteableNote from '~/notes/components/noteable_note.vue';
+import '~/behaviors/markdown/render_gfm';
+import { createDraft } from '../mock_data';
+
+const localVue = createLocalVue();
+
+describe('Batch comments draft note component', () => {
+  let wrapper;
+  let draft;
+
+  beforeEach(() => {
+    const store = createStore();
+
+    draft = createDraft();
+
+    wrapper = shallowMount(localVue.extend(DraftNote), {
+      store,
+      propsData: { draft },
+      localVue,
+    });
+
+    jest.spyOn(wrapper.vm.$store, 'dispatch').mockImplementation();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('renders template', () => {
+    expect(wrapper.find('.draft-pending-label').exists()).toBe(true);
+
+    const note = wrapper.find(NoteableNote);
+
+    expect(note.exists()).toBe(true);
+    expect(note.props().note).toEqual(draft);
+  });
+
+  describe('add comment now', () => {
+    it('dispatches publishSingleDraft when clicking', () => {
+      const publishNowButton = wrapper.find({ ref: 'publishNowButton' });
+      publishNowButton.vm.$emit('click');
+
+      expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith(
+        'batchComments/publishSingleDraft',
+        1,
+      );
+    });
+
+    it('sets as loading when draft is publishing', done => {
+      wrapper.vm.$store.state.batchComments.currentlyPublishingDrafts.push(1);
+
+      wrapper.vm.$nextTick(() => {
+        const publishNowButton = wrapper.find({ ref: 'publishNowButton' });
+
+        expect(publishNowButton.props().loading).toBe(true);
+
+        done();
+      });
+    });
+  });
+
+  describe('update', () => {
+    it('dispatches updateDraft', done => {
+      const note = wrapper.find(NoteableNote);
+
+      note.vm.$emit('handleEdit');
+
+      wrapper.vm
+        .$nextTick()
+        .then(() => {
+          const formData = {
+            note: draft,
+            noteText: 'a',
+            resolveDiscussion: false,
+          };
+
+          note.vm.$emit('handleUpdateNote', formData);
+
+          expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith(
+            'batchComments/updateDraft',
+            formData,
+          );
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
+  describe('deleteDraft', () => {
+    it('dispatches deleteDraft', () => {
+      jest.spyOn(window, 'confirm').mockImplementation(() => true);
+
+      const note = wrapper.find(NoteableNote);
+
+      note.vm.$emit('handleDeleteNote', draft);
+
+      expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith('batchComments/deleteDraft', draft);
+    });
+  });
+
+  describe('quick actions', () => {
+    it('renders referenced commands', done => {
+      wrapper.setProps({
+        draft: {
+          ...draft,
+          references: {
+            commands: 'test command',
+          },
+        },
+      });
+
+      wrapper.vm.$nextTick(() => {
+        const referencedCommands = wrapper.find('.referenced-commands');
+
+        expect(referencedCommands.exists()).toBe(true);
+        expect(referencedCommands.text()).toContain('test command');
+
+        done();
+      });
+    });
+  });
+});
diff --git a/spec/frontend/batch_comments/components/drafts_count_spec.js b/spec/frontend/batch_comments/components/drafts_count_spec.js
new file mode 100644
index 00000000000..9d9fffce7e7
--- /dev/null
+++ b/spec/frontend/batch_comments/components/drafts_count_spec.js
@@ -0,0 +1,43 @@
+import Vue from 'vue';
+import DraftsCount from '~/batch_comments/components/drafts_count.vue';
+import { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
+import { createStore } from '~/batch_comments/stores';
+
+describe('Batch comments drafts count component', () => {
+  let vm;
+  let Component;
+
+  beforeAll(() => {
+    Component = Vue.extend(DraftsCount);
+  });
+
+  beforeEach(() => {
+    const store = createStore();
+
+    store.state.batchComments.drafts.push('comment');
+
+    vm = mountComponentWithStore(Component, { store });
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('renders count', () => {
+    expect(vm.$el.querySelector('.drafts-count-number').textContent).toBe('1');
+  });
+
+  it('renders screen reader text', done => {
+    const el = vm.$el.querySelector('.sr-only');
+
+    expect(el.textContent).toContain('draft');
+
+    vm.$store.state.batchComments.drafts.push('comment 2');
+
+    vm.$nextTick(() => {
+      expect(el.textContent).toContain('drafts');
+
+      done();
+    });
+  });
+});
diff --git a/spec/frontend/batch_comments/components/preview_item_spec.js b/spec/frontend/batch_comments/components/preview_item_spec.js
new file mode 100644
index 00000000000..7d951fd7799
--- /dev/null
+++ b/spec/frontend/batch_comments/components/preview_item_spec.js
@@ -0,0 +1,130 @@
+import Vue from 'vue';
+import PreviewItem from '~/batch_comments/components/preview_item.vue';
+import { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
+import { createStore } from '~/batch_comments/stores';
+import diffsModule from '~/diffs/store/modules';
+import notesModule from '~/notes/stores/modules';
+import '~/behaviors/markdown/render_gfm';
+import { createDraft } from '../mock_data';
+
+describe('Batch comments draft preview item component', () => {
+  let vm;
+  let Component;
+  let draft;
+
+  function createComponent(isLast = false, extra = {}, extendStore = () => {}) {
+    const store = createStore();
+    store.registerModule('diffs', diffsModule());
+    store.registerModule('notes', notesModule());
+
+    extendStore(store);
+
+    draft = {
+      ...createDraft(),
+      ...extra,
+    };
+
+    vm = mountComponentWithStore(Component, { store, props: { draft, isLast } });
+  }
+
+  beforeAll(() => {
+    Component = Vue.extend(PreviewItem);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('renders text content', () => {
+    createComponent(false, { note_html: '<img src="" /><p>Hello world</p>' });
+
+    expect(vm.$el.querySelector('.review-preview-item-content').innerHTML).toEqual(
+      '<p>Hello world</p>',
+    );
+  });
+
+  it('adds is last class', () => {
+    createComponent(true);
+
+    expect(vm.$el.classList).toContain('is-last');
+  });
+
+  it('scrolls to draft on click', () => {
+    createComponent();
+
+    jest.spyOn(vm.$store, 'dispatch').mockImplementation();
+
+    vm.$el.click();
+
+    expect(vm.$store.dispatch).toHaveBeenCalledWith('batchComments/scrollToDraft', vm.draft);
+  });
+
+  describe('for file', () => {
+    it('renders file path', () => {
+      createComponent(false, { file_path: 'index.js', file_hash: 'abc', position: {} });
+
+      expect(vm.$el.querySelector('.review-preview-item-header-text').textContent).toContain(
+        'index.js',
+      );
+    });
+
+    it('renders new line position', () => {
+      createComponent(false, {
+        file_path: 'index.js',
+        file_hash: 'abc',
+        position: { new_line: 1 },
+      });
+
+      expect(vm.$el.querySelector('.bold').textContent).toContain(':1');
+    });
+
+    it('renders old line position', () => {
+      createComponent(false, {
+        file_path: 'index.js',
+        file_hash: 'abc',
+        position: { old_line: 2 },
+      });
+
+      expect(vm.$el.querySelector('.bold').textContent).toContain(':2');
+    });
+
+    it('renders image position', () => {
+      createComponent(false, {
+        file_path: 'index.js',
+        file_hash: 'abc',
+        position: { position_type: 'image', x: 10, y: 20 },
+      });
+
+      expect(vm.$el.querySelector('.bold').textContent).toContain('10x 20y');
+    });
+  });
+
+  describe('for thread', () => {
+    beforeEach(() => {
+      createComponent(false, { discussion_id: '1', resolve_discussion: true }, store => {
+        store.state.notes.discussions.push({
+          id: '1',
+          notes: [
+            {
+              author: {
+                name: 'Author Name',
+              },
+            },
+          ],
+        });
+      });
+    });
+
+    it('renders title', () => {
+      expect(vm.$el.querySelector('.review-preview-item-header-text').textContent).toContain(
+        "Author Name's thread",
+      );
+    });
+
+    it('it renders thread resolved text', () => {
+      expect(vm.$el.querySelector('.draft-note-resolution').textContent).toContain(
+        'Thread will be resolved',
+      );
+    });
+  });
+});
diff --git a/spec/frontend/batch_comments/components/publish_button_spec.js b/spec/frontend/batch_comments/components/publish_button_spec.js
new file mode 100644
index 00000000000..97f3a1c8939
--- /dev/null
+++ b/spec/frontend/batch_comments/components/publish_button_spec.js
@@ -0,0 +1,52 @@
+import Vue from 'vue';
+import PublishButton from '~/batch_comments/components/publish_button.vue';
+import { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
+import { createStore } from '~/batch_comments/stores';
+
+describe('Batch comments publish button component', () => {
+  let vm;
+  let Component;
+
+  beforeAll(() => {
+    Component = Vue.extend(PublishButton);
+  });
+
+  beforeEach(() => {
+    const store = createStore();
+
+    vm = mountComponentWithStore(Component, { store, props: { shouldPublish: true } });
+
+    jest.spyOn(vm.$store, 'dispatch').mockImplementation();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('dispatches publishReview on click', () => {
+    vm.$el.click();
+
+    expect(vm.$store.dispatch).toHaveBeenCalledWith('batchComments/publishReview', undefined);
+  });
+
+  it('dispatches toggleReviewDropdown when shouldPublish is false on click', () => {
+    vm.shouldPublish = false;
+
+    vm.$el.click();
+
+    expect(vm.$store.dispatch).toHaveBeenCalledWith(
+      'batchComments/toggleReviewDropdown',
+      undefined,
+    );
+  });
+
+  it('sets loading when isPublishing is true', done => {
+    vm.$store.state.batchComments.isPublishing = true;
+
+    vm.$nextTick(() => {
+      expect(vm.$el.getAttribute('disabled')).toBe('disabled');
+
+      done();
+    });
+  });
+});
diff --git a/spec/frontend/batch_comments/components/publish_dropdown_spec.js b/spec/frontend/batch_comments/components/publish_dropdown_spec.js
new file mode 100644
index 00000000000..b50ae340691
--- /dev/null
+++ b/spec/frontend/batch_comments/components/publish_dropdown_spec.js
@@ -0,0 +1,96 @@
+import Vue from 'vue';
+import PreviewDropdown from '~/batch_comments/components/preview_dropdown.vue';
+import { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
+import { createStore } from '~/mr_notes/stores';
+import '~/behaviors/markdown/render_gfm';
+import { createDraft } from '../mock_data';
+
+describe('Batch comments publish dropdown component', () => {
+  let vm;
+  let Component;
+
+  function createComponent(extendStore = () => {}) {
+    const store = createStore();
+    store.state.batchComments.drafts.push(createDraft(), { ...createDraft(), id: 2 });
+
+    extendStore(store);
+
+    vm = mountComponentWithStore(Component, { store });
+  }
+
+  beforeAll(() => {
+    Component = Vue.extend(PreviewDropdown);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('toggles dropdown when clicking button', done => {
+    createComponent();
+
+    jest.spyOn(vm.$store, 'dispatch');
+
+    vm.$el.querySelector('.review-preview-dropdown-toggle').click();
+
+    expect(vm.$store.dispatch).toHaveBeenCalledWith(
+      'batchComments/toggleReviewDropdown',
+      expect.anything(),
+    );
+
+    setImmediate(() => {
+      expect(vm.$el.classList).toContain('show');
+
+      done();
+    });
+  });
+
+  it('toggles dropdown when clicking body', () => {
+    createComponent();
+
+    vm.$store.state.batchComments.showPreviewDropdown = true;
+
+    jest.spyOn(vm.$store, 'dispatch').mockImplementation();
+
+    document.body.click();
+
+    expect(vm.$store.dispatch).toHaveBeenCalledWith(
+      'batchComments/toggleReviewDropdown',
+      undefined,
+    );
+  });
+
+  it('renders list of drafts', () => {
+    createComponent(store => {
+      Object.assign(store.state.notes, {
+        isNotesFetched: true,
+      });
+    });
+
+    expect(vm.$el.querySelectorAll('.dropdown-content li').length).toBe(2);
+  });
+
+  it('adds is-last class to last item', () => {
+    createComponent(store => {
+      Object.assign(store.state.notes, {
+        isNotesFetched: true,
+      });
+    });
+
+    expect(vm.$el.querySelectorAll('.dropdown-content li')[1].querySelector('.is-last')).not.toBe(
+      null,
+    );
+  });
+
+  it('renders draft count in dropdown title', () => {
+    createComponent();
+
+    expect(vm.$el.querySelector('.dropdown-title').textContent).toContain('2 pending comments');
+  });
+
+  it('renders publish button in footer', () => {
+    createComponent();
+
+    expect(vm.$el.querySelector('.dropdown-footer .js-publish-draft-button')).not.toBe(null);
+  });
+});
diff --git a/spec/frontend/batch_comments/mock_data.js b/spec/frontend/batch_comments/mock_data.js
new file mode 100644
index 00000000000..c50fea94fe3
--- /dev/null
+++ b/spec/frontend/batch_comments/mock_data.js
@@ -0,0 +1,27 @@
+import { TEST_HOST } from 'spec/test_constants';
+
+export const createDraft = () => ({
+  author: {
+    id: 1,
+    name: 'Test',
+    username: 'test',
+    state: 'active',
+    avatar_url: TEST_HOST,
+  },
+  current_user: { can_edit: true, can_award_emoji: false, can_resolve: false },
+  discussion_id: null,
+  file_hash: null,
+  file_path: null,
+  id: 1,
+  line_code: null,
+  merge_request_id: 1,
+  note: 'a',
+  note_html: '<p>Test</p>',
+  noteable_type: 'MergeRequest',
+  references: { users: [], commands: '' },
+  resolve_discussion: false,
+  isDraft: true,
+  position: null,
+});
+
+export default () => {};
diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
new file mode 100644
index 00000000000..2ec114d026a
--- /dev/null
+++ b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
@@ -0,0 +1,403 @@
+import MockAdapter from 'axios-mock-adapter';
+import testAction from 'helpers/vuex_action_helper';
+import * as actions from '~/batch_comments/stores/modules/batch_comments/actions';
+import axios from '~/lib/utils/axios_utils';
+
+describe('Batch comments store actions', () => {
+  let res = {};
+  let mock;
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+  });
+
+  afterEach(() => {
+    res = {};
+    mock.restore();
+  });
+
+  describe('saveDraft', () => {
+    it('dispatches saveNote on root', () => {
+      const dispatch = jest.fn();
+
+      actions.saveDraft({ dispatch }, { id: 1 });
+
+      expect(dispatch).toHaveBeenCalledWith('saveNote', { id: 1, isDraft: true }, { root: true });
+    });
+  });
+
+  describe('addDraftToDiscussion', () => {
+    it('commits ADD_NEW_DRAFT if no errors returned', done => {
+      res = { id: 1 };
+      mock.onAny().reply(200, res);
+
+      testAction(
+        actions.addDraftToDiscussion,
+        { endpoint: gl.TEST_HOST, data: 'test' },
+        null,
+        [{ type: 'ADD_NEW_DRAFT', payload: res }],
+        [],
+        done,
+      );
+    });
+
+    it('does not commit ADD_NEW_DRAFT if errors returned', done => {
+      mock.onAny().reply(500);
+
+      testAction(
+        actions.addDraftToDiscussion,
+        { endpoint: gl.TEST_HOST, data: 'test' },
+        null,
+        [],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('createNewDraft', () => {
+    it('commits ADD_NEW_DRAFT if no errors returned', done => {
+      res = { id: 1 };
+      mock.onAny().reply(200, res);
+
+      testAction(
+        actions.createNewDraft,
+        { endpoint: gl.TEST_HOST, data: 'test' },
+        null,
+        [{ type: 'ADD_NEW_DRAFT', payload: res }],
+        [],
+        done,
+      );
+    });
+
+    it('does not commit ADD_NEW_DRAFT if errors returned', done => {
+      mock.onAny().reply(500);
+
+      testAction(
+        actions.createNewDraft,
+        { endpoint: gl.TEST_HOST, data: 'test' },
+        null,
+        [],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('deleteDraft', () => {
+    let getters;
+
+    beforeEach(() => {
+      getters = {
+        getNotesData: {
+          draftsDiscardPath: gl.TEST_HOST,
+        },
+      };
+    });
+
+    it('commits DELETE_DRAFT if no errors returned', done => {
+      const commit = jest.fn();
+      const context = {
+        getters,
+        commit,
+      };
+      res = { id: 1 };
+      mock.onAny().reply(200);
+
+      actions
+        .deleteDraft(context, { id: 1 })
+        .then(() => {
+          expect(commit).toHaveBeenCalledWith('DELETE_DRAFT', 1);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('does not commit DELETE_DRAFT if errors returned', done => {
+      const commit = jest.fn();
+      const context = {
+        getters,
+        commit,
+      };
+      mock.onAny().reply(500);
+
+      actions
+        .deleteDraft(context, { id: 1 })
+        .then(() => {
+          expect(commit).not.toHaveBeenCalledWith('DELETE_DRAFT', 1);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
+  describe('fetchDrafts', () => {
+    let getters;
+
+    beforeEach(() => {
+      getters = {
+        getNotesData: {
+          draftsPath: gl.TEST_HOST,
+        },
+      };
+    });
+
+    it('commits SET_BATCH_COMMENTS_DRAFTS with returned data', done => {
+      const commit = jest.fn();
+      const context = {
+        getters,
+        commit,
+      };
+      res = { id: 1 };
+      mock.onAny().reply(200, res);
+
+      actions
+        .fetchDrafts(context)
+        .then(() => {
+          expect(commit).toHaveBeenCalledWith('SET_BATCH_COMMENTS_DRAFTS', { id: 1 });
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
+  describe('publishReview', () => {
+    let dispatch;
+    let commit;
+    let getters;
+    let rootGetters;
+
+    beforeEach(() => {
+      dispatch = jest.fn();
+      commit = jest.fn();
+      getters = {
+        getNotesData: { draftsPublishPath: gl.TEST_HOST, discussionsPath: gl.TEST_HOST },
+      };
+      rootGetters = { discussionsStructuredByLineCode: 'discussions' };
+    });
+
+    it('dispatches actions & commits', done => {
+      mock.onAny().reply(200);
+
+      actions
+        .publishReview({ dispatch, commit, getters, rootGetters })
+        .then(() => {
+          expect(commit.mock.calls[0]).toEqual(['REQUEST_PUBLISH_REVIEW']);
+          expect(commit.mock.calls[1]).toEqual(['RECEIVE_PUBLISH_REVIEW_SUCCESS']);
+
+          expect(dispatch.mock.calls[0]).toEqual(['updateDiscussionsAfterPublish']);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('dispatches error commits', done => {
+      mock.onAny().reply(500);
+
+      actions
+        .publishReview({ dispatch, commit, getters, rootGetters })
+        .then(() => {
+          expect(commit.mock.calls[0]).toEqual(['REQUEST_PUBLISH_REVIEW']);
+          expect(commit.mock.calls[1]).toEqual(['RECEIVE_PUBLISH_REVIEW_ERROR']);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
+  describe('discardReview', () => {
+    it('commits mutations', done => {
+      const getters = {
+        getNotesData: { draftsDiscardPath: gl.TEST_HOST },
+      };
+      const commit = jest.fn();
+      mock.onAny().reply(200);
+
+      actions
+        .discardReview({ getters, commit })
+        .then(() => {
+          expect(commit.mock.calls[0]).toEqual(['REQUEST_DISCARD_REVIEW']);
+          expect(commit.mock.calls[1]).toEqual(['RECEIVE_DISCARD_REVIEW_SUCCESS']);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('commits error mutations', done => {
+      const getters = {
+        getNotesData: { draftsDiscardPath: gl.TEST_HOST },
+      };
+      const commit = jest.fn();
+      mock.onAny().reply(500);
+
+      actions
+        .discardReview({ getters, commit })
+        .then(() => {
+          expect(commit.mock.calls[0]).toEqual(['REQUEST_DISCARD_REVIEW']);
+          expect(commit.mock.calls[1]).toEqual(['RECEIVE_DISCARD_REVIEW_ERROR']);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
+  describe('updateDraft', () => {
+    let getters;
+
+    beforeEach(() => {
+      getters = {
+        getNotesData: {
+          draftsPath: gl.TEST_HOST,
+        },
+      };
+    });
+
+    it('commits RECEIVE_DRAFT_UPDATE_SUCCESS with returned data', done => {
+      const commit = jest.fn();
+      const context = {
+        getters,
+        commit,
+      };
+      res = { id: 1 };
+      mock.onAny().reply(200, res);
+
+      actions
+        .updateDraft(context, { note: { id: 1 }, noteText: 'test', callback() {} })
+        .then(() => {
+          expect(commit).toHaveBeenCalledWith('RECEIVE_DRAFT_UPDATE_SUCCESS', { id: 1 });
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('calls passed callback', done => {
+      const commit = jest.fn();
+      const context = {
+        getters,
+        commit,
+      };
+      const callback = jest.fn();
+      res = { id: 1 };
+      mock.onAny().reply(200, res);
+
+      actions
+        .updateDraft(context, { note: { id: 1 }, noteText: 'test', callback })
+        .then(() => {
+          expect(callback).toHaveBeenCalled();
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
+  describe('toggleReviewDropdown', () => {
+    it('dispatches openReviewDropdown', done => {
+      testAction(
+        actions.toggleReviewDropdown,
+        null,
+        { showPreviewDropdown: false },
+        [],
+        [{ type: 'openReviewDropdown' }],
+        done,
+      );
+    });
+
+    it('dispatches closeReviewDropdown when showPreviewDropdown is true', done => {
+      testAction(
+        actions.toggleReviewDropdown,
+        null,
+        { showPreviewDropdown: true },
+        [],
+        [{ type: 'closeReviewDropdown' }],
+        done,
+      );
+    });
+  });
+
+  describe('openReviewDropdown', () => {
+    it('commits OPEN_REVIEW_DROPDOWN', done => {
+      testAction(
+        actions.openReviewDropdown,
+        null,
+        null,
+        [{ type: 'OPEN_REVIEW_DROPDOWN' }],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('closeReviewDropdown', () => {
+    it('commits CLOSE_REVIEW_DROPDOWN', done => {
+      testAction(
+        actions.closeReviewDropdown,
+        null,
+        null,
+        [{ type: 'CLOSE_REVIEW_DROPDOWN' }],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('expandAllDiscussions', () => {
+    it('dispatches expandDiscussion for all drafts', done => {
+      const state = {
+        drafts: [
+          {
+            discussion_id: '1',
+          },
+        ],
+      };
+
+      testAction(
+        actions.expandAllDiscussions,
+        null,
+        state,
+        [],
+        [
+          {
+            type: 'expandDiscussion',
+            payload: { discussionId: '1' },
+          },
+        ],
+        done,
+      );
+    });
+  });
+
+  describe('scrollToDraft', () => {
+    beforeEach(() => {
+      window.mrTabs = {
+        currentAction: 'notes',
+        tabShown: jest.fn(),
+      };
+    });
+
+    it('scrolls to draft item', () => {
+      const dispatch = jest.fn();
+      const rootGetters = {
+        getDiscussion: () => ({
+          id: '1',
+          diff_discussion: true,
+        }),
+      };
+      const draft = {
+        discussion_id: '1',
+        id: '2',
+      };
+
+      actions.scrollToDraft({ dispatch, rootGetters }, draft);
+
+      expect(dispatch.mock.calls[0]).toEqual(['closeReviewDropdown']);
+
+      expect(dispatch.mock.calls[1]).toEqual([
+        'expandDiscussion',
+        { discussionId: '1' },
+        { root: true },
+      ]);
+
+      expect(window.mrTabs.tabShown).toHaveBeenCalledWith('diffs');
+    });
+  });
+});
diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/getters_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/getters_spec.js
new file mode 100644
index 00000000000..2398bb4feb1
--- /dev/null
+++ b/spec/frontend/batch_comments/stores/modules/batch_comments/getters_spec.js
@@ -0,0 +1,27 @@
+import * as getters from '~/batch_comments/stores/modules/batch_comments/getters';
+
+describe('Batch comments store getters', () => {
+  describe('draftsForFile', () => {
+    it('returns drafts for a file hash', () => {
+      const state = {
+        drafts: [
+          {
+            file_hash: 'filehash',
+            comment: 'testing 123',
+          },
+          {
+            file_hash: 'filehash2',
+            comment: 'testing 1234',
+          },
+        ],
+      };
+
+      expect(getters.draftsForFile(state)('filehash')).toEqual([
+        {
+          file_hash: 'filehash',
+          comment: 'testing 123',
+        },
+      ]);
+    });
+  });
+});
diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js
new file mode 100644
index 00000000000..a86726269ef
--- /dev/null
+++ b/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js
@@ -0,0 +1,159 @@
+import createState from '~/batch_comments/stores/modules/batch_comments/state';
+import mutations from '~/batch_comments/stores/modules/batch_comments/mutations';
+import * as types from '~/batch_comments/stores/modules/batch_comments/mutation_types';
+
+describe('Batch comments mutations', () => {
+  let state;
+
+  beforeEach(() => {
+    state = createState();
+  });
+
+  describe(types.ADD_NEW_DRAFT, () => {
+    it('adds processed object into drafts array', () => {
+      const draft = { id: 1, note: 'test' };
+
+      mutations[types.ADD_NEW_DRAFT](state, draft);
+
+      expect(state.drafts).toEqual([
+        {
+          ...draft,
+          isDraft: true,
+        },
+      ]);
+    });
+  });
+
+  describe(types.DELETE_DRAFT, () => {
+    it('removes draft from array by ID', () => {
+      state.drafts.push({ id: 1 }, { id: 2 });
+
+      mutations[types.DELETE_DRAFT](state, 1);
+
+      expect(state.drafts).toEqual([{ id: 2 }]);
+    });
+  });
+
+  describe(types.SET_BATCH_COMMENTS_DRAFTS, () => {
+    it('adds to processed drafts in state', () => {
+      const drafts = [{ id: 1 }, { id: 2 }];
+
+      mutations[types.SET_BATCH_COMMENTS_DRAFTS](state, drafts);
+
+      expect(state.drafts).toEqual([
+        {
+          id: 1,
+          isDraft: true,
+        },
+        {
+          id: 2,
+          isDraft: true,
+        },
+      ]);
+    });
+  });
+
+  describe(types.REQUEST_PUBLISH_REVIEW, () => {
+    it('sets isPublishing to true', () => {
+      mutations[types.REQUEST_PUBLISH_REVIEW](state);
+
+      expect(state.isPublishing).toBe(true);
+    });
+  });
+
+  describe(types.RECEIVE_PUBLISH_REVIEW_SUCCESS, () => {
+    it('resets drafts', () => {
+      state.drafts.push('test');
+
+      mutations[types.RECEIVE_PUBLISH_REVIEW_SUCCESS](state);
+
+      expect(state.drafts).toEqual([]);
+    });
+
+    it('sets isPublishing to false', () => {
+      state.isPublishing = true;
+
+      mutations[types.RECEIVE_PUBLISH_REVIEW_SUCCESS](state);
+
+      expect(state.isPublishing).toBe(false);
+    });
+  });
+
+  describe(types.RECEIVE_PUBLISH_REVIEW_ERROR, () => {
+    it('updates isPublishing to false', () => {
+      state.isPublishing = true;
+
+      mutations[types.RECEIVE_PUBLISH_REVIEW_ERROR](state);
+
+      expect(state.isPublishing).toBe(false);
+    });
+  });
+
+  describe(types.REQUEST_DISCARD_REVIEW, () => {
+    it('sets isDiscarding to true', () => {
+      mutations[types.REQUEST_DISCARD_REVIEW](state);
+
+      expect(state.isDiscarding).toBe(true);
+    });
+  });
+
+  describe(types.RECEIVE_DISCARD_REVIEW_SUCCESS, () => {
+    it('emptys drafts array', () => {
+      state.drafts.push('test');
+
+      mutations[types.RECEIVE_DISCARD_REVIEW_SUCCESS](state);
+
+      expect(state.drafts).toEqual([]);
+    });
+
+    it('sets isDiscarding to false', () => {
+      state.isDiscarding = true;
+
+      mutations[types.RECEIVE_DISCARD_REVIEW_SUCCESS](state);
+
+      expect(state.isDiscarding).toBe(false);
+    });
+  });
+
+  describe(types.RECEIVE_DISCARD_REVIEW_ERROR, () => {
+    it('updates isDiscarding to false', () => {
+      state.isDiscarding = true;
+
+      mutations[types.RECEIVE_DISCARD_REVIEW_ERROR](state);
+
+      expect(state.isDiscarding).toBe(false);
+    });
+  });
+
+  describe(types.RECEIVE_DRAFT_UPDATE_SUCCESS, () => {
+    it('updates draft in store', () => {
+      state.drafts.push({ id: 1 });
+
+      mutations[types.RECEIVE_DRAFT_UPDATE_SUCCESS](state, { id: 1, note: 'test' });
+
+      expect(state.drafts).toEqual([
+        {
+          id: 1,
+          note: 'test',
+          isDraft: true,
+        },
+      ]);
+    });
+  });
+
+  describe(types.OPEN_REVIEW_DROPDOWN, () => {
+    it('sets showPreviewDropdown to true', () => {
+      mutations[types.OPEN_REVIEW_DROPDOWN](state);
+
+      expect(state.showPreviewDropdown).toBe(true);
+    });
+  });
+
+  describe(types.CLOSE_REVIEW_DROPDOWN, () => {
+    it('sets showPreviewDropdown to false', () => {
+      mutations[types.CLOSE_REVIEW_DROPDOWN](state);
+
+      expect(state.showPreviewDropdown).toBe(false);
+    });
+  });
+});
diff --git a/spec/javascripts/behaviors/autosize_spec.js b/spec/frontend/behaviors/autosize_spec.js
index 59abae479d4..59abae479d4 100644
--- a/spec/javascripts/behaviors/autosize_spec.js
+++ b/spec/frontend/behaviors/autosize_spec.js
diff --git a/spec/frontend/behaviors/bind_in_out_spec.js b/spec/frontend/behaviors/bind_in_out_spec.js
index 923b6d372dd..92a68ddd387 100644
--- a/spec/frontend/behaviors/bind_in_out_spec.js
+++ b/spec/frontend/behaviors/bind_in_out_spec.js
@@ -163,14 +163,8 @@ describe('BindInOut', () => {
 
   describe('init', () => {
     beforeEach(() => {
-      // eslint-disable-next-line func-names
-      jest.spyOn(BindInOut.prototype, 'addEvents').mockImplementation(function() {
-        return this;
-      });
-      // eslint-disable-next-line func-names
-      jest.spyOn(BindInOut.prototype, 'updateOut').mockImplementation(function() {
-        return this;
-      });
+      jest.spyOn(BindInOut.prototype, 'addEvents').mockReturnThis();
+      jest.spyOn(BindInOut.prototype, 'updateOut').mockReturnThis();
 
       testContext.init = BindInOut.init({}, {});
     });
diff --git a/spec/javascripts/behaviors/copy_as_gfm_spec.js b/spec/frontend/behaviors/copy_as_gfm_spec.js
index d653fca0988..cf96ac488a8 100644
--- a/spec/javascripts/behaviors/copy_as_gfm_spec.js
+++ b/spec/frontend/behaviors/copy_as_gfm_spec.js
@@ -27,7 +27,7 @@ describe('CopyAsGFM', () => {
     }
 
     it('wraps pasted code when not already in code tags', () => {
-      spyOn(window.gl.utils, 'insertText').and.callFake((el, textFunc) => {
+      jest.spyOn(window.gl.utils, 'insertText').mockImplementation((el, textFunc) => {
         const insertedText = textFunc('This is code: ', '');
 
         expect(insertedText).toEqual('`code`');
@@ -37,7 +37,7 @@ describe('CopyAsGFM', () => {
     });
 
     it('does not wrap pasted code when already in code tags', () => {
-      spyOn(window.gl.utils, 'insertText').and.callFake((el, textFunc) => {
+      jest.spyOn(window.gl.utils, 'insertText').mockImplementation((el, textFunc) => {
         const insertedText = textFunc('This is code: `', '`');
 
         expect(insertedText).toEqual('code');
@@ -90,16 +90,16 @@ describe('CopyAsGFM', () => {
         .catch(done.fail);
     });
 
-    beforeEach(() => spyOn(clipboardData, 'setData'));
+    beforeEach(() => jest.spyOn(clipboardData, 'setData'));
 
     describe('list handling', () => {
       it('uses correct gfm for unordered lists', done => {
         const selection = stubSelection('<li>List Item1</li><li>List Item2</li>\n', 'UL');
 
-        spyOn(window, 'getSelection').and.returnValue(selection);
+        window.getSelection = jest.fn(() => selection);
         simulateCopy();
 
-        setTimeout(() => {
+        setImmediate(() => {
           const expectedGFM = '* List Item1\n* List Item2';
 
           expect(clipboardData.setData).toHaveBeenCalledWith('text/x-gfm', expectedGFM);
@@ -110,10 +110,10 @@ describe('CopyAsGFM', () => {
       it('uses correct gfm for ordered lists', done => {
         const selection = stubSelection('<li>List Item1</li><li>List Item2</li>\n', 'OL');
 
-        spyOn(window, 'getSelection').and.returnValue(selection);
+        window.getSelection = jest.fn(() => selection);
         simulateCopy();
 
-        setTimeout(() => {
+        setImmediate(() => {
           const expectedGFM = '1. List Item1\n1. List Item2';
 
           expect(clipboardData.setData).toHaveBeenCalledWith('text/x-gfm', expectedGFM);
diff --git a/spec/javascripts/behaviors/gl_emoji/unicode_support_map_spec.js b/spec/frontend/behaviors/gl_emoji/unicode_support_map_spec.js
index f656b97fec2..aaee9c30cac 100644
--- a/spec/javascripts/behaviors/gl_emoji/unicode_support_map_spec.js
+++ b/spec/frontend/behaviors/gl_emoji/unicode_support_map_spec.js
@@ -1,28 +1,28 @@
 import getUnicodeSupportMap from '~/emoji/support/unicode_support_map';
 import AccessorUtilities from '~/lib/utils/accessor';
+import { useLocalStorageSpy } from 'helpers/local_storage_helper';
 
 describe('Unicode Support Map', () => {
+  useLocalStorageSpy();
   describe('getUnicodeSupportMap', () => {
     const stringSupportMap = 'stringSupportMap';
 
     beforeEach(() => {
-      spyOn(AccessorUtilities, 'isLocalStorageAccessSafe');
-      spyOn(window.localStorage, 'getItem');
-      spyOn(window.localStorage, 'setItem');
-      spyOn(JSON, 'parse');
-      spyOn(JSON, 'stringify').and.returnValue(stringSupportMap);
+      jest.spyOn(AccessorUtilities, 'isLocalStorageAccessSafe').mockImplementation(() => {});
+      jest.spyOn(JSON, 'parse').mockImplementation(() => {});
+      jest.spyOn(JSON, 'stringify').mockReturnValue(stringSupportMap);
     });
 
-    describe('if isLocalStorageAvailable is `true`', function() {
+    describe('if isLocalStorageAvailable is `true`', () => {
       beforeEach(() => {
-        AccessorUtilities.isLocalStorageAccessSafe.and.returnValue(true);
+        jest.spyOn(AccessorUtilities, 'isLocalStorageAccessSafe').mockReturnValue(true);
 
         getUnicodeSupportMap();
       });
 
       it('should call .getItem and .setItem', () => {
-        const getArgs = window.localStorage.getItem.calls.allArgs();
-        const setArgs = window.localStorage.setItem.calls.allArgs();
+        const getArgs = window.localStorage.getItem.mock.calls;
+        const setArgs = window.localStorage.setItem.mock.calls;
 
         expect(getArgs[0][0]).toBe('gl-emoji-version');
         expect(getArgs[1][0]).toBe('gl-emoji-user-agent');
@@ -36,15 +36,15 @@ describe('Unicode Support Map', () => {
       });
     });
 
-    describe('if isLocalStorageAvailable is `false`', function() {
+    describe('if isLocalStorageAvailable is `false`', () => {
       beforeEach(() => {
-        AccessorUtilities.isLocalStorageAccessSafe.and.returnValue(false);
+        jest.spyOn(AccessorUtilities, 'isLocalStorageAccessSafe').mockReturnValue(false);
 
         getUnicodeSupportMap();
       });
 
       it('should not call .getItem or .setItem', () => {
-        expect(window.localStorage.getItem.calls.count()).toBe(1);
+        expect(window.localStorage.getItem.mock.calls.length).toBe(1);
         expect(window.localStorage.setItem).not.toHaveBeenCalled();
       });
     });
diff --git a/spec/javascripts/behaviors/markdown/highlight_current_user_spec.js b/spec/frontend/behaviors/markdown/highlight_current_user_spec.js
index 3305ddc412d..3305ddc412d 100644
--- a/spec/javascripts/behaviors/markdown/highlight_current_user_spec.js
+++ b/spec/frontend/behaviors/markdown/highlight_current_user_spec.js
diff --git a/spec/javascripts/behaviors/requires_input_spec.js b/spec/frontend/behaviors/requires_input_spec.js
index 617fe49b059..617fe49b059 100644
--- a/spec/javascripts/behaviors/requires_input_spec.js
+++ b/spec/frontend/behaviors/requires_input_spec.js
diff --git a/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js b/spec/frontend/behaviors/shortcuts/shortcuts_issuable_spec.js
index f6232026915..6391a544985 100644
--- a/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js
+++ b/spec/frontend/behaviors/shortcuts/shortcuts_issuable_spec.js
@@ -1,15 +1,19 @@
-/* eslint-disable
-  no-underscore-dangle
-*/
-
 import $ from 'jquery';
+import 'mousetrap';
 import initCopyAsGFM, { CopyAsGFM } from '~/behaviors/markdown/copy_as_gfm';
 import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
+import { getSelectedFragment } from '~/lib/utils/common_utils';
 
 const FORM_SELECTOR = '.js-main-target-form .js-vue-comment-form';
 
-describe('ShortcutsIssuable', function() {
+jest.mock('~/lib/utils/common_utils', () => ({
+  ...jest.requireActual('~/lib/utils/common_utils'),
+  getSelectedFragment: jest.fn().mockName('getSelectedFragment'),
+}));
+
+describe('ShortcutsIssuable', () => {
   const fixtureName = 'snippets/show.html';
+
   preloadFixtures(fixtureName);
 
   beforeAll(done => {
@@ -27,21 +31,24 @@ describe('ShortcutsIssuable', function() {
     loadFixtures(fixtureName);
     $('body').append(
       `<div class="js-main-target-form">
-        <textare class="js-vue-comment-form"></textare>
+        <textarea class="js-vue-comment-form"></textarea>
       </div>`,
     );
     document.querySelector('.js-new-note-form').classList.add('js-main-target-form');
-    this.shortcut = new ShortcutsIssuable(true);
+
+    window.shortcut = new ShortcutsIssuable(true);
   });
 
   afterEach(() => {
     $(FORM_SELECTOR).remove();
+
+    delete window.shortcut;
   });
 
   describe('replyWithSelectedText', () => {
     // Stub window.gl.utils.getSelectedFragment to return a node with the provided HTML.
     const stubSelection = (html, invalidNode) => {
-      ShortcutsIssuable.__Rewire__('getSelectedFragment', () => {
+      getSelectedFragment.mockImplementation(() => {
         const documentFragment = document.createDocumentFragment();
         const node = document.createElement('div');
 
@@ -61,7 +68,7 @@ describe('ShortcutsIssuable', function() {
       });
 
       it('triggers `focus`', () => {
-        const spy = spyOn(document.querySelector(FORM_SELECTOR), 'focus');
+        const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus');
         ShortcutsIssuable.replyWithSelectedText(true);
 
         expect(spy).toHaveBeenCalled();
@@ -80,7 +87,7 @@ describe('ShortcutsIssuable', function() {
 
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect($(FORM_SELECTOR).val()).toBe(
             'This text was already here.\n\n> Selected text.\n\n',
           );
@@ -96,17 +103,17 @@ describe('ShortcutsIssuable', function() {
 
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(triggered).toBe(true);
           done();
         });
       });
 
       it('triggers `focus`', done => {
-        const spy = spyOn(document.querySelector(FORM_SELECTOR), 'focus');
+        const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus');
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(spy).toHaveBeenCalled();
           done();
         });
@@ -118,7 +125,7 @@ describe('ShortcutsIssuable', function() {
         stubSelection('<p>This text has been selected.</p>');
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect($(FORM_SELECTOR).val()).toBe('> This text has been selected.\n\n');
           done();
         });
@@ -132,7 +139,7 @@ describe('ShortcutsIssuable', function() {
         );
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect($(FORM_SELECTOR).val()).toBe(
             '> Selected line one.\n>\n> Selected line two.\n>\n> Selected line three.\n\n',
           );
@@ -149,17 +156,17 @@ describe('ShortcutsIssuable', function() {
       it('does not add anything to the input', done => {
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect($(FORM_SELECTOR).val()).toBe('');
           done();
         });
       });
 
       it('triggers `focus`', done => {
-        const spy = spyOn(document.querySelector(FORM_SELECTOR), 'focus');
+        const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus');
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(spy).toHaveBeenCalled();
           done();
         });
@@ -174,17 +181,17 @@ describe('ShortcutsIssuable', function() {
       it('only adds the valid part to the input', done => {
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect($(FORM_SELECTOR).val()).toBe('> Selected text.\n\n');
           done();
         });
       });
 
       it('triggers `focus`', done => {
-        const spy = spyOn(document.querySelector(FORM_SELECTOR), 'focus');
+        const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus');
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(spy).toHaveBeenCalled();
           done();
         });
@@ -198,7 +205,7 @@ describe('ShortcutsIssuable', function() {
 
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(triggered).toBe(true);
           done();
         });
@@ -207,7 +214,7 @@ describe('ShortcutsIssuable', function() {
 
     describe('with a selection in a valid block', () => {
       beforeEach(() => {
-        ShortcutsIssuable.__Rewire__('getSelectedFragment', () => {
+        getSelectedFragment.mockImplementation(() => {
           const documentFragment = document.createDocumentFragment();
           const node = document.createElement('div');
           const originalNode = document.createElement('body');
@@ -228,17 +235,17 @@ describe('ShortcutsIssuable', function() {
       it('adds the quoted selection to the input', done => {
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect($(FORM_SELECTOR).val()).toBe('> *Selected text.*\n\n');
           done();
         });
       });
 
       it('triggers `focus`', done => {
-        const spy = spyOn(document.querySelector(FORM_SELECTOR), 'focus');
+        const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus');
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(spy).toHaveBeenCalled();
           done();
         });
@@ -252,7 +259,7 @@ describe('ShortcutsIssuable', function() {
 
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(triggered).toBe(true);
           done();
         });
@@ -261,7 +268,7 @@ describe('ShortcutsIssuable', function() {
 
     describe('with a selection in an invalid block', () => {
       beforeEach(() => {
-        ShortcutsIssuable.__Rewire__('getSelectedFragment', () => {
+        getSelectedFragment.mockImplementation(() => {
           const documentFragment = document.createDocumentFragment();
           const node = document.createElement('div');
           const originalNode = document.createElement('body');
@@ -282,17 +289,17 @@ describe('ShortcutsIssuable', function() {
       it('does not add anything to the input', done => {
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect($(FORM_SELECTOR).val()).toBe('');
           done();
         });
       });
 
       it('triggers `focus`', done => {
-        const spy = spyOn(document.querySelector(FORM_SELECTOR), 'focus');
+        const spy = jest.spyOn(document.querySelector(FORM_SELECTOR), 'focus');
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(spy).toHaveBeenCalled();
           done();
         });
@@ -301,11 +308,11 @@ describe('ShortcutsIssuable', function() {
 
     describe('with a valid selection with no text content', () => {
       it('returns the proper markdown', done => {
-        stubSelection('<img src="foo" alt="image" />');
+        stubSelection('<img src="https://gitlab.com/logo.png" alt="logo" />');
         ShortcutsIssuable.replyWithSelectedText(true);
 
-        setTimeout(() => {
-          expect($(FORM_SELECTOR).val()).toBe('> ![image](http://localhost:9876/foo)\n\n');
+        setImmediate(() => {
+          expect($(FORM_SELECTOR).val()).toBe('> ![logo](https://gitlab.com/logo.png)\n\n');
 
           done();
         });
diff --git a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
index 2ac6e0d5d24..005b2c5da1c 100644
--- a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
+++ b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
@@ -14,7 +14,7 @@ exports[`Blob Header Filepath rendering matches the snapshot 1`] = `
    
   <strong
     class="file-title-name mr-1 js-blob-header-filepath"
-    data-qa-selector="file_title_name"
+    data-qa-selector="file_title_content"
   >
     foo/bar/dummy.md
   </strong>
diff --git a/spec/frontend/blob/components/blob_header_default_actions_spec.js b/spec/frontend/blob/components/blob_header_default_actions_spec.js
index 684840afe1c..0247a12d8d3 100644
--- a/spec/frontend/blob/components/blob_header_default_actions_spec.js
+++ b/spec/frontend/blob/components/blob_header_default_actions_spec.js
@@ -66,5 +66,13 @@ describe('Blob Header Default Actions', () => {
 
       expect(buttons.at(0).attributes('disabled')).toBeTruthy();
     });
+
+    it('does not render the copy button if a rendering error is set', () => {
+      createComponent({
+        hasRenderError: true,
+      });
+
+      expect(wrapper.find('[data-testid="copyContentsButton"]').exists()).toBe(false);
+    });
   });
 });
diff --git a/spec/frontend/blob/components/blob_header_filepath_spec.js b/spec/frontend/blob/components/blob_header_filepath_spec.js
index 3a53208f357..43057353051 100644
--- a/spec/frontend/blob/components/blob_header_filepath_spec.js
+++ b/spec/frontend/blob/components/blob_header_filepath_spec.js
@@ -4,9 +4,8 @@ import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import { Blob as MockBlob } from './mock_data';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
 
-const mockHumanReadableSize = 'a lot';
 jest.mock('~/lib/utils/number_utils', () => ({
-  numberToHumanSize: jest.fn(() => mockHumanReadableSize),
+  numberToHumanSize: jest.fn(() => 'a lot'),
 }));
 
 describe('Blob Header Filepath', () => {
@@ -57,7 +56,7 @@ describe('Blob Header Filepath', () => {
     it('renders filesize in a human-friendly format', () => {
       createComponent();
       expect(numberToHumanSize).toHaveBeenCalled();
-      expect(wrapper.vm.blobSize).toBe(mockHumanReadableSize);
+      expect(wrapper.vm.blobSize).toBe('a lot');
     });
 
     it('renders a slot and prepends its contents to the existing one', () => {
diff --git a/spec/frontend/blob/components/blob_header_spec.js b/spec/frontend/blob/components/blob_header_spec.js
index 0e7d2f6516a..01d4bf834d2 100644
--- a/spec/frontend/blob/components/blob_header_spec.js
+++ b/spec/frontend/blob/components/blob_header_spec.js
@@ -87,6 +87,17 @@ describe('Blob Header Default Actions', () => {
         expect(wrapper.text()).toContain(slotContent);
       });
     });
+
+    it('passes information about render error down to default actions', () => {
+      createComponent(
+        {},
+        {},
+        {
+          hasRenderError: true,
+        },
+      );
+      expect(wrapper.find(DefaultActions).props('hasRenderError')).toBe(true);
+    });
   });
 
   describe('functionality', () => {
diff --git a/spec/javascripts/boards/board_list_common_spec.js b/spec/frontend/boards/board_list_helper.js
index b51a82f2a35..b51a82f2a35 100644
--- a/spec/javascripts/boards/board_list_common_spec.js
+++ b/spec/frontend/boards/board_list_helper.js
diff --git a/spec/frontend/boards/board_list_spec.js b/spec/frontend/boards/board_list_spec.js
index fa21053e2de..3a64b004847 100644
--- a/spec/frontend/boards/board_list_spec.js
+++ b/spec/frontend/boards/board_list_spec.js
@@ -118,7 +118,7 @@ describe('Board list component', () => {
     });
 
     it('shows new issue form after eventhub event', () => {
-      eventHub.$emit(`hide-issue-form-${component.list.id}`);
+      eventHub.$emit(`toggle-issue-form-${component.list.id}`);
 
       return Vue.nextTick().then(() => {
         expect(component.$el.querySelector('.board-new-issue-form')).not.toBeNull();
diff --git a/spec/frontend/boards/components/board_column_spec.js b/spec/frontend/boards/components/board_column_spec.js
index 7cf6ec913b4..6853fe2559d 100644
--- a/spec/frontend/boards/components/board_column_spec.js
+++ b/spec/frontend/boards/components/board_column_spec.js
@@ -70,37 +70,6 @@ describe('Board Column Component', () => {
   const isExpandable = () => wrapper.classes('is-expandable');
   const isCollapsed = () => wrapper.classes('is-collapsed');
 
-  const findAddIssueButton = () => wrapper.find({ ref: 'newIssueBtn' });
-
-  describe('Add issue button', () => {
-    const hasNoAddButton = [ListType.promotion, ListType.blank, ListType.closed];
-    const hasAddButton = [ListType.backlog, ListType.label, ListType.milestone, ListType.assignee];
-
-    it.each(hasNoAddButton)('does not render when List Type is `%s`', listType => {
-      createComponent({ listType });
-
-      expect(findAddIssueButton().exists()).toBe(false);
-    });
-
-    it.each(hasAddButton)('does render when List Type is `%s`', listType => {
-      createComponent({ listType });
-
-      expect(findAddIssueButton().exists()).toBe(true);
-    });
-
-    it('has a test for each list type', () => {
-      Object.values(ListType).forEach(value => {
-        expect([...hasAddButton, ...hasNoAddButton]).toContain(value);
-      });
-    });
-
-    it('does render when logged out', () => {
-      createComponent();
-
-      expect(findAddIssueButton().exists()).toBe(true);
-    });
-  });
-
   describe('Given different list types', () => {
     it('is expandable when List Type is `backlog`', () => {
       createComponent({ listType: ListType.backlog });
@@ -109,64 +78,17 @@ describe('Board Column Component', () => {
     });
   });
 
-  describe('expanding / collapsing the column', () => {
-    it('does not collapse when clicking the header', () => {
-      createComponent();
-      expect(isCollapsed()).toBe(false);
-      wrapper.find('.board-header').trigger('click');
+  describe('expanded / collaped column', () => {
+    it('has class is-collapsed when list is collapsed', () => {
+      createComponent({ collapsed: false });
 
-      return wrapper.vm.$nextTick().then(() => {
-        expect(isCollapsed()).toBe(false);
-      });
-    });
-
-    it('collapses expanded Column when clicking the collapse icon', () => {
-      createComponent();
       expect(wrapper.vm.list.isExpanded).toBe(true);
-      wrapper.find('.board-title-caret').trigger('click');
-
-      return wrapper.vm.$nextTick().then(() => {
-        expect(isCollapsed()).toBe(true);
-      });
     });
 
-    it('expands collapsed Column when clicking the expand icon', () => {
+    it('does not have class is-collapsed when list is expanded', () => {
       createComponent({ collapsed: true });
-      expect(isCollapsed()).toBe(true);
-      wrapper.find('.board-title-caret').trigger('click');
-
-      return wrapper.vm.$nextTick().then(() => {
-        expect(isCollapsed()).toBe(false);
-      });
-    });
-
-    it("when logged in it calls list update and doesn't set localStorage", () => {
-      jest.spyOn(List.prototype, 'update');
-      window.gon.current_user_id = 1;
-
-      createComponent({ withLocalStorage: false });
 
-      wrapper.find('.board-title-caret').trigger('click');
-
-      return wrapper.vm.$nextTick().then(() => {
-        expect(wrapper.vm.list.update).toHaveBeenCalledTimes(1);
-        expect(localStorage.getItem(`${wrapper.vm.uniqueKey}.expanded`)).toBe(null);
-      });
-    });
-
-    it("when logged out it doesn't call list update and sets localStorage", () => {
-      jest.spyOn(List.prototype, 'update');
-
-      createComponent();
-
-      wrapper.find('.board-title-caret').trigger('click');
-
-      return wrapper.vm.$nextTick().then(() => {
-        expect(wrapper.vm.list.update).toHaveBeenCalledTimes(0);
-        expect(localStorage.getItem(`${wrapper.vm.uniqueKey}.expanded`)).toBe(
-          String(wrapper.vm.list.isExpanded),
-        );
-      });
+      expect(isCollapsed()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/boards/components/board_list_header_spec.js b/spec/frontend/boards/components/board_list_header_spec.js
new file mode 100644
index 00000000000..95673da1c56
--- /dev/null
+++ b/spec/frontend/boards/components/board_list_header_spec.js
@@ -0,0 +1,166 @@
+import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
+import AxiosMockAdapter from 'axios-mock-adapter';
+
+import BoardListHeader from '~/boards/components/board_list_header.vue';
+import List from '~/boards/models/list';
+import { ListType } from '~/boards/constants';
+import axios from '~/lib/utils/axios_utils';
+
+import { TEST_HOST } from 'helpers/test_constants';
+import { listObj } from 'jest/boards/mock_data';
+
+describe('Board List Header Component', () => {
+  let wrapper;
+  let axiosMock;
+
+  beforeEach(() => {
+    window.gon = {};
+    axiosMock = new AxiosMockAdapter(axios);
+    axiosMock.onGet(`${TEST_HOST}/lists/1/issues`).reply(200, { issues: [] });
+  });
+
+  afterEach(() => {
+    axiosMock.restore();
+
+    wrapper.destroy();
+
+    localStorage.clear();
+  });
+
+  const createComponent = ({
+    listType = ListType.backlog,
+    collapsed = false,
+    withLocalStorage = true,
+  } = {}) => {
+    const boardId = '1';
+
+    const listMock = {
+      ...listObj,
+      list_type: listType,
+      collapsed,
+    };
+
+    if (listType === ListType.assignee) {
+      delete listMock.label;
+      listMock.user = {};
+    }
+
+    // Making List reactive
+    const list = Vue.observable(new List(listMock));
+
+    if (withLocalStorage) {
+      localStorage.setItem(
+        `boards.${boardId}.${list.type}.${list.id}.expanded`,
+        (!collapsed).toString(),
+      );
+    }
+
+    wrapper = shallowMount(BoardListHeader, {
+      propsData: {
+        boardId,
+        disabled: false,
+        issueLinkBase: '/',
+        rootPath: '/',
+        list,
+      },
+    });
+  };
+
+  const isCollapsed = () => !wrapper.props().list.isExpanded;
+  const isExpanded = () => wrapper.vm.list.isExpanded;
+
+  const findAddIssueButton = () => wrapper.find({ ref: 'newIssueBtn' });
+  const findCaret = () => wrapper.find('.board-title-caret');
+
+  describe('Add issue button', () => {
+    const hasNoAddButton = [ListType.promotion, ListType.blank, ListType.closed];
+    const hasAddButton = [ListType.backlog, ListType.label, ListType.milestone, ListType.assignee];
+
+    it.each(hasNoAddButton)('does not render when List Type is `%s`', listType => {
+      createComponent({ listType });
+
+      expect(findAddIssueButton().exists()).toBe(false);
+    });
+
+    it.each(hasAddButton)('does render when List Type is `%s`', listType => {
+      createComponent({ listType });
+
+      expect(findAddIssueButton().exists()).toBe(true);
+    });
+
+    it('has a test for each list type', () => {
+      Object.values(ListType).forEach(value => {
+        expect([...hasAddButton, ...hasNoAddButton]).toContain(value);
+      });
+    });
+
+    it('does render when logged out', () => {
+      createComponent();
+
+      expect(findAddIssueButton().exists()).toBe(true);
+    });
+  });
+
+  describe('expanding / collapsing the column', () => {
+    it('does not collapse when clicking the header', () => {
+      createComponent();
+
+      expect(isCollapsed()).toBe(false);
+      wrapper.find('[data-testid="board-list-header"]').vm.$emit('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(isCollapsed()).toBe(false);
+      });
+    });
+
+    it('collapses expanded Column when clicking the collapse icon', () => {
+      createComponent();
+
+      expect(isExpanded()).toBe(true);
+      findCaret().vm.$emit('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(isCollapsed()).toBe(true);
+      });
+    });
+
+    it('expands collapsed Column when clicking the expand icon', () => {
+      createComponent({ collapsed: true });
+
+      expect(isCollapsed()).toBe(true);
+      findCaret().vm.$emit('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(isCollapsed()).toBe(false);
+      });
+    });
+
+    it("when logged in it calls list update and doesn't set localStorage", () => {
+      jest.spyOn(List.prototype, 'update');
+      window.gon.current_user_id = 1;
+
+      createComponent({ withLocalStorage: false });
+
+      findCaret().vm.$emit('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(wrapper.vm.list.update).toHaveBeenCalledTimes(1);
+        expect(localStorage.getItem(`${wrapper.vm.uniqueKey}.expanded`)).toBe(null);
+      });
+    });
+
+    it("when logged out it doesn't call list update and sets localStorage", () => {
+      jest.spyOn(List.prototype, 'update');
+
+      createComponent();
+
+      findCaret().vm.$emit('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(wrapper.vm.list.update).not.toHaveBeenCalled();
+        expect(localStorage.getItem(`${wrapper.vm.uniqueKey}.expanded`)).toBe(String(isExpanded()));
+      });
+    });
+  });
+});
diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index d23393db60d..0debca1310a 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -1,4 +1,6 @@
 import actions from '~/boards/stores/actions';
+import * as types from '~/boards/stores/mutation_types';
+import testAction from 'helpers/vuex_action_helper';
 
 const expectNotImplemented = action => {
   it('is not implemented', () => {
@@ -7,7 +9,20 @@ const expectNotImplemented = action => {
 };
 
 describe('setEndpoints', () => {
-  expectNotImplemented(actions.setEndpoints);
+  it('sets endpoints object', () => {
+    const mockEndpoints = {
+      foo: 'bar',
+      bar: 'baz',
+    };
+
+    return testAction(
+      actions.setEndpoints,
+      mockEndpoints,
+      {},
+      [{ type: types.SET_ENDPOINTS, payload: mockEndpoints }],
+      [],
+    );
+  });
 });
 
 describe('fetchLists', () => {
diff --git a/spec/frontend/boards/stores/mutations_spec.js b/spec/frontend/boards/stores/mutations_spec.js
index aa477766978..bc57c30b354 100644
--- a/spec/frontend/boards/stores/mutations_spec.js
+++ b/spec/frontend/boards/stores/mutations_spec.js
@@ -1,4 +1,6 @@
 import mutations from '~/boards/stores/mutations';
+import * as types from '~/boards/stores/mutation_types';
+import defaultState from '~/boards/stores/state';
 
 const expectNotImplemented = action => {
   it('is not implemented', () => {
@@ -6,86 +8,107 @@ const expectNotImplemented = action => {
   });
 };
 
-describe('SET_ENDPOINTS', () => {
-  expectNotImplemented(mutations.SET_ENDPOINTS);
-});
+describe('Board Store Mutations', () => {
+  let state;
 
-describe('REQUEST_ADD_LIST', () => {
-  expectNotImplemented(mutations.REQUEST_ADD_LIST);
-});
+  beforeEach(() => {
+    state = defaultState();
+  });
 
-describe('RECEIVE_ADD_LIST_SUCCESS', () => {
-  expectNotImplemented(mutations.RECEIVE_ADD_LIST_SUCCESS);
-});
+  describe('SET_ENDPOINTS', () => {
+    it('Should set initial Boards data to state', () => {
+      const endpoints = {
+        boardsEndpoint: '/boards/',
+        recentBoardsEndpoint: '/boards/',
+        listsEndpoint: '/boards/lists',
+        bulkUpdatePath: '/boards/bulkUpdate',
+        boardId: 1,
+        fullPath: 'gitlab-org',
+      };
+
+      mutations[types.SET_ENDPOINTS](state, endpoints);
+
+      expect(state.endpoints).toEqual(endpoints);
+    });
+  });
 
-describe('RECEIVE_ADD_LIST_ERROR', () => {
-  expectNotImplemented(mutations.RECEIVE_ADD_LIST_ERROR);
-});
+  describe('REQUEST_ADD_LIST', () => {
+    expectNotImplemented(mutations.REQUEST_ADD_LIST);
+  });
 
-describe('REQUEST_UPDATE_LIST', () => {
-  expectNotImplemented(mutations.REQUEST_UPDATE_LIST);
-});
+  describe('RECEIVE_ADD_LIST_SUCCESS', () => {
+    expectNotImplemented(mutations.RECEIVE_ADD_LIST_SUCCESS);
+  });
 
-describe('RECEIVE_UPDATE_LIST_SUCCESS', () => {
-  expectNotImplemented(mutations.RECEIVE_UPDATE_LIST_SUCCESS);
-});
+  describe('RECEIVE_ADD_LIST_ERROR', () => {
+    expectNotImplemented(mutations.RECEIVE_ADD_LIST_ERROR);
+  });
 
-describe('RECEIVE_UPDATE_LIST_ERROR', () => {
-  expectNotImplemented(mutations.RECEIVE_UPDATE_LIST_ERROR);
-});
+  describe('REQUEST_UPDATE_LIST', () => {
+    expectNotImplemented(mutations.REQUEST_UPDATE_LIST);
+  });
 
-describe('REQUEST_REMOVE_LIST', () => {
-  expectNotImplemented(mutations.REQUEST_REMOVE_LIST);
-});
+  describe('RECEIVE_UPDATE_LIST_SUCCESS', () => {
+    expectNotImplemented(mutations.RECEIVE_UPDATE_LIST_SUCCESS);
+  });
 
-describe('RECEIVE_REMOVE_LIST_SUCCESS', () => {
-  expectNotImplemented(mutations.RECEIVE_REMOVE_LIST_SUCCESS);
-});
+  describe('RECEIVE_UPDATE_LIST_ERROR', () => {
+    expectNotImplemented(mutations.RECEIVE_UPDATE_LIST_ERROR);
+  });
 
-describe('RECEIVE_REMOVE_LIST_ERROR', () => {
-  expectNotImplemented(mutations.RECEIVE_REMOVE_LIST_ERROR);
-});
+  describe('REQUEST_REMOVE_LIST', () => {
+    expectNotImplemented(mutations.REQUEST_REMOVE_LIST);
+  });
 
-describe('REQUEST_ADD_ISSUE', () => {
-  expectNotImplemented(mutations.REQUEST_ADD_ISSUE);
-});
+  describe('RECEIVE_REMOVE_LIST_SUCCESS', () => {
+    expectNotImplemented(mutations.RECEIVE_REMOVE_LIST_SUCCESS);
+  });
 
-describe('RECEIVE_ADD_ISSUE_SUCCESS', () => {
-  expectNotImplemented(mutations.RECEIVE_ADD_ISSUE_SUCCESS);
-});
+  describe('RECEIVE_REMOVE_LIST_ERROR', () => {
+    expectNotImplemented(mutations.RECEIVE_REMOVE_LIST_ERROR);
+  });
 
-describe('RECEIVE_ADD_ISSUE_ERROR', () => {
-  expectNotImplemented(mutations.RECEIVE_ADD_ISSUE_ERROR);
-});
+  describe('REQUEST_ADD_ISSUE', () => {
+    expectNotImplemented(mutations.REQUEST_ADD_ISSUE);
+  });
 
-describe('REQUEST_MOVE_ISSUE', () => {
-  expectNotImplemented(mutations.REQUEST_MOVE_ISSUE);
-});
+  describe('RECEIVE_ADD_ISSUE_SUCCESS', () => {
+    expectNotImplemented(mutations.RECEIVE_ADD_ISSUE_SUCCESS);
+  });
 
-describe('RECEIVE_MOVE_ISSUE_SUCCESS', () => {
-  expectNotImplemented(mutations.RECEIVE_MOVE_ISSUE_SUCCESS);
-});
+  describe('RECEIVE_ADD_ISSUE_ERROR', () => {
+    expectNotImplemented(mutations.RECEIVE_ADD_ISSUE_ERROR);
+  });
 
-describe('RECEIVE_MOVE_ISSUE_ERROR', () => {
-  expectNotImplemented(mutations.RECEIVE_MOVE_ISSUE_ERROR);
-});
+  describe('REQUEST_MOVE_ISSUE', () => {
+    expectNotImplemented(mutations.REQUEST_MOVE_ISSUE);
+  });
 
-describe('REQUEST_UPDATE_ISSUE', () => {
-  expectNotImplemented(mutations.REQUEST_UPDATE_ISSUE);
-});
+  describe('RECEIVE_MOVE_ISSUE_SUCCESS', () => {
+    expectNotImplemented(mutations.RECEIVE_MOVE_ISSUE_SUCCESS);
+  });
 
-describe('RECEIVE_UPDATE_ISSUE_SUCCESS', () => {
-  expectNotImplemented(mutations.RECEIVE_UPDATE_ISSUE_SUCCESS);
-});
+  describe('RECEIVE_MOVE_ISSUE_ERROR', () => {
+    expectNotImplemented(mutations.RECEIVE_MOVE_ISSUE_ERROR);
+  });
 
-describe('RECEIVE_UPDATE_ISSUE_ERROR', () => {
-  expectNotImplemented(mutations.RECEIVE_UPDATE_ISSUE_ERROR);
-});
+  describe('REQUEST_UPDATE_ISSUE', () => {
+    expectNotImplemented(mutations.REQUEST_UPDATE_ISSUE);
+  });
 
-describe('SET_CURRENT_PAGE', () => {
-  expectNotImplemented(mutations.SET_CURRENT_PAGE);
-});
+  describe('RECEIVE_UPDATE_ISSUE_SUCCESS', () => {
+    expectNotImplemented(mutations.RECEIVE_UPDATE_ISSUE_SUCCESS);
+  });
 
-describe('TOGGLE_EMPTY_STATE', () => {
-  expectNotImplemented(mutations.TOGGLE_EMPTY_STATE);
+  describe('RECEIVE_UPDATE_ISSUE_ERROR', () => {
+    expectNotImplemented(mutations.RECEIVE_UPDATE_ISSUE_ERROR);
+  });
+
+  describe('SET_CURRENT_PAGE', () => {
+    expectNotImplemented(mutations.SET_CURRENT_PAGE);
+  });
+
+  describe('TOGGLE_EMPTY_STATE', () => {
+    expectNotImplemented(mutations.TOGGLE_EMPTY_STATE);
+  });
 });
diff --git a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
index 9179302f786..094fdcdc185 100644
--- a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
+++ b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
@@ -105,6 +105,46 @@ describe('Ci variable modal', () => {
     });
   });
 
+  describe('Adding a new non-AWS variable', () => {
+    beforeEach(() => {
+      const [variable] = mockData.mockVariables;
+      const invalidKeyVariable = {
+        ...variable,
+        key: 'key',
+        value: 'value',
+        secret_value: 'secret_value',
+      };
+      createComponent(mount);
+      store.state.variable = invalidKeyVariable;
+    });
+
+    it('does not show AWS guidance tip', () => {
+      const tip = wrapper.find(`div[data-testid='aws-guidance-tip']`);
+      expect(tip.exists()).toBe(true);
+      expect(tip.isVisible()).toBe(false);
+    });
+  });
+
+  describe('Adding a new AWS variable', () => {
+    beforeEach(() => {
+      const [variable] = mockData.mockVariables;
+      const invalidKeyVariable = {
+        ...variable,
+        key: AWS_ACCESS_KEY_ID,
+        value: 'AKIAIOSFODNN7EXAMPLEjdhy',
+        secret_value: 'AKIAIOSFODNN7EXAMPLEjdhy',
+      };
+      createComponent(mount);
+      store.state.variable = invalidKeyVariable;
+    });
+
+    it('shows AWS guidance tip', () => {
+      const tip = wrapper.find(`[data-testid='aws-guidance-tip']`);
+      expect(tip.exists()).toBe(true);
+      expect(tip.isVisible()).toBe(true);
+    });
+  });
+
   describe('Editing a variable', () => {
     beforeEach(() => {
       const [variable] = mockData.mockVariables;
diff --git a/spec/frontend/clusters/clusters_bundle_spec.js b/spec/frontend/clusters/clusters_bundle_spec.js
index 9d0ed423759..a9870e4db57 100644
--- a/spec/frontend/clusters/clusters_bundle_spec.js
+++ b/spec/frontend/clusters/clusters_bundle_spec.js
@@ -268,13 +268,18 @@ describe('Clusters', () => {
 
       cluster.store.state.applications[applicationId].status = INSTALLABLE;
 
+      const params = {};
+      if (applicationId === 'knative') {
+        params.hostname = 'test-example.com';
+      }
+
       // eslint-disable-next-line promise/valid-params
       cluster
-        .installApplication({ id: applicationId })
+        .installApplication({ id: applicationId, params })
         .then(() => {
           expect(cluster.store.state.applications[applicationId].status).toEqual(INSTALLING);
           expect(cluster.store.state.applications[applicationId].requestReason).toEqual(null);
-          expect(cluster.service.installApplication).toHaveBeenCalledWith(applicationId, undefined);
+          expect(cluster.service.installApplication).toHaveBeenCalledWith(applicationId, params);
           done();
         })
         .catch();
diff --git a/spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap b/spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap
new file mode 100644
index 00000000000..92237590550
--- /dev/null
+++ b/spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap
@@ -0,0 +1,89 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Applications Cert-Manager application shows the correct description 1`] = `
+<p
+  data-testid="certManagerDescription"
+>
+  Cert-Manager is a native Kubernetes certificate management controller that helps with issuing certificates. Installing Cert-Manager on your cluster will issue a certificate by 
+  <a
+    class="gl-link"
+    href="https://letsencrypt.org/"
+    rel="noopener noreferrer"
+    target="_blank"
+  >
+    Let's Encrypt
+  </a>
+   and ensure that certificates are valid and up-to-date.
+</p>
+`;
+
+exports[`Applications Crossplane application shows the correct description 1`] = `
+<p
+  data-testid="crossplaneDescription"
+>
+  Crossplane enables declarative provisioning of managed services from your cloud of choice using 
+  <code>
+    kubectl
+  </code>
+   or 
+  <a
+    class="gl-link"
+    href="https://docs.gitlab.com/ee/user/clusters/applications.html#crossplane"
+    rel="noopener noreferrer"
+    target="_blank"
+  >
+    GitLab Integration
+  </a>
+  . Crossplane runs inside your Kubernetes cluster and supports secure connectivity and secrets management between app containers and the cloud services they depend on.
+</p>
+`;
+
+exports[`Applications Ingress application shows the correct warning message 1`] = `
+<strong
+  data-testid="ingressCostWarning"
+>
+  Installing Ingress may incur additional costs. Learn more about 
+  <a
+    class="gl-link"
+    href="https://cloud.google.com/compute/pricing#lb"
+    rel="noopener noreferrer"
+    target="_blank"
+  >
+    pricing
+  </a>
+  .
+</strong>
+`;
+
+exports[`Applications Knative application shows the correct description 1`] = `
+<span
+  data-testid="installedVia"
+>
+  installed via 
+  <a
+    class="gl-link"
+    href=""
+    rel="noopener"
+    target="_blank"
+  >
+    Cloud Run
+  </a>
+</span>
+`;
+
+exports[`Applications Prometheus application shows the correct description 1`] = `
+<span
+  data-testid="prometheusDescription"
+>
+  Prometheus is an open-source monitoring system with 
+  <a
+    class="gl-link"
+    href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
+    rel="noopener noreferrer"
+    target="_blank"
+  >
+    GitLab Integration
+  </a>
+   to monitor deployed applications.
+</span>
+`;
diff --git a/spec/frontend/clusters/components/application_row_spec.js b/spec/frontend/clusters/components/application_row_spec.js
index 33ff1424c61..94bdd7b7778 100644
--- a/spec/frontend/clusters/components/application_row_spec.js
+++ b/spec/frontend/clusters/components/application_row_spec.js
@@ -1,242 +1,194 @@
-import Vue from 'vue';
 import { shallowMount } from '@vue/test-utils';
-import mountComponent from 'helpers/vue_mount_component_helper';
+import { GlSprintf } from '@gitlab/ui';
 import eventHub from '~/clusters/event_hub';
-import { APPLICATION_STATUS } from '~/clusters/constants';
-import applicationRow from '~/clusters/components/application_row.vue';
+import { APPLICATION_STATUS, ELASTIC_STACK } from '~/clusters/constants';
+import ApplicationRow from '~/clusters/components/application_row.vue';
 import UninstallApplicationConfirmationModal from '~/clusters/components/uninstall_application_confirmation_modal.vue';
+import UpdateApplicationConfirmationModal from '~/clusters/components/update_application_confirmation_modal.vue';
 
 import { DEFAULT_APPLICATION_STATE } from '../services/mock_data';
 
 describe('Application Row', () => {
-  let vm;
-  let ApplicationRow;
-
-  beforeEach(() => {
-    ApplicationRow = Vue.extend(applicationRow);
-  });
+  let wrapper;
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
+  const mountComponent = data => {
+    wrapper = shallowMount(ApplicationRow, {
+      stubs: { GlSprintf },
+      propsData: {
+        ...DEFAULT_APPLICATION_STATE,
+        ...data,
+      },
+    });
+  };
+
   describe('Title', () => {
     it('shows title', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        titleLink: null,
-      });
-      const title = vm.$el.querySelector('.js-cluster-application-title');
+      mountComponent({ titleLink: null });
+
+      const title = wrapper.find('.js-cluster-application-title');
 
-      expect(title.tagName).toEqual('SPAN');
-      expect(title.textContent.trim()).toEqual(DEFAULT_APPLICATION_STATE.title);
+      expect(title.element).toBeInstanceOf(HTMLSpanElement);
+      expect(title.text()).toEqual(DEFAULT_APPLICATION_STATE.title);
     });
 
     it('shows title link', () => {
       expect(DEFAULT_APPLICATION_STATE.titleLink).toBeDefined();
+      mountComponent();
+      const title = wrapper.find('.js-cluster-application-title');
 
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-      });
-      const title = vm.$el.querySelector('.js-cluster-application-title');
-
-      expect(title.tagName).toEqual('A');
-      expect(title.textContent.trim()).toEqual(DEFAULT_APPLICATION_STATE.title);
+      expect(title.element).toBeInstanceOf(HTMLAnchorElement);
+      expect(title.text()).toEqual(DEFAULT_APPLICATION_STATE.title);
     });
   });
 
   describe('Install button', () => {
+    const button = () => wrapper.find('.js-cluster-application-install-button');
+    const checkButtonState = (label, loading, disabled) => {
+      expect(button().props('label')).toEqual(label);
+      expect(button().props('loading')).toEqual(loading);
+      expect(button().props('disabled')).toEqual(disabled);
+    };
+
     it('has indeterminate state on page load', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: null,
-      });
+      mountComponent({ status: null });
 
-      expect(vm.installButtonLabel).toBeUndefined();
+      expect(button().props('label')).toBeUndefined();
     });
 
     it('has install button', () => {
-      const installationBtn = vm.$el.querySelector('.js-cluster-application-install-button');
+      mountComponent();
 
-      expect(installationBtn).not.toBe(null);
+      expect(button().exists()).toBe(true);
     });
 
     it('has disabled "Install" when APPLICATION_STATUS.NOT_INSTALLABLE', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.NOT_INSTALLABLE,
-      });
+      mountComponent({ status: APPLICATION_STATUS.NOT_INSTALLABLE });
 
-      expect(vm.installButtonLabel).toEqual('Install');
-      expect(vm.installButtonLoading).toEqual(false);
-      expect(vm.installButtonDisabled).toEqual(true);
+      checkButtonState('Install', false, true);
     });
 
     it('has enabled "Install" when APPLICATION_STATUS.INSTALLABLE', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.INSTALLABLE,
-      });
+      mountComponent({ status: APPLICATION_STATUS.INSTALLABLE });
 
-      expect(vm.installButtonLabel).toEqual('Install');
-      expect(vm.installButtonLoading).toEqual(false);
-      expect(vm.installButtonDisabled).toEqual(false);
+      checkButtonState('Install', false, false);
     });
 
     it('has loading "Installing" when APPLICATION_STATUS.INSTALLING', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.INSTALLING,
-      });
+      mountComponent({ status: APPLICATION_STATUS.INSTALLING });
 
-      expect(vm.installButtonLabel).toEqual('Installing');
-      expect(vm.installButtonLoading).toEqual(true);
-      expect(vm.installButtonDisabled).toEqual(true);
+      checkButtonState('Installing', true, true);
     });
 
     it('has disabled "Installed" when application is installed and not uninstallable', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLED,
         installed: true,
         uninstallable: false,
       });
 
-      expect(vm.installButtonLabel).toEqual('Installed');
-      expect(vm.installButtonLoading).toEqual(false);
-      expect(vm.installButtonDisabled).toEqual(true);
+      checkButtonState('Installed', false, true);
     });
 
     it('hides when application is installed and uninstallable', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLED,
         installed: true,
         uninstallable: true,
       });
-      const installBtn = vm.$el.querySelector('.js-cluster-application-install-button');
 
-      expect(installBtn).toBe(null);
+      expect(button().exists()).toBe(false);
     });
 
     it('has enabled "Install" when install fails', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLABLE,
         installFailed: true,
       });
 
-      expect(vm.installButtonLabel).toEqual('Install');
-      expect(vm.installButtonLoading).toEqual(false);
-      expect(vm.installButtonDisabled).toEqual(false);
+      checkButtonState('Install', false, false);
     });
 
     it('has enabled "Install" when REQUEST_FAILURE (so you can try installing again)', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.INSTALLABLE,
-      });
+      mountComponent({ status: APPLICATION_STATUS.INSTALLABLE });
 
-      expect(vm.installButtonLabel).toEqual('Install');
-      expect(vm.installButtonLoading).toEqual(false);
-      expect(vm.installButtonDisabled).toEqual(false);
+      checkButtonState('Install', false, false);
     });
 
     it('clicking install button emits event', () => {
-      jest.spyOn(eventHub, '$emit');
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.INSTALLABLE,
-      });
-      const installButton = vm.$el.querySelector('.js-cluster-application-install-button');
+      const spy = jest.spyOn(eventHub, '$emit');
+      mountComponent({ status: APPLICATION_STATUS.INSTALLABLE });
 
-      installButton.click();
+      button().vm.$emit('click');
 
-      expect(eventHub.$emit).toHaveBeenCalledWith('installApplication', {
+      expect(spy).toHaveBeenCalledWith('installApplication', {
         id: DEFAULT_APPLICATION_STATE.id,
         params: {},
       });
     });
 
     it('clicking install button when installApplicationRequestParams are provided emits event', () => {
-      jest.spyOn(eventHub, '$emit');
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      const spy = jest.spyOn(eventHub, '$emit');
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLABLE,
         installApplicationRequestParams: { hostname: 'jupyter' },
       });
-      const installButton = vm.$el.querySelector('.js-cluster-application-install-button');
 
-      installButton.click();
+      button().vm.$emit('click');
 
-      expect(eventHub.$emit).toHaveBeenCalledWith('installApplication', {
+      expect(spy).toHaveBeenCalledWith('installApplication', {
         id: DEFAULT_APPLICATION_STATE.id,
         params: { hostname: 'jupyter' },
       });
     });
 
     it('clicking disabled install button emits nothing', () => {
-      jest.spyOn(eventHub, '$emit');
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.INSTALLING,
-      });
-      const installButton = vm.$el.querySelector('.js-cluster-application-install-button');
+      const spy = jest.spyOn(eventHub, '$emit');
+      mountComponent({ status: APPLICATION_STATUS.INSTALLING });
 
-      expect(vm.installButtonDisabled).toEqual(true);
+      expect(button().props('disabled')).toEqual(true);
 
-      installButton.click();
+      button().vm.$emit('click');
 
-      expect(eventHub.$emit).not.toHaveBeenCalled();
+      expect(spy).not.toHaveBeenCalled();
     });
   });
 
   describe('Uninstall button', () => {
     it('displays button when app is installed and uninstallable', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         installed: true,
         uninstallable: true,
         status: APPLICATION_STATUS.NOT_INSTALLABLE,
       });
-      const uninstallButton = vm.$el.querySelector('.js-cluster-application-uninstall-button');
+      const uninstallButton = wrapper.find('.js-cluster-application-uninstall-button');
 
-      expect(uninstallButton).toBeTruthy();
+      expect(uninstallButton.exists()).toBe(true);
     });
 
-    it('displays a success toast message if application uninstall was successful', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+    it('displays a success toast message if application uninstall was successful', async () => {
+      mountComponent({
         title: 'GitLab Runner',
         uninstallSuccessful: false,
       });
 
-      vm.$toast = { show: jest.fn() };
-      vm.uninstallSuccessful = true;
+      wrapper.vm.$toast = { show: jest.fn() };
+      wrapper.setProps({ uninstallSuccessful: true });
 
-      return vm.$nextTick(() => {
-        expect(vm.$toast.show).toHaveBeenCalledWith('GitLab Runner uninstalled successfully.');
-      });
+      await wrapper.vm.$nextTick();
+      expect(wrapper.vm.$toast.show).toHaveBeenCalledWith(
+        'GitLab Runner uninstalled successfully.',
+      );
     });
   });
 
   describe('when confirmation modal triggers confirm event', () => {
-    let wrapper;
-
-    beforeEach(() => {
-      wrapper = shallowMount(ApplicationRow, {
-        propsData: {
-          ...DEFAULT_APPLICATION_STATE,
-        },
-      });
-    });
-
-    afterEach(() => {
-      wrapper.destroy();
-    });
-
     it('triggers uninstallApplication event', () => {
       jest.spyOn(eventHub, '$emit');
+      mountComponent();
       wrapper.find(UninstallApplicationConfirmationModal).vm.$emit('confirm');
 
       expect(eventHub.$emit).toHaveBeenCalledWith('uninstallApplication', {
@@ -246,172 +198,226 @@ describe('Application Row', () => {
   });
 
   describe('Update button', () => {
+    const button = () => wrapper.find('.js-cluster-application-update-button');
+
     it('has indeterminate state on page load', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: null,
-      });
-      const updateBtn = vm.$el.querySelector('.js-cluster-application-update-button');
+      mountComponent();
 
-      expect(updateBtn).toBe(null);
+      expect(button().exists()).toBe(false);
     });
 
     it('has enabled "Update" when "updateAvailable" is true', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        updateAvailable: true,
-      });
-      const updateBtn = vm.$el.querySelector('.js-cluster-application-update-button');
+      mountComponent({ updateAvailable: true });
 
-      expect(updateBtn).not.toBe(null);
-      expect(updateBtn.innerHTML).toContain('Update');
+      expect(button().exists()).toBe(true);
+      expect(button().props('label')).toContain('Update');
     });
 
     it('has enabled "Retry update" when update process fails', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLED,
         updateFailed: true,
       });
-      const updateBtn = vm.$el.querySelector('.js-cluster-application-update-button');
 
-      expect(updateBtn).not.toBe(null);
-      expect(updateBtn.innerHTML).toContain('Retry update');
+      expect(button().exists()).toBe(true);
+      expect(button().props('label')).toContain('Retry update');
     });
 
     it('has disabled "Updating" when APPLICATION_STATUS.UPDATING', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.UPDATING,
-      });
-      const updateBtn = vm.$el.querySelector('.js-cluster-application-update-button');
+      mountComponent({ status: APPLICATION_STATUS.UPDATING });
 
-      expect(updateBtn).not.toBe(null);
-      expect(vm.isUpdating).toBe(true);
-      expect(updateBtn.innerHTML).toContain('Updating');
+      expect(button().exists()).toBe(true);
+      expect(button().props('label')).toContain('Updating');
     });
 
     it('clicking update button emits event', () => {
-      jest.spyOn(eventHub, '$emit');
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      const spy = jest.spyOn(eventHub, '$emit');
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLED,
         updateAvailable: true,
       });
-      const updateBtn = vm.$el.querySelector('.js-cluster-application-update-button');
 
-      updateBtn.click();
+      button().vm.$emit('click');
 
-      expect(eventHub.$emit).toHaveBeenCalledWith('updateApplication', {
+      expect(spy).toHaveBeenCalledWith('updateApplication', {
         id: DEFAULT_APPLICATION_STATE.id,
         params: {},
       });
     });
 
     it('clicking disabled update button emits nothing', () => {
-      jest.spyOn(eventHub, '$emit');
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
-        status: APPLICATION_STATUS.UPDATING,
-      });
-      const updateBtn = vm.$el.querySelector('.js-cluster-application-update-button');
+      const spy = jest.spyOn(eventHub, '$emit');
+      mountComponent({ status: APPLICATION_STATUS.UPDATING });
 
-      updateBtn.click();
+      button().vm.$emit('click');
 
-      expect(eventHub.$emit).not.toHaveBeenCalled();
+      expect(spy).not.toHaveBeenCalled();
     });
 
     it('displays an error message if application update failed', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         title: 'GitLab Runner',
         status: APPLICATION_STATUS.INSTALLED,
         updateFailed: true,
       });
-      const failureMessage = vm.$el.querySelector('.js-cluster-application-update-details');
+      const failureMessage = wrapper.find('.js-cluster-application-update-details');
 
-      expect(failureMessage).not.toBe(null);
-      expect(failureMessage.innerHTML).toContain(
+      expect(failureMessage.exists()).toBe(true);
+      expect(failureMessage.text()).toContain(
         'Update failed. Please check the logs and try again.',
       );
     });
 
-    it('displays a success toast message if application update was successful', () => {
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+    it('displays a success toast message if application update was successful', async () => {
+      mountComponent({
         title: 'GitLab Runner',
         updateSuccessful: false,
       });
 
-      vm.$toast = { show: jest.fn() };
-      vm.updateSuccessful = true;
+      wrapper.vm.$toast = { show: jest.fn() };
+      wrapper.setProps({ updateSuccessful: true });
 
-      return vm.$nextTick(() => {
-        expect(vm.$toast.show).toHaveBeenCalledWith('GitLab Runner updated successfully.');
+      await wrapper.vm.$nextTick();
+      expect(wrapper.vm.$toast.show).toHaveBeenCalledWith('GitLab Runner updated successfully.');
+    });
+
+    describe('when updating does not require confirmation', () => {
+      beforeEach(() => mountComponent({ updateAvailable: true }));
+
+      it('the modal is not rendered', () => {
+        expect(wrapper.contains(UpdateApplicationConfirmationModal)).toBe(false);
+      });
+
+      it('the correct button is rendered', () => {
+        expect(wrapper.contains("[data-qa-selector='update_button']")).toBe(true);
+      });
+    });
+
+    describe('when updating requires confirmation', () => {
+      beforeEach(() => {
+        mountComponent({
+          updateAvailable: true,
+          id: ELASTIC_STACK,
+          version: '1.1.2',
+        });
+      });
+
+      it('displays a modal', () => {
+        expect(wrapper.contains(UpdateApplicationConfirmationModal)).toBe(true);
+      });
+
+      it('the correct button is rendered', () => {
+        expect(wrapper.contains("[data-qa-selector='update_button_with_confirmation']")).toBe(true);
+      });
+
+      it('triggers updateApplication event', () => {
+        jest.spyOn(eventHub, '$emit');
+        wrapper.find(UpdateApplicationConfirmationModal).vm.$emit('confirm');
+
+        expect(eventHub.$emit).toHaveBeenCalledWith('updateApplication', {
+          id: ELASTIC_STACK,
+          params: {},
+        });
+      });
+    });
+
+    describe('updating Elastic Stack special case', () => {
+      it('needs confirmation if version is lower than 3.0.0', () => {
+        mountComponent({
+          updateAvailable: true,
+          id: ELASTIC_STACK,
+          version: '1.1.2',
+        });
+
+        expect(wrapper.contains("[data-qa-selector='update_button_with_confirmation']")).toBe(true);
+        expect(wrapper.contains(UpdateApplicationConfirmationModal)).toBe(true);
+      });
+
+      it('does not need confirmation is version is 3.0.0', () => {
+        mountComponent({
+          updateAvailable: true,
+          id: ELASTIC_STACK,
+          version: '3.0.0',
+        });
+
+        expect(wrapper.contains("[data-qa-selector='update_button']")).toBe(true);
+        expect(wrapper.contains(UpdateApplicationConfirmationModal)).toBe(false);
+      });
+
+      it('does not need confirmation if version is higher than 3.0.0', () => {
+        mountComponent({
+          updateAvailable: true,
+          id: ELASTIC_STACK,
+          version: '5.2.1',
+        });
+
+        expect(wrapper.contains("[data-qa-selector='update_button']")).toBe(true);
+        expect(wrapper.contains(UpdateApplicationConfirmationModal)).toBe(false);
       });
     });
   });
 
   describe('Version', () => {
+    const updateDetails = () => wrapper.find('.js-cluster-application-update-details');
+    const versionEl = () => wrapper.find('.js-cluster-application-update-version');
+
     it('displays a version number if application has been updated', () => {
       const version = '0.1.45';
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLED,
         updateSuccessful: true,
         version,
       });
-      const updateDetails = vm.$el.querySelector('.js-cluster-application-update-details');
-      const versionEl = vm.$el.querySelector('.js-cluster-application-update-version');
 
-      expect(updateDetails.innerHTML).toContain('Updated');
-      expect(versionEl).not.toBe(null);
-      expect(versionEl.innerHTML).toContain(version);
+      expect(updateDetails().text()).toBe(`Updated to chart v${version}`);
     });
 
     it('contains a link to the chart repo if application has been updated', () => {
       const version = '0.1.45';
       const chartRepo = 'https://gitlab.com/gitlab-org/charts/gitlab-runner';
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLED,
         updateSuccessful: true,
         chartRepo,
         version,
       });
-      const versionEl = vm.$el.querySelector('.js-cluster-application-update-version');
 
-      expect(versionEl.href).toEqual(chartRepo);
-      expect(versionEl.target).toEqual('_blank');
+      expect(versionEl().attributes('href')).toEqual(chartRepo);
+      expect(versionEl().props('target')).toEqual('_blank');
     });
 
     it('does not display a version number if application update failed', () => {
       const version = '0.1.45';
-      vm = mountComponent(ApplicationRow, {
-        ...DEFAULT_APPLICATION_STATE,
+      mountComponent({
         status: APPLICATION_STATUS.INSTALLED,
         updateFailed: true,
         version,
       });
-      const updateDetails = vm.$el.querySelector('.js-cluster-application-update-details');
-      const versionEl = vm.$el.querySelector('.js-cluster-application-update-version');
 
-      expect(updateDetails.innerHTML).toContain('failed');
-      expect(versionEl).toBe(null);
+      expect(updateDetails().text()).toBe('Update failed');
+      expect(versionEl().exists()).toBe(false);
+    });
+
+    it('displays updating when the application update is currently updating', () => {
+      mountComponent({
+        status: APPLICATION_STATUS.UPDATING,
+        updateSuccessful: true,
+        version: '1.2.3',
+      });
+
+      expect(updateDetails().text()).toBe('Updating');
+      expect(versionEl().exists()).toBe(false);
     });
   });
 
   describe('Error block', () => {
+    const generalErrorMessage = () => wrapper.find('.js-cluster-application-general-error-message');
+
     describe('when nothing fails', () => {
       it('does not show error block', () => {
-        vm = mountComponent(ApplicationRow, {
-          ...DEFAULT_APPLICATION_STATE,
-        });
-        const generalErrorMessage = vm.$el.querySelector(
-          '.js-cluster-application-general-error-message',
-        );
+        mountComponent();
 
-        expect(generalErrorMessage).toBeNull();
+        expect(generalErrorMessage().exists()).toBe(false);
       });
     });
 
@@ -420,8 +426,7 @@ describe('Application Row', () => {
       const requestReason = 'We broke the request 0.0';
 
       beforeEach(() => {
-        vm = mountComponent(ApplicationRow, {
-          ...DEFAULT_APPLICATION_STATE,
+        mountComponent({
           status: APPLICATION_STATUS.ERROR,
           statusReason,
           requestReason,
@@ -430,37 +435,28 @@ describe('Application Row', () => {
       });
 
       it('shows status reason if it is available', () => {
-        const statusErrorMessage = vm.$el.querySelector(
-          '.js-cluster-application-status-error-message',
-        );
+        const statusErrorMessage = wrapper.find('.js-cluster-application-status-error-message');
 
-        expect(statusErrorMessage.textContent.trim()).toEqual(statusReason);
+        expect(statusErrorMessage.text()).toEqual(statusReason);
       });
 
       it('shows request reason if it is available', () => {
-        const requestErrorMessage = vm.$el.querySelector(
-          '.js-cluster-application-request-error-message',
-        );
+        const requestErrorMessage = wrapper.find('.js-cluster-application-request-error-message');
 
-        expect(requestErrorMessage.textContent.trim()).toEqual(requestReason);
+        expect(requestErrorMessage.text()).toEqual(requestReason);
       });
     });
 
     describe('when install fails', () => {
       beforeEach(() => {
-        vm = mountComponent(ApplicationRow, {
-          ...DEFAULT_APPLICATION_STATE,
+        mountComponent({
           status: APPLICATION_STATUS.ERROR,
           installFailed: true,
         });
       });
 
       it('shows a general message indicating the installation failed', () => {
-        const generalErrorMessage = vm.$el.querySelector(
-          '.js-cluster-application-general-error-message',
-        );
-
-        expect(generalErrorMessage.textContent.trim()).toEqual(
+        expect(generalErrorMessage().text()).toEqual(
           `Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`,
         );
       });
@@ -468,19 +464,14 @@ describe('Application Row', () => {
 
     describe('when uninstall fails', () => {
       beforeEach(() => {
-        vm = mountComponent(ApplicationRow, {
-          ...DEFAULT_APPLICATION_STATE,
+        mountComponent({
           status: APPLICATION_STATUS.ERROR,
           uninstallFailed: true,
         });
       });
 
       it('shows a general message indicating the uninstalling failed', () => {
-        const generalErrorMessage = vm.$el.querySelector(
-          '.js-cluster-application-general-error-message',
-        );
-
-        expect(generalErrorMessage.textContent.trim()).toEqual(
+        expect(generalErrorMessage().text()).toEqual(
           `Something went wrong while uninstalling ${DEFAULT_APPLICATION_STATE.title}`,
         );
       });
diff --git a/spec/frontend/clusters/components/applications_spec.js b/spec/frontend/clusters/components/applications_spec.js
index 33b30891d5e..7fc771201c1 100644
--- a/spec/frontend/clusters/components/applications_spec.js
+++ b/spec/frontend/clusters/components/applications_spec.js
@@ -1,174 +1,175 @@
-import Vue from 'vue';
-import mountComponent from 'helpers/vue_mount_component_helper';
-import { shallowMount } from '@vue/test-utils';
-import applications from '~/clusters/components/applications.vue';
-import { CLUSTER_TYPE } from '~/clusters/constants';
+import { shallowMount, mount } from '@vue/test-utils';
+import Applications from '~/clusters/components/applications.vue';
+import { CLUSTER_TYPE, PROVIDER_TYPE } from '~/clusters/constants';
 import { APPLICATIONS_MOCK_STATE } from '../services/mock_data';
 import eventHub from '~/clusters/event_hub';
+import ApplicationRow from '~/clusters/components/application_row.vue';
 import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue';
 import CrossplaneProviderStack from '~/clusters/components/crossplane_provider_stack.vue';
 import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue';
 import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings.vue';
 
 describe('Applications', () => {
-  let vm;
-  let Applications;
+  let wrapper;
 
   beforeEach(() => {
-    Applications = Vue.extend(applications);
-
     gon.features = gon.features || {};
     gon.features.managedAppsLocalTiller = false;
   });
 
+  const createApp = ({ applications, type } = {}, isShallow) => {
+    const mountMethod = isShallow ? shallowMount : mount;
+
+    wrapper = mountMethod(Applications, {
+      stubs: { ApplicationRow },
+      propsData: {
+        type,
+        applications: { ...APPLICATIONS_MOCK_STATE, ...applications },
+      },
+    });
+  };
+
+  const createShallowApp = options => createApp(options, true);
+  const findByTestId = id => wrapper.find(`[data-testid="${id}"]`);
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
   describe('Project cluster applications', () => {
     beforeEach(() => {
-      vm = mountComponent(Applications, {
-        applications: APPLICATIONS_MOCK_STATE,
-        type: CLUSTER_TYPE.PROJECT,
-      });
+      createApp({ type: CLUSTER_TYPE.PROJECT });
     });
 
     it('renders a row for Helm Tiller', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-helm')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-helm').exists()).toBe(true);
     });
 
     it('renders a row for Ingress', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-ingress')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-ingress').exists()).toBe(true);
     });
 
     it('renders a row for Cert-Manager', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-cert_manager')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-cert_manager').exists()).toBe(true);
     });
 
     it('renders a row for Crossplane', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-crossplane')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-crossplane').exists()).toBe(true);
     });
 
     it('renders a row for Prometheus', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-prometheus')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-prometheus').exists()).toBe(true);
     });
 
     it('renders a row for GitLab Runner', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-runner')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-runner').exists()).toBe(true);
     });
 
     it('renders a row for Jupyter', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-jupyter')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-jupyter').exists()).toBe(true);
     });
 
     it('renders a row for Knative', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-knative')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-knative').exists()).toBe(true);
     });
 
     it('renders a row for Elastic Stack', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-elastic_stack')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-elastic_stack').exists()).toBe(true);
     });
 
     it('renders a row for Fluentd', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-fluentd')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-fluentd').exists()).toBe(true);
     });
   });
 
   describe('Group cluster applications', () => {
     beforeEach(() => {
-      vm = mountComponent(Applications, {
-        type: CLUSTER_TYPE.GROUP,
-        applications: APPLICATIONS_MOCK_STATE,
-      });
+      createApp({ type: CLUSTER_TYPE.GROUP });
     });
 
     it('renders a row for Helm Tiller', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-helm')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-helm').exists()).toBe(true);
     });
 
     it('renders a row for Ingress', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-ingress')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-ingress').exists()).toBe(true);
     });
 
     it('renders a row for Cert-Manager', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-cert_manager')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-cert_manager').exists()).toBe(true);
     });
 
     it('renders a row for Crossplane', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-crossplane')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-crossplane').exists()).toBe(true);
     });
 
     it('renders a row for Prometheus', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-prometheus')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-prometheus').exists()).toBe(true);
     });
 
     it('renders a row for GitLab Runner', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-runner')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-runner').exists()).toBe(true);
     });
 
     it('renders a row for Jupyter', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-jupyter')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-jupyter').exists()).toBe(true);
     });
 
     it('renders a row for Knative', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-knative')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-knative').exists()).toBe(true);
     });
 
     it('renders a row for Elastic Stack', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-elastic_stack')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-elastic_stack').exists()).toBe(true);
     });
 
     it('renders a row for Fluentd', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-fluentd')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-fluentd').exists()).toBe(true);
     });
   });
 
   describe('Instance cluster applications', () => {
     beforeEach(() => {
-      vm = mountComponent(Applications, {
-        type: CLUSTER_TYPE.INSTANCE,
-        applications: APPLICATIONS_MOCK_STATE,
-      });
+      createApp({ type: CLUSTER_TYPE.INSTANCE });
     });
 
     it('renders a row for Helm Tiller', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-helm')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-helm').exists()).toBe(true);
     });
 
     it('renders a row for Ingress', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-ingress')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-ingress').exists()).toBe(true);
     });
 
     it('renders a row for Cert-Manager', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-cert_manager')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-cert_manager').exists()).toBe(true);
     });
 
     it('renders a row for Crossplane', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-crossplane')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-crossplane').exists()).toBe(true);
     });
 
     it('renders a row for Prometheus', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-prometheus')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-prometheus').exists()).toBe(true);
     });
 
     it('renders a row for GitLab Runner', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-runner')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-runner').exists()).toBe(true);
     });
 
     it('renders a row for Jupyter', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-jupyter')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-jupyter').exists()).toBe(true);
     });
 
     it('renders a row for Knative', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-knative')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-knative').exists()).toBe(true);
     });
 
     it('renders a row for Elastic Stack', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-elastic_stack')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-elastic_stack').exists()).toBe(true);
     });
 
     it('renders a row for Fluentd', () => {
-      expect(vm.$el.querySelector('.js-cluster-application-row-fluentd')).not.toBeNull();
+      expect(wrapper.find('.js-cluster-application-row-fluentd').exists()).toBe(true);
     });
   });
 
@@ -179,20 +180,21 @@ describe('Applications', () => {
       });
 
       it('does not render a row for Helm Tiller', () => {
-        vm = mountComponent(Applications, {
-          applications: APPLICATIONS_MOCK_STATE,
-        });
-
-        expect(vm.$el.querySelector('.js-cluster-application-row-helm')).toBeNull();
+        createApp();
+        expect(wrapper.find('.js-cluster-application-row-helm').exists()).toBe(false);
       });
     });
   });
 
   describe('Ingress application', () => {
+    it('shows the correct warning message', () => {
+      createApp();
+      expect(findByTestId('ingressCostWarning').element).toMatchSnapshot();
+    });
+
     describe('with nested component', () => {
       const propsData = {
         applications: {
-          ...APPLICATIONS_MOCK_STATE,
           ingress: {
             title: 'Ingress',
             status: 'installed',
@@ -200,13 +202,8 @@ describe('Applications', () => {
         },
       };
 
-      let wrapper;
-      beforeEach(() => {
-        wrapper = shallowMount(Applications, { propsData });
-      });
-      afterEach(() => {
-        wrapper.destroy();
-      });
+      beforeEach(() => createShallowApp(propsData));
+
       it('renders IngressModsecuritySettings', () => {
         const modsecuritySettings = wrapper.find(IngressModsecuritySettings);
         expect(modsecuritySettings.exists()).toBe(true);
@@ -216,9 +213,8 @@ describe('Applications', () => {
     describe('when installed', () => {
       describe('with ip address', () => {
         it('renders ip address with a clipboard button', () => {
-          vm = mountComponent(Applications, {
+          createApp({
             applications: {
-              ...APPLICATIONS_MOCK_STATE,
               ingress: {
                 title: 'Ingress',
                 status: 'installed',
@@ -227,17 +223,16 @@ describe('Applications', () => {
             },
           });
 
-          expect(vm.$el.querySelector('.js-endpoint').value).toEqual('0.0.0.0');
-
-          expect(
-            vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'),
-          ).toEqual('0.0.0.0');
+          expect(wrapper.find('.js-endpoint').element.value).toEqual('0.0.0.0');
+          expect(wrapper.find('.js-clipboard-btn').attributes('data-clipboard-text')).toEqual(
+            '0.0.0.0',
+          );
         });
       });
 
       describe('with hostname', () => {
         it('renders hostname with a clipboard button', () => {
-          vm = mountComponent(Applications, {
+          createApp({
             applications: {
               ingress: {
                 title: 'Ingress',
@@ -257,19 +252,18 @@ describe('Applications', () => {
             },
           });
 
-          expect(vm.$el.querySelector('.js-endpoint').value).toEqual('localhost.localdomain');
+          expect(wrapper.find('.js-endpoint').element.value).toEqual('localhost.localdomain');
 
-          expect(
-            vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'),
-          ).toEqual('localhost.localdomain');
+          expect(wrapper.find('.js-clipboard-btn').attributes('data-clipboard-text')).toEqual(
+            'localhost.localdomain',
+          );
         });
       });
 
       describe('without ip address', () => {
         it('renders an input text with a loading icon and an alert text', () => {
-          vm = mountComponent(Applications, {
+          createApp({
             applications: {
-              ...APPLICATIONS_MOCK_STATE,
               ingress: {
                 title: 'Ingress',
                 status: 'installed',
@@ -277,142 +271,139 @@ describe('Applications', () => {
             },
           });
 
-          expect(vm.$el.querySelector('.js-ingress-ip-loading-icon')).not.toBe(null);
-          expect(vm.$el.querySelector('.js-no-endpoint-message')).not.toBe(null);
+          expect(wrapper.find('.js-ingress-ip-loading-icon').exists()).toBe(true);
+          expect(wrapper.find('.js-no-endpoint-message').exists()).toBe(true);
         });
       });
     });
 
     describe('before installing', () => {
       it('does not render the IP address', () => {
-        vm = mountComponent(Applications, {
-          applications: APPLICATIONS_MOCK_STATE,
-        });
+        createApp();
 
-        expect(vm.$el.textContent).not.toContain('Ingress IP Address');
-        expect(vm.$el.querySelector('.js-endpoint')).toBe(null);
+        expect(wrapper.text()).not.toContain('Ingress IP Address');
+        expect(wrapper.find('.js-endpoint').exists()).toBe(false);
       });
     });
+  });
 
-    describe('Cert-Manager application', () => {
-      describe('when not installed', () => {
-        it('renders email & allows editing', () => {
-          vm = mountComponent(Applications, {
-            applications: {
-              ...APPLICATIONS_MOCK_STATE,
-              cert_manager: {
-                title: 'Cert-Manager',
-                email: 'before@example.com',
-                status: 'installable',
-              },
-            },
-          });
+  describe('Cert-Manager application', () => {
+    it('shows the correct description', () => {
+      createApp();
+      expect(findByTestId('certManagerDescription').element).toMatchSnapshot();
+    });
 
-          expect(vm.$el.querySelector('.js-email').value).toEqual('before@example.com');
-          expect(vm.$el.querySelector('.js-email').getAttribute('readonly')).toBe(null);
+    describe('when not installed', () => {
+      it('renders email & allows editing', () => {
+        createApp({
+          applications: {
+            cert_manager: {
+              title: 'Cert-Manager',
+              email: 'before@example.com',
+              status: 'installable',
+            },
+          },
         });
+
+        expect(wrapper.find('.js-email').element.value).toEqual('before@example.com');
+        expect(wrapper.find('.js-email').attributes('readonly')).toBe(undefined);
       });
+    });
 
-      describe('when installed', () => {
-        it('renders email in readonly', () => {
-          vm = mountComponent(Applications, {
-            applications: {
-              ...APPLICATIONS_MOCK_STATE,
-              cert_manager: {
-                title: 'Cert-Manager',
-                email: 'after@example.com',
-                status: 'installed',
-              },
+    describe('when installed', () => {
+      it('renders email in readonly', () => {
+        createApp({
+          applications: {
+            cert_manager: {
+              title: 'Cert-Manager',
+              email: 'after@example.com',
+              status: 'installed',
             },
-          });
-
-          expect(vm.$el.querySelector('.js-email').value).toEqual('after@example.com');
-          expect(vm.$el.querySelector('.js-email').getAttribute('readonly')).toEqual('readonly');
+          },
         });
+
+        expect(wrapper.find('.js-email').element.value).toEqual('after@example.com');
+        expect(wrapper.find('.js-email').attributes('readonly')).toEqual('readonly');
       });
     });
+  });
 
-    describe('Jupyter application', () => {
-      describe('with ingress installed with ip & jupyter installable', () => {
-        it('renders hostname active input', () => {
-          vm = mountComponent(Applications, {
-            applications: {
-              ...APPLICATIONS_MOCK_STATE,
-              ingress: {
-                title: 'Ingress',
-                status: 'installed',
-                externalIp: '1.1.1.1',
-              },
+  describe('Jupyter application', () => {
+    describe('with ingress installed with ip & jupyter installable', () => {
+      it('renders hostname active input', () => {
+        createApp({
+          applications: {
+            ingress: {
+              title: 'Ingress',
+              status: 'installed',
+              externalIp: '1.1.1.1',
             },
-          });
-
-          expect(
-            vm.$el
-              .querySelector('.js-cluster-application-row-jupyter .js-hostname')
-              .getAttribute('readonly'),
-          ).toEqual(null);
+          },
         });
-      });
 
-      describe('with ingress installed without external ip', () => {
-        it('does not render hostname input', () => {
-          vm = mountComponent(Applications, {
-            applications: {
-              ...APPLICATIONS_MOCK_STATE,
-              ingress: { title: 'Ingress', status: 'installed' },
-            },
-          });
+        expect(
+          wrapper.find('.js-cluster-application-row-jupyter .js-hostname').attributes('readonly'),
+        ).toEqual(undefined);
+      });
+    });
 
-          expect(vm.$el.querySelector('.js-cluster-application-row-jupyter .js-hostname')).toBe(
-            null,
-          );
+    describe('with ingress installed without external ip', () => {
+      it('does not render hostname input', () => {
+        createApp({
+          applications: {
+            ingress: { title: 'Ingress', status: 'installed' },
+          },
         });
-      });
 
-      describe('with ingress & jupyter installed', () => {
-        it('renders readonly input', () => {
-          vm = mountComponent(Applications, {
-            applications: {
-              ...APPLICATIONS_MOCK_STATE,
-              ingress: { title: 'Ingress', status: 'installed', externalIp: '1.1.1.1' },
-              jupyter: { title: 'JupyterHub', status: 'installed', hostname: '' },
-            },
-          });
+        expect(wrapper.find('.js-cluster-application-row-jupyter .js-hostname').exists()).toBe(
+          false,
+        );
+      });
+    });
 
-          expect(
-            vm.$el
-              .querySelector('.js-cluster-application-row-jupyter .js-hostname')
-              .getAttribute('readonly'),
-          ).toEqual('readonly');
+    describe('with ingress & jupyter installed', () => {
+      it('renders readonly input', () => {
+        createApp({
+          applications: {
+            ingress: { title: 'Ingress', status: 'installed', externalIp: '1.1.1.1' },
+            jupyter: { title: 'JupyterHub', status: 'installed', hostname: '' },
+          },
         });
+
+        expect(
+          wrapper.find('.js-cluster-application-row-jupyter .js-hostname').attributes('readonly'),
+        ).toEqual('readonly');
       });
+    });
 
-      describe('without ingress installed', () => {
-        beforeEach(() => {
-          vm = mountComponent(Applications, {
-            applications: APPLICATIONS_MOCK_STATE,
-          });
-        });
+    describe('without ingress installed', () => {
+      beforeEach(() => {
+        createApp();
+      });
 
-        it('does not render input', () => {
-          expect(vm.$el.querySelector('.js-cluster-application-row-jupyter .js-hostname')).toBe(
-            null,
-          );
-        });
+      it('does not render input', () => {
+        expect(wrapper.find('.js-cluster-application-row-jupyter .js-hostname').exists()).toBe(
+          false,
+        );
+      });
 
-        it('renders disabled install button', () => {
-          expect(
-            vm.$el
-              .querySelector(
-                '.js-cluster-application-row-jupyter .js-cluster-application-install-button',
-              )
-              .getAttribute('disabled'),
-          ).toEqual('disabled');
-        });
+      it('renders disabled install button', () => {
+        expect(
+          wrapper
+            .find('.js-cluster-application-row-jupyter .js-cluster-application-install-button')
+            .attributes('disabled'),
+        ).toEqual('disabled');
       });
     });
   });
 
+  describe('Prometheus application', () => {
+    it('shows the correct description', () => {
+      createApp();
+      expect(findByTestId('prometheusDescription').element).toMatchSnapshot();
+    });
+  });
+
   describe('Knative application', () => {
     const availableDomain = {
       id: 4,
@@ -420,7 +411,6 @@ describe('Applications', () => {
     };
     const propsData = {
       applications: {
-        ...APPLICATIONS_MOCK_STATE,
         knative: {
           title: 'Knative',
           hostname: 'example.com',
@@ -432,18 +422,25 @@ describe('Applications', () => {
         },
       },
     };
-    let wrapper;
     let knativeDomainEditor;
 
     beforeEach(() => {
-      wrapper = shallowMount(Applications, { propsData });
+      createShallowApp(propsData);
       jest.spyOn(eventHub, '$emit');
 
       knativeDomainEditor = wrapper.find(KnativeDomainEditor);
     });
 
-    afterEach(() => {
-      wrapper.destroy();
+    it('shows the correct description', async () => {
+      createApp();
+      wrapper.setProps({
+        providerType: PROVIDER_TYPE.GCP,
+        preInstalledKnative: true,
+      });
+
+      await wrapper.vm.$nextTick();
+
+      expect(findByTestId('installedVia').element).toMatchSnapshot();
     });
 
     it('emits saveKnativeDomain event when knative domain editor emits save event', () => {
@@ -492,7 +489,6 @@ describe('Applications', () => {
   describe('Crossplane application', () => {
     const propsData = {
       applications: {
-        ...APPLICATIONS_MOCK_STATE,
         crossplane: {
           title: 'Crossplane',
           stack: {
@@ -502,74 +498,58 @@ describe('Applications', () => {
       },
     };
 
-    let wrapper;
-    beforeEach(() => {
-      wrapper = shallowMount(Applications, { propsData });
-    });
-    afterEach(() => {
-      wrapper.destroy();
-    });
+    beforeEach(() => createShallowApp(propsData));
+
     it('renders the correct Component', () => {
       const crossplane = wrapper.find(CrossplaneProviderStack);
       expect(crossplane.exists()).toBe(true);
     });
+
+    it('shows the correct description', () => {
+      createApp();
+      expect(findByTestId('crossplaneDescription').element).toMatchSnapshot();
+    });
   });
 
   describe('Elastic Stack application', () => {
     describe('with elastic stack installable', () => {
       it('renders hostname active input', () => {
-        vm = mountComponent(Applications, {
-          applications: {
-            ...APPLICATIONS_MOCK_STATE,
-          },
-        });
+        createApp();
 
         expect(
-          vm.$el
-            .querySelector(
+          wrapper
+            .find(
               '.js-cluster-application-row-elastic_stack .js-cluster-application-install-button',
             )
-            .getAttribute('disabled'),
+            .attributes('disabled'),
         ).toEqual('disabled');
       });
     });
 
     describe('elastic stack installed', () => {
       it('renders uninstall button', () => {
-        vm = mountComponent(Applications, {
+        createApp({
           applications: {
-            ...APPLICATIONS_MOCK_STATE,
             elastic_stack: { title: 'Elastic Stack', status: 'installed' },
           },
         });
 
         expect(
-          vm.$el
-            .querySelector(
+          wrapper
+            .find(
               '.js-cluster-application-row-elastic_stack .js-cluster-application-install-button',
             )
-            .getAttribute('disabled'),
+            .attributes('disabled'),
         ).toEqual('disabled');
       });
     });
   });
 
   describe('Fluentd application', () => {
-    const propsData = {
-      applications: {
-        ...APPLICATIONS_MOCK_STATE,
-      },
-    };
+    beforeEach(() => createShallowApp());
 
-    let wrapper;
-    beforeEach(() => {
-      wrapper = shallowMount(Applications, { propsData });
-    });
-    afterEach(() => {
-      wrapper.destroy();
-    });
     it('renders the correct Component', () => {
-      expect(wrapper.contains(FluentdOutputSettings)).toBe(true);
+      expect(wrapper.find(FluentdOutputSettings).exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/clusters/components/fluentd_output_settings_spec.js b/spec/frontend/clusters/components/fluentd_output_settings_spec.js
index 5e27cc49049..f03f2535947 100644
--- a/spec/frontend/clusters/components/fluentd_output_settings_spec.js
+++ b/spec/frontend/clusters/components/fluentd_output_settings_spec.js
@@ -70,12 +70,12 @@ describe('FluentdOutputSettings', () => {
     });
 
     describe.each`
-      desc                                     | changeFn                                                       | key                   | value
-      ${'when protocol dropdown is triggered'} | ${() => changeProtocol(1)}                                     | ${'protocol'}         | ${'udp'}
-      ${'when host is changed'}                | ${() => changeHost('test-host')}                               | ${'host'}             | ${'test-host'}
-      ${'when port is changed'}                | ${() => changePort(123)}                                       | ${'port'}             | ${123}
-      ${'when wafLogEnabled changes'}          | ${() => changeCheckbox(findCheckbox('Send ModSecurity Logs'))} | ${'wafLogEnabled'}    | ${!defaultSettings.wafLogEnabled}
-      ${'when ciliumLogEnabled changes'}       | ${() => changeCheckbox(findCheckbox('Send Cilium Logs'))}      | ${'ciliumLogEnabled'} | ${!defaultSettings.ciliumLogEnabled}
+      desc                                     | changeFn                                                                      | key                   | value
+      ${'when protocol dropdown is triggered'} | ${() => changeProtocol(1)}                                                    | ${'protocol'}         | ${'udp'}
+      ${'when host is changed'}                | ${() => changeHost('test-host')}                                              | ${'host'}             | ${'test-host'}
+      ${'when port is changed'}                | ${() => changePort(123)}                                                      | ${'port'}             | ${123}
+      ${'when wafLogEnabled changes'}          | ${() => changeCheckbox(findCheckbox('Send Web Application Firewall Logs'))}   | ${'wafLogEnabled'}    | ${!defaultSettings.wafLogEnabled}
+      ${'when ciliumLogEnabled changes'}       | ${() => changeCheckbox(findCheckbox('Send Container Network Policies Logs'))} | ${'ciliumLogEnabled'} | ${!defaultSettings.ciliumLogEnabled}
     `('$desc', ({ changeFn, key, value }) => {
       beforeEach(() => {
         changeFn();
diff --git a/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js b/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js
new file mode 100644
index 00000000000..dd3aaf6f946
--- /dev/null
+++ b/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js
@@ -0,0 +1,52 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlModal } from '@gitlab/ui';
+import UpdateApplicationConfirmationModal from '~/clusters/components/update_application_confirmation_modal.vue';
+import { ELASTIC_STACK } from '~/clusters/constants';
+
+describe('UpdateApplicationConfirmationModal', () => {
+  let wrapper;
+  const appTitle = 'Elastic stack';
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(UpdateApplicationConfirmationModal, {
+      propsData: { ...props },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  beforeEach(() => {
+    createComponent({ application: ELASTIC_STACK, applicationTitle: appTitle });
+  });
+
+  it(`renders a modal with a title "Update ${appTitle}"`, () => {
+    expect(wrapper.find(GlModal).attributes('title')).toEqual(`Update ${appTitle}`);
+  });
+
+  it(`renders a modal with an ok button labeled "Update ${appTitle}"`, () => {
+    expect(wrapper.find(GlModal).attributes('ok-title')).toEqual(`Update ${appTitle}`);
+  });
+
+  describe('when ok button is clicked', () => {
+    beforeEach(() => {
+      wrapper.find(GlModal).vm.$emit('ok');
+    });
+
+    it('emits confirm event', () =>
+      wrapper.vm.$nextTick().then(() => {
+        expect(wrapper.emitted('confirm')).toBeTruthy();
+      }));
+
+    it('displays a warning text indicating the app will be updated', () => {
+      expect(wrapper.text()).toContain(`You are about to update ${appTitle} on your cluster.`);
+    });
+
+    it('displays a custom warning text depending on the application', () => {
+      expect(wrapper.text()).toContain(
+        `Your Elasticsearch cluster will be re-created during this upgrade. Your logs will be re-indexed, and you will lose historical logs from hosts terminated in the last 30 days.`,
+      );
+    });
+  });
+});
diff --git a/spec/frontend/clusters_list/components/clusters_spec.js b/spec/frontend/clusters_list/components/clusters_spec.js
index e2d2e4b73b3..07faee7e50b 100644
--- a/spec/frontend/clusters_list/components/clusters_spec.js
+++ b/spec/frontend/clusters_list/components/clusters_spec.js
@@ -5,6 +5,7 @@ import MockAdapter from 'axios-mock-adapter';
 import { apiData } from '../mock_data';
 import { mount } from '@vue/test-utils';
 import { GlLoadingIcon, GlTable, GlPagination } from '@gitlab/ui';
+import * as Sentry from '@sentry/browser';
 
 describe('Clusters', () => {
   let mock;
@@ -13,6 +14,13 @@ describe('Clusters', () => {
 
   const endpoint = 'some/endpoint';
 
+  const entryData = {
+    endpoint,
+    imgTagsAwsText: 'AWS Icon',
+    imgTagsDefaultText: 'Default Icon',
+    imgTagsGcpText: 'GCP Icon',
+  };
+
   const findLoader = () => wrapper.find(GlLoadingIcon);
   const findPaginatedButtons = () => wrapper.find(GlPagination);
   const findTable = () => wrapper.find(GlTable);
@@ -23,18 +31,26 @@ describe('Clusters', () => {
   };
 
   const mountWrapper = () => {
-    store = ClusterStore({ endpoint });
+    store = ClusterStore(entryData);
     wrapper = mount(Clusters, { store });
     return axios.waitForAll();
   };
 
+  const paginationHeader = (total = apiData.clusters.length, perPage = 20, currentPage = 1) => {
+    return {
+      'x-total': total,
+      'x-per-page': perPage,
+      'x-page': currentPage,
+    };
+  };
+
+  let captureException;
+
   beforeEach(() => {
+    captureException = jest.spyOn(Sentry, 'captureException');
+
     mock = new MockAdapter(axios);
-    mockPollingApi(200, apiData, {
-      'x-total': apiData.clusters.length,
-      'x-per-page': 20,
-      'x-page': 1,
-    });
+    mockPollingApi(200, apiData, paginationHeader());
 
     return mountWrapper();
   });
@@ -42,6 +58,7 @@ describe('Clusters', () => {
   afterEach(() => {
     wrapper.destroy();
     mock.restore();
+    captureException.mockRestore();
   });
 
   describe('clusters table', () => {
@@ -77,25 +94,108 @@ describe('Clusters', () => {
     });
   });
 
+  describe('cluster icon', () => {
+    it.each`
+      providerText      | lineNumber
+      ${'GCP Icon'}     | ${0}
+      ${'AWS Icon'}     | ${1}
+      ${'Default Icon'} | ${2}
+      ${'Default Icon'} | ${3}
+      ${'Default Icon'} | ${4}
+      ${'Default Icon'} | ${5}
+    `('renders provider image and alt text for each cluster', ({ providerText, lineNumber }) => {
+      const images = findTable().findAll('.js-status img');
+      const image = images.at(lineNumber);
+
+      expect(image.attributes('alt')).toBe(providerText);
+    });
+  });
+
   describe('cluster status', () => {
     it.each`
-      statusName                  | className       | lineNumber
-      ${'disabled'}               | ${'disabled'}   | ${0}
-      ${'unreachable'}            | ${'bg-danger'}  | ${1}
-      ${'authentication_failure'} | ${'bg-warning'} | ${2}
-      ${'deleting'}               | ${null}         | ${3}
-      ${'created'}                | ${'bg-success'} | ${4}
-      ${'default'}                | ${'bg-white'}   | ${5}
-    `('renders a status for each cluster', ({ statusName, className, lineNumber }) => {
-      const statuses = findStatuses();
-      const status = statuses.at(lineNumber);
-      if (statusName !== 'deleting') {
-        const statusIndicator = status.find('.cluster-status-indicator');
-        expect(statusIndicator.exists()).toBe(true);
-        expect(statusIndicator.classes()).toContain(className);
-      } else {
-        expect(status.find(GlLoadingIcon).exists()).toBe(true);
-      }
+      statusName    | lineNumber | result
+      ${'creating'} | ${0}       | ${true}
+      ${null}       | ${1}       | ${false}
+      ${null}       | ${2}       | ${false}
+      ${'deleting'} | ${3}       | ${true}
+      ${null}       | ${4}       | ${false}
+      ${null}       | ${5}       | ${false}
+    `(
+      'renders $result when status=$statusName and lineNumber=$lineNumber',
+      ({ lineNumber, result }) => {
+        const statuses = findStatuses();
+        const status = statuses.at(lineNumber);
+        expect(status.find(GlLoadingIcon).exists()).toBe(result);
+      },
+    );
+  });
+
+  describe('nodes present', () => {
+    it.each`
+      nodeSize     | lineNumber
+      ${'Unknown'} | ${0}
+      ${'1'}       | ${1}
+      ${'2'}       | ${2}
+      ${'1'}       | ${3}
+      ${'1'}       | ${4}
+      ${'Unknown'} | ${5}
+    `('renders node size for each cluster', ({ nodeSize, lineNumber }) => {
+      const sizes = findTable().findAll('td:nth-child(3)');
+      const size = sizes.at(lineNumber);
+
+      expect(size.text()).toBe(nodeSize);
+    });
+
+    describe('nodes with unknown quantity', () => {
+      it('notifies Sentry about all missing quantity types', () => {
+        expect(captureException).toHaveBeenCalledTimes(8);
+      });
+
+      it('notifies Sentry about CPU missing quantity types', () => {
+        const missingCpuTypeError = new Error('UnknownK8sCpuQuantity:1missingCpuUnit');
+
+        expect(captureException).toHaveBeenCalledWith(missingCpuTypeError);
+      });
+
+      it('notifies Sentry about Memory missing quantity types', () => {
+        const missingMemoryTypeError = new Error('UnknownK8sMemoryQuantity:1missingMemoryUnit');
+
+        expect(captureException).toHaveBeenCalledWith(missingMemoryTypeError);
+      });
+    });
+  });
+
+  describe('cluster CPU', () => {
+    it.each`
+      clusterCpu           | lineNumber
+      ${''}                | ${0}
+      ${'1.93 (87% free)'} | ${1}
+      ${'3.87 (86% free)'} | ${2}
+      ${'(% free)'}        | ${3}
+      ${'(% free)'}        | ${4}
+      ${''}                | ${5}
+    `('renders total cpu for each cluster', ({ clusterCpu, lineNumber }) => {
+      const clusterCpus = findTable().findAll('td:nth-child(4)');
+      const cpuData = clusterCpus.at(lineNumber);
+
+      expect(cpuData.text()).toBe(clusterCpu);
+    });
+  });
+
+  describe('cluster Memory', () => {
+    it.each`
+      clusterMemory         | lineNumber
+      ${''}                 | ${0}
+      ${'5.92 (78% free)'}  | ${1}
+      ${'12.86 (79% free)'} | ${2}
+      ${'(% free)'}         | ${3}
+      ${'(% free)'}         | ${4}
+      ${''}                 | ${5}
+    `('renders total memory for each cluster', ({ clusterMemory, lineNumber }) => {
+      const clusterMemories = findTable().findAll('td:nth-child(5)');
+      const memoryData = clusterMemories.at(lineNumber);
+
+      expect(memoryData.text()).toBe(clusterMemory);
     });
   });
 
@@ -105,11 +205,7 @@ describe('Clusters', () => {
     const totalSecondPage = 500;
 
     beforeEach(() => {
-      mockPollingApi(200, apiData, {
-        'x-total': totalFirstPage,
-        'x-per-page': perPage,
-        'x-page': 1,
-      });
+      mockPollingApi(200, apiData, paginationHeader(totalFirstPage, perPage, 1));
       return mountWrapper();
     });
 
@@ -123,11 +219,7 @@ describe('Clusters', () => {
 
     describe('when updating currentPage', () => {
       beforeEach(() => {
-        mockPollingApi(200, apiData, {
-          'x-total': totalSecondPage,
-          'x-per-page': perPage,
-          'x-page': 2,
-        });
+        mockPollingApi(200, apiData, paginationHeader(totalSecondPage, perPage, 2));
         wrapper.setData({ currentPage: 2 });
         return axios.waitForAll();
       });
diff --git a/spec/frontend/clusters_list/mock_data.js b/spec/frontend/clusters_list/mock_data.js
index 9a90a378f31..48af3b91c94 100644
--- a/spec/frontend/clusters_list/mock_data.js
+++ b/spec/frontend/clusters_list/mock_data.js
@@ -1,57 +1,70 @@
 export const clusterList = [
   {
     name: 'My Cluster 1',
-    environmentScope: '*',
-    size: '3',
-    clusterType: 'group_type',
-    status: 'disabled',
-    cpu: '6 (100% free)',
-    memory: '22.50 (30% free)',
+    environment_scope: '*',
+    cluster_type: 'group_type',
+    provider_type: 'gcp',
+    status: 'creating',
+    nodes: null,
   },
   {
     name: 'My Cluster 2',
-    environmentScope: 'development',
-    size: '12',
-    clusterType: 'project_type',
+    environment_scope: 'development',
+    cluster_type: 'project_type',
+    provider_type: 'aws',
     status: 'unreachable',
-    cpu: '3 (50% free)',
-    memory: '11 (60% free)',
+    nodes: [
+      {
+        status: { allocatable: { cpu: '1930m', memory: '5777156Ki' } },
+        usage: { cpu: '246155922n', memory: '1255212Ki' },
+      },
+    ],
   },
   {
     name: 'My Cluster 3',
-    environmentScope: 'development',
-    size: '12',
-    clusterType: 'project_type',
+    environment_scope: 'development',
+    cluster_type: 'project_type',
+    provider_type: 'none',
     status: 'authentication_failure',
-    cpu: '1 (0% free)',
-    memory: '22 (33% free)',
+    nodes: [
+      {
+        status: { allocatable: { cpu: '1930m', memory: '5777156Ki' } },
+        usage: { cpu: '246155922n', memory: '1255212Ki' },
+      },
+      {
+        status: { allocatable: { cpu: '1940m', memory: '6777156Ki' } },
+        usage: { cpu: '307051934n', memory: '1379136Ki' },
+      },
+    ],
   },
   {
     name: 'My Cluster 4',
-    environmentScope: 'production',
-    size: '12',
-    clusterType: 'project_type',
+    environment_scope: 'production',
+    cluster_type: 'project_type',
     status: 'deleting',
-    cpu: '6 (100% free)',
-    memory: '45 (15% free)',
+    nodes: [
+      {
+        status: { allocatable: { cpu: '1missingCpuUnit', memory: '1missingMemoryUnit' } },
+        usage: { cpu: '1missingCpuUnit', memory: '1missingMemoryUnit' },
+      },
+    ],
   },
   {
     name: 'My Cluster 5',
-    environmentScope: 'development',
-    size: '12',
-    clusterType: 'project_type',
+    environment_scope: 'development',
+    cluster_type: 'project_type',
     status: 'created',
-    cpu: '6 (100% free)',
-    memory: '20.12 (35% free)',
+    nodes: [
+      {
+        status: { allocatable: { cpu: '1missingCpuUnit', memory: '1missingMemoryUnit' } },
+      },
+    ],
   },
   {
     name: 'My Cluster 6',
-    environmentScope: '*',
-    size: '1',
-    clusterType: 'project_type',
+    environment_scope: '*',
+    cluster_type: 'project_type',
     status: 'cleanup_ongoing',
-    cpu: '6 (100% free)',
-    memory: '20.12 (35% free)',
   },
 ];
 
diff --git a/spec/frontend/clusters_list/store/actions_spec.js b/spec/frontend/clusters_list/store/actions_spec.js
index 70766af3ec4..74e351a3704 100644
--- a/spec/frontend/clusters_list/store/actions_spec.js
+++ b/spec/frontend/clusters_list/store/actions_spec.js
@@ -1,10 +1,14 @@
 import MockAdapter from 'axios-mock-adapter';
+import Poll from '~/lib/utils/poll';
 import flashError from '~/flash';
 import testAction from 'helpers/vuex_action_helper';
 import axios from '~/lib/utils/axios_utils';
+import waitForPromises from 'helpers/wait_for_promises';
 import { apiData } from '../mock_data';
+import { MAX_REQUESTS } from '~/clusters_list/constants';
 import * as types from '~/clusters_list/store/mutation_types';
 import * as actions from '~/clusters_list/store/actions';
+import * as Sentry from '@sentry/browser';
 
 jest.mock('~/flash.js');
 
@@ -12,6 +16,24 @@ describe('Clusters store actions', () => {
   describe('fetchClusters', () => {
     let mock;
 
+    const headers = {
+      'x-next-page': 1,
+      'x-total': apiData.clusters.length,
+      'x-total-pages': 1,
+      'x-per-page': 20,
+      'x-page': 1,
+      'x-prev-page': 1,
+    };
+
+    const paginationInformation = {
+      nextPage: 1,
+      page: 1,
+      perPage: 20,
+      previousPage: 1,
+      total: apiData.clusters.length,
+      totalPages: 1,
+    };
+
     beforeEach(() => {
       mock = new MockAdapter(axios);
     });
@@ -19,21 +41,6 @@ describe('Clusters store actions', () => {
     afterEach(() => mock.restore());
 
     it('should commit SET_CLUSTERS_DATA with received response', done => {
-      const headers = {
-        'x-total': apiData.clusters.length,
-        'x-per-page': 20,
-        'x-page': 1,
-      };
-
-      const paginationInformation = {
-        nextPage: NaN,
-        page: 1,
-        perPage: 20,
-        previousPage: NaN,
-        total: apiData.clusters.length,
-        totalPages: NaN,
-      };
-
       mock.onGet().reply(200, apiData, headers);
 
       testAction(
@@ -52,9 +59,110 @@ describe('Clusters store actions', () => {
     it('should show flash on API error', done => {
       mock.onGet().reply(400, 'Not Found');
 
-      testAction(actions.fetchClusters, { endpoint: apiData.endpoint }, {}, [], [], () => {
-        expect(flashError).toHaveBeenCalledWith(expect.stringMatching('error'));
-        done();
+      testAction(
+        actions.fetchClusters,
+        { endpoint: apiData.endpoint },
+        {},
+        [{ type: types.SET_LOADING_STATE, payload: false }],
+        [],
+        () => {
+          expect(flashError).toHaveBeenCalledWith(expect.stringMatching('error'));
+          done();
+        },
+      );
+    });
+
+    describe('multiple api requests', () => {
+      let captureException;
+      let pollRequest;
+      let pollStop;
+
+      const pollInterval = 10;
+      const pollHeaders = { 'poll-interval': pollInterval, ...headers };
+
+      beforeEach(() => {
+        captureException = jest.spyOn(Sentry, 'captureException');
+        pollRequest = jest.spyOn(Poll.prototype, 'makeRequest');
+        pollStop = jest.spyOn(Poll.prototype, 'stop');
+
+        mock.onGet().reply(200, apiData, pollHeaders);
+      });
+
+      afterEach(() => {
+        captureException.mockRestore();
+        pollRequest.mockRestore();
+        pollStop.mockRestore();
+      });
+
+      it('should stop polling after MAX Requests', done => {
+        testAction(
+          actions.fetchClusters,
+          { endpoint: apiData.endpoint },
+          {},
+          [
+            { type: types.SET_CLUSTERS_DATA, payload: { data: apiData, paginationInformation } },
+            { type: types.SET_LOADING_STATE, payload: false },
+          ],
+          [],
+          () => {
+            expect(pollRequest).toHaveBeenCalledTimes(1);
+            expect(pollStop).toHaveBeenCalledTimes(0);
+            jest.advanceTimersByTime(pollInterval);
+
+            waitForPromises()
+              .then(() => {
+                expect(pollRequest).toHaveBeenCalledTimes(2);
+                expect(pollStop).toHaveBeenCalledTimes(0);
+                jest.advanceTimersByTime(pollInterval);
+              })
+              .then(() => waitForPromises())
+              .then(() => {
+                expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS);
+                expect(pollStop).toHaveBeenCalledTimes(0);
+                jest.advanceTimersByTime(pollInterval);
+              })
+              .then(() => waitForPromises())
+              .then(() => {
+                expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS + 1);
+                // Stops poll once it exceeds the MAX_REQUESTS limit
+                expect(pollStop).toHaveBeenCalledTimes(1);
+                jest.advanceTimersByTime(pollInterval);
+              })
+              .then(() => waitForPromises())
+              .then(() => {
+                // Additional poll requests are not made once pollStop is called
+                expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS + 1);
+                expect(pollStop).toHaveBeenCalledTimes(1);
+              })
+              .then(done)
+              .catch(done.fail);
+          },
+        );
+      });
+
+      it('should stop polling and report to Sentry when data is invalid', done => {
+        const badApiResponse = { clusters: {} };
+        mock.onGet().reply(200, badApiResponse, pollHeaders);
+
+        testAction(
+          actions.fetchClusters,
+          { endpoint: apiData.endpoint },
+          {},
+          [
+            {
+              type: types.SET_CLUSTERS_DATA,
+              payload: { data: badApiResponse, paginationInformation },
+            },
+            { type: types.SET_LOADING_STATE, payload: false },
+          ],
+          [],
+          () => {
+            expect(pollRequest).toHaveBeenCalledTimes(1);
+            expect(pollStop).toHaveBeenCalledTimes(1);
+            expect(captureException).toHaveBeenCalledTimes(1);
+            done();
+          },
+        );
       });
     });
   });
diff --git a/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap b/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
index c9fdd388585..7079ddfc2ab 100644
--- a/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
+++ b/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
@@ -16,7 +16,27 @@ exports[`Code navigation popover component renders popover 1`] = `
     <pre
       class="border-0 bg-transparent m-0 code highlight"
     >
-      console.log
+      <span
+        class="line"
+        lang="javascript"
+      >
+        <span
+          class="k"
+        >
+          function
+        </span>
+        <span>
+           main() {
+        </span>
+      </span>
+      <span
+        class="line"
+        lang="javascript"
+      >
+        <span>
+          }
+        </span>
+      </span>
     </pre>
   </div>
    
diff --git a/spec/frontend/code_navigation/components/popover_spec.js b/spec/frontend/code_navigation/components/popover_spec.js
index 858e94cf155..b3f814f1be4 100644
--- a/spec/frontend/code_navigation/components/popover_spec.js
+++ b/spec/frontend/code_navigation/components/popover_spec.js
@@ -1,5 +1,6 @@
 import { shallowMount } from '@vue/test-utils';
 import Popover from '~/code_navigation/components/popover.vue';
+import DocLine from '~/code_navigation/components/doc_line.vue';
 
 const DEFINITION_PATH_PREFIX = 'http://gitlab.com';
 
@@ -7,7 +8,22 @@ const MOCK_CODE_DATA = Object.freeze({
   hover: [
     {
       language: 'javascript',
-      value: 'console.log',
+      tokens: [
+        [
+          {
+            class: 'k',
+            value: 'function',
+          },
+          {
+            value: ' main() {',
+          },
+        ],
+        [
+          {
+            value: '}',
+          },
+        ],
+      ],
     },
   ],
   definition_path: 'test.js#L20',
@@ -28,6 +44,7 @@ let wrapper;
 function factory({ position, data, definitionPathPrefix, blobPath = 'index.js' }) {
   wrapper = shallowMount(Popover, {
     propsData: { position, data, definitionPathPrefix, blobPath },
+    stubs: { DocLine },
   });
 }
 
diff --git a/spec/javascripts/collapsed_sidebar_todo_spec.js b/spec/frontend/collapsed_sidebar_todo_spec.js
index f2eb08fa198..0ea797ce4b3 100644
--- a/spec/javascripts/collapsed_sidebar_todo_spec.js
+++ b/spec/frontend/collapsed_sidebar_todo_spec.js
@@ -3,7 +3,8 @@ import { clone } from 'lodash';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import Sidebar from '~/right_sidebar';
-import timeoutPromise from './helpers/set_timeout_promise_helper';
+import waitForPromises from './helpers/wait_for_promises';
+import { TEST_HOST } from 'spec/test_constants';
 
 describe('Issuable right sidebar collapsed todo toggle', () => {
   const fixtureName = 'issues/open-issue.html';
@@ -23,7 +24,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
 
     mock = new MockAdapter(axios);
 
-    mock.onPost(`${gl.TEST_HOST}/frontend-fixtures/issues-project/todos`).reply(() => {
+    mock.onPost(`${TEST_HOST}/frontend-fixtures/issues-project/todos`).reply(() => {
       const response = clone(todoData);
 
       return [200, response];
@@ -64,7 +65,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
   it('toggle todo state', done => {
     document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
 
-    setTimeout(() => {
+    setImmediate(() => {
       expect(
         document.querySelector('.js-issuable-todo.sidebar-collapsed-icon .todo-undone'),
       ).not.toBeNull();
@@ -82,7 +83,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
   it('toggle todo state of expanded todo toggle', done => {
     document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
 
-    setTimeout(() => {
+    setImmediate(() => {
       expect(
         document.querySelector('.issuable-sidebar-header .js-issuable-todo').textContent.trim(),
       ).toBe('Mark as done');
@@ -94,7 +95,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
   it('toggles todo button tooltip', done => {
     document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
 
-    setTimeout(() => {
+    setImmediate(() => {
       expect(
         document
           .querySelector('.js-issuable-todo.sidebar-collapsed-icon')
@@ -108,7 +109,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
   it('marks todo as done', done => {
     document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
 
-    timeoutPromise()
+    waitForPromises()
       .then(() => {
         expect(
           document.querySelector('.js-issuable-todo.sidebar-collapsed-icon .todo-undone'),
@@ -116,7 +117,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
 
         document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
       })
-      .then(timeoutPromise)
+      .then(waitForPromises)
       .then(() => {
         expect(
           document.querySelector('.js-issuable-todo.sidebar-collapsed-icon .todo-undone'),
@@ -133,7 +134,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
   it('updates aria-label to Mark as done', done => {
     document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
 
-    setTimeout(() => {
+    setImmediate(() => {
       expect(
         document
           .querySelector('.js-issuable-todo.sidebar-collapsed-icon')
@@ -147,7 +148,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
   it('updates aria-label to add todo', done => {
     document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
 
-    timeoutPromise()
+    waitForPromises()
       .then(() => {
         expect(
           document
@@ -157,7 +158,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
 
         document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').click();
       })
-      .then(timeoutPromise)
+      .then(waitForPromises)
       .then(() => {
         expect(
           document
diff --git a/spec/frontend/comment_type_toggle_spec.js b/spec/frontend/comment_type_toggle_spec.js
new file mode 100644
index 00000000000..06dbfac1803
--- /dev/null
+++ b/spec/frontend/comment_type_toggle_spec.js
@@ -0,0 +1,169 @@
+import CommentTypeToggle from '~/comment_type_toggle';
+import DropLab from '~/droplab/drop_lab';
+import InputSetter from '~/droplab/plugins/input_setter';
+
+describe('CommentTypeToggle', () => {
+  const testContext = {};
+
+  describe('class constructor', () => {
+    beforeEach(() => {
+      testContext.dropdownTrigger = {};
+      testContext.dropdownList = {};
+      testContext.noteTypeInput = {};
+      testContext.submitButton = {};
+      testContext.closeButton = {};
+
+      testContext.commentTypeToggle = new CommentTypeToggle({
+        dropdownTrigger: testContext.dropdownTrigger,
+        dropdownList: testContext.dropdownList,
+        noteTypeInput: testContext.noteTypeInput,
+        submitButton: testContext.submitButton,
+        closeButton: testContext.closeButton,
+      });
+    });
+
+    it('should set .dropdownTrigger', () => {
+      expect(testContext.commentTypeToggle.dropdownTrigger).toBe(testContext.dropdownTrigger);
+    });
+
+    it('should set .dropdownList', () => {
+      expect(testContext.commentTypeToggle.dropdownList).toBe(testContext.dropdownList);
+    });
+
+    it('should set .noteTypeInput', () => {
+      expect(testContext.commentTypeToggle.noteTypeInput).toBe(testContext.noteTypeInput);
+    });
+
+    it('should set .submitButton', () => {
+      expect(testContext.commentTypeToggle.submitButton).toBe(testContext.submitButton);
+    });
+
+    it('should set .closeButton', () => {
+      expect(testContext.commentTypeToggle.closeButton).toBe(testContext.closeButton);
+    });
+
+    it('should set .reopenButton', () => {
+      expect(testContext.commentTypeToggle.reopenButton).toBe(testContext.reopenButton);
+    });
+  });
+
+  describe('initDroplab', () => {
+    beforeEach(() => {
+      testContext.commentTypeToggle = {
+        dropdownTrigger: {},
+        dropdownList: {},
+        noteTypeInput: {},
+        submitButton: {},
+        closeButton: {},
+        setConfig: () => {},
+      };
+      testContext.config = {};
+
+      jest.spyOn(DropLab.prototype, 'init').mockImplementation();
+      jest.spyOn(DropLab.prototype, 'constructor').mockImplementation();
+
+      jest.spyOn(testContext.commentTypeToggle, 'setConfig').mockReturnValue(testContext.config);
+
+      CommentTypeToggle.prototype.initDroplab.call(testContext.commentTypeToggle);
+    });
+
+    it('should instantiate a DropLab instance and set .droplab', () => {
+      expect(testContext.commentTypeToggle.droplab instanceof DropLab).toBe(true);
+    });
+
+    it('should call .setConfig', () => {
+      expect(testContext.commentTypeToggle.setConfig).toHaveBeenCalled();
+    });
+
+    it('should call DropLab.prototype.init', () => {
+      expect(DropLab.prototype.init).toHaveBeenCalledWith(
+        testContext.commentTypeToggle.dropdownTrigger,
+        testContext.commentTypeToggle.dropdownList,
+        [InputSetter],
+        testContext.config,
+      );
+    });
+  });
+
+  describe('setConfig', () => {
+    describe('if no .closeButton is provided', () => {
+      beforeEach(() => {
+        testContext.commentTypeToggle = {
+          dropdownTrigger: {},
+          dropdownList: {},
+          noteTypeInput: {},
+          submitButton: {},
+          reopenButton: {},
+        };
+
+        testContext.setConfig = CommentTypeToggle.prototype.setConfig.call(
+          testContext.commentTypeToggle,
+        );
+      });
+
+      it('should not add .closeButton related InputSetter config', () => {
+        expect(testContext.setConfig).toEqual({
+          InputSetter: [
+            {
+              input: testContext.commentTypeToggle.noteTypeInput,
+              valueAttribute: 'data-value',
+            },
+            {
+              input: testContext.commentTypeToggle.submitButton,
+              valueAttribute: 'data-submit-text',
+            },
+            {
+              input: testContext.commentTypeToggle.reopenButton,
+              valueAttribute: 'data-reopen-text',
+            },
+            {
+              input: testContext.commentTypeToggle.reopenButton,
+              valueAttribute: 'data-reopen-text',
+              inputAttribute: 'data-alternative-text',
+            },
+          ],
+        });
+      });
+    });
+
+    describe('if no .reopenButton is provided', () => {
+      beforeEach(() => {
+        testContext.commentTypeToggle = {
+          dropdownTrigger: {},
+          dropdownList: {},
+          noteTypeInput: {},
+          submitButton: {},
+          closeButton: {},
+        };
+
+        testContext.setConfig = CommentTypeToggle.prototype.setConfig.call(
+          testContext.commentTypeToggle,
+        );
+      });
+
+      it('should not add .reopenButton related InputSetter config', () => {
+        expect(testContext.setConfig).toEqual({
+          InputSetter: [
+            {
+              input: testContext.commentTypeToggle.noteTypeInput,
+              valueAttribute: 'data-value',
+            },
+            {
+              input: testContext.commentTypeToggle.submitButton,
+              valueAttribute: 'data-submit-text',
+            },
+            {
+              input: testContext.commentTypeToggle.closeButton,
+              valueAttribute: 'data-close-text',
+            },
+            {
+              input: testContext.commentTypeToggle.closeButton,
+              valueAttribute: 'data-close-text',
+              inputAttribute: 'data-alternative-text',
+            },
+          ],
+        });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/confirm_modal_spec.js b/spec/frontend/confirm_modal_spec.js
index 89cfc3ef3a3..b14d1c3e01d 100644
--- a/spec/frontend/confirm_modal_spec.js
+++ b/spec/frontend/confirm_modal_spec.js
@@ -51,7 +51,7 @@ describe('ConfirmModal', () => {
   const findModalOkButton = (modal, variant) =>
     modal.querySelector(`.modal-footer .btn-${variant}`);
   const findModalCancelButton = modal => modal.querySelector('.modal-footer .btn-secondary');
-  const modalIsHidden = () => findModal().getAttribute('aria-hidden') === 'true';
+  const modalIsHidden = () => findModal() === null;
 
   const serializeModal = (modal, buttonIndex) => {
     const { modalAttributes } = buttons[buttonIndex];
@@ -101,7 +101,9 @@ describe('ConfirmModal', () => {
         });
 
         it('closes the modal', () => {
-          expect(modalIsHidden()).toBe(true);
+          setImmediate(() => {
+            expect(modalIsHidden()).toBe(true);
+          });
         });
       });
     });
diff --git a/spec/frontend/contributors/component/__snapshots__/contributors_spec.js.snap b/spec/frontend/contributors/component/__snapshots__/contributors_spec.js.snap
index fafffcb6e0c..a5eb42e0f08 100644
--- a/spec/frontend/contributors/component/__snapshots__/contributors_spec.js.snap
+++ b/spec/frontend/contributors/component/__snapshots__/contributors_spec.js.snap
@@ -20,7 +20,10 @@ exports[`Contributors charts should render charts when loading completed and the
         height="264"
         includelegendavgmax="true"
         legendaveragetext="Avg"
+        legendcurrenttext="Current"
+        legendlayout="inline"
         legendmaxtext="Max"
+        legendmintext="Min"
         option="[object Object]"
         thresholds=""
         width="0"
@@ -48,7 +51,10 @@ exports[`Contributors charts should render charts when loading completed and the
             height="216"
             includelegendavgmax="true"
             legendaveragetext="Avg"
+            legendcurrenttext="Current"
+            legendlayout="inline"
             legendmaxtext="Max"
+            legendmintext="Min"
             option="[object Object]"
             thresholds=""
             width="0"
diff --git a/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js b/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js
index 1139f094705..01f7ada9cd6 100644
--- a/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js
+++ b/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js
@@ -1,4 +1,5 @@
 import testAction from 'helpers/vuex_action_helper';
+import { useMockLocationHelper } from 'helpers/mock_window_location_helper';
 import MockAdapter from 'axios-mock-adapter';
 import createState from '~/create_cluster/eks_cluster/store/state';
 import * as actions from '~/create_cluster/eks_cluster/store/actions';
@@ -251,12 +252,7 @@ describe('EKS Cluster Store Actions', () => {
   });
 
   describe('createClusterSuccess', () => {
-    beforeEach(() => {
-      jest.spyOn(window.location, 'assign').mockImplementation(() => {});
-    });
-    afterEach(() => {
-      window.location.assign.mockRestore();
-    });
+    useMockLocationHelper();
 
     it('redirects to the new cluster URL', () => {
       actions.createClusterSuccess(null, newClusterUrl);
diff --git a/spec/frontend/design_management/components/__snapshots__/design_note_pin_spec.js.snap b/spec/frontend/design_management/components/__snapshots__/design_note_pin_spec.js.snap
index 4828e8cb3c2..4c848256e5b 100644
--- a/spec/frontend/design_management/components/__snapshots__/design_note_pin_spec.js.snap
+++ b/spec/frontend/design_management/components/__snapshots__/design_note_pin_spec.js.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Design discussions component should match the snapshot of note when repositioning 1`] = `
+exports[`Design note pin component should match the snapshot of note when repositioning 1`] = `
 <button
   aria-label="Comment form position"
-  class="position-absolute btn-transparent comment-indicator"
+  class="design-pin gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center btn-transparent comment-indicator"
   style="left: 10px; top: 10px; cursor: move;"
   type="button"
 >
@@ -14,10 +14,10 @@ exports[`Design discussions component should match the snapshot of note when rep
 </button>
 `;
 
-exports[`Design discussions component should match the snapshot of note with index 1`] = `
+exports[`Design note pin component should match the snapshot of note with index 1`] = `
 <button
   aria-label="Comment '1' position"
-  class="position-absolute js-image-badge badge badge-pill"
+  class="design-pin gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center js-image-badge badge badge-pill"
   style="left: 10px; top: 10px;"
   type="button"
 >
@@ -27,10 +27,10 @@ exports[`Design discussions component should match the snapshot of note with ind
 </button>
 `;
 
-exports[`Design discussions component should match the snapshot of note without index 1`] = `
+exports[`Design note pin component should match the snapshot of note without index 1`] = `
 <button
   aria-label="Comment form position"
-  class="position-absolute btn-transparent comment-indicator"
+  class="design-pin gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center btn-transparent comment-indicator"
   style="left: 10px; top: 10px;"
   type="button"
 >
diff --git a/spec/frontend/design_management/components/design_note_pin_spec.js b/spec/frontend/design_management/components/design_note_pin_spec.js
index 4f7260b1363..4e045b58a35 100644
--- a/spec/frontend/design_management/components/design_note_pin_spec.js
+++ b/spec/frontend/design_management/components/design_note_pin_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import DesignNotePin from '~/design_management/components/design_note_pin.vue';
 
-describe('Design discussions component', () => {
+describe('Design note pin component', () => {
   let wrapper;
 
   function createComponent(propsData = {}) {
@@ -26,7 +26,7 @@ describe('Design discussions component', () => {
   });
 
   it('should match the snapshot of note with index', () => {
-    createComponent({ label: '1' });
+    createComponent({ label: 1 });
     expect(wrapper.element).toMatchSnapshot();
   });
 
diff --git a/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap b/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
index e071274cc81..b55bacb6fc5 100644
--- a/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
+++ b/spec/frontend/design_management/components/design_notes/__snapshots__/design_note_spec.js.snap
@@ -50,12 +50,18 @@ exports[`Design note component should match the snapshot 1`] = `
       </span>
     </div>
      
-    <!---->
+    <div
+      class="gl-display-flex"
+    >
+       
+      <!---->
+    </div>
   </div>
    
   <div
     class="note-text js-note-text md"
     data-qa-selector="note_content"
   />
+   
 </timeline-entry-item-stub>
 `;
diff --git a/spec/frontend/design_management/components/design_notes/design_discussion_spec.js b/spec/frontend/design_management/components/design_notes/design_discussion_spec.js
index b16b26ff82f..557f53e864f 100644
--- a/spec/frontend/design_management/components/design_notes/design_discussion_spec.js
+++ b/spec/frontend/design_management/components/design_notes/design_discussion_spec.js
@@ -1,16 +1,33 @@
-import { shallowMount } from '@vue/test-utils';
-import { ApolloMutation } from 'vue-apollo';
+import { mount } from '@vue/test-utils';
+import { GlLoadingIcon } from '@gitlab/ui';
+import notes from '../../mock_data/notes';
 import DesignDiscussion from '~/design_management/components/design_notes/design_discussion.vue';
 import DesignNote from '~/design_management/components/design_notes/design_note.vue';
 import DesignReplyForm from '~/design_management/components/design_notes/design_reply_form.vue';
 import createNoteMutation from '~/design_management/graphql/mutations/createNote.mutation.graphql';
+import toggleResolveDiscussionMutation from '~/design_management/graphql/mutations/toggle_resolve_discussion.mutation.graphql';
 import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
+import ToggleRepliesWidget from '~/design_management/components/design_notes/toggle_replies_widget.vue';
+
+const discussion = {
+  id: '0',
+  resolved: false,
+  resolvable: true,
+  notes,
+};
 
 describe('Design discussions component', () => {
   let wrapper;
 
+  const findDesignNotes = () => wrapper.findAll(DesignNote);
   const findReplyPlaceholder = () => wrapper.find(ReplyPlaceholder);
   const findReplyForm = () => wrapper.find(DesignReplyForm);
+  const findRepliesWidget = () => wrapper.find(ToggleRepliesWidget);
+  const findResolveButton = () => wrapper.find('[data-testid="resolve-button"]');
+  const findResolveIcon = () => wrapper.find('[data-testid="resolve-icon"]');
+  const findResolvedMessage = () => wrapper.find('[data-testid="resolved-message"]');
+  const findResolveLoadingIcon = () => wrapper.find(GlLoadingIcon);
+  const findResolveCheckbox = () => wrapper.find('[data-testid="resolve-checkbox"]');
 
   const mutationVariables = {
     mutation: createNoteMutation,
@@ -29,22 +46,14 @@ describe('Design discussions component', () => {
   };
 
   function createComponent(props = {}, data = {}) {
-    wrapper = shallowMount(DesignDiscussion, {
+    wrapper = mount(DesignDiscussion, {
       propsData: {
-        discussion: {
-          id: '0',
-          notes: [
-            {
-              id: '1',
-            },
-            {
-              id: '2',
-            },
-          ],
-        },
+        resolvedDiscussionsExpanded: true,
+        discussion,
         noteableId: 'noteable-id',
         designId: 'design-id',
         discussionIndex: 1,
+        discussionWithOpenForm: '',
         ...props,
       },
       data() {
@@ -52,11 +61,12 @@ describe('Design discussions component', () => {
           ...data,
         };
       },
-      stubs: {
-        ReplyPlaceholder,
-        ApolloMutation,
+      mocks: {
+        $apollo,
+        $route: {
+          hash: '#note_1',
+        },
       },
-      mocks: { $apollo },
     });
   }
 
@@ -64,19 +74,147 @@ describe('Design discussions component', () => {
     wrapper.destroy();
   });
 
-  it('renders correct amount of discussion notes', () => {
-    createComponent();
-    expect(wrapper.findAll(DesignNote)).toHaveLength(2);
+  describe('when discussion is not resolvable', () => {
+    beforeEach(() => {
+      createComponent({
+        discussion: {
+          ...discussion,
+          resolvable: false,
+        },
+      });
+    });
+
+    it('does not render an icon to resolve a thread', () => {
+      expect(findResolveIcon().exists()).toBe(false);
+    });
+
+    it('does not render a checkbox in reply form', () => {
+      findReplyPlaceholder().vm.$emit('onMouseDown');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findResolveCheckbox().exists()).toBe(false);
+      });
+    });
   });
 
-  it('renders reply placeholder by default', () => {
-    createComponent();
-    expect(findReplyPlaceholder().exists()).toBe(true);
+  describe('when discussion is unresolved', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('renders correct amount of discussion notes', () => {
+      expect(findDesignNotes()).toHaveLength(2);
+      expect(findDesignNotes().wrappers.every(w => w.isVisible())).toBe(true);
+    });
+
+    it('renders reply placeholder', () => {
+      expect(findReplyPlaceholder().isVisible()).toBe(true);
+    });
+
+    it('does not render toggle replies widget', () => {
+      expect(findRepliesWidget().exists()).toBe(false);
+    });
+
+    it('renders a correct icon to resolve a thread', () => {
+      expect(findResolveIcon().props('name')).toBe('check-circle');
+    });
+
+    it('renders a checkbox with Resolve thread text in reply form', () => {
+      findReplyPlaceholder().vm.$emit('onClick');
+      wrapper.setProps({ discussionWithOpenForm: discussion.id });
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findResolveCheckbox().text()).toBe('Resolve thread');
+      });
+    });
+
+    it('does not render resolved message', () => {
+      expect(findResolvedMessage().exists()).toBe(false);
+    });
+  });
+
+  describe('when discussion is resolved', () => {
+    beforeEach(() => {
+      createComponent({
+        discussion: {
+          ...discussion,
+          resolved: true,
+          resolvedBy: notes[0].author,
+          resolvedAt: '2020-05-08T07:10:45Z',
+        },
+      });
+    });
+
+    it('shows only the first note', () => {
+      expect(
+        findDesignNotes()
+          .at(0)
+          .isVisible(),
+      ).toBe(true);
+      expect(
+        findDesignNotes()
+          .at(1)
+          .isVisible(),
+      ).toBe(false);
+    });
+
+    it('renders resolved message', () => {
+      expect(findResolvedMessage().exists()).toBe(true);
+    });
+
+    it('does not show renders reply placeholder', () => {
+      expect(findReplyPlaceholder().isVisible()).toBe(false);
+    });
+
+    it('renders toggle replies widget with correct props', () => {
+      expect(findRepliesWidget().exists()).toBe(true);
+      expect(findRepliesWidget().props()).toEqual({
+        collapsed: true,
+        replies: notes.slice(1),
+      });
+    });
+
+    it('renders a correct icon to resolve a thread', () => {
+      expect(findResolveIcon().props('name')).toBe('check-circle-filled');
+    });
+
+    describe('when replies are expanded', () => {
+      beforeEach(() => {
+        findRepliesWidget().vm.$emit('toggle');
+        return wrapper.vm.$nextTick();
+      });
+
+      it('renders replies widget with collapsed prop equal to false', () => {
+        expect(findRepliesWidget().props('collapsed')).toBe(false);
+      });
+
+      it('renders the second note', () => {
+        expect(
+          findDesignNotes()
+            .at(1)
+            .isVisible(),
+        ).toBe(true);
+      });
+
+      it('renders a reply placeholder', () => {
+        expect(findReplyPlaceholder().isVisible()).toBe(true);
+      });
+
+      it('renders a checkbox with Unresolve thread text in reply form', () => {
+        findReplyPlaceholder().vm.$emit('onClick');
+        wrapper.setProps({ discussionWithOpenForm: discussion.id });
+
+        return wrapper.vm.$nextTick().then(() => {
+          expect(findResolveCheckbox().text()).toBe('Unresolve thread');
+        });
+      });
+    });
   });
 
   it('hides reply placeholder and opens form on placeholder click', () => {
     createComponent();
-    findReplyPlaceholder().trigger('click');
+    findReplyPlaceholder().vm.$emit('onClick');
+    wrapper.setProps({ discussionWithOpenForm: discussion.id });
 
     return wrapper.vm.$nextTick().then(() => {
       expect(findReplyPlaceholder().exists()).toBe(false);
@@ -85,7 +223,10 @@ describe('Design discussions component', () => {
   });
 
   it('calls mutation on submitting form and closes the form', () => {
-    createComponent({}, { discussionComment: 'test', isFormRendered: true });
+    createComponent(
+      { discussionWithOpenForm: discussion.id },
+      { discussionComment: 'test', isFormRendered: true },
+    );
 
     findReplyForm().vm.$emit('submitForm');
     expect(mutate).toHaveBeenCalledWith(mutationVariables);
@@ -100,7 +241,10 @@ describe('Design discussions component', () => {
   });
 
   it('clears the discussion comment on closing comment form', () => {
-    createComponent({}, { discussionComment: 'test', isFormRendered: true });
+    createComponent(
+      { discussionWithOpenForm: discussion.id },
+      { discussionComment: 'test', isFormRendered: true },
+    );
 
     return wrapper.vm
       .$nextTick()
@@ -120,7 +264,7 @@ describe('Design discussions component', () => {
       {},
       {
         activeDiscussion: {
-          id: '1',
+          id: notes[0].id,
           source: 'pin',
         },
       },
@@ -130,4 +274,45 @@ describe('Design discussions component', () => {
       true,
     );
   });
+
+  it('calls toggleResolveDiscussion mutation on resolve thread button click', () => {
+    createComponent();
+    findResolveButton().trigger('click');
+    expect(mutate).toHaveBeenCalledWith({
+      mutation: toggleResolveDiscussionMutation,
+      variables: {
+        id: discussion.id,
+        resolve: true,
+      },
+    });
+    return wrapper.vm.$nextTick(() => {
+      expect(findResolveLoadingIcon().exists()).toBe(true);
+    });
+  });
+
+  it('calls toggleResolveDiscussion mutation after adding a note if checkbox was checked', () => {
+    createComponent(
+      { discussionWithOpenForm: discussion.id },
+      { discussionComment: 'test', isFormRendered: true },
+    );
+    findResolveButton().trigger('click');
+    findReplyForm().vm.$emit('submitForm');
+
+    return mutate().then(() => {
+      expect(mutate).toHaveBeenCalledWith({
+        mutation: toggleResolveDiscussionMutation,
+        variables: {
+          id: discussion.id,
+          resolve: true,
+        },
+      });
+    });
+  });
+
+  it('emits openForm event on opening the form', () => {
+    createComponent();
+    findReplyPlaceholder().vm.$emit('onClick');
+
+    expect(wrapper.emitted('openForm')).toBeTruthy();
+  });
 });
diff --git a/spec/frontend/design_management/components/design_notes/design_reply_form_spec.js b/spec/frontend/design_management/components/design_notes/design_reply_form_spec.js
index 34b8f1f9fa8..16b34f150b8 100644
--- a/spec/frontend/design_management/components/design_notes/design_reply_form_spec.js
+++ b/spec/frontend/design_management/components/design_notes/design_reply_form_spec.js
@@ -18,7 +18,7 @@ describe('Design reply form component', () => {
   const findCancelButton = () => wrapper.find({ ref: 'cancelButton' });
   const findModal = () => wrapper.find({ ref: 'cancelCommentModal' });
 
-  function createComponent(props = {}) {
+  function createComponent(props = {}, mountOptions = {}) {
     wrapper = mount(DesignReplyForm, {
       propsData: {
         value: '',
@@ -26,6 +26,7 @@ describe('Design reply form component', () => {
         ...props,
       },
       stubs: { GlModal },
+      ...mountOptions,
     });
   }
 
@@ -34,7 +35,8 @@ describe('Design reply form component', () => {
   });
 
   it('textarea has focus after component mount', () => {
-    createComponent();
+    // We need to attach to document, so that `document.activeElement` is properly set in jsdom
+    createComponent({}, { attachToDocument: true });
 
     expect(findTextarea().element).toEqual(document.activeElement);
   });
diff --git a/spec/frontend/design_management/components/design_notes/toggle_replies_widget_spec.js b/spec/frontend/design_management/components/design_notes/toggle_replies_widget_spec.js
new file mode 100644
index 00000000000..7eda294d2d3
--- /dev/null
+++ b/spec/frontend/design_management/components/design_notes/toggle_replies_widget_spec.js
@@ -0,0 +1,98 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon, GlButton, GlLink } from '@gitlab/ui';
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import ToggleRepliesWidget from '~/design_management/components/design_notes/toggle_replies_widget.vue';
+import notes from '../../mock_data/notes';
+
+describe('Toggle replies widget component', () => {
+  let wrapper;
+
+  const findToggleWrapper = () => wrapper.find('[data-testid="toggle-comments-wrapper"]');
+  const findIcon = () => wrapper.find(GlIcon);
+  const findButton = () => wrapper.find(GlButton);
+  const findAuthorLink = () => wrapper.find(GlLink);
+  const findTimeAgo = () => wrapper.find(TimeAgoTooltip);
+
+  function createComponent(props = {}) {
+    wrapper = shallowMount(ToggleRepliesWidget, {
+      propsData: {
+        collapsed: true,
+        replies: notes,
+        ...props,
+      },
+    });
+  }
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  describe('when replies are collapsed', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('should not have expanded class', () => {
+      expect(findToggleWrapper().classes()).not.toContain('expanded');
+    });
+
+    it('should render chevron-right icon', () => {
+      expect(findIcon().props('name')).toBe('chevron-right');
+    });
+
+    it('should have replies length on button', () => {
+      expect(findButton().text()).toBe('2 replies');
+    });
+
+    it('should render a link to the last reply author', () => {
+      expect(findAuthorLink().exists()).toBe(true);
+      expect(findAuthorLink().text()).toBe(notes[1].author.name);
+      expect(findAuthorLink().attributes('href')).toBe(notes[1].author.webUrl);
+    });
+
+    it('should render correct time ago tooltip', () => {
+      expect(findTimeAgo().exists()).toBe(true);
+      expect(findTimeAgo().props('time')).toBe(notes[1].createdAt);
+    });
+  });
+
+  describe('when replies are expanded', () => {
+    beforeEach(() => {
+      createComponent({ collapsed: false });
+    });
+
+    it('should have expanded class', () => {
+      expect(findToggleWrapper().classes()).toContain('expanded');
+    });
+
+    it('should render chevron-down icon', () => {
+      expect(findIcon().props('name')).toBe('chevron-down');
+    });
+
+    it('should have Collapse replies text on button', () => {
+      expect(findButton().text()).toBe('Collapse replies');
+    });
+
+    it('should not have a link to the last reply author', () => {
+      expect(findAuthorLink().exists()).toBe(false);
+    });
+
+    it('should not render time ago tooltip', () => {
+      expect(findTimeAgo().exists()).toBe(false);
+    });
+  });
+
+  it('should emit toggle event on icon click', () => {
+    createComponent();
+    findIcon().vm.$emit('click', new MouseEvent('click'));
+
+    expect(wrapper.emitted('toggle')).toHaveLength(1);
+  });
+
+  it('should emit toggle event on button click', () => {
+    createComponent();
+    findButton().vm.$emit('click', new MouseEvent('click'));
+
+    expect(wrapper.emitted('toggle')).toHaveLength(1);
+  });
+});
diff --git a/spec/frontend/design_management/components/design_overlay_spec.js b/spec/frontend/design_management/components/design_overlay_spec.js
index 1c9b130aca6..f243323b162 100644
--- a/spec/frontend/design_management/components/design_overlay_spec.js
+++ b/spec/frontend/design_management/components/design_overlay_spec.js
@@ -10,16 +10,6 @@ describe('Design overlay component', () => {
   let wrapper;
 
   const mockDimensions = { width: 100, height: 100 };
-  const mockNoteNotAuthorised = {
-    id: 'note-not-authorised',
-    discussion: { id: 'discussion-not-authorised' },
-    position: {
-      x: 1,
-      y: 80,
-      ...mockDimensions,
-    },
-    userPermissions: {},
-  };
 
   const findOverlay = () => wrapper.find('.image-diff-overlay');
   const findAllNotes = () => wrapper.findAll('.js-image-badge');
@@ -43,6 +33,7 @@ describe('Design overlay component', () => {
           top: '0',
           left: '0',
         },
+        resolvedDiscussionsExpanded: false,
         ...props,
       },
       data() {
@@ -88,19 +79,46 @@ describe('Design overlay component', () => {
   });
 
   describe('with notes', () => {
-    beforeEach(() => {
+    it('should render only the first note', () => {
       createComponent({
         notes,
       });
+      expect(findAllNotes()).toHaveLength(1);
     });
 
-    it('should render a correct amount of notes', () => {
-      expect(findAllNotes()).toHaveLength(notes.length);
-    });
+    describe('with resolved discussions toggle expanded', () => {
+      beforeEach(() => {
+        createComponent({
+          notes,
+          resolvedDiscussionsExpanded: true,
+        });
+      });
+
+      it('should render all notes', () => {
+        expect(findAllNotes()).toHaveLength(notes.length);
+      });
+
+      it('should have set the correct position for each note badge', () => {
+        expect(findFirstBadge().attributes().style).toBe('left: 10px; top: 15px;');
+        expect(findSecondBadge().attributes().style).toBe('left: 50px; top: 50px;');
+      });
+
+      it('should apply resolved class to the resolved note pin', () => {
+        expect(findSecondBadge().classes()).toContain('resolved');
+      });
+
+      it('when there is an active discussion, should apply inactive class to all pins besides the active one', () => {
+        wrapper.setData({
+          activeDiscussion: {
+            id: notes[0].id,
+            source: 'discussion',
+          },
+        });
 
-    it('should have a correct style for each note badge', () => {
-      expect(findFirstBadge().attributes().style).toBe('left: 10px; top: 15px;');
-      expect(findSecondBadge().attributes().style).toBe('left: 50px; top: 50px;');
+        return wrapper.vm.$nextTick().then(() => {
+          expect(findSecondBadge().classes()).toContain('inactive');
+        });
+      });
     });
 
     it('should recalculate badges positions on window resize', () => {
@@ -144,19 +162,6 @@ describe('Design overlay component', () => {
         expect(mutate).toHaveBeenCalledWith(mutationVariables);
       });
     });
-
-    it('when there is an active discussion, should apply inactive class to all pins besides the active one', () => {
-      wrapper.setData({
-        activeDiscussion: {
-          id: notes[0].id,
-          source: 'discussion',
-        },
-      });
-
-      return wrapper.vm.$nextTick().then(() => {
-        expect(findSecondBadge().classes()).toContain('inactive');
-      });
-    });
   });
 
   describe('when moving notes', () => {
@@ -213,20 +218,32 @@ describe('Design overlay component', () => {
         });
     });
 
-    it('should do nothing if [adminNote] permission is not present', () => {
-      createComponent({
-        dimensions: mockDimensions,
-        notes: [mockNoteNotAuthorised],
-      });
+    describe('without [adminNote] permission', () => {
+      const mockNoteNotAuthorised = {
+        ...notes[0],
+        userPermissions: {
+          adminNote: false,
+        },
+      };
 
-      const badge = findAllNotes().at(0);
-      return clickAndDragBadge(
-        badge,
-        { x: mockNoteNotAuthorised.x, y: mockNoteNotAuthorised.y },
-        { x: 20, y: 20 },
-      ).then(() => {
-        expect(wrapper.vm.movingNoteStartPosition).toBeNull();
-        expect(findFirstBadge().attributes().style).toBe('left: 1px; top: 80px;');
+      const mockNoteCoordinates = {
+        x: mockNoteNotAuthorised.position.x,
+        y: mockNoteNotAuthorised.position.y,
+      };
+
+      it('should be unable to move a note', () => {
+        createComponent({
+          dimensions: mockDimensions,
+          notes: [mockNoteNotAuthorised],
+        });
+
+        const badge = findAllNotes().at(0);
+        return clickAndDragBadge(badge, { ...mockNoteCoordinates }, { x: 20, y: 20 }).then(() => {
+          // note position should not change after a click-and-drag attempt
+          expect(findFirstBadge().attributes().style).toContain(
+            `left: ${mockNoteCoordinates.x}px; top: ${mockNoteCoordinates.y}px;`,
+          );
+        });
       });
     });
   });
diff --git a/spec/frontend/design_management/components/design_presentation_spec.js b/spec/frontend/design_management/components/design_presentation_spec.js
index 8a709393d92..7e513182589 100644
--- a/spec/frontend/design_management/components/design_presentation_spec.js
+++ b/spec/frontend/design_management/components/design_presentation_spec.js
@@ -17,7 +17,13 @@ describe('Design management design presentation component', () => {
   let wrapper;
 
   function createComponent(
-    { image, imageName, discussions = [], isAnnotating = false } = {},
+    {
+      image,
+      imageName,
+      discussions = [],
+      isAnnotating = false,
+      resolvedDiscussionsExpanded = false,
+    } = {},
     data = {},
     stubs = {},
   ) {
@@ -27,6 +33,7 @@ describe('Design management design presentation component', () => {
         imageName,
         discussions,
         isAnnotating,
+        resolvedDiscussionsExpanded,
       },
       stubs,
     });
diff --git a/spec/frontend/design_management/components/design_sidebar_spec.js b/spec/frontend/design_management/components/design_sidebar_spec.js
new file mode 100644
index 00000000000..e098e7de867
--- /dev/null
+++ b/spec/frontend/design_management/components/design_sidebar_spec.js
@@ -0,0 +1,236 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlCollapse, GlPopover } from '@gitlab/ui';
+import Cookies from 'js-cookie';
+import DesignSidebar from '~/design_management/components/design_sidebar.vue';
+import Participants from '~/sidebar/components/participants/participants.vue';
+import DesignDiscussion from '~/design_management/components/design_notes/design_discussion.vue';
+import design from '../mock_data/design';
+import updateActiveDiscussionMutation from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql';
+
+const updateActiveDiscussionMutationVariables = {
+  mutation: updateActiveDiscussionMutation,
+  variables: {
+    id: design.discussions.nodes[0].notes.nodes[0].id,
+    source: 'discussion',
+  },
+};
+
+const $route = {
+  params: {
+    id: '1',
+  },
+};
+
+const cookieKey = 'hide_design_resolved_comments_popover';
+
+const mutate = jest.fn().mockResolvedValue();
+
+describe('Design management design sidebar component', () => {
+  let wrapper;
+
+  const findDiscussions = () => wrapper.findAll(DesignDiscussion);
+  const findFirstDiscussion = () => findDiscussions().at(0);
+  const findUnresolvedDiscussions = () => wrapper.findAll('[data-testid="unresolved-discussion"]');
+  const findResolvedDiscussions = () => wrapper.findAll('[data-testid="resolved-discussion"]');
+  const findParticipants = () => wrapper.find(Participants);
+  const findCollapsible = () => wrapper.find(GlCollapse);
+  const findToggleResolvedCommentsButton = () => wrapper.find('[data-testid="resolved-comments"]');
+  const findPopover = () => wrapper.find(GlPopover);
+  const findNewDiscussionDisclaimer = () =>
+    wrapper.find('[data-testid="new-discussion-disclaimer"]');
+
+  function createComponent(props = {}) {
+    wrapper = shallowMount(DesignSidebar, {
+      propsData: {
+        design,
+        resolvedDiscussionsExpanded: false,
+        markdownPreviewPath: '',
+        ...props,
+      },
+      mocks: {
+        $route,
+        $apollo: {
+          mutate,
+        },
+      },
+    });
+  }
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('renders participants', () => {
+    createComponent();
+
+    expect(findParticipants().exists()).toBe(true);
+  });
+
+  it('passes the correct amount of participants to the Participants component', () => {
+    createComponent();
+
+    expect(findParticipants().props('participants')).toHaveLength(1);
+  });
+
+  describe('when has no discussions', () => {
+    beforeEach(() => {
+      createComponent({
+        design: {
+          ...design,
+          discussions: {
+            nodes: [],
+          },
+        },
+      });
+    });
+
+    it('does not render discussions', () => {
+      expect(findDiscussions().exists()).toBe(false);
+    });
+
+    it('renders a message about possibility to create a new discussion', () => {
+      expect(findNewDiscussionDisclaimer().exists()).toBe(true);
+    });
+  });
+
+  describe('when has discussions', () => {
+    beforeEach(() => {
+      Cookies.set(cookieKey, true);
+      createComponent();
+    });
+
+    it('renders correct amount of unresolved discussions', () => {
+      expect(findUnresolvedDiscussions()).toHaveLength(1);
+    });
+
+    it('renders correct amount of resolved discussions', () => {
+      expect(findResolvedDiscussions()).toHaveLength(1);
+    });
+
+    it('has resolved comments collapsible collapsed', () => {
+      expect(findCollapsible().attributes('visible')).toBeUndefined();
+    });
+
+    it('emits toggleResolveComments event on resolve comments button click', () => {
+      findToggleResolvedCommentsButton().vm.$emit('click');
+      expect(wrapper.emitted('toggleResolvedComments')).toHaveLength(1);
+    });
+
+    it('opens a collapsible when resolvedDiscussionsExpanded prop changes to true', () => {
+      expect(findCollapsible().attributes('visible')).toBeUndefined();
+      wrapper.setProps({
+        resolvedDiscussionsExpanded: true,
+      });
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findCollapsible().attributes('visible')).toBe('true');
+      });
+    });
+
+    it('does not popover about resolved comments', () => {
+      expect(findPopover().exists()).toBe(false);
+    });
+
+    it('sends a mutation to set an active discussion when clicking on a discussion', () => {
+      findFirstDiscussion().trigger('click');
+
+      expect(mutate).toHaveBeenCalledWith(updateActiveDiscussionMutationVariables);
+    });
+
+    it('sends a mutation to reset an active discussion when clicking outside of discussion', () => {
+      wrapper.trigger('click');
+
+      expect(mutate).toHaveBeenCalledWith({
+        ...updateActiveDiscussionMutationVariables,
+        variables: { id: undefined, source: 'discussion' },
+      });
+    });
+
+    it('emits correct event on discussion create note error', () => {
+      findFirstDiscussion().vm.$emit('createNoteError', 'payload');
+      expect(wrapper.emitted('onDesignDiscussionError')).toEqual([['payload']]);
+    });
+
+    it('emits correct event on discussion update note error', () => {
+      findFirstDiscussion().vm.$emit('updateNoteError', 'payload');
+      expect(wrapper.emitted('updateNoteError')).toEqual([['payload']]);
+    });
+
+    it('emits correct event on discussion resolve error', () => {
+      findFirstDiscussion().vm.$emit('resolveDiscussionError', 'payload');
+      expect(wrapper.emitted('resolveDiscussionError')).toEqual([['payload']]);
+    });
+
+    it('changes prop correctly on opening discussion form', () => {
+      findFirstDiscussion().vm.$emit('openForm', 'some-id');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findFirstDiscussion().props('discussionWithOpenForm')).toBe('some-id');
+      });
+    });
+  });
+
+  describe('when all discussions are resolved', () => {
+    beforeEach(() => {
+      createComponent({
+        design: {
+          ...design,
+          discussions: {
+            nodes: [
+              {
+                id: 'discussion-id',
+                replyId: 'discussion-reply-id',
+                resolved: true,
+                notes: {
+                  nodes: [
+                    {
+                      id: 'note-id',
+                      body: '123',
+                      author: {
+                        name: 'Administrator',
+                        username: 'root',
+                        webUrl: 'link-to-author',
+                        avatarUrl: 'link-to-avatar',
+                      },
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
+      });
+    });
+
+    it('renders a message about possibility to create a new discussion', () => {
+      expect(findNewDiscussionDisclaimer().exists()).toBe(true);
+    });
+
+    it('does not render unresolved discussions', () => {
+      expect(findUnresolvedDiscussions()).toHaveLength(0);
+    });
+  });
+
+  describe('when showing resolved discussions for the first time', () => {
+    beforeEach(() => {
+      Cookies.set(cookieKey, false);
+      createComponent();
+    });
+
+    it('renders a popover if we show resolved comments collapsible for the first time', () => {
+      expect(findPopover().exists()).toBe(true);
+    });
+
+    it('dismisses a popover on the outside click', () => {
+      wrapper.trigger('click');
+      return wrapper.vm.$nextTick(() => {
+        expect(findPopover().exists()).toBe(false);
+      });
+    });
+
+    it(`sets a ${cookieKey} cookie on clicking outside the popover`, () => {
+      jest.spyOn(Cookies, 'set');
+      wrapper.trigger('click');
+      expect(Cookies.set).toHaveBeenCalledWith(cookieKey, 'true', { expires: 365 * 10 });
+    });
+  });
+});
diff --git a/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap b/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
index 185bf4a48f7..27c0ba589e6 100644
--- a/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
+++ b/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
@@ -10,7 +10,7 @@ exports[`Design management upload button component renders inverted upload desig
     variant="success"
   >
     
-    Add designs
+    Upload designs
     
     <!---->
   </gl-deprecated-button-stub>
@@ -34,7 +34,7 @@ exports[`Design management upload button component renders loading icon 1`] = `
     variant="success"
   >
     
-    Add designs
+    Upload designs
     
     <gl-loading-icon-stub
       class="ml-1"
@@ -63,7 +63,7 @@ exports[`Design management upload button component renders upload design button
     variant="success"
   >
     
-    Add designs
+    Upload designs
     
     <!---->
   </gl-deprecated-button-stub>
diff --git a/spec/frontend/design_management/mock_data/design.js b/spec/frontend/design_management/mock_data/design.js
index 34e3077f4a2..675198b9408 100644
--- a/spec/frontend/design_management/mock_data/design.js
+++ b/spec/frontend/design_management/mock_data/design.js
@@ -29,6 +29,7 @@ export default {
       {
         id: 'discussion-id',
         replyId: 'discussion-reply-id',
+        resolved: false,
         notes: {
           nodes: [
             {
@@ -44,6 +45,25 @@ export default {
           ],
         },
       },
+      {
+        id: 'discussion-resolved',
+        replyId: 'discussion-reply-resolved',
+        resolved: true,
+        notes: {
+          nodes: [
+            {
+              id: 'note-resolved',
+              body: '123',
+              author: {
+                name: 'Administrator',
+                username: 'root',
+                webUrl: 'link-to-author',
+                avatarUrl: 'link-to-avatar',
+              },
+            },
+          ],
+        },
+      },
     ],
   },
   diffRefs: {
diff --git a/spec/frontend/design_management/mock_data/notes.js b/spec/frontend/design_management/mock_data/notes.js
index db4624c8524..80cb3944786 100644
--- a/spec/frontend/design_management/mock_data/notes.js
+++ b/spec/frontend/design_management/mock_data/notes.js
@@ -1,32 +1,46 @@
 export default [
   {
     id: 'note-id-1',
+    index: 1,
     position: {
       height: 100,
       width: 100,
       x: 10,
       y: 15,
     },
+    author: {
+      name: 'John',
+      webUrl: 'link-to-john-profile',
+    },
+    createdAt: '2020-05-08T07:10:45Z',
     userPermissions: {
       adminNote: true,
     },
     discussion: {
       id: 'discussion-id-1',
     },
+    resolved: false,
   },
   {
     id: 'note-id-2',
+    index: 2,
     position: {
       height: 50,
       width: 50,
       x: 25,
       y: 25,
     },
+    author: {
+      name: 'Mary',
+      webUrl: 'link-to-mary-profile',
+    },
+    createdAt: '2020-05-08T07:10:45Z',
     userPermissions: {
       adminNote: true,
     },
     discussion: {
       id: 'discussion-id-2',
     },
+    resolved: true,
   },
 ];
diff --git a/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
index 76e481ee518..65c4811536e 100644
--- a/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
@@ -16,7 +16,7 @@ exports[`Design management design index page renders design index 1`] = `
     <!---->
      
     <design-presentation-stub
-      discussions="[object Object]"
+      discussions="[object Object],[object Object]"
       image="test.jpg"
       imagename="test.jpg"
       scale="1"
@@ -33,58 +33,86 @@ exports[`Design management design index page renders design index 1`] = `
     class="image-notes"
   >
     <h2
-      class="gl-font-size-20-deprecated-no-really-do-not-use-me font-weight-bold mt-0"
+      class="gl-font-weight-bold gl-mt-0"
     >
       
-        My precious issue
-      
+    My precious issue
+  
     </h2>
      
     <a
-      class="text-tertiary text-decoration-none mb-3 d-block"
+      class="gl-text-gray-600 gl-text-decoration-none gl-mb-6 gl-display-block"
       href="full-issue-url"
     >
       ull-issue-path
     </a>
      
     <participants-stub
-      class="mb-4"
+      class="gl-mb-4"
       numberoflessparticipants="7"
       participants="[object Object]"
     />
      
-    <div
-      class="design-discussion-wrapper"
+    <!---->
+     
+    <design-discussion-stub
+      data-testid="unresolved-discussion"
+      designid="test"
+      discussion="[object Object]"
+      discussionwithopenform=""
+      markdownpreviewpath="//preview_markdown?target_type=Issue"
+      noteableid="design-id"
+    />
+     
+    <gl-button-stub
+      category="tertiary"
+      class="link-inherit-color gl-text-black-normal gl-text-decoration-none gl-font-weight-bold gl-mb-4"
+      data-testid="resolved-comments"
+      icon="chevron-right"
+      id="resolved-comments"
+      size="medium"
+      variant="link"
     >
-      <div
-        class="badge badge-pill"
-        type="button"
-      >
-        1
-      </div>
+      Resolved Comments (1)
+    
+    </gl-button-stub>
+     
+    <gl-popover-stub
+      container="popovercontainer"
+      cssclasses=""
+      placement="top"
+      show="true"
+      target="resolved-comments"
+      title="Resolved Comments"
+    >
+      <p>
+        
+        Comments you resolve can be viewed and unresolved by going to the "Resolved Comments" section below
+      
+      </p>
        
-      <div
-        class="design-discussion bordered-box position-relative"
-        data-qa-selector="design_discussion_content"
+      <a
+        href="#"
+        rel="noopener noreferrer"
+        target="_blank"
       >
-        <design-note-stub
-          class=""
-          markdownpreviewpath="//preview_markdown?target_type=Issue"
-          note="[object Object]"
-        />
-         
-        <div
-          class="reply-wrapper"
-        >
-          <reply-placeholder-stub
-            buttontext="Reply..."
-            class="qa-discussion-reply"
-          />
-        </div>
-      </div>
-    </div>
+        Learn more about resolving comments
+      </a>
+    </gl-popover-stub>
+     
+    <gl-collapse-stub
+      class="gl-mt-3"
+    >
+      <design-discussion-stub
+        data-testid="resolved-discussion"
+        designid="test"
+        discussion="[object Object]"
+        discussionwithopenform=""
+        markdownpreviewpath="//preview_markdown?target_type=Issue"
+        noteableid="design-id"
+      />
+    </gl-collapse-stub>
      
-    <!---->
   </div>
 </div>
 `;
@@ -152,33 +180,37 @@ exports[`Design management design index page with error GlAlert is rendered in c
     class="image-notes"
   >
     <h2
-      class="gl-font-size-20-deprecated-no-really-do-not-use-me font-weight-bold mt-0"
+      class="gl-font-weight-bold gl-mt-0"
     >
       
-        My precious issue
-      
+    My precious issue
+  
     </h2>
      
     <a
-      class="text-tertiary text-decoration-none mb-3 d-block"
+      class="gl-text-gray-600 gl-text-decoration-none gl-mb-6 gl-display-block"
       href="full-issue-url"
     >
       ull-issue-path
     </a>
      
     <participants-stub
-      class="mb-4"
+      class="gl-mb-4"
       numberoflessparticipants="7"
       participants="[object Object]"
     />
      
     <h2
-      class="new-discussion-disclaimer gl-font-base m-0"
+      class="new-discussion-disclaimer gl-font-base gl-m-0 gl-mb-4"
+      data-testid="new-discussion-disclaimer"
     >
       
-        Click the image where you'd like to start a new discussion
-      
+    Click the image where you'd like to start a new discussion
+  
     </h2>
+      
+    <!---->
+     
   </div>
 </div>
 `;
diff --git a/spec/frontend/design_management/pages/design/index_spec.js b/spec/frontend/design_management/pages/design/index_spec.js
index 9e2f071a983..430cf8722fe 100644
--- a/spec/frontend/design_management/pages/design/index_spec.js
+++ b/spec/frontend/design_management/pages/design/index_spec.js
@@ -1,13 +1,12 @@
-import { shallowMount } from '@vue/test-utils';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import VueRouter from 'vue-router';
 import { GlAlert } from '@gitlab/ui';
 import { ApolloMutation } from 'vue-apollo';
 import createFlash from '~/flash';
 import DesignIndex from '~/design_management/pages/design/index.vue';
-import DesignDiscussion from '~/design_management/components/design_notes/design_discussion.vue';
+import DesignSidebar from '~/design_management/components/design_sidebar.vue';
 import DesignReplyForm from '~/design_management/components/design_notes/design_reply_form.vue';
-import Participants from '~/sidebar/components/participants/participants.vue';
 import createImageDiffNoteMutation from '~/design_management/graphql/mutations/createImageDiffNote.mutation.graphql';
-import updateActiveDiscussionMutation from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql';
 import design from '../../mock_data/design';
 import mockResponseWithDesigns from '../../mock_data/designs';
 import mockResponseNoDesigns from '../../mock_data/no_designs';
@@ -17,6 +16,9 @@ import {
   DESIGN_VERSION_NOT_EXIST_ERROR,
 } from '~/design_management/utils/error_messages';
 import { DESIGNS_ROUTE_NAME } from '~/design_management/router/constants';
+import createRouter from '~/design_management/router';
+import * as utils from '~/design_management/utils/design_management_utils';
+import { DESIGN_DETAIL_LAYOUT_CLASSLIST } from '~/design_management/constants';
 
 jest.mock('~/flash');
 jest.mock('mousetrap', () => ({
@@ -24,8 +26,13 @@ jest.mock('mousetrap', () => ({
   unbind: jest.fn(),
 }));
 
+const localVue = createLocalVue();
+localVue.use(VueRouter);
+
 describe('Design management design index page', () => {
   let wrapper;
+  let router;
+
   const newComment = 'new comment';
   const annotationCoordinates = {
     x: 10,
@@ -53,23 +60,12 @@ describe('Design management design index page', () => {
     },
   };
 
-  const updateActiveDiscussionMutationVariables = {
-    mutation: updateActiveDiscussionMutation,
-    variables: {
-      id: design.discussions.nodes[0].notes.nodes[0].id,
-      source: 'discussion',
-    },
-  };
-
   const mutate = jest.fn().mockResolvedValue();
-  const routerPush = jest.fn();
 
-  const findDiscussions = () => wrapper.findAll(DesignDiscussion);
   const findDiscussionForm = () => wrapper.find(DesignReplyForm);
-  const findParticipants = () => wrapper.find(Participants);
-  const findDiscussionsWrapper = () => wrapper.find('.image-notes');
+  const findSidebar = () => wrapper.find(DesignSidebar);
 
-  function createComponent(loading = false, data = {}, { routeQuery = {} } = {}) {
+  function createComponent(loading = false, data = {}) {
     const $apollo = {
       queries: {
         design: {
@@ -79,20 +75,14 @@ describe('Design management design index page', () => {
       mutate,
     };
 
-    const $router = {
-      push: routerPush,
-    };
-
-    const $route = {
-      query: routeQuery,
-    };
+    router = createRouter();
 
     wrapper = shallowMount(DesignIndex, {
       propsData: { id: '1' },
-      mocks: { $apollo, $router, $route },
+      mocks: { $apollo },
       stubs: {
         ApolloMutation,
-        DesignDiscussion,
+        DesignSidebar,
       },
       data() {
         return {
@@ -104,6 +94,8 @@ describe('Design management design index page', () => {
           ...data,
         };
       },
+      localVue,
+      router,
     });
   }
 
@@ -111,6 +103,23 @@ describe('Design management design index page', () => {
     wrapper.destroy();
   });
 
+  describe('when navigating', () => {
+    it('applies fullscreen layout', () => {
+      const mockEl = {
+        classList: {
+          add: jest.fn(),
+          remove: jest.fn(),
+        },
+      };
+      jest.spyOn(utils, 'getPageLayoutElement').mockReturnValue(mockEl);
+      createComponent(true);
+
+      wrapper.vm.$router.push('/designs/test');
+      expect(mockEl.classList.add).toHaveBeenCalledTimes(1);
+      expect(mockEl.classList.add).toHaveBeenCalledWith(...DESIGN_DETAIL_LAYOUT_CLASSLIST);
+    });
+  });
+
   it('sets loading state', () => {
     createComponent(true);
 
@@ -124,63 +133,13 @@ describe('Design management design index page', () => {
     expect(wrapper.find(GlAlert).exists()).toBe(false);
   });
 
-  it('renders participants', () => {
-    createComponent(false, { design });
-
-    expect(findParticipants().exists()).toBe(true);
-  });
-
-  it('passes the correct amount of participants to the Participants component', () => {
+  it('passes correct props to sidebar component', () => {
     createComponent(false, { design });
 
-    expect(findParticipants().props('participants')).toHaveLength(1);
-  });
-
-  describe('when has no discussions', () => {
-    beforeEach(() => {
-      createComponent(false, {
-        design: {
-          ...design,
-          discussions: {
-            nodes: [],
-          },
-        },
-      });
-    });
-
-    it('does not render discussions', () => {
-      expect(findDiscussions().exists()).toBe(false);
-    });
-
-    it('renders a message about possibility to create a new discussion', () => {
-      expect(wrapper.find('.new-discussion-disclaimer').exists()).toBe(true);
-    });
-  });
-
-  describe('when has discussions', () => {
-    beforeEach(() => {
-      createComponent(false, { design });
-    });
-
-    it('renders correct amount of discussions', () => {
-      expect(findDiscussions()).toHaveLength(1);
-    });
-
-    it('sends a mutation to set an active discussion when clicking on a discussion', () => {
-      findDiscussions()
-        .at(0)
-        .trigger('click');
-
-      expect(mutate).toHaveBeenCalledWith(updateActiveDiscussionMutationVariables);
-    });
-
-    it('sends a mutation to reset an active discussion when clicking outside of discussion', () => {
-      findDiscussionsWrapper().trigger('click');
-
-      expect(mutate).toHaveBeenCalledWith({
-        ...updateActiveDiscussionMutationVariables,
-        variables: { id: undefined, source: 'discussion' },
-      });
+    expect(findSidebar().props()).toEqual({
+      design,
+      markdownPreviewPath: '//preview_markdown?target_type=Issue',
+      resolvedDiscussionsExpanded: false,
     });
   });
 
@@ -269,31 +228,35 @@ describe('Design management design index page', () => {
     describe('with no designs', () => {
       it('redirects to /designs', () => {
         createComponent(true);
+        router.push = jest.fn();
 
         wrapper.vm.onDesignQueryResult({ data: mockResponseNoDesigns, loading: false });
         return wrapper.vm.$nextTick().then(() => {
           expect(createFlash).toHaveBeenCalledTimes(1);
           expect(createFlash).toHaveBeenCalledWith(DESIGN_NOT_FOUND_ERROR);
-          expect(routerPush).toHaveBeenCalledTimes(1);
-          expect(routerPush).toHaveBeenCalledWith({ name: DESIGNS_ROUTE_NAME });
+          expect(router.push).toHaveBeenCalledTimes(1);
+          expect(router.push).toHaveBeenCalledWith({ name: DESIGNS_ROUTE_NAME });
         });
       });
     });
 
     describe('when no design exists for given version', () => {
       it('redirects to /designs', () => {
-        // attempt to query for a version of the design that doesn't exist
-        createComponent(true, {}, { routeQuery: { version: '999' } });
+        createComponent(true);
         wrapper.setData({
           allVersions: mockAllVersions,
         });
 
+        // attempt to query for a version of the design that doesn't exist
+        router.push({ query: { version: '999' } });
+        router.push = jest.fn();
+
         wrapper.vm.onDesignQueryResult({ data: mockResponseWithDesigns, loading: false });
         return wrapper.vm.$nextTick().then(() => {
           expect(createFlash).toHaveBeenCalledTimes(1);
           expect(createFlash).toHaveBeenCalledWith(DESIGN_VERSION_NOT_EXIST_ERROR);
-          expect(routerPush).toHaveBeenCalledTimes(1);
-          expect(routerPush).toHaveBeenCalledWith({ name: DESIGNS_ROUTE_NAME });
+          expect(router.push).toHaveBeenCalledTimes(1);
+          expect(router.push).toHaveBeenCalledWith({ name: DESIGNS_ROUTE_NAME });
         });
       });
     });
diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js
index 2299b858da9..d4e9bae3e89 100644
--- a/spec/frontend/design_management/pages/index_spec.js
+++ b/spec/frontend/design_management/pages/index_spec.js
@@ -2,7 +2,6 @@ import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { ApolloMutation } from 'vue-apollo';
 import VueRouter from 'vue-router';
 import { GlEmptyState } from '@gitlab/ui';
-
 import Index from '~/design_management/pages/index.vue';
 import uploadDesignQuery from '~/design_management/graphql/mutations/uploadDesign.mutation.graphql';
 import DesignDestroyer from '~/design_management/components/design_destroyer.vue';
@@ -14,20 +13,21 @@ import {
   EXISTING_DESIGN_DROP_INVALID_FILENAME_MESSAGE,
 } from '~/design_management/utils/error_messages';
 import createFlash from '~/flash';
+import createRouter from '~/design_management/router';
+import * as utils from '~/design_management/utils/design_management_utils';
+import { DESIGN_DETAIL_LAYOUT_CLASSLIST } from '~/design_management/constants';
+
+jest.mock('~/flash.js');
+const mockPageEl = {
+  classList: {
+    remove: jest.fn(),
+  },
+};
+jest.spyOn(utils, 'getPageLayoutElement').mockReturnValue(mockPageEl);
 
 const localVue = createLocalVue();
+const router = createRouter();
 localVue.use(VueRouter);
-const router = new VueRouter({
-  routes: [
-    {
-      name: DESIGNS_ROUTE_NAME,
-      path: '/designs',
-      component: Index,
-    },
-  ],
-});
-
-jest.mock('~/flash.js');
 
 const mockDesigns = [
   {
@@ -530,4 +530,14 @@ describe('Design management index page', () => {
       expect(wrapper.vm.onUploadDesign).not.toHaveBeenCalled();
     });
   });
+
+  describe('when navigating', () => {
+    it('ensures fullscreen layout is not applied', () => {
+      createComponent(true);
+
+      wrapper.vm.$router.push('/designs');
+      expect(mockPageEl.classList.remove).toHaveBeenCalledTimes(1);
+      expect(mockPageEl.classList.remove).toHaveBeenCalledWith(...DESIGN_DETAIL_LAYOUT_CLASSLIST);
+    });
+  });
 });
diff --git a/spec/frontend/design_management/router_spec.js b/spec/frontend/design_management/router_spec.js
index 0f4afa5e288..d6488d3837a 100644
--- a/spec/frontend/design_management/router_spec.js
+++ b/spec/frontend/design_management/router_spec.js
@@ -33,6 +33,7 @@ function factory(routeArg) {
           design: { loading: true },
           permissions: { loading: true },
         },
+        mutate: jest.fn(),
       },
     },
   });
diff --git a/spec/frontend/design_management/utils/design_management_utils_spec.js b/spec/frontend/design_management/utils/design_management_utils_spec.js
index af631073df6..478ebadc8f6 100644
--- a/spec/frontend/design_management/utils/design_management_utils_spec.js
+++ b/spec/frontend/design_management/utils/design_management_utils_spec.js
@@ -53,10 +53,10 @@ describe('extractDiscussions', () => {
 
   it('discards the edges.node artifacts of GraphQL', () => {
     expect(extractDiscussions(discussions)).toEqual([
-      { id: 1, notes: ['a'] },
-      { id: 2, notes: ['b'] },
-      { id: 3, notes: ['c'] },
-      { id: 4, notes: ['d'] },
+      { id: 1, notes: ['a'], index: 1 },
+      { id: 2, notes: ['b'], index: 2 },
+      { id: 3, notes: ['c'], index: 3 },
+      { id: 4, notes: ['d'], index: 4 },
     ]);
   });
 });
diff --git a/spec/frontend/diffs/components/diff_file_spec.js b/spec/frontend/diffs/components/diff_file_spec.js
index d0ba71fce47..71e975f2409 100644
--- a/spec/frontend/diffs/components/diff_file_spec.js
+++ b/spec/frontend/diffs/components/diff_file_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { createStore } from 'ee_else_ce/mr_notes/stores';
+import { createStore } from '~/mr_notes/stores';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import { mockTracking, triggerEvent } from 'helpers/tracking_helper';
 import DiffFileComponent from '~/diffs/components/diff_file.vue';
diff --git a/spec/frontend/diffs/components/diff_line_note_form_spec.js b/spec/frontend/diffs/components/diff_line_note_form_spec.js
index 3e0acd0dace..623df8bd55e 100644
--- a/spec/frontend/diffs/components/diff_line_note_form_spec.js
+++ b/spec/frontend/diffs/components/diff_line_note_form_spec.js
@@ -77,12 +77,24 @@ describe('DiffLineNoteForm', () => {
           .spyOn(wrapper.vm, 'saveDiffDiscussion')
           .mockReturnValue(Promise.resolve());
 
+        const lineRange = {
+          start_line_code: wrapper.vm.commentLineStart.lineCode,
+          start_line_type: wrapper.vm.commentLineStart.type,
+          end_line_code: wrapper.vm.line.line_code,
+          end_line_type: wrapper.vm.line.type,
+        };
+
+        const formData = {
+          ...wrapper.vm.formData,
+          lineRange,
+        };
+
         wrapper.vm
           .handleSaveNote('note body')
           .then(() => {
             expect(saveDiffDiscussionSpy).toHaveBeenCalledWith({
               note: 'note body',
-              formData: wrapper.vm.formData,
+              formData,
             });
           })
           .then(done)
diff --git a/spec/frontend/diffs/components/inline_diff_view_spec.js b/spec/frontend/diffs/components/inline_diff_view_spec.js
index 9b0cf6a84d9..eeef8e5a7b0 100644
--- a/spec/frontend/diffs/components/inline_diff_view_spec.js
+++ b/spec/frontend/diffs/components/inline_diff_view_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import '~/behaviors/markdown/render_gfm';
-import { createStore } from 'ee_else_ce/mr_notes/stores';
+import { createStore } from '~/mr_notes/stores';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import InlineDiffView from '~/diffs/components/inline_diff_view.vue';
 import diffFileMockData from '../mock_data/diff_file';
diff --git a/spec/frontend/diffs/components/parallel_diff_view_spec.js b/spec/frontend/diffs/components/parallel_diff_view_spec.js
index 03cf1b72b62..30231f0ba71 100644
--- a/spec/frontend/diffs/components/parallel_diff_view_spec.js
+++ b/spec/frontend/diffs/components/parallel_diff_view_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { createStore } from 'ee_else_ce/mr_notes/stores';
+import { createStore } from '~/mr_notes/stores';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import ParallelDiffView from '~/diffs/components/parallel_diff_view.vue';
 import * as constants from '~/diffs/constants';
diff --git a/spec/frontend/diffs/mock_data/diff_file.js b/spec/frontend/diffs/mock_data/diff_file.js
index 27428197c1c..e4b2fdf6ede 100644
--- a/spec/frontend/diffs/mock_data/diff_file.js
+++ b/spec/frontend/diffs/mock_data/diff_file.js
@@ -13,6 +13,7 @@ export default {
   blob_name: 'CHANGELOG',
   blob_icon: '<i aria-hidden="true" data-hidden="true" class="fa fa-file-text-o fa-fw"></i>',
   file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
+  file_identifier_hash: '928f8286952bda02d674b692addcbe077084663a',
   file_path: 'CHANGELOG',
   new_file: false,
   deleted_file: false,
diff --git a/spec/frontend/diffs/mock_data/diff_metadata.js b/spec/frontend/diffs/mock_data/diff_metadata.js
new file mode 100644
index 00000000000..b73b29e4bc8
--- /dev/null
+++ b/spec/frontend/diffs/mock_data/diff_metadata.js
@@ -0,0 +1,58 @@
+/* eslint-disable import/prefer-default-export */
+/* https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/20 */
+
+export const diffMetadata = {
+  real_size: '1',
+  size: 1,
+  branch_name: 'update-changelog',
+  source_branch_exists: true,
+  target_branch_name: 'master',
+  commit: null,
+  context_commits: null,
+  merge_request_diff: {
+    version_index: null,
+    created_at: '2019-11-07T06:48:35.202Z',
+    commits_count: 1,
+    latest: true,
+    short_commit_sha: 'eb227b3e',
+    base_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+    head_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_head=true',
+    version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+    compare_path:
+      '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4\u0026start_sha=eb227b3e214624708c474bdab7bde7afc17cefcc',
+  },
+  start_version: null,
+  latest_diff: true,
+  latest_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs',
+  added_lines: 2,
+  removed_lines: 0,
+  render_overflow_warning: false,
+  email_patch_path: '/gitlab-org/gitlab-test/-/merge_requests/4.patch',
+  plain_diff_path: '/gitlab-org/gitlab-test/-/merge_requests/4.diff',
+  merge_request_diffs: [
+    {
+      version_index: null,
+      created_at: '2019-11-07T06:48:35.202Z',
+      commits_count: 1,
+      latest: true,
+      short_commit_sha: 'eb227b3e',
+      base_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+      head_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_head=true',
+      version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+      compare_path:
+        '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4\u0026start_sha=eb227b3e214624708c474bdab7bde7afc17cefcc',
+    },
+  ],
+  diff_files: [
+    {
+      added_lines: 2,
+      removed_lines: 0,
+      new_path: 'CHANGELOG',
+      old_path: 'CHANGELOG',
+      new_file: false,
+      deleted_file: false,
+      file_identifier_hash: '928f8286952bda02d674b692addcbe077084663a',
+      file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
+    },
+  ],
+};
diff --git a/spec/frontend/diffs/store/actions_spec.js b/spec/frontend/diffs/store/actions_spec.js
index 3fba661da44..7d79dcfbfe3 100644
--- a/spec/frontend/diffs/store/actions_spec.js
+++ b/spec/frontend/diffs/store/actions_spec.js
@@ -35,8 +35,6 @@ import {
   setRenderTreeList,
   setShowWhitespace,
   setRenderIt,
-  requestFullDiff,
-  receiveFullDiffSucess,
   receiveFullDiffError,
   fetchFullDiff,
   toggleFullDiff,
@@ -53,7 +51,9 @@ import axios from '~/lib/utils/axios_utils';
 import testAction from '../../helpers/vuex_action_helper';
 import * as utils from '~/diffs/store/utils';
 import * as commonUtils from '~/lib/utils/common_utils';
+import { mergeUrlParams } from '~/lib/utils/url_utility';
 import { useLocalStorageSpy } from 'helpers/local_storage_helper';
+import { diffMetadata } from '../mock_data/diff_metadata';
 import createFlash from '~/flash';
 
 jest.mock('~/flash', () => jest.fn());
@@ -175,19 +175,44 @@ describe('DiffsStoreActions', () => {
   });
 
   describe('fetchDiffFilesBatch', () => {
+    let mock;
+
+    beforeEach(() => {
+      mock = new MockAdapter(axios);
+    });
+
+    afterEach(() => {
+      mock.restore();
+    });
+
     it('should fetch batch diff files', done => {
       const endpointBatch = '/fetch/diffs_batch';
-      const mock = new MockAdapter(axios);
       const res1 = { diff_files: [], pagination: { next_page: 2 } };
       const res2 = { diff_files: [], pagination: {} };
       mock
-        .onGet(endpointBatch, {
-          params: { page: 1, per_page: DIFFS_PER_PAGE, w: '1', view: 'inline' },
-        })
+        .onGet(
+          mergeUrlParams(
+            {
+              per_page: DIFFS_PER_PAGE,
+              w: '1',
+              view: 'inline',
+              page: 1,
+            },
+            endpointBatch,
+          ),
+        )
         .reply(200, res1)
-        .onGet(endpointBatch, {
-          params: { page: 2, per_page: DIFFS_PER_PAGE, w: '1', view: 'inline' },
-        })
+        .onGet(
+          mergeUrlParams(
+            {
+              per_page: DIFFS_PER_PAGE,
+              w: '1',
+              view: 'inline',
+              page: 2,
+            },
+            endpointBatch,
+          ),
+        )
         .reply(200, res2);
 
       testAction(
@@ -204,22 +229,50 @@ describe('DiffsStoreActions', () => {
           { type: types.SET_RETRIEVING_BATCHES, payload: false },
         ],
         [],
-        () => {
-          mock.restore();
-          done();
-        },
+        done,
       );
     });
+
+    it.each`
+      viewStyle     | otherView
+      ${'inline'}   | ${'parallel'}
+      ${'parallel'} | ${'inline'}
+    `(
+      'should make a request with the view parameter "$viewStyle" when the batchEndpoint already contains "$otherView"',
+      ({ viewStyle, otherView }) => {
+        const endpointBatch = '/fetch/diffs_batch';
+
+        fetchDiffFilesBatch({
+          commit: () => {},
+          state: {
+            endpointBatch: `${endpointBatch}?view=${otherView}`,
+            useSingleDiffStyle: true,
+            diffViewType: viewStyle,
+          },
+        })
+          .then(() => {
+            expect(mock.history.get[0].url).toContain(`view=${viewStyle}`);
+            expect(mock.history.get[0].url).not.toContain(`view=${otherView}`);
+          })
+          .catch(() => {});
+      },
+    );
   });
 
   describe('fetchDiffFilesMeta', () => {
-    it('should fetch diff meta information', done => {
-      const endpointMetadata = '/fetch/diffs_meta?view=inline';
-      const mock = new MockAdapter(axios);
-      const data = { diff_files: [] };
-      const res = { data };
-      mock.onGet(endpointMetadata).reply(200, res);
+    const endpointMetadata = '/fetch/diffs_metadata.json?view=inline';
+    const noFilesData = { ...diffMetadata };
+    let mock;
+
+    beforeEach(() => {
+      mock = new MockAdapter(axios);
+
+      delete noFilesData.diff_files;
+
+      mock.onGet(endpointMetadata).reply(200, diffMetadata);
+    });
 
+    it('should fetch diff meta information', done => {
       testAction(
         fetchDiffFilesMeta,
         {},
@@ -227,8 +280,8 @@ describe('DiffsStoreActions', () => {
         [
           { type: types.SET_LOADING, payload: true },
           { type: types.SET_LOADING, payload: false },
-          { type: types.SET_MERGE_REQUEST_DIFFS, payload: [] },
-          { type: types.SET_DIFF_DATA, payload: { data } },
+          { type: types.SET_MERGE_REQUEST_DIFFS, payload: diffMetadata.merge_request_diffs },
+          { type: types.SET_DIFF_DATA, payload: noFilesData },
         ],
         [],
         () => {
@@ -280,15 +333,24 @@ describe('DiffsStoreActions', () => {
     });
 
     describe('fetchDiffFilesBatch', () => {
+      let mock;
+
+      beforeEach(() => {
+        mock = new MockAdapter(axios);
+      });
+
+      afterEach(() => {
+        mock.restore();
+      });
+
       it('should fetch batch diff files', done => {
         const endpointBatch = '/fetch/diffs_batch';
-        const mock = new MockAdapter(axios);
         const res1 = { diff_files: [], pagination: { next_page: 2 } };
         const res2 = { diff_files: [], pagination: {} };
         mock
-          .onGet(endpointBatch, { params: { page: 1, per_page: DIFFS_PER_PAGE, w: '1' } })
+          .onGet(mergeUrlParams({ per_page: DIFFS_PER_PAGE, w: '1', page: 1 }, endpointBatch))
           .reply(200, res1)
-          .onGet(endpointBatch, { params: { page: 2, per_page: DIFFS_PER_PAGE, w: '1' } })
+          .onGet(mergeUrlParams({ per_page: DIFFS_PER_PAGE, w: '1', page: 2 }, endpointBatch))
           .reply(200, res2);
 
         testAction(
@@ -305,22 +367,48 @@ describe('DiffsStoreActions', () => {
             { type: types.SET_RETRIEVING_BATCHES, payload: false },
           ],
           [],
-          () => {
-            mock.restore();
-            done();
-          },
+          done,
         );
       });
+
+      it.each`
+        querystrings        | requestUrl
+        ${'?view=parallel'} | ${'/fetch/diffs_batch?view=parallel'}
+        ${'?view=inline'}   | ${'/fetch/diffs_batch?view=inline'}
+        ${''}               | ${'/fetch/diffs_batch'}
+      `(
+        'should use the endpoint $requestUrl if the endpointBatch in state includes `$querystrings` as a querystring',
+        ({ querystrings, requestUrl }) => {
+          const endpointBatch = '/fetch/diffs_batch';
+
+          fetchDiffFilesBatch({
+            commit: () => {},
+            state: {
+              endpointBatch: `${endpointBatch}${querystrings}`,
+              diffViewType: 'inline',
+            },
+          })
+            .then(() => {
+              expect(mock.history.get[0].url).toEqual(requestUrl);
+            })
+            .catch(() => {});
+        },
+      );
     });
 
     describe('fetchDiffFilesMeta', () => {
-      it('should fetch diff meta information', done => {
-        const endpointMetadata = '/fetch/diffs_meta';
-        const mock = new MockAdapter(axios);
-        const data = { diff_files: [] };
-        const res = { data };
-        mock.onGet(endpointMetadata).reply(200, res);
+      const endpointMetadata = '/fetch/diffs_metadata.json';
+      const noFilesData = { ...diffMetadata };
+      let mock;
+
+      beforeEach(() => {
+        mock = new MockAdapter(axios);
+
+        delete noFilesData.diff_files;
 
+        mock.onGet(endpointMetadata).reply(200, diffMetadata);
+      });
+      it('should fetch diff meta information', done => {
         testAction(
           fetchDiffFilesMeta,
           {},
@@ -328,8 +416,8 @@ describe('DiffsStoreActions', () => {
           [
             { type: types.SET_LOADING, payload: true },
             { type: types.SET_LOADING, payload: false },
-            { type: types.SET_MERGE_REQUEST_DIFFS, payload: [] },
-            { type: types.SET_DIFF_DATA, payload: { data } },
+            { type: types.SET_MERGE_REQUEST_DIFFS, payload: diffMetadata.merge_request_diffs },
+            { type: types.SET_DIFF_DATA, payload: noFilesData },
           ],
           [],
           () => {
@@ -467,9 +555,9 @@ describe('DiffsStoreActions', () => {
                   new_path: 'file1',
                   old_line: 5,
                   old_path: 'file2',
+                  line_range: null,
                   line_code: 'ABC_1_1',
                   position_type: 'text',
-                  line_range: null,
                 },
               },
               hash: 'ABC_123',
@@ -1136,34 +1224,8 @@ describe('DiffsStoreActions', () => {
     });
   });
 
-  describe('requestFullDiff', () => {
-    it('commits REQUEST_FULL_DIFF', done => {
-      testAction(
-        requestFullDiff,
-        'file',
-        {},
-        [{ type: types.REQUEST_FULL_DIFF, payload: 'file' }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('receiveFullDiffSucess', () => {
-    it('commits REQUEST_FULL_DIFF', done => {
-      testAction(
-        receiveFullDiffSucess,
-        { filePath: 'test' },
-        {},
-        [{ type: types.RECEIVE_FULL_DIFF_SUCCESS, payload: { filePath: 'test' } }],
-        [],
-        done,
-      );
-    });
-  });
-
   describe('receiveFullDiffError', () => {
-    it('commits REQUEST_FULL_DIFF', done => {
+    it('updates state with the file that did not load', done => {
       testAction(
         receiveFullDiffError,
         'file',
@@ -1191,7 +1253,7 @@ describe('DiffsStoreActions', () => {
         mock.onGet(`${gl.TEST_HOST}/context`).replyOnce(200, ['test']);
       });
 
-      it('dispatches receiveFullDiffSucess', done => {
+      it('commits the success and dispatches an action to expand the new lines', done => {
         const file = {
           context_lines_path: `${gl.TEST_HOST}/context`,
           file_path: 'test',
@@ -1201,11 +1263,8 @@ describe('DiffsStoreActions', () => {
           fetchFullDiff,
           file,
           null,
-          [],
-          [
-            { type: 'receiveFullDiffSucess', payload: { filePath: 'test' } },
-            { type: 'setExpandedDiffLines', payload: { file, data: ['test'] } },
-          ],
+          [{ type: types.RECEIVE_FULL_DIFF_SUCCESS, payload: { filePath: 'test' } }],
+          [{ type: 'setExpandedDiffLines', payload: { file, data: ['test'] } }],
           done,
         );
       });
@@ -1243,11 +1302,8 @@ describe('DiffsStoreActions', () => {
         toggleFullDiff,
         'test',
         state,
-        [],
-        [
-          { type: 'requestFullDiff', payload: 'test' },
-          { type: 'fetchFullDiff', payload: state.diffFiles[0] },
-        ],
+        [{ type: types.REQUEST_FULL_DIFF, payload: 'test' }],
+        [{ type: 'fetchFullDiff', payload: state.diffFiles[0] }],
         done,
       );
     });
@@ -1255,7 +1311,6 @@ describe('DiffsStoreActions', () => {
 
   describe('switchToFullDiffFromRenamedFile', () => {
     const SUCCESS_URL = 'fakehost/context.success';
-    const ERROR_URL = 'fakehost/context.error';
     const testFilePath = 'testpath';
     const updatedViewerName = 'testviewer';
     const preparedLine = { prepared: 'in-a-test' };
@@ -1311,27 +1366,6 @@ describe('DiffsStoreActions', () => {
         },
       );
     });
-
-    describe('error', () => {
-      beforeEach(() => {
-        renamedFile = { ...testFile, context_lines_path: ERROR_URL };
-        mock.onGet(ERROR_URL).reply(500);
-      });
-
-      it('dispatches the error handling action', () => {
-        const rejected = testAction(
-          switchToFullDiffFromRenamedFile,
-          { diffFile: renamedFile },
-          null,
-          [],
-          [{ type: 'receiveFullDiffError', payload: testFilePath }],
-        );
-
-        return rejected.catch(error =>
-          expect(error).toEqual(new Error('Request failed with status code 500')),
-        );
-      });
-    });
   });
 
   describe('setFileCollapsed', () => {
diff --git a/spec/frontend/diffs/store/utils_spec.js b/spec/frontend/diffs/store/utils_spec.js
index 641373e666f..891de45e268 100644
--- a/spec/frontend/diffs/store/utils_spec.js
+++ b/spec/frontend/diffs/store/utils_spec.js
@@ -14,9 +14,11 @@ import {
 } from '~/diffs/constants';
 import { MERGE_REQUEST_NOTEABLE_TYPE } from '~/notes/constants';
 import diffFileMockData from '../mock_data/diff_file';
+import { diffMetadata } from '../mock_data/diff_metadata';
 import { noteableDataMock } from '../../notes/mock_data';
 
 const getDiffFileMock = () => JSON.parse(JSON.stringify(diffFileMockData));
+const getDiffMetadataMock = () => JSON.parse(JSON.stringify(diffMetadata));
 
 describe('DiffsStoreUtils', () => {
   describe('findDiffFile', () => {
@@ -187,6 +189,7 @@ describe('DiffsStoreUtils', () => {
         },
         diffViewType: PARALLEL_DIFF_VIEW_TYPE,
         linePosition: LINE_POSITION_LEFT,
+        lineRange: { start_line_code: 'abc_1_1', end_line_code: 'abc_2_2' },
       };
 
       const position = JSON.stringify({
@@ -198,6 +201,7 @@ describe('DiffsStoreUtils', () => {
         position_type: TEXT_DIFF_POSITION_TYPE,
         old_line: options.noteTargetLine.old_line,
         new_line: options.noteTargetLine.new_line,
+        line_range: options.lineRange,
       });
 
       const postData = {
@@ -428,112 +432,177 @@ describe('DiffsStoreUtils', () => {
   });
 
   describe('prepareDiffData', () => {
-    let mock;
-    let preparedDiff;
-    let splitInlineDiff;
-    let splitParallelDiff;
-    let completedDiff;
+    describe('for regular diff files', () => {
+      let mock;
+      let preparedDiff;
+      let splitInlineDiff;
+      let splitParallelDiff;
+      let completedDiff;
+
+      beforeEach(() => {
+        mock = getDiffFileMock();
+
+        preparedDiff = { diff_files: [mock] };
+        splitInlineDiff = {
+          diff_files: [{ ...mock, parallel_diff_lines: undefined }],
+        };
+        splitParallelDiff = {
+          diff_files: [{ ...mock, highlighted_diff_lines: undefined }],
+        };
+        completedDiff = {
+          diff_files: [{ ...mock, highlighted_diff_lines: undefined }],
+        };
 
-    beforeEach(() => {
-      mock = getDiffFileMock();
-      preparedDiff = { diff_files: [mock] };
-      splitInlineDiff = {
-        diff_files: [{ ...mock, parallel_diff_lines: undefined }],
-      };
-      splitParallelDiff = {
-        diff_files: [{ ...mock, highlighted_diff_lines: undefined }],
-      };
-      completedDiff = {
-        diff_files: [{ ...mock, highlighted_diff_lines: undefined }],
-      };
+        preparedDiff.diff_files = utils.prepareDiffData(preparedDiff);
+        splitInlineDiff.diff_files = utils.prepareDiffData(splitInlineDiff);
+        splitParallelDiff.diff_files = utils.prepareDiffData(splitParallelDiff);
+        completedDiff.diff_files = utils.prepareDiffData(completedDiff, [mock]);
+      });
 
-      preparedDiff.diff_files = utils.prepareDiffData(preparedDiff);
-      splitInlineDiff.diff_files = utils.prepareDiffData(splitInlineDiff);
-      splitParallelDiff.diff_files = utils.prepareDiffData(splitParallelDiff);
-      completedDiff.diff_files = utils.prepareDiffData(completedDiff, [mock]);
-    });
+      it('sets the renderIt and collapsed attribute on files', () => {
+        const firstParallelDiffLine = preparedDiff.diff_files[0].parallel_diff_lines[2];
 
-    it('sets the renderIt and collapsed attribute on files', () => {
-      const firstParallelDiffLine = preparedDiff.diff_files[0].parallel_diff_lines[2];
+        expect(firstParallelDiffLine.left.discussions.length).toBe(0);
+        expect(firstParallelDiffLine.left).not.toHaveAttr('text');
+        expect(firstParallelDiffLine.right.discussions.length).toBe(0);
+        expect(firstParallelDiffLine.right).not.toHaveAttr('text');
+        const firstParallelChar = firstParallelDiffLine.right.rich_text.charAt(0);
 
-      expect(firstParallelDiffLine.left.discussions.length).toBe(0);
-      expect(firstParallelDiffLine.left).not.toHaveAttr('text');
-      expect(firstParallelDiffLine.right.discussions.length).toBe(0);
-      expect(firstParallelDiffLine.right).not.toHaveAttr('text');
-      const firstParallelChar = firstParallelDiffLine.right.rich_text.charAt(0);
+        expect(firstParallelChar).not.toBe(' ');
+        expect(firstParallelChar).not.toBe('+');
+        expect(firstParallelChar).not.toBe('-');
 
-      expect(firstParallelChar).not.toBe(' ');
-      expect(firstParallelChar).not.toBe('+');
-      expect(firstParallelChar).not.toBe('-');
+        const checkLine = preparedDiff.diff_files[0].highlighted_diff_lines[0];
 
-      const checkLine = preparedDiff.diff_files[0].highlighted_diff_lines[0];
+        expect(checkLine.discussions.length).toBe(0);
+        expect(checkLine).not.toHaveAttr('text');
+        const firstChar = checkLine.rich_text.charAt(0);
 
-      expect(checkLine.discussions.length).toBe(0);
-      expect(checkLine).not.toHaveAttr('text');
-      const firstChar = checkLine.rich_text.charAt(0);
+        expect(firstChar).not.toBe(' ');
+        expect(firstChar).not.toBe('+');
+        expect(firstChar).not.toBe('-');
 
-      expect(firstChar).not.toBe(' ');
-      expect(firstChar).not.toBe('+');
-      expect(firstChar).not.toBe('-');
+        expect(preparedDiff.diff_files[0].renderIt).toBeTruthy();
+        expect(preparedDiff.diff_files[0].collapsed).toBeFalsy();
+      });
 
-      expect(preparedDiff.diff_files[0].renderIt).toBeTruthy();
-      expect(preparedDiff.diff_files[0].collapsed).toBeFalsy();
-    });
+      it('adds line_code to all lines', () => {
+        expect(
+          preparedDiff.diff_files[0].parallel_diff_lines.filter(line => !line.line_code),
+        ).toHaveLength(0);
+      });
 
-    it('adds line_code to all lines', () => {
-      expect(
-        preparedDiff.diff_files[0].parallel_diff_lines.filter(line => !line.line_code),
-      ).toHaveLength(0);
-    });
+      it('uses right line code if left has none', () => {
+        const firstLine = preparedDiff.diff_files[0].parallel_diff_lines[0];
 
-    it('uses right line code if left has none', () => {
-      const firstLine = preparedDiff.diff_files[0].parallel_diff_lines[0];
+        expect(firstLine.line_code).toEqual(firstLine.right.line_code);
+      });
 
-      expect(firstLine.line_code).toEqual(firstLine.right.line_code);
-    });
+      it('guarantees an empty array for both diff styles', () => {
+        expect(splitInlineDiff.diff_files[0].parallel_diff_lines.length).toEqual(0);
+        expect(splitInlineDiff.diff_files[0].highlighted_diff_lines.length).toBeGreaterThan(0);
+        expect(splitParallelDiff.diff_files[0].parallel_diff_lines.length).toBeGreaterThan(0);
+        expect(splitParallelDiff.diff_files[0].highlighted_diff_lines.length).toEqual(0);
+      });
 
-    it('guarantees an empty array for both diff styles', () => {
-      expect(splitInlineDiff.diff_files[0].parallel_diff_lines.length).toEqual(0);
-      expect(splitInlineDiff.diff_files[0].highlighted_diff_lines.length).toBeGreaterThan(0);
-      expect(splitParallelDiff.diff_files[0].parallel_diff_lines.length).toBeGreaterThan(0);
-      expect(splitParallelDiff.diff_files[0].highlighted_diff_lines.length).toEqual(0);
-    });
+      it('merges existing diff files with newly loaded diff files to ensure split diffs are eventually completed', () => {
+        expect(completedDiff.diff_files.length).toEqual(1);
+        expect(completedDiff.diff_files[0].parallel_diff_lines.length).toBeGreaterThan(0);
+        expect(completedDiff.diff_files[0].highlighted_diff_lines.length).toBeGreaterThan(0);
+      });
 
-    it('merges existing diff files with newly loaded diff files to ensure split diffs are eventually completed', () => {
-      expect(completedDiff.diff_files.length).toEqual(1);
-      expect(completedDiff.diff_files[0].parallel_diff_lines.length).toBeGreaterThan(0);
-      expect(completedDiff.diff_files[0].highlighted_diff_lines.length).toBeGreaterThan(0);
-    });
+      it('leaves files in the existing state', () => {
+        const priorFiles = [mock];
+        const fakeNewFile = {
+          ...mock,
+          content_sha: 'ABC',
+          file_hash: 'DEF',
+        };
+        const updatedFilesList = utils.prepareDiffData({ diff_files: [fakeNewFile] }, priorFiles);
 
-    it('leaves files in the existing state', () => {
-      const priorFiles = [mock];
-      const fakeNewFile = {
-        ...mock,
-        content_sha: 'ABC',
-        file_hash: 'DEF',
-      };
-      const updatedFilesList = utils.prepareDiffData({ diff_files: [fakeNewFile] }, priorFiles);
+        expect(updatedFilesList).toEqual([mock, fakeNewFile]);
+      });
 
-      expect(updatedFilesList).toEqual([mock, fakeNewFile]);
+      it('completes an existing split diff without overwriting existing diffs', () => {
+        // The current state has a file that has only loaded inline lines
+        const priorFiles = [{ ...mock, parallel_diff_lines: [] }];
+        // The next (batch) load loads two files: the other half of that file, and a new file
+        const fakeBatch = [
+          { ...mock, highlighted_diff_lines: undefined },
+          { ...mock, highlighted_diff_lines: undefined, content_sha: 'ABC', file_hash: 'DEF' },
+        ];
+        const updatedFilesList = utils.prepareDiffData({ diff_files: fakeBatch }, priorFiles);
+
+        expect(updatedFilesList).toEqual([
+          mock,
+          expect.objectContaining({
+            content_sha: 'ABC',
+            file_hash: 'DEF',
+          }),
+        ]);
+      });
     });
 
-    it('completes an existing split diff without overwriting existing diffs', () => {
-      // The current state has a file that has only loaded inline lines
-      const priorFiles = [{ ...mock, parallel_diff_lines: [] }];
-      // The next (batch) load loads two files: the other half of that file, and a new file
-      const fakeBatch = [
-        { ...mock, highlighted_diff_lines: undefined },
-        { ...mock, highlighted_diff_lines: undefined, content_sha: 'ABC', file_hash: 'DEF' },
-      ];
-      const updatedFilesList = utils.prepareDiffData({ diff_files: fakeBatch }, priorFiles);
+    describe('for diff metadata', () => {
+      let mock;
+      let preparedDiffFiles;
 
-      expect(updatedFilesList).toEqual([
-        mock,
-        expect.objectContaining({
-          content_sha: 'ABC',
-          file_hash: 'DEF',
-        }),
-      ]);
+      beforeEach(() => {
+        mock = getDiffMetadataMock();
+
+        preparedDiffFiles = utils.prepareDiffData(mock);
+      });
+
+      it('sets the renderIt and collapsed attribute on files', () => {
+        expect(preparedDiffFiles[0].renderIt).toBeTruthy();
+        expect(preparedDiffFiles[0].collapsed).toBeFalsy();
+      });
+
+      it('guarantees an empty array of lines for both diff styles', () => {
+        expect(preparedDiffFiles[0].parallel_diff_lines.length).toEqual(0);
+        expect(preparedDiffFiles[0].highlighted_diff_lines.length).toEqual(0);
+      });
+
+      it('leaves files in the existing state', () => {
+        const fileMock = getDiffFileMock();
+        const metaData = getDiffMetadataMock();
+        const priorFiles = [fileMock];
+        const updatedFilesList = utils.prepareDiffData(metaData, priorFiles);
+
+        expect(updatedFilesList.length).toEqual(2);
+        expect(updatedFilesList[0]).toEqual(fileMock);
+      });
+
+      it('adds a new file to the file that already exists in state', () => {
+        // This is actually buggy behavior:
+        // Because the metadata doesn't include a content_sha,
+        // the de-duplicator in prepareDiffData doesn't realize it
+        // should combine these two.
+
+        // This buggy behavior hasn't caused a defect YET, because
+        // `diffs_metadata.json` is only called the first time the
+        // diffs app starts up, which is:
+        // - after a fresh page load
+        // - after you switch to the changes tab *the first time*
+
+        // This test should begin FAILING and can be reversed to check
+        // for just a single file when this is implemented:
+        // https://gitlab.com/groups/gitlab-org/-/epics/2852#note_304803233
+
+        const fileMock = getDiffFileMock();
+        const metaMock = getDiffMetadataMock();
+        const priorFiles = [{ ...fileMock }];
+        const updatedFilesList = utils.prepareDiffData(metaMock, priorFiles);
+
+        expect(updatedFilesList).toEqual([
+          fileMock,
+          {
+            ...metaMock.diff_files[0],
+            highlighted_diff_lines: [],
+            parallel_diff_lines: [],
+          },
+        ]);
+      });
     });
   });
 
diff --git a/spec/frontend/diffs/utils/uuids_spec.js b/spec/frontend/diffs/utils/uuids_spec.js
new file mode 100644
index 00000000000..79d3ebadd4f
--- /dev/null
+++ b/spec/frontend/diffs/utils/uuids_spec.js
@@ -0,0 +1,92 @@
+import { uuids } from '~/diffs/utils/uuids';
+
+const HEX = /[a-f0-9]/i;
+const HEX_RE = HEX.source;
+const UUIDV4 = new RegExp(
+  `${HEX_RE}{8}-${HEX_RE}{4}-4${HEX_RE}{3}-[89ab]${HEX_RE}{3}-${HEX_RE}{12}`,
+  'i',
+);
+
+describe('UUIDs Util', () => {
+  describe('uuids', () => {
+    const SEQUENCE_FOR_GITLAB_SEED = [
+      'a1826a44-316c-480e-a93d-8cdfeb36617c',
+      'e049db1f-a4cf-4cba-aa60-6d95e3b547dc',
+      '6e3c737c-13a7-4380-b17d-601f187d7e69',
+      'bee5cc7f-c486-45c0-8ad3-d1ac5402632d',
+      'af248c9f-a3a6-4d4f-a311-fe151ffab25a',
+    ];
+    const SEQUENCE_FOR_12345_SEED = [
+      'edfb51e2-e3e1-4de5-90fd-fd1d21760881',
+      '2f154da4-0a2d-4da9-b45e-0ffed391517e',
+      '91566d65-8836-4222-9875-9e1df4d0bb01',
+      'f6ea6c76-7640-4d71-a736-9d3bec7a1a8e',
+      'bfb85869-5fb9-4c5b-a750-5af727ac5576',
+    ];
+
+    it('returns version 4 UUIDs', () => {
+      expect(uuids()[0]).toMatch(UUIDV4);
+    });
+
+    it('outputs an array of UUIDs', () => {
+      const ids = uuids({ count: 11 });
+
+      expect(ids.length).toEqual(11);
+      expect(ids.every(id => UUIDV4.test(id))).toEqual(true);
+    });
+
+    it.each`
+      seeds                          | uuid
+      ${['some', 'special', 'seed']} | ${'6fa53e51-0f70-4072-9c84-1c1eee1b9934'}
+      ${['magic']}                   | ${'fafae8cd-7083-44f3-b82d-43b30bd27486'}
+      ${['seeded']}                  | ${'e06ed291-46c5-4e42-836b-e7c772d48b49'}
+      ${['GitLab']}                  | ${'a1826a44-316c-480e-a93d-8cdfeb36617c'}
+      ${['JavaScript']}              | ${'12dfb297-1560-4c38-9775-7178ef8472fb'}
+      ${[99, 169834, 2619]}          | ${'3ecc8ad6-5b7c-4c9b-94a8-c7271c2fa083'}
+      ${[12]}                        | ${'2777374b-723b-469b-bd73-e586df964cfd'}
+      ${[9876, 'mixed!', 7654]}      | ${'865212e0-4a16-4934-96f9-103cf36a6931'}
+      ${[123, 1234, 12345, 6]}       | ${'40aa2ee6-0a11-4e67-8f09-72f5eba04244'}
+      ${[0]}                         | ${'8c7f0aac-97c4-4a2f-b716-a675d821ccc0'}
+    `(
+      'should always output the UUID $uuid when the options.seeds argument is $seeds',
+      ({ uuid, seeds }) => {
+        expect(uuids({ seeds })[0]).toEqual(uuid);
+      },
+    );
+
+    describe('unseeded UUID randomness', () => {
+      const nonRandom = Array(6)
+        .fill(0)
+        .map((_, i) => uuids({ seeds: [i] })[0]);
+      const random = uuids({ count: 6 });
+      const moreRandom = uuids({ count: 6 });
+
+      it('is different from a seeded result', () => {
+        random.forEach((id, i) => {
+          expect(id).not.toEqual(nonRandom[i]);
+        });
+      });
+
+      it('is different from other random results', () => {
+        random.forEach((id, i) => {
+          expect(id).not.toEqual(moreRandom[i]);
+        });
+      });
+
+      it('never produces any duplicates', () => {
+        expect(new Set(random).size).toEqual(random.length);
+      });
+    });
+
+    it.each`
+      seed        | sequence
+      ${'GitLab'} | ${SEQUENCE_FOR_GITLAB_SEED}
+      ${12345}    | ${SEQUENCE_FOR_12345_SEED}
+    `(
+      'should output the same sequence of UUIDs for the given seed "$seed"',
+      ({ seed, sequence }) => {
+        expect(uuids({ seeds: [seed], count: 5 })).toEqual(sequence);
+      },
+    );
+  });
+});
diff --git a/spec/frontend/droplab/drop_down_spec.js b/spec/frontend/droplab/drop_down_spec.js
new file mode 100644
index 00000000000..d33d6bb70f1
--- /dev/null
+++ b/spec/frontend/droplab/drop_down_spec.js
@@ -0,0 +1,662 @@
+import DropDown from '~/droplab/drop_down';
+import utils from '~/droplab/utils';
+import { SELECTED_CLASS } from '~/droplab/constants';
+
+describe('DropLab DropDown', () => {
+  let testContext;
+
+  beforeEach(() => {
+    testContext = {};
+  });
+
+  describe('class constructor', () => {
+    beforeEach(() => {
+      jest.spyOn(DropDown.prototype, 'getItems').mockImplementation(() => {});
+      jest.spyOn(DropDown.prototype, 'initTemplateString').mockImplementation(() => {});
+      jest.spyOn(DropDown.prototype, 'addEvents').mockImplementation(() => {});
+
+      testContext.list = { innerHTML: 'innerHTML' };
+      testContext.dropdown = new DropDown(testContext.list);
+    });
+
+    it('sets the .hidden property to true', () => {
+      expect(testContext.dropdown.hidden).toBe(true);
+    });
+
+    it('sets the .list property', () => {
+      expect(testContext.dropdown.list).toBe(testContext.list);
+    });
+
+    it('calls .getItems', () => {
+      expect(DropDown.prototype.getItems).toHaveBeenCalled();
+    });
+
+    it('calls .initTemplateString', () => {
+      expect(DropDown.prototype.initTemplateString).toHaveBeenCalled();
+    });
+
+    it('calls .addEvents', () => {
+      expect(DropDown.prototype.addEvents).toHaveBeenCalled();
+    });
+
+    it('sets the .initialState property to the .list.innerHTML', () => {
+      expect(testContext.dropdown.initialState).toBe(testContext.list.innerHTML);
+    });
+
+    describe('if the list argument is a string', () => {
+      beforeEach(() => {
+        testContext.element = {};
+        testContext.selector = '.selector';
+
+        jest.spyOn(Document.prototype, 'querySelector').mockReturnValue(testContext.element);
+
+        testContext.dropdown = new DropDown(testContext.selector);
+      });
+
+      it('calls .querySelector with the selector string', () => {
+        expect(Document.prototype.querySelector).toHaveBeenCalledWith(testContext.selector);
+      });
+
+      it('sets the .list property element', () => {
+        expect(testContext.dropdown.list).toBe(testContext.element);
+      });
+    });
+  });
+
+  describe('getItems', () => {
+    beforeEach(() => {
+      testContext.list = { querySelectorAll: () => {} };
+      testContext.dropdown = { list: testContext.list };
+      testContext.nodeList = [];
+
+      jest.spyOn(testContext.list, 'querySelectorAll').mockReturnValue(testContext.nodeList);
+
+      testContext.getItems = DropDown.prototype.getItems.call(testContext.dropdown);
+    });
+
+    it('calls .querySelectorAll with a list item query', () => {
+      expect(testContext.list.querySelectorAll).toHaveBeenCalledWith('li');
+    });
+
+    it('sets the .items property to the returned list items', () => {
+      expect(testContext.dropdown.items).toEqual(expect.any(Array));
+    });
+
+    it('returns the .items', () => {
+      expect(testContext.getItems).toEqual(expect.any(Array));
+    });
+  });
+
+  describe('initTemplateString', () => {
+    beforeEach(() => {
+      testContext.items = [{ outerHTML: '<a></a>' }, { outerHTML: '<img>' }];
+      testContext.dropdown = { items: testContext.items };
+
+      DropDown.prototype.initTemplateString.call(testContext.dropdown);
+    });
+
+    it('should set .templateString to the last items .outerHTML', () => {
+      expect(testContext.dropdown.templateString).toBe(testContext.items[1].outerHTML);
+    });
+
+    it('should not set .templateString to a non-last items .outerHTML', () => {
+      expect(testContext.dropdown.templateString).not.toBe(testContext.items[0].outerHTML);
+    });
+
+    describe('if .items is not set', () => {
+      beforeEach(() => {
+        testContext.dropdown = { getItems: () => {} };
+
+        jest.spyOn(testContext.dropdown, 'getItems').mockReturnValue([]);
+
+        DropDown.prototype.initTemplateString.call(testContext.dropdown);
+      });
+
+      it('should call .getItems', () => {
+        expect(testContext.dropdown.getItems).toHaveBeenCalled();
+      });
+    });
+
+    describe('if items array is empty', () => {
+      beforeEach(() => {
+        testContext.dropdown = { items: [] };
+
+        DropDown.prototype.initTemplateString.call(testContext.dropdown);
+      });
+
+      it('should set .templateString to an empty string', () => {
+        expect(testContext.dropdown.templateString).toBe('');
+      });
+    });
+  });
+
+  describe('clickEvent', () => {
+    beforeEach(() => {
+      testContext.classList = {
+        contains: jest.fn(),
+      };
+      testContext.list = { dispatchEvent: () => {} };
+      testContext.dropdown = {
+        hideOnClick: true,
+        hide: () => {},
+        list: testContext.list,
+        addSelectedClass: () => {},
+      };
+      testContext.event = {
+        preventDefault: () => {},
+        target: {
+          classList: testContext.classList,
+          closest: () => null,
+        },
+      };
+
+      testContext.dummyListItem = document.createElement('li');
+      jest.spyOn(testContext.event.target, 'closest').mockImplementation(selector => {
+        if (selector === 'li') {
+          return testContext.dummyListItem;
+        }
+
+        return null;
+      });
+
+      jest.spyOn(testContext.dropdown, 'hide').mockImplementation(() => {});
+      jest.spyOn(testContext.dropdown, 'addSelectedClass').mockImplementation(() => {});
+      jest.spyOn(testContext.list, 'dispatchEvent').mockImplementation(() => {});
+      jest.spyOn(testContext.event, 'preventDefault').mockImplementation(() => {});
+      window.CustomEvent = jest.fn();
+      testContext.classList.contains.mockReturnValue(false);
+    });
+
+    describe('normal click event', () => {
+      beforeEach(() => {
+        DropDown.prototype.clickEvent.call(testContext.dropdown, testContext.event);
+      });
+      it('should call event.target.closest', () => {
+        expect(testContext.event.target.closest).toHaveBeenCalledWith('.droplab-item-ignore');
+        expect(testContext.event.target.closest).toHaveBeenCalledWith('li');
+      });
+
+      it('should call addSelectedClass', () => {
+        expect(testContext.dropdown.addSelectedClass).toHaveBeenCalledWith(
+          testContext.dummyListItem,
+        );
+      });
+
+      it('should call .preventDefault', () => {
+        expect(testContext.event.preventDefault).toHaveBeenCalled();
+      });
+
+      it('should call .hide', () => {
+        expect(testContext.dropdown.hide).toHaveBeenCalled();
+      });
+
+      it('should construct CustomEvent', () => {
+        expect(window.CustomEvent).toHaveBeenCalledWith('click.dl', expect.any(Object));
+      });
+
+      it('should call .dispatchEvent with the customEvent', () => {
+        expect(testContext.list.dispatchEvent).toHaveBeenCalledWith({});
+      });
+    });
+
+    describe('if the target is a UL element', () => {
+      beforeEach(() => {
+        testContext.event.target = document.createElement('ul');
+
+        jest.spyOn(testContext.event.target, 'closest').mockImplementation(() => {});
+      });
+
+      it('should return immediately', () => {
+        DropDown.prototype.clickEvent.call(testContext.dropdown, testContext.event);
+
+        expect(testContext.event.target.closest).not.toHaveBeenCalled();
+        expect(testContext.dropdown.addSelectedClass).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('if the target has the droplab-item-ignore class', () => {
+      beforeEach(() => {
+        testContext.ignoredButton = document.createElement('button');
+        testContext.ignoredButton.classList.add('droplab-item-ignore');
+        testContext.event.target = testContext.ignoredButton;
+
+        jest.spyOn(testContext.ignoredButton, 'closest');
+      });
+
+      it('does not select element', () => {
+        DropDown.prototype.clickEvent.call(testContext.dropdown, testContext.event);
+
+        expect(testContext.ignoredButton.closest.mock.calls.length).toBe(1);
+        expect(testContext.ignoredButton.closest).toHaveBeenCalledWith('.droplab-item-ignore');
+        expect(testContext.dropdown.addSelectedClass).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('if no selected element exists', () => {
+      beforeEach(() => {
+        testContext.event.preventDefault.mockReset();
+        testContext.dummyListItem = null;
+      });
+
+      it('should return before .preventDefault is called', () => {
+        DropDown.prototype.clickEvent.call(testContext.dropdown, testContext.event);
+
+        expect(testContext.event.preventDefault).not.toHaveBeenCalled();
+        expect(testContext.dropdown.addSelectedClass).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('if hideOnClick is false', () => {
+      beforeEach(() => {
+        testContext.dropdown.hideOnClick = false;
+        testContext.dropdown.hide.mockReset();
+      });
+
+      it('should not call .hide', () => {
+        DropDown.prototype.clickEvent.call(testContext.dropdown, testContext.event);
+
+        expect(testContext.dropdown.hide).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('addSelectedClass', () => {
+    beforeEach(() => {
+      testContext.items = Array(4).forEach((item, i) => {
+        testContext.items[i] = { classList: { add: () => {} } };
+        jest.spyOn(testContext.items[i].classList, 'add').mockImplementation(() => {});
+      });
+      testContext.selected = { classList: { add: () => {} } };
+      testContext.dropdown = { removeSelectedClasses: () => {} };
+
+      jest.spyOn(testContext.dropdown, 'removeSelectedClasses').mockImplementation(() => {});
+      jest.spyOn(testContext.selected.classList, 'add').mockImplementation(() => {});
+
+      DropDown.prototype.addSelectedClass.call(testContext.dropdown, testContext.selected);
+    });
+
+    it('should call .removeSelectedClasses', () => {
+      expect(testContext.dropdown.removeSelectedClasses).toHaveBeenCalled();
+    });
+
+    it('should call .classList.add', () => {
+      expect(testContext.selected.classList.add).toHaveBeenCalledWith(SELECTED_CLASS);
+    });
+  });
+
+  describe('removeSelectedClasses', () => {
+    beforeEach(() => {
+      testContext.items = [...Array(4)];
+      testContext.items.forEach((item, i) => {
+        testContext.items[i] = { classList: { add: jest.fn(), remove: jest.fn() } };
+      });
+      testContext.dropdown = { items: testContext.items };
+
+      DropDown.prototype.removeSelectedClasses.call(testContext.dropdown);
+    });
+
+    it('should call .classList.remove for all items', () => {
+      testContext.items.forEach((_, i) => {
+        expect(testContext.items[i].classList.remove).toHaveBeenCalledWith(SELECTED_CLASS);
+      });
+    });
+
+    describe('if .items is not set', () => {
+      beforeEach(() => {
+        testContext.dropdown = { getItems: () => {} };
+
+        jest.spyOn(testContext.dropdown, 'getItems').mockReturnValue([]);
+
+        DropDown.prototype.removeSelectedClasses.call(testContext.dropdown);
+      });
+
+      it('should call .getItems', () => {
+        expect(testContext.dropdown.getItems).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('addEvents', () => {
+    beforeEach(() => {
+      testContext.list = {
+        addEventListener: () => {},
+        querySelectorAll: () => [],
+      };
+      testContext.dropdown = {
+        list: testContext.list,
+        clickEvent: () => {},
+        closeDropdown: () => {},
+        eventWrapper: {},
+      };
+    });
+
+    it('should call .addEventListener', () => {
+      jest.spyOn(testContext.list, 'addEventListener').mockImplementation(() => {});
+
+      DropDown.prototype.addEvents.call(testContext.dropdown);
+
+      expect(testContext.list.addEventListener).toHaveBeenCalledWith('click', expect.any(Function));
+      expect(testContext.list.addEventListener).toHaveBeenCalledWith('keyup', expect.any(Function));
+    });
+  });
+
+  describe('setData', () => {
+    beforeEach(() => {
+      testContext.dropdown = { render: () => {} };
+      testContext.data = ['data'];
+
+      jest.spyOn(testContext.dropdown, 'render').mockImplementation(() => {});
+
+      DropDown.prototype.setData.call(testContext.dropdown, testContext.data);
+    });
+
+    it('should set .data', () => {
+      expect(testContext.dropdown.data).toBe(testContext.data);
+    });
+
+    it('should call .render with the .data', () => {
+      expect(testContext.dropdown.render).toHaveBeenCalledWith(testContext.data);
+    });
+  });
+
+  describe('addData', () => {
+    beforeEach(() => {
+      testContext.dropdown = { render: () => {}, data: ['data1'] };
+      testContext.data = ['data2'];
+
+      jest.spyOn(testContext.dropdown, 'render').mockImplementation(() => {});
+      jest.spyOn(Array.prototype, 'concat');
+
+      DropDown.prototype.addData.call(testContext.dropdown, testContext.data);
+    });
+
+    it('should call .concat with data', () => {
+      expect(Array.prototype.concat).toHaveBeenCalledWith(testContext.data);
+    });
+
+    it('should set .data with concatination', () => {
+      expect(testContext.dropdown.data).toStrictEqual(['data1', 'data2']);
+    });
+
+    it('should call .render with the .data', () => {
+      expect(testContext.dropdown.render).toHaveBeenCalledWith(['data1', 'data2']);
+    });
+
+    describe('if .data is undefined', () => {
+      beforeEach(() => {
+        testContext.dropdown = { render: () => {}, data: undefined };
+        testContext.data = ['data2'];
+
+        jest.spyOn(testContext.dropdown, 'render').mockImplementation(() => {});
+
+        DropDown.prototype.addData.call(testContext.dropdown, testContext.data);
+      });
+
+      it('should set .data with concatination', () => {
+        expect(testContext.dropdown.data).toStrictEqual(['data2']);
+      });
+    });
+  });
+
+  describe('render', () => {
+    beforeEach(() => {
+      testContext.renderableList = {};
+      testContext.list = {
+        querySelector: q => {
+          if (q === '.filter-dropdown-loading') {
+            return false;
+          }
+          return testContext.renderableList;
+        },
+        dispatchEvent: () => {},
+      };
+      testContext.dropdown = { renderChildren: () => {}, list: testContext.list };
+      testContext.data = [0, 1];
+      testContext.customEvent = {};
+
+      jest.spyOn(testContext.dropdown, 'renderChildren').mockImplementation(data => data);
+      jest.spyOn(testContext.list, 'dispatchEvent').mockImplementation(() => {});
+      jest.spyOn(testContext.data, 'map');
+      jest.spyOn(window, 'CustomEvent').mockReturnValue(testContext.customEvent);
+
+      DropDown.prototype.render.call(testContext.dropdown, testContext.data);
+    });
+
+    it('should call .map', () => {
+      expect(testContext.data.map).toHaveBeenCalledWith(expect.any(Function));
+    });
+
+    it('should call .renderChildren for each data item', () => {
+      expect(testContext.dropdown.renderChildren.mock.calls.length).toBe(testContext.data.length);
+    });
+
+    it('sets the renderableList .innerHTML', () => {
+      expect(testContext.renderableList.innerHTML).toBe('01');
+    });
+
+    it('should call render.dl', () => {
+      expect(window.CustomEvent).toHaveBeenCalledWith('render.dl', expect.any(Object));
+    });
+
+    it('should call dispatchEvent with the customEvent', () => {
+      expect(testContext.list.dispatchEvent).toHaveBeenCalledWith(testContext.customEvent);
+    });
+
+    describe('if no data argument is passed', () => {
+      beforeEach(() => {
+        testContext.data.map.mockReset();
+        testContext.dropdown.renderChildren.mockReset();
+
+        DropDown.prototype.render.call(testContext.dropdown, undefined);
+      });
+
+      it('should not call .map', () => {
+        expect(testContext.data.map).not.toHaveBeenCalled();
+      });
+
+      it('should not call .renderChildren', () => {
+        expect(testContext.dropdown.renderChildren).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('if no dynamic list is present', () => {
+      beforeEach(() => {
+        testContext.list = { querySelector: () => {}, dispatchEvent: () => {} };
+        testContext.dropdown = { renderChildren: () => {}, list: testContext.list };
+        testContext.data = [0, 1];
+
+        jest.spyOn(testContext.dropdown, 'renderChildren').mockImplementation(data => data);
+        jest.spyOn(testContext.list, 'querySelector').mockImplementation(() => {});
+        jest.spyOn(testContext.data, 'map');
+
+        DropDown.prototype.render.call(testContext.dropdown, testContext.data);
+      });
+
+      it('sets the .list .innerHTML', () => {
+        expect(testContext.list.innerHTML).toBe('01');
+      });
+    });
+  });
+
+  describe('renderChildren', () => {
+    beforeEach(() => {
+      testContext.templateString = 'templateString';
+      testContext.dropdown = { templateString: testContext.templateString };
+      testContext.data = { droplab_hidden: true };
+      testContext.html = 'html';
+      testContext.template = { firstChild: { outerHTML: 'outerHTML', style: {} } };
+
+      jest.spyOn(utils, 'template').mockReturnValue(testContext.html);
+      jest.spyOn(document, 'createElement').mockReturnValue(testContext.template);
+      jest.spyOn(DropDown, 'setImagesSrc').mockImplementation(() => {});
+
+      testContext.renderChildren = DropDown.prototype.renderChildren.call(
+        testContext.dropdown,
+        testContext.data,
+      );
+    });
+
+    it('should call utils.t with .templateString and data', () => {
+      expect(utils.template).toHaveBeenCalledWith(testContext.templateString, testContext.data);
+    });
+
+    it('should call document.createElement', () => {
+      expect(document.createElement).toHaveBeenCalledWith('div');
+    });
+
+    it('should set the templates .innerHTML to the HTML', () => {
+      expect(testContext.template.innerHTML).toBe(testContext.html);
+    });
+
+    it('should call .setImagesSrc with the template', () => {
+      expect(DropDown.setImagesSrc).toHaveBeenCalledWith(testContext.template);
+    });
+
+    it('should set the template display to none', () => {
+      expect(testContext.template.firstChild.style.display).toBe('none');
+    });
+
+    it('should return the templates .firstChild.outerHTML', () => {
+      expect(testContext.renderChildren).toBe(testContext.template.firstChild.outerHTML);
+    });
+
+    describe('if droplab_hidden is false', () => {
+      beforeEach(() => {
+        testContext.data = { droplab_hidden: false };
+        testContext.renderChildren = DropDown.prototype.renderChildren.call(
+          testContext.dropdown,
+          testContext.data,
+        );
+      });
+
+      it('should set the template display to block', () => {
+        expect(testContext.template.firstChild.style.display).toBe('block');
+      });
+    });
+  });
+
+  describe('setImagesSrc', () => {
+    beforeEach(() => {
+      testContext.template = { querySelectorAll: () => {} };
+
+      jest.spyOn(testContext.template, 'querySelectorAll').mockReturnValue([]);
+
+      DropDown.setImagesSrc(testContext.template);
+    });
+
+    it('should call .querySelectorAll', () => {
+      expect(testContext.template.querySelectorAll).toHaveBeenCalledWith('img[data-src]');
+    });
+  });
+
+  describe('show', () => {
+    beforeEach(() => {
+      testContext.list = { style: {} };
+      testContext.dropdown = { list: testContext.list, hidden: true };
+
+      DropDown.prototype.show.call(testContext.dropdown);
+    });
+
+    it('it should set .list display to block', () => {
+      expect(testContext.list.style.display).toBe('block');
+    });
+
+    it('it should set .hidden to false', () => {
+      expect(testContext.dropdown.hidden).toBe(false);
+    });
+
+    describe('if .hidden is false', () => {
+      beforeEach(() => {
+        testContext.list = { style: {} };
+        testContext.dropdown = { list: testContext.list, hidden: false };
+
+        testContext.show = DropDown.prototype.show.call(testContext.dropdown);
+      });
+
+      it('should return undefined', () => {
+        expect(testContext.show).toBeUndefined();
+      });
+
+      it('should not set .list display to block', () => {
+        expect(testContext.list.style.display).not.toBe('block');
+      });
+    });
+  });
+
+  describe('hide', () => {
+    beforeEach(() => {
+      testContext.list = { style: {} };
+      testContext.dropdown = { list: testContext.list };
+
+      DropDown.prototype.hide.call(testContext.dropdown);
+    });
+
+    it('it should set .list display to none', () => {
+      expect(testContext.list.style.display).toBe('none');
+    });
+
+    it('it should set .hidden to true', () => {
+      expect(testContext.dropdown.hidden).toBe(true);
+    });
+  });
+
+  describe('toggle', () => {
+    beforeEach(() => {
+      testContext.hidden = true;
+      testContext.dropdown = { hidden: testContext.hidden, show: () => {}, hide: () => {} };
+
+      jest.spyOn(testContext.dropdown, 'show').mockImplementation(() => {});
+      jest.spyOn(testContext.dropdown, 'hide').mockImplementation(() => {});
+
+      DropDown.prototype.toggle.call(testContext.dropdown);
+    });
+
+    it('should call .show', () => {
+      expect(testContext.dropdown.show).toHaveBeenCalled();
+    });
+
+    describe('if .hidden is false', () => {
+      beforeEach(() => {
+        testContext.hidden = false;
+        testContext.dropdown = { hidden: testContext.hidden, show: () => {}, hide: () => {} };
+
+        jest.spyOn(testContext.dropdown, 'show').mockImplementation(() => {});
+        jest.spyOn(testContext.dropdown, 'hide').mockImplementation(() => {});
+
+        DropDown.prototype.toggle.call(testContext.dropdown);
+      });
+
+      it('should call .hide', () => {
+        expect(testContext.dropdown.hide).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('destroy', () => {
+    beforeEach(() => {
+      testContext.list = { removeEventListener: () => {} };
+      testContext.eventWrapper = { clickEvent: 'clickEvent' };
+      testContext.dropdown = {
+        list: testContext.list,
+        hide: () => {},
+        eventWrapper: testContext.eventWrapper,
+      };
+
+      jest.spyOn(testContext.list, 'removeEventListener').mockImplementation(() => {});
+      jest.spyOn(testContext.dropdown, 'hide').mockImplementation(() => {});
+
+      DropDown.prototype.destroy.call(testContext.dropdown);
+    });
+
+    it('it should call .hide', () => {
+      expect(testContext.dropdown.hide).toHaveBeenCalled();
+    });
+
+    it('it should call .removeEventListener', () => {
+      expect(testContext.list.removeEventListener).toHaveBeenCalledWith(
+        'click',
+        testContext.eventWrapper.clickEvent,
+      );
+    });
+  });
+});
diff --git a/spec/frontend/droplab/hook_spec.js b/spec/frontend/droplab/hook_spec.js
new file mode 100644
index 00000000000..11488cab521
--- /dev/null
+++ b/spec/frontend/droplab/hook_spec.js
@@ -0,0 +1,94 @@
+import Hook from '~/droplab/hook';
+import DropDown from '~/droplab/drop_down';
+
+jest.mock('~/droplab/drop_down', () => jest.fn());
+
+describe('Hook', () => {
+  let testContext;
+
+  beforeEach(() => {
+    testContext = {};
+  });
+
+  describe('class constructor', () => {
+    beforeEach(() => {
+      testContext.trigger = { id: 'id' };
+      testContext.list = {};
+      testContext.plugins = {};
+      testContext.config = {};
+
+      testContext.hook = new Hook(
+        testContext.trigger,
+        testContext.list,
+        testContext.plugins,
+        testContext.config,
+      );
+    });
+
+    it('should set .trigger', () => {
+      expect(testContext.hook.trigger).toBe(testContext.trigger);
+    });
+
+    it('should set .list', () => {
+      expect(testContext.hook.list).toEqual({});
+    });
+
+    it('should call DropDown constructor', () => {
+      expect(DropDown).toHaveBeenCalledWith(testContext.list, testContext.config);
+    });
+
+    it('should set .type', () => {
+      expect(testContext.hook.type).toBe('Hook');
+    });
+
+    it('should set .event', () => {
+      expect(testContext.hook.event).toBe('click');
+    });
+
+    it('should set .plugins', () => {
+      expect(testContext.hook.plugins).toBe(testContext.plugins);
+    });
+
+    it('should set .config', () => {
+      expect(testContext.hook.config).toBe(testContext.config);
+    });
+
+    it('should set .id', () => {
+      expect(testContext.hook.id).toBe(testContext.trigger.id);
+    });
+
+    describe('if config argument is undefined', () => {
+      beforeEach(() => {
+        testContext.config = undefined;
+
+        testContext.hook = new Hook(
+          testContext.trigger,
+          testContext.list,
+          testContext.plugins,
+          testContext.config,
+        );
+      });
+
+      it('should set .config to an empty object', () => {
+        expect(testContext.hook.config).toEqual({});
+      });
+    });
+
+    describe('if plugins argument is undefined', () => {
+      beforeEach(() => {
+        testContext.plugins = undefined;
+
+        testContext.hook = new Hook(
+          testContext.trigger,
+          testContext.list,
+          testContext.plugins,
+          testContext.config,
+        );
+      });
+
+      it('should set .plugins to an empty array', () => {
+        expect(testContext.hook.plugins).toEqual([]);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/droplab/plugins/input_setter_spec.js b/spec/frontend/droplab/plugins/input_setter_spec.js
new file mode 100644
index 00000000000..eebde018fa1
--- /dev/null
+++ b/spec/frontend/droplab/plugins/input_setter_spec.js
@@ -0,0 +1,259 @@
+import InputSetter from '~/droplab/plugins/input_setter';
+
+describe('InputSetter', () => {
+  let testContext;
+
+  beforeEach(() => {
+    testContext = {};
+  });
+
+  describe('init', () => {
+    beforeEach(() => {
+      testContext.config = { InputSetter: {} };
+      testContext.hook = { config: testContext.config };
+      testContext.inputSetter = {
+        addEvents: jest.fn(),
+      };
+
+      InputSetter.init.call(testContext.inputSetter, testContext.hook);
+    });
+
+    it('should set .hook', () => {
+      expect(testContext.inputSetter.hook).toBe(testContext.hook);
+    });
+
+    it('should set .config', () => {
+      expect(testContext.inputSetter.config).toBe(testContext.config.InputSetter);
+    });
+
+    it('should set .eventWrapper', () => {
+      expect(testContext.inputSetter.eventWrapper).toEqual({});
+    });
+
+    it('should call .addEvents', () => {
+      expect(testContext.inputSetter.addEvents).toHaveBeenCalled();
+    });
+
+    describe('if config.InputSetter is not set', () => {
+      beforeEach(() => {
+        testContext.config = { InputSetter: undefined };
+        testContext.hook = { config: testContext.config };
+
+        InputSetter.init.call(testContext.inputSetter, testContext.hook);
+      });
+
+      it('should set .config to an empty object', () => {
+        expect(testContext.inputSetter.config).toEqual({});
+      });
+
+      it('should set hook.config to an empty object', () => {
+        expect(testContext.hook.config.InputSetter).toEqual({});
+      });
+    });
+  });
+
+  describe('addEvents', () => {
+    beforeEach(() => {
+      testContext.hook = {
+        list: {
+          list: {
+            addEventListener: jest.fn(),
+          },
+        },
+      };
+      testContext.inputSetter = { eventWrapper: {}, hook: testContext.hook, setInputs: () => {} };
+
+      InputSetter.addEvents.call(testContext.inputSetter);
+    });
+
+    it('should set .eventWrapper.setInputs', () => {
+      expect(testContext.inputSetter.eventWrapper.setInputs).toEqual(expect.any(Function));
+    });
+
+    it('should call .addEventListener', () => {
+      expect(testContext.hook.list.list.addEventListener).toHaveBeenCalledWith(
+        'click.dl',
+        testContext.inputSetter.eventWrapper.setInputs,
+      );
+    });
+  });
+
+  describe('removeEvents', () => {
+    beforeEach(() => {
+      testContext.hook = {
+        list: {
+          list: {
+            removeEventListener: jest.fn(),
+          },
+        },
+      };
+      testContext.eventWrapper = {
+        setInputs: jest.fn(),
+      };
+      testContext.inputSetter = { eventWrapper: testContext.eventWrapper, hook: testContext.hook };
+
+      InputSetter.removeEvents.call(testContext.inputSetter);
+    });
+
+    it('should call .removeEventListener', () => {
+      expect(testContext.hook.list.list.removeEventListener).toHaveBeenCalledWith(
+        'click.dl',
+        testContext.eventWrapper.setInputs,
+      );
+    });
+  });
+
+  describe('setInputs', () => {
+    beforeEach(() => {
+      testContext.event = { detail: { selected: {} } };
+      testContext.config = [0, 1];
+      testContext.inputSetter = { config: testContext.config, setInput: () => {} };
+
+      jest.spyOn(testContext.inputSetter, 'setInput').mockImplementation(() => {});
+
+      InputSetter.setInputs.call(testContext.inputSetter, testContext.event);
+    });
+
+    it('should call .setInput for each config element', () => {
+      const allArgs = testContext.inputSetter.setInput.mock.calls;
+
+      expect(allArgs.length).toEqual(2);
+
+      allArgs.forEach((args, i) => {
+        expect(args[0]).toBe(testContext.config[i]);
+        expect(args[1]).toBe(testContext.event.detail.selected);
+      });
+    });
+
+    describe('if config isnt an array', () => {
+      beforeEach(() => {
+        testContext.inputSetter = { config: {}, setInput: () => {} };
+
+        InputSetter.setInputs.call(testContext.inputSetter, testContext.event);
+      });
+
+      it('should set .config to an array with .config as the first element', () => {
+        expect(testContext.inputSetter.config).toEqual([{}]);
+      });
+    });
+  });
+
+  describe('setInput', () => {
+    beforeEach(() => {
+      testContext.selectedItem = { getAttribute: () => {} };
+      testContext.input = { value: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} };
+      testContext.config = { valueAttribute: {}, input: testContext.input };
+      testContext.inputSetter = { hook: { trigger: {} } };
+      testContext.newValue = 'newValue';
+
+      jest.spyOn(testContext.selectedItem, 'getAttribute').mockReturnValue(testContext.newValue);
+      jest.spyOn(testContext.input, 'hasAttribute').mockReturnValue(false);
+
+      InputSetter.setInput.call(
+        testContext.inputSetter,
+        testContext.config,
+        testContext.selectedItem,
+      );
+    });
+
+    it('should call .getAttribute', () => {
+      expect(testContext.selectedItem.getAttribute).toHaveBeenCalledWith(
+        testContext.config.valueAttribute,
+      );
+    });
+
+    it('should call .hasAttribute', () => {
+      expect(testContext.input.hasAttribute).toHaveBeenCalledWith(undefined);
+    });
+
+    it('should set the value of the input', () => {
+      expect(testContext.input.value).toBe(testContext.newValue);
+    });
+
+    describe('if no config.input is provided', () => {
+      beforeEach(() => {
+        testContext.config = { valueAttribute: {} };
+        testContext.trigger = { value: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} };
+        testContext.inputSetter = { hook: { trigger: testContext.trigger } };
+
+        InputSetter.setInput.call(
+          testContext.inputSetter,
+          testContext.config,
+          testContext.selectedItem,
+        );
+      });
+
+      it('should set the value of the hook.trigger', () => {
+        expect(testContext.trigger.value).toBe(testContext.newValue);
+      });
+    });
+
+    describe('if the input tag is not INPUT', () => {
+      beforeEach(() => {
+        testContext.input = { textContent: 'oldValue', tagName: 'SPAN', hasAttribute: () => {} };
+        testContext.config = { valueAttribute: {}, input: testContext.input };
+
+        InputSetter.setInput.call(
+          testContext.inputSetter,
+          testContext.config,
+          testContext.selectedItem,
+        );
+      });
+
+      it('should set the textContent of the input', () => {
+        expect(testContext.input.textContent).toBe(testContext.newValue);
+      });
+    });
+
+    describe('if there is an inputAttribute', () => {
+      beforeEach(() => {
+        testContext.selectedItem = { getAttribute: () => {} };
+        testContext.input = { id: 'oldValue', hasAttribute: () => {}, setAttribute: () => {} };
+        testContext.inputSetter = { hook: { trigger: {} } };
+        testContext.newValue = 'newValue';
+        testContext.inputAttribute = 'id';
+        testContext.config = {
+          valueAttribute: {},
+          input: testContext.input,
+          inputAttribute: testContext.inputAttribute,
+        };
+
+        jest.spyOn(testContext.selectedItem, 'getAttribute').mockReturnValue(testContext.newValue);
+        jest.spyOn(testContext.input, 'hasAttribute').mockReturnValue(true);
+        jest.spyOn(testContext.input, 'setAttribute').mockImplementation(() => {});
+
+        InputSetter.setInput.call(
+          testContext.inputSetter,
+          testContext.config,
+          testContext.selectedItem,
+        );
+      });
+
+      it('should call setAttribute', () => {
+        expect(testContext.input.setAttribute).toHaveBeenCalledWith(
+          testContext.inputAttribute,
+          testContext.newValue,
+        );
+      });
+
+      it('should not set the value or textContent of the input', () => {
+        expect(testContext.input.value).not.toBe('newValue');
+        expect(testContext.input.textContent).not.toBe('newValue');
+      });
+    });
+  });
+
+  describe('destroy', () => {
+    beforeEach(() => {
+      testContext.inputSetter = {
+        removeEvents: jest.fn(),
+      };
+
+      InputSetter.destroy.call(testContext.inputSetter);
+    });
+
+    it('should call .removeEvents', () => {
+      expect(testContext.inputSetter.removeEvents).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/javascripts/dropzone_input_spec.js b/spec/frontend/dropzone_input_spec.js
index 6f6f20ccca2..688b9164e5f 100644
--- a/spec/javascripts/dropzone_input_spec.js
+++ b/spec/frontend/dropzone_input_spec.js
@@ -1,7 +1,9 @@
 import $ from 'jquery';
+import mock from 'xhr-mock';
 import { TEST_HOST } from 'spec/test_constants';
 import dropzoneInput from '~/dropzone_input';
 import PasteMarkdownTable from '~/behaviors/markdown/paste_markdown_table';
+import waitForPromises from 'helpers/wait_for_promises';
 
 const TEST_FILE = new File([], 'somefile.jpg');
 TEST_FILE.upload = {};
@@ -38,14 +40,16 @@ describe('dropzone_input', () => {
     it('pastes Markdown tables', () => {
       const event = $.Event('paste');
       const origEvent = new Event('paste');
-      const pasteData = new DataTransfer();
-      pasteData.setData('text/plain', 'Hello World');
-      pasteData.setData('text/html', '<table><tr><td>Hello World</td></tr></table>');
-      origEvent.clipboardData = pasteData;
+
+      origEvent.clipboardData = {
+        types: ['text/plain', 'text/html'],
+        getData: () => '<table><tr><td>Hello World</td></tr></table>',
+        items: [],
+      };
       event.originalEvent = origEvent;
 
-      spyOn(PasteMarkdownTable.prototype, 'isTable').and.callThrough();
-      spyOn(PasteMarkdownTable.prototype, 'convertToTableMarkdown').and.callThrough();
+      jest.spyOn(PasteMarkdownTable.prototype, 'isTable');
+      jest.spyOn(PasteMarkdownTable.prototype, 'convertToTableMarkdown');
 
       $('.js-gfm-input').trigger(event);
 
@@ -57,53 +61,37 @@ describe('dropzone_input', () => {
   describe('shows error message', () => {
     let form;
     let dropzone;
-    let xhr;
-    let oldXMLHttpRequest;
 
     beforeEach(() => {
+      mock.setup();
+
       form = $(TEMPLATE);
 
       dropzone = dropzoneInput(form);
-
-      xhr = jasmine.createSpyObj(Object.keys(XMLHttpRequest.prototype));
-      oldXMLHttpRequest = window.XMLHttpRequest;
-      window.XMLHttpRequest = () => xhr;
     });
 
     afterEach(() => {
-      window.XMLHttpRequest = oldXMLHttpRequest;
+      mock.teardown();
     });
 
-    it('when AJAX fails with json', () => {
-      xhr = {
-        ...xhr,
-        statusCode: 400,
-        readyState: 4,
-        responseText: JSON.stringify({ message: TEST_ERROR_MESSAGE }),
-        getResponseHeader: () => 'application/json',
-      };
-
-      dropzone.processFile(TEST_FILE);
-
-      xhr.onload();
-
-      expect(form.find('.uploading-error-message').text()).toEqual(TEST_ERROR_MESSAGE);
-    });
+    beforeEach(() => {});
 
-    it('when AJAX fails with text', () => {
-      xhr = {
-        ...xhr,
-        statusCode: 400,
-        readyState: 4,
-        responseText: TEST_ERROR_MESSAGE,
-        getResponseHeader: () => 'text/plain',
-      };
+    it.each`
+      responseType          | responseBody
+      ${'application/json'} | ${JSON.stringify({ message: TEST_ERROR_MESSAGE })}
+      ${'text/plain'}       | ${TEST_ERROR_MESSAGE}
+    `('when AJAX fails with json', ({ responseType, responseBody }) => {
+      mock.post(TEST_UPLOAD_PATH, {
+        status: 400,
+        body: responseBody,
+        headers: { 'Content-Type': responseType },
+      });
 
       dropzone.processFile(TEST_FILE);
 
-      xhr.onload();
-
-      expect(form.find('.uploading-error-message').text()).toEqual(TEST_ERROR_MESSAGE);
+      return waitForPromises().then(() => {
+        expect(form.find('.uploading-error-message').text()).toEqual(TEST_ERROR_MESSAGE);
+      });
     });
   });
 });
diff --git a/spec/frontend/environment.js b/spec/frontend/environment.js
index cd4fae60049..08da34aa27a 100644
--- a/spec/frontend/environment.js
+++ b/spec/frontend/environment.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const { ErrorWithStack } = require('jest-util');
-const JSDOMEnvironment = require('jest-environment-jsdom');
+const JSDOMEnvironment = require('jest-environment-jsdom-sixteen');
 
 const ROOT_PATH = path.resolve(__dirname, '../..');
 
diff --git a/spec/frontend/environments/environments_app_spec.js b/spec/frontend/environments/environments_app_spec.js
index f3d2bd2462e..c0bf0dca176 100644
--- a/spec/frontend/environments/environments_app_spec.js
+++ b/spec/frontend/environments/environments_app_spec.js
@@ -53,7 +53,7 @@ describe('Environment', () => {
     describe('without environments', () => {
       beforeEach(() => {
         mockRequest(200, { environments: [] });
-        return createWrapper(true);
+        return createWrapper();
       });
 
       it('should render the empty state', () => {
@@ -118,7 +118,7 @@ describe('Environment', () => {
   describe('unsuccessful request', () => {
     beforeEach(() => {
       mockRequest(500, {});
-      return createWrapper(true);
+      return createWrapper();
     });
 
     it('should render empty state', () => {
diff --git a/spec/frontend/error_tracking/components/error_details_spec.js b/spec/frontend/error_tracking/components/error_details_spec.js
index adbbc04ce78..fd2164d05fc 100644
--- a/spec/frontend/error_tracking/components/error_details_spec.js
+++ b/spec/frontend/error_tracking/components/error_details_spec.js
@@ -18,6 +18,12 @@ import {
   severityLevelVariant,
   errorStatus,
 } from '~/error_tracking/components/constants';
+import Tracking from '~/tracking';
+import {
+  trackClickErrorLinkToSentryOptions,
+  trackErrorDetailsViewsOptions,
+  trackErrorStatusUpdateOptions,
+} from '~/error_tracking/utils';
 
 jest.mock('~/flash');
 
@@ -30,12 +36,19 @@ describe('ErrorDetails', () => {
   let actions;
   let getters;
   let mocks;
+  const externalUrl = 'https://sentry.io/organizations/test-sentry-nk/issues/1/?project=1';
 
   const findInput = name => {
     const inputs = wrapper.findAll(GlFormInput).filter(c => c.attributes('name') === name);
     return inputs.length ? inputs.at(0) : inputs;
   };
 
+  const findUpdateIgnoreStatusButton = () =>
+    wrapper.find('[data-testid="update-ignore-status-btn"]');
+  const findUpdateResolveStatusButton = () =>
+    wrapper.find('[data-testid="update-resolve-status-btn"]');
+  const findExternalUrl = () => wrapper.find('[data-testid="external-url-link"]');
+
   function mountComponent() {
     wrapper = shallowMount(ErrorDetails, {
       stubs: { GlDeprecatedButton, GlSprintf },
@@ -57,7 +70,7 @@ describe('ErrorDetails', () => {
   beforeEach(() => {
     actions = {
       startPollingStacktrace: () => {},
-      updateIgnoreStatus: jest.fn(),
+      updateIgnoreStatus: jest.fn().mockResolvedValue({}),
       updateResolveStatus: jest.fn().mockResolvedValue({ closed_issue_iid: 1 }),
     };
 
@@ -170,6 +183,9 @@ describe('ErrorDetails', () => {
           count: 12,
           userCount: 2,
         },
+        stacktraceData: {
+          date_received: '2020-05-20',
+        },
       });
     });
 
@@ -235,7 +251,7 @@ describe('ErrorDetails', () => {
             },
           });
           return wrapper.vm.$nextTick().then(() => {
-            expect(wrapper.find(GlBadge).attributes('variant')).toEqual(
+            expect(wrapper.find(GlBadge).props('variant')).toEqual(
               severityLevelVariant[severityLevel[level]],
             );
           });
@@ -249,7 +265,7 @@ describe('ErrorDetails', () => {
           },
         });
         return wrapper.vm.$nextTick().then(() => {
-          expect(wrapper.find(GlBadge).attributes('variant')).toEqual(
+          expect(wrapper.find(GlBadge).props('variant')).toEqual(
             severityLevelVariant[severityLevel.ERROR],
           );
         });
@@ -302,11 +318,6 @@ describe('ErrorDetails', () => {
     });
 
     describe('Status update', () => {
-      const findUpdateIgnoreStatusButton = () =>
-        wrapper.find('[data-qa-selector="update_ignore_status_button"]');
-      const findUpdateResolveStatusButton = () =>
-        wrapper.find('[data-qa-selector="update_resolve_status_button"]');
-
       afterEach(() => {
         actions.updateIgnoreStatus.mockClear();
         actions.updateResolveStatus.mockClear();
@@ -491,4 +502,49 @@ describe('ErrorDetails', () => {
       });
     });
   });
+
+  describe('Snowplow tracking', () => {
+    beforeEach(() => {
+      jest.spyOn(Tracking, 'event');
+      mocks.$apollo.queries.error.loading = false;
+      mountComponent();
+      wrapper.setData({
+        error: { externalUrl },
+      });
+    });
+
+    it('should track detail page views', () => {
+      const { category, action } = trackErrorDetailsViewsOptions;
+      expect(Tracking.event).toHaveBeenCalledWith(category, action);
+    });
+
+    it('should track IGNORE status update', () => {
+      Tracking.event.mockClear();
+      findUpdateIgnoreStatusButton().vm.$emit('click');
+      setImmediate(() => {
+        const { category, action } = trackErrorStatusUpdateOptions('ignored');
+        expect(Tracking.event).toHaveBeenCalledWith(category, action);
+      });
+    });
+
+    it('should track RESOLVE status update', () => {
+      Tracking.event.mockClear();
+      findUpdateResolveStatusButton().vm.$emit('click');
+      setImmediate(() => {
+        const { category, action } = trackErrorStatusUpdateOptions('resolved');
+        expect(Tracking.event).toHaveBeenCalledWith(category, action);
+      });
+    });
+
+    it('should track external Sentry link views', () => {
+      Tracking.event.mockClear();
+      findExternalUrl().trigger('click');
+      setImmediate(() => {
+        const { category, action, label, property } = trackClickErrorLinkToSentryOptions(
+          externalUrl,
+        );
+        expect(Tracking.event).toHaveBeenCalledWith(category, action, { label, property });
+      });
+    });
+  });
 });
diff --git a/spec/frontend/error_tracking/components/error_tracking_list_spec.js b/spec/frontend/error_tracking/components/error_tracking_list_spec.js
index a6cb074f481..d88a412fb50 100644
--- a/spec/frontend/error_tracking/components/error_tracking_list_spec.js
+++ b/spec/frontend/error_tracking/components/error_tracking_list_spec.js
@@ -4,7 +4,9 @@ import { GlEmptyState, GlLoadingIcon, GlFormInput, GlPagination, GlDropdown } fr
 import stubChildren from 'helpers/stub_children';
 import ErrorTrackingList from '~/error_tracking/components/error_tracking_list.vue';
 import ErrorTrackingActions from '~/error_tracking/components/error_tracking_actions.vue';
+import { trackErrorListViewsOptions, trackErrorStatusUpdateOptions } from '~/error_tracking/utils';
 import errorsList from './list_mock.json';
+import Tracking from '~/tracking';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -460,4 +462,38 @@ describe('ErrorTrackingList', () => {
       });
     });
   });
+
+  describe('Snowplow tracking', () => {
+    beforeEach(() => {
+      jest.spyOn(Tracking, 'event');
+      store.state.list.loading = false;
+      store.state.list.errors = errorsList;
+      mountComponent({
+        stubs: {
+          GlTable: false,
+          GlLink: false,
+          GlDeprecatedButton: false,
+        },
+      });
+    });
+
+    it('should track list views', () => {
+      const { category, action } = trackErrorListViewsOptions;
+      expect(Tracking.event).toHaveBeenCalledWith(category, action);
+    });
+
+    it('should track status updates', () => {
+      Tracking.event.mockClear();
+      const status = 'ignored';
+      findErrorActions().vm.$emit('update-issue-status', {
+        errorId: 1,
+        status,
+      });
+
+      setImmediate(() => {
+        const { category, action } = trackErrorStatusUpdateOptions(status);
+        expect(Tracking.event).toHaveBeenCalledWith(category, action);
+      });
+    });
+  });
 });
diff --git a/spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js b/spec/frontend/filtered_search/filtered_search_dropdown_manager_spec.js
index 853f6b3b7b8..e9ee69ca163 100644
--- a/spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js
+++ b/spec/frontend/filtered_search/filtered_search_dropdown_manager_spec.js
@@ -1,9 +1,13 @@
-import $ from 'jquery';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import FilteredSearchDropdownManager from '~/filtered_search/filtered_search_dropdown_manager';
 
 describe('Filtered Search Dropdown Manager', () => {
+  let mock;
+
   beforeEach(() => {
-    spyOn($, 'ajax');
+    mock = new MockAdapter(axios);
+    mock.onGet().reply(200);
   });
 
   describe('addWordToInput', () => {
@@ -32,7 +36,7 @@ describe('Filtered Search Dropdown Manager', () => {
         const token = document.querySelector('.tokens-container .js-visual-token');
 
         expect(token.classList.contains('filtered-search-token')).toEqual(true);
-        expect(token.querySelector('.name').innerText).toBe('milestone');
+        expect(token.querySelector('.name').textContent).toBe('milestone');
         expect(getInputValue()).toBe('');
       });
 
@@ -42,7 +46,7 @@ describe('Filtered Search Dropdown Manager', () => {
         let token = document.querySelector('.tokens-container .js-visual-token');
 
         expect(token.classList.contains('filtered-search-token')).toEqual(true);
-        expect(token.querySelector('.name').innerText).toBe('label');
+        expect(token.querySelector('.name').textContent).toBe('label');
         expect(getInputValue()).toBe('');
 
         FilteredSearchDropdownManager.addWordToInput({ tokenName: 'label', tokenOperator: '=' });
@@ -50,8 +54,8 @@ describe('Filtered Search Dropdown Manager', () => {
         token = document.querySelector('.tokens-container .js-visual-token');
 
         expect(token.classList.contains('filtered-search-token')).toEqual(true);
-        expect(token.querySelector('.name').innerText).toBe('label');
-        expect(token.querySelector('.operator').innerText).toBe('=');
+        expect(token.querySelector('.name').textContent).toBe('label');
+        expect(token.querySelector('.operator').textContent).toBe('=');
         expect(getInputValue()).toBe('');
 
         FilteredSearchDropdownManager.addWordToInput({
@@ -64,9 +68,9 @@ describe('Filtered Search Dropdown Manager', () => {
         token = document.querySelector('.tokens-container .js-visual-token');
 
         expect(token.classList.contains('filtered-search-token')).toEqual(true);
-        expect(token.querySelector('.name').innerText).toBe('label');
-        expect(token.querySelector('.operator').innerText).toBe('=');
-        expect(token.querySelector('.value').innerText).toBe('none');
+        expect(token.querySelector('.name').textContent).toBe('label');
+        expect(token.querySelector('.operator').textContent).toBe('=');
+        expect(token.querySelector('.value').textContent).toBe('none');
         expect(getInputValue()).toBe('');
       });
     });
@@ -79,7 +83,7 @@ describe('Filtered Search Dropdown Manager', () => {
         const token = document.querySelector('.tokens-container .js-visual-token');
 
         expect(token.classList.contains('filtered-search-token')).toEqual(true);
-        expect(token.querySelector('.name').innerText).toBe('author');
+        expect(token.querySelector('.name').textContent).toBe('author');
         expect(getInputValue()).toBe('');
       });
 
@@ -97,9 +101,9 @@ describe('Filtered Search Dropdown Manager', () => {
         const token = document.querySelector('.tokens-container .js-visual-token');
 
         expect(token.classList.contains('filtered-search-token')).toEqual(true);
-        expect(token.querySelector('.name').innerText).toBe('author');
-        expect(token.querySelector('.operator').innerText).toBe('=');
-        expect(token.querySelector('.value').innerText).toBe('@root');
+        expect(token.querySelector('.name').textContent).toBe('author');
+        expect(token.querySelector('.operator').textContent).toBe('=');
+        expect(token.querySelector('.value').textContent).toBe('@root');
         expect(getInputValue()).toBe('');
       });
 
@@ -116,9 +120,9 @@ describe('Filtered Search Dropdown Manager', () => {
         const token = document.querySelector('.tokens-container .js-visual-token');
 
         expect(token.classList.contains('filtered-search-token')).toEqual(true);
-        expect(token.querySelector('.name').innerText).toBe('label');
-        expect(token.querySelector('.operator').innerText).toBe('=');
-        expect(token.querySelector('.value').innerText).toBe('~\'"test me"\'');
+        expect(token.querySelector('.name').textContent).toBe('label');
+        expect(token.querySelector('.operator').textContent).toBe('=');
+        expect(token.querySelector('.value').textContent).toBe('~\'"test me"\'');
         expect(getInputValue()).toBe('');
       });
     });
diff --git a/spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js b/spec/frontend/filtered_search/filtered_search_visual_tokens_spec.js
index fda078bd41c..e59ee925cc7 100644
--- a/spec/javascripts/filtered_search/filtered_search_visual_tokens_spec.js
+++ b/spec/frontend/filtered_search/filtered_search_visual_tokens_spec.js
@@ -1,7 +1,10 @@
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens';
 import FilteredSearchSpecHelper from '../helpers/filtered_search_spec_helper';
 
 describe('Filtered Search Visual Tokens', () => {
+  let mock;
   const subject = FilteredSearchVisualTokens;
 
   const findElements = tokenElement => {
@@ -17,6 +20,9 @@ describe('Filtered Search Visual Tokens', () => {
   let bugLabelToken;
 
   beforeEach(() => {
+    mock = new MockAdapter(axios);
+    mock.onGet().reply(200);
+
     setFixtures(`
       <ul class="tokens-container">
         ${FilteredSearchSpecHelper.createInputHTML()}
@@ -248,15 +254,15 @@ describe('Filtered Search Visual Tokens', () => {
     });
 
     it('contains name div', () => {
-      expect(tokenElement.querySelector('.name')).toEqual(jasmine.anything());
+      expect(tokenElement.querySelector('.name')).toEqual(expect.anything());
     });
 
     it('contains value container div', () => {
-      expect(tokenElement.querySelector('.value-container')).toEqual(jasmine.anything());
+      expect(tokenElement.querySelector('.value-container')).toEqual(expect.anything());
     });
 
     it('contains value div', () => {
-      expect(tokenElement.querySelector('.value-container .value')).toEqual(jasmine.anything());
+      expect(tokenElement.querySelector('.value-container .value')).toEqual(expect.anything());
     });
 
     it('contains selectable class', () => {
@@ -270,12 +276,12 @@ describe('Filtered Search Visual Tokens', () => {
     describe('remove token', () => {
       it('contains remove-token button', () => {
         expect(tokenElement.querySelector('.value-container .remove-token')).toEqual(
-          jasmine.anything(),
+          expect.anything(),
         );
       });
 
       it('contains fa-close icon', () => {
-        expect(tokenElement.querySelector('.remove-token .fa-close')).toEqual(jasmine.anything());
+        expect(tokenElement.querySelector('.remove-token .fa-close')).toEqual(expect.anything());
       });
     });
   });
@@ -453,7 +459,7 @@ describe('Filtered Search Visual Tokens', () => {
       valueContainer.dataset.originalValue = originalValue;
       const avatar = document.createElement('img');
       const valueElement = valueContainer.querySelector('.value');
-      valueElement.insertAdjacentElement('afterbegin', avatar);
+      valueElement.appendChild(avatar);
       tokensContainer.innerHTML = FilteredSearchSpecHelper.createTokensContainerHTML(
         authorToken.outerHTML,
       );
@@ -573,7 +579,7 @@ describe('Filtered Search Visual Tokens', () => {
 
     it("tokenize's existing input", () => {
       input.value = 'some text';
-      spyOn(subject, 'tokenizeInput').and.callThrough();
+      jest.spyOn(subject, 'tokenizeInput');
 
       subject.editToken(token);
 
@@ -635,8 +641,8 @@ describe('Filtered Search Visual Tokens', () => {
         FilteredSearchSpecHelper.createFilterVisualTokenHTML('label', '=', 'none'),
       );
 
-      spyOn(subject, 'tokenizeInput').and.callFake(() => {});
-      spyOn(subject, 'getLastVisualTokenBeforeInput').and.callThrough();
+      jest.spyOn(subject, 'tokenizeInput').mockImplementation(() => {});
+      jest.spyOn(subject, 'getLastVisualTokenBeforeInput');
 
       subject.moveInputToTheRight();
 
@@ -711,12 +717,16 @@ describe('Filtered Search Visual Tokens', () => {
 
     it('renders a author token value element', () => {
       const { tokenNameElement, tokenValueElement } = findElements(authorToken);
-      const tokenName = tokenNameElement.innerText;
+      const tokenName = tokenNameElement.textContent;
       const tokenValue = 'new value';
 
       subject.renderVisualTokenValue(authorToken, tokenName, tokenValue);
 
-      expect(tokenValueElement.innerText).toBe(tokenValue);
+      jest.runOnlyPendingTimers();
+
+      setImmediate(() => {
+        expect(tokenValueElement.textContent).toBe(tokenValue);
+      });
     });
   });
 });
diff --git a/spec/frontend/fixtures/abuse_reports.rb b/spec/frontend/fixtures/abuse_reports.rb
index 712ed2e8d7e..48b055fcda5 100644
--- a/spec/frontend/fixtures/abuse_reports.rb
+++ b/spec/frontend/fixtures/abuse_reports.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::AbuseReportsController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Admin::AbuseReportsController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/admin_users.rb b/spec/frontend/fixtures/admin_users.rb
index b0f7d69f091..f068ada53e1 100644
--- a/spec/frontend/fixtures/admin_users.rb
+++ b/spec/frontend/fixtures/admin_users.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::UsersController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Admin::UsersController, '(JavaScript fixtures)', type: :controller do
   include StubENV
   include JavaScriptFixturesHelpers
 
diff --git a/spec/frontend/fixtures/application_settings.rb b/spec/frontend/fixtures/application_settings.rb
index a16888d8f03..6156e6a43bc 100644
--- a/spec/frontend/fixtures/application_settings.rb
+++ b/spec/frontend/fixtures/application_settings.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Admin::ApplicationSettingsController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Admin::ApplicationSettingsController, '(JavaScript fixtures)', type: :controller do
   include StubENV
   include JavaScriptFixturesHelpers
 
diff --git a/spec/frontend/fixtures/autocomplete_sources.rb b/spec/frontend/fixtures/autocomplete_sources.rb
index 812364c8b06..8858d69a939 100644
--- a/spec/frontend/fixtures/autocomplete_sources.rb
+++ b/spec/frontend/fixtures/autocomplete_sources.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::AutocompleteSourcesController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::AutocompleteSourcesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let_it_be(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/blob.rb b/spec/frontend/fixtures/blob.rb
index 28a3badaa17..712c3bd9b23 100644
--- a/spec/frontend/fixtures/blob.rb
+++ b/spec/frontend/fixtures/blob.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::BlobController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::BlobController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/boards.rb b/spec/frontend/fixtures/boards.rb
index b3c7865a088..90e2ca4db63 100644
--- a/spec/frontend/fixtures/boards.rb
+++ b/spec/frontend/fixtures/boards.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::BoardsController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::BoardsController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/branches.rb b/spec/frontend/fixtures/branches.rb
index 2dc8cde625a..4667dfb69f8 100644
--- a/spec/frontend/fixtures/branches.rb
+++ b/spec/frontend/fixtures/branches.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::BranchesController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::BranchesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/clusters.rb b/spec/frontend/fixtures/clusters.rb
index fd64d3c0e28..d0940c7dc7f 100644
--- a/spec/frontend/fixtures/clusters.rb
+++ b/spec/frontend/fixtures/clusters.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ClustersController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::ClustersController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/commit.rb b/spec/frontend/fixtures/commit.rb
index c9a5aa9a67c..c5c00afd4ca 100644
--- a/spec/frontend/fixtures/commit.rb
+++ b/spec/frontend/fixtures/commit.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let_it_be(:project) { create(:project, :repository) }
diff --git a/spec/frontend/fixtures/deploy_keys.rb b/spec/frontend/fixtures/deploy_keys.rb
index f491c424bcf..e87600e9d24 100644
--- a/spec/frontend/fixtures/deploy_keys.rb
+++ b/spec/frontend/fixtures/deploy_keys.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::DeployKeysController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::DeployKeysController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/groups.rb b/spec/frontend/fixtures/groups.rb
index 2421b67a130..6f0d7aa1f7c 100644
--- a/spec/frontend/fixtures/groups.rb
+++ b/spec/frontend/fixtures/groups.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Groups (JavaScript fixtures)', type: :controller do
+RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/issues.rb b/spec/frontend/fixtures/issues.rb
index 9a194e5ca84..2c380ba6a96 100644
--- a/spec/frontend/fixtures/issues.rb
+++ b/spec/frontend/fixtures/issues.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin, feed_token: 'feedtoken:coldfeed') }
@@ -75,7 +75,7 @@ describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller
   end
 end
 
-describe API::Issues, '(JavaScript fixtures)', type: :request do
+RSpec.describe API::Issues, '(JavaScript fixtures)', type: :request do
   include ApiHelpers
   include JavaScriptFixturesHelpers
 
diff --git a/spec/frontend/fixtures/jobs.rb b/spec/frontend/fixtures/jobs.rb
index 787ab517f75..64197a62301 100644
--- a/spec/frontend/fixtures/jobs.rb
+++ b/spec/frontend/fixtures/jobs.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::JobsController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::JobsController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/labels.rb b/spec/frontend/fixtures/labels.rb
index e5a0501ac03..2b7babb2e52 100644
--- a/spec/frontend/fixtures/labels.rb
+++ b/spec/frontend/fixtures/labels.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Labels (JavaScript fixtures)' do
+RSpec.describe 'Labels (JavaScript fixtures)' do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb
index a347ef683e7..7801eb27ce8 100644
--- a/spec/frontend/fixtures/merge_requests.rb
+++ b/spec/frontend/fixtures/merge_requests.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/merge_requests_diffs.rb b/spec/frontend/fixtures/merge_requests_diffs.rb
index 76bb8567a64..63bd02d0fbd 100644
--- a/spec/frontend/fixtures/merge_requests_diffs.rb
+++ b/spec/frontend/fixtures/merge_requests_diffs.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/metrics_dashboard.rb b/spec/frontend/fixtures/metrics_dashboard.rb
index f0c741af37d..b5dee7525f6 100644
--- a/spec/frontend/fixtures/metrics_dashboard.rb
+++ b/spec/frontend/fixtures/metrics_dashboard.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do
+RSpec.describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
   include MetricsDashboardHelpers
 
diff --git a/spec/frontend/fixtures/pipeline_schedules.rb b/spec/frontend/fixtures/pipeline_schedules.rb
index e00a35d5362..e47bb25ec0a 100644
--- a/spec/frontend/fixtures/pipeline_schedules.rb
+++ b/spec/frontend/fixtures/pipeline_schedules.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PipelineSchedulesController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::PipelineSchedulesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/pipelines.rb b/spec/frontend/fixtures/pipelines.rb
index 83fc13af7d3..93e2c19fc27 100644
--- a/spec/frontend/fixtures/pipelines.rb
+++ b/spec/frontend/fixtures/pipelines.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::PipelinesController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::PipelinesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/projects.rb b/spec/frontend/fixtures/projects.rb
index ff21dbaebe8..d33909fb98b 100644
--- a/spec/frontend/fixtures/projects.rb
+++ b/spec/frontend/fixtures/projects.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects (JavaScript fixtures)', type: :controller do
+RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   runners_token = 'runnerstoken:intabulasreferre'
diff --git a/spec/frontend/fixtures/prometheus_service.rb b/spec/frontend/fixtures/prometheus_service.rb
index c404b8260d2..8c923d91d08 100644
--- a/spec/frontend/fixtures/prometheus_service.rb
+++ b/spec/frontend/fixtures/prometheus_service.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin)     { create(:admin) }
diff --git a/spec/frontend/fixtures/raw.rb b/spec/frontend/fixtures/raw.rb
index 9c9fa4ec40b..337067121d0 100644
--- a/spec/frontend/fixtures/raw.rb
+++ b/spec/frontend/fixtures/raw.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Raw files', '(JavaScript fixtures)' do
+RSpec.describe 'Raw files', '(JavaScript fixtures)' do
   include JavaScriptFixturesHelpers
 
   let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
diff --git a/spec/frontend/fixtures/search.rb b/spec/frontend/fixtures/search.rb
index cbe3e373986..fcd68662acc 100644
--- a/spec/frontend/fixtures/search.rb
+++ b/spec/frontend/fixtures/search.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SearchController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe SearchController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   render_views
diff --git a/spec/frontend/fixtures/services.rb b/spec/frontend/fixtures/services.rb
index 1b81a83ca49..0877998cc9d 100644
--- a/spec/frontend/fixtures/services.rb
+++ b/spec/frontend/fixtures/services.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin)     { create(:admin) }
diff --git a/spec/frontend/fixtures/sessions.rb b/spec/frontend/fixtures/sessions.rb
index a4dc0aef79c..0ef14c1d4fa 100644
--- a/spec/frontend/fixtures/sessions.rb
+++ b/spec/frontend/fixtures/sessions.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Sessions (JavaScript fixtures)' do
+RSpec.describe 'Sessions (JavaScript fixtures)' do
   include JavaScriptFixturesHelpers
 
   before(:all) do
diff --git a/spec/frontend/fixtures/snippet.rb b/spec/frontend/fixtures/snippet.rb
index d27c2fbe68b..26b088bbd88 100644
--- a/spec/frontend/fixtures/snippet.rb
+++ b/spec/frontend/fixtures/snippet.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe SnippetsController, '(JavaScript fixtures)', type: :controller do
+RSpec.describe SnippetsController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/static/search_autocomplete.html b/spec/frontend/fixtures/static/global_search_input.html
index 29db9020424..29db9020424 100644
--- a/spec/frontend/fixtures/static/search_autocomplete.html
+++ b/spec/frontend/fixtures/static/global_search_input.html
diff --git a/spec/frontend/fixtures/static/oauth_remember_me.html b/spec/frontend/fixtures/static/oauth_remember_me.html
index 9ba1ffc72fe..c6af8129b4d 100644
--- a/spec/frontend/fixtures/static/oauth_remember_me.html
+++ b/spec/frontend/fixtures/static/oauth_remember_me.html
@@ -1,6 +1,22 @@
 <div id="oauth-container">
 <input id="remember_me" type="checkbox">
-<a class="oauth-login twitter" href="http://example.com/"></a>
-<a class="oauth-login github" href="http://example.com/"></a>
-<a class="oauth-login facebook" href="http://example.com/?redirect_fragment=L1"></a>
+
+<form method="post" action="http://example.com/">
+  <button class="oauth-login twitter" type="submit">
+    <span>Twitter</span>
+  </button>
+</form>
+
+<form method="post" action="http://example.com/">
+  <button class="oauth-login github" type="submit">
+    <span>GitHub</span>
+  </button>
+</form>
+
+<form method="post" action="http://example.com/?redirect_fragment=L1">
+  <button class="oauth-login facebook" type="submit">
+    <span>Facebook</span>
+  </button>
+</form>
+
 </div>
diff --git a/spec/frontend/fixtures/test_report.rb b/spec/frontend/fixtures/test_report.rb
index d0ecaf11994..16496aa901b 100644
--- a/spec/frontend/fixtures/test_report.rb
+++ b/spec/frontend/fixtures/test_report.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Projects::PipelinesController, "(JavaScript fixtures)", type: :controller do
+RSpec.describe Projects::PipelinesController, "(JavaScript fixtures)", type: :controller do
   include JavaScriptFixturesHelpers
 
   let(:namespace) { create(:namespace, name: "frontend-fixtures") }
diff --git a/spec/frontend/fixtures/todos.rb b/spec/frontend/fixtures/todos.rb
index e5bdb4998ed..399be272e9b 100644
--- a/spec/frontend/fixtures/todos.rb
+++ b/spec/frontend/fixtures/todos.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Todos (JavaScript fixtures)' do
+RSpec.describe 'Todos (JavaScript fixtures)' do
   include JavaScriptFixturesHelpers
 
   let(:admin) { create(:admin) }
diff --git a/spec/frontend/fixtures/u2f.rb b/spec/frontend/fixtures/u2f.rb
index 9710fbbc181..be3874d7c42 100644
--- a/spec/frontend/fixtures/u2f.rb
+++ b/spec/frontend/fixtures/u2f.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-context 'U2F' do
+RSpec.context 'U2F' do
   include JavaScriptFixturesHelpers
 
   let(:user) { create(:user, :two_factor_via_u2f, otp_secret: 'otpsecret:coolkids') }
diff --git a/spec/javascripts/gl_dropdown_spec.js b/spec/frontend/gl_dropdown_spec.js
index 06f76c581f2..8bfe7f56e37 100644
--- a/spec/javascripts/gl_dropdown_spec.js
+++ b/spec/frontend/gl_dropdown_spec.js
@@ -1,19 +1,22 @@
 /* eslint-disable no-param-reassign */
 
 import $ from 'jquery';
-import GLDropdown from '~/gl_dropdown';
+import '~/gl_dropdown';
 import '~/lib/utils/common_utils';
+import { visitUrl } from '~/lib/utils/url_utility';
 
-describe('glDropdown', function describeDropdown() {
+jest.mock('~/lib/utils/url_utility', () => ({
+  visitUrl: jest.fn().mockName('visitUrl'),
+}));
+
+describe('glDropdown', () => {
   preloadFixtures('static/gl_dropdown.html');
-  loadJSONFixtures('static/projects.json');
 
   const NON_SELECTABLE_CLASSES =
     '.divider, .separator, .dropdown-header, .dropdown-menu-empty-item';
   const SEARCH_INPUT_SELECTOR = '.dropdown-input-field';
   const ITEM_SELECTOR = `.dropdown-content li:not(${NON_SELECTABLE_CLASSES})`;
   const FOCUSED_ITEM_SELECTOR = `${ITEM_SELECTOR} a.is-focused`;
-
   const ARROW_KEYS = {
     DOWN: 40,
     UP: 38,
@@ -23,7 +26,9 @@ describe('glDropdown', function describeDropdown() {
 
   let remoteCallback;
 
-  const navigateWithKeys = function navigateWithKeys(direction, steps, cb, i) {
+  const test = {};
+
+  const navigateWithKeys = (direction, steps, cb, i) => {
     i = i || 0;
     if (!i) direction = direction.toUpperCase();
     $('body').trigger({
@@ -39,7 +44,7 @@ describe('glDropdown', function describeDropdown() {
     }
   };
 
-  const remoteMock = function remoteMock(data, term, callback) {
+  const remoteMock = (data, term, callback) => {
     remoteCallback = callback.bind({}, data);
   };
 
@@ -47,7 +52,7 @@ describe('glDropdown', function describeDropdown() {
     const options = {
       selectable: true,
       filterable: isFilterable,
-      data: hasRemote ? remoteMock.bind({}, this.projectsData) : this.projectsData,
+      data: hasRemote ? remoteMock.bind({}, test.projectsData) : test.projectsData,
       search: {
         fields: ['name'],
       },
@@ -55,52 +60,52 @@ describe('glDropdown', function describeDropdown() {
       id: project => project.id,
       ...extraOpts,
     };
-    this.dropdownButtonElement = $(
+    test.dropdownButtonElement = $(
       '#js-project-dropdown',
-      this.dropdownContainerElement,
+      test.dropdownContainerElement,
     ).glDropdown(options);
   }
 
   beforeEach(() => {
     loadFixtures('static/gl_dropdown.html');
-    this.dropdownContainerElement = $('.dropdown.inline');
-    this.$dropdownMenuElement = $('.dropdown-menu', this.dropdownContainerElement);
-    this.projectsData = getJSONFixture('static/projects.json');
+    test.dropdownContainerElement = $('.dropdown.inline');
+    test.$dropdownMenuElement = $('.dropdown-menu', test.dropdownContainerElement);
+    test.projectsData = getJSONFixture('static/projects.json');
   });
 
   afterEach(() => {
     $('body').off('keydown');
-    this.dropdownContainerElement.off('keyup');
+    test.dropdownContainerElement.off('keyup');
   });
 
   it('should open on click', () => {
     initDropDown.call(this, false);
 
-    expect(this.dropdownContainerElement).not.toHaveClass('show');
-    this.dropdownButtonElement.click();
+    expect(test.dropdownContainerElement).not.toHaveClass('show');
+    test.dropdownButtonElement.click();
 
-    expect(this.dropdownContainerElement).toHaveClass('show');
+    expect(test.dropdownContainerElement).toHaveClass('show');
   });
 
   it('escapes HTML as text', () => {
-    this.projectsData[0].name_with_namespace = '<script>alert("testing");</script>';
+    test.projectsData[0].name_with_namespace = '<script>alert("testing");</script>';
 
     initDropDown.call(this, false);
 
-    this.dropdownButtonElement.click();
+    test.dropdownButtonElement.click();
 
     expect($('.dropdown-content li:first-child').text()).toBe('<script>alert("testing");</script>');
   });
 
   it('should output HTML when highlighting', () => {
-    this.projectsData[0].name_with_namespace = 'testing';
+    test.projectsData[0].name_with_namespace = 'testing';
     $('.dropdown-input .dropdown-input-field').val('test');
 
     initDropDown.call(this, false, true, {
       highlight: true,
     });
 
-    this.dropdownButtonElement.click();
+    test.dropdownButtonElement.click();
 
     expect($('.dropdown-content li:first-child').text()).toBe('testing');
 
@@ -112,31 +117,31 @@ describe('glDropdown', function describeDropdown() {
   describe('that is open', () => {
     beforeEach(() => {
       initDropDown.call(this, false, false);
-      this.dropdownButtonElement.click();
+      test.dropdownButtonElement.click();
     });
 
     it('should select a following item on DOWN keypress', () => {
-      expect($(FOCUSED_ITEM_SELECTOR, this.$dropdownMenuElement).length).toBe(0);
-      const randomIndex = Math.floor(Math.random() * (this.projectsData.length - 1)) + 0;
+      expect($(FOCUSED_ITEM_SELECTOR, test.$dropdownMenuElement).length).toBe(0);
+      const randomIndex = Math.floor(Math.random() * (test.projectsData.length - 1)) + 0;
       navigateWithKeys('down', randomIndex, () => {
-        expect($(FOCUSED_ITEM_SELECTOR, this.$dropdownMenuElement).length).toBe(1);
-        expect($(`${ITEM_SELECTOR}:eq(${randomIndex}) a`, this.$dropdownMenuElement)).toHaveClass(
+        expect($(FOCUSED_ITEM_SELECTOR, test.$dropdownMenuElement).length).toBe(1);
+        expect($(`${ITEM_SELECTOR}:eq(${randomIndex}) a`, test.$dropdownMenuElement)).toHaveClass(
           'is-focused',
         );
       });
     });
 
     it('should select a previous item on UP keypress', () => {
-      expect($(FOCUSED_ITEM_SELECTOR, this.$dropdownMenuElement).length).toBe(0);
-      navigateWithKeys('down', this.projectsData.length - 1, () => {
-        expect($(FOCUSED_ITEM_SELECTOR, this.$dropdownMenuElement).length).toBe(1);
-        const randomIndex = Math.floor(Math.random() * (this.projectsData.length - 2)) + 0;
+      expect($(FOCUSED_ITEM_SELECTOR, test.$dropdownMenuElement).length).toBe(0);
+      navigateWithKeys('down', test.projectsData.length - 1, () => {
+        expect($(FOCUSED_ITEM_SELECTOR, test.$dropdownMenuElement).length).toBe(1);
+        const randomIndex = Math.floor(Math.random() * (test.projectsData.length - 2)) + 0;
         navigateWithKeys('up', randomIndex, () => {
-          expect($(FOCUSED_ITEM_SELECTOR, this.$dropdownMenuElement).length).toBe(1);
+          expect($(FOCUSED_ITEM_SELECTOR, test.$dropdownMenuElement).length).toBe(1);
           expect(
             $(
-              `${ITEM_SELECTOR}:eq(${this.projectsData.length - 2 - randomIndex}) a`,
-              this.$dropdownMenuElement,
+              `${ITEM_SELECTOR}:eq(${test.projectsData.length - 2 - randomIndex}) a`,
+              test.$dropdownMenuElement,
             ),
           ).toHaveClass('is-focused');
         });
@@ -144,13 +149,12 @@ describe('glDropdown', function describeDropdown() {
     });
 
     it('should click the selected item on ENTER keypress', () => {
-      expect(this.dropdownContainerElement).toHaveClass('show');
-      const randomIndex = Math.floor(Math.random() * (this.projectsData.length - 1)) + 0;
+      expect(test.dropdownContainerElement).toHaveClass('show');
+      const randomIndex = Math.floor(Math.random() * (test.projectsData.length - 1)) + 0;
       navigateWithKeys('down', randomIndex, () => {
-        const visitUrl = spyOnDependency(GLDropdown, 'visitUrl').and.stub();
         navigateWithKeys('enter', null, () => {
-          expect(this.dropdownContainerElement).not.toHaveClass('show');
-          const link = $(`${ITEM_SELECTOR}:eq(${randomIndex}) a`, this.$dropdownMenuElement);
+          expect(test.dropdownContainerElement).not.toHaveClass('show');
+          const link = $(`${ITEM_SELECTOR}:eq(${randomIndex}) a`, test.$dropdownMenuElement);
 
           expect(link).toHaveClass('is-active');
           const linkedLocation = link.attr('href');
@@ -162,21 +166,21 @@ describe('glDropdown', function describeDropdown() {
     });
 
     it('should close on ESC keypress', () => {
-      expect(this.dropdownContainerElement).toHaveClass('show');
-      this.dropdownContainerElement.trigger({
+      expect(test.dropdownContainerElement).toHaveClass('show');
+      test.dropdownContainerElement.trigger({
         type: 'keyup',
         which: ARROW_KEYS.ESC,
         keyCode: ARROW_KEYS.ESC,
       });
 
-      expect(this.dropdownContainerElement).not.toHaveClass('show');
+      expect(test.dropdownContainerElement).not.toHaveClass('show');
     });
   });
 
   describe('opened and waiting for a remote callback', () => {
     beforeEach(() => {
       initDropDown.call(this, true, true);
-      this.dropdownButtonElement.click();
+      test.dropdownButtonElement.click();
     });
 
     it('should show loading indicator while search results are being fetched by backend', () => {
@@ -203,13 +207,13 @@ describe('glDropdown', function describeDropdown() {
 
     it('should focus on input when opening for the second time after transition', () => {
       remoteCallback();
-      this.dropdownContainerElement.trigger({
+      test.dropdownContainerElement.trigger({
         type: 'keyup',
         which: ARROW_KEYS.ESC,
         keyCode: ARROW_KEYS.ESC,
       });
-      this.dropdownButtonElement.click();
-      this.dropdownContainerElement.trigger('transitionend');
+      test.dropdownButtonElement.click();
+      test.dropdownContainerElement.trigger('transitionend');
 
       expect($(document.activeElement)).toEqual($(SEARCH_INPUT_SELECTOR));
     });
@@ -218,8 +222,8 @@ describe('glDropdown', function describeDropdown() {
   describe('input focus with array data', () => {
     it('should focus input when passing array data to drop down', () => {
       initDropDown.call(this, false, true);
-      this.dropdownButtonElement.click();
-      this.dropdownContainerElement.trigger('transitionend');
+      test.dropdownButtonElement.click();
+      test.dropdownContainerElement.trigger('transitionend');
 
       expect($(document.activeElement)).toEqual($(SEARCH_INPUT_SELECTOR));
     });
@@ -234,7 +238,7 @@ describe('glDropdown', function describeDropdown() {
       .trigger('input');
 
     expect($searchInput.val()).toEqual('g');
-    this.dropdownButtonElement.trigger('hidden.bs.dropdown');
+    test.dropdownButtonElement.trigger('hidden.bs.dropdown');
     $searchInput.trigger('blur').trigger('focus');
 
     expect($searchInput.val()).toEqual('g');
@@ -323,19 +327,19 @@ describe('glDropdown', function describeDropdown() {
       },
     };
     initDropDown.call(this, false, false, options);
-    const $item = $(`${ITEM_SELECTOR}:first() a`, this.$dropdownMenuElement);
+    const $item = $(`${ITEM_SELECTOR}:first() a`, test.$dropdownMenuElement);
 
     // select item the first time
-    this.dropdownButtonElement.click();
+    test.dropdownButtonElement.click();
     $item.click();
 
     expect($item).toHaveClass('is-active');
     // select item the second time
-    this.dropdownButtonElement.click();
+    test.dropdownButtonElement.click();
     $item.click();
 
     expect($item).toHaveClass('is-active');
 
-    expect($('.dropdown-toggle-text')).toHaveText(this.projectsData[0].id.toString());
+    expect($('.dropdown-toggle-text')).toHaveText(test.projectsData[0].id.toString());
   });
 });
diff --git a/spec/javascripts/gl_form_spec.js b/spec/frontend/gl_form_spec.js
index 69b3dae743a..150d8a053d5 100644
--- a/spec/javascripts/gl_form_spec.js
+++ b/spec/frontend/gl_form_spec.js
@@ -5,51 +5,56 @@ import '~/lib/utils/text_utility';
 import '~/lib/utils/common_utils';
 
 describe('GLForm', () => {
-  describe('when instantiated', function() {
+  const testContext = {};
+
+  describe('when instantiated', () => {
     beforeEach(done => {
-      this.form = $('<form class="gfm-form"><textarea class="js-gfm-input"></form>');
-      this.textarea = this.form.find('textarea');
-      spyOn($.prototype, 'off').and.returnValue(this.textarea);
-      spyOn($.prototype, 'on').and.returnValue(this.textarea);
-      spyOn($.prototype, 'css');
-
-      this.glForm = new GLForm(this.form, false);
-      setTimeout(() => {
-        $.prototype.off.calls.reset();
-        $.prototype.on.calls.reset();
-        $.prototype.css.calls.reset();
+      testContext.form = $('<form class="gfm-form"><textarea class="js-gfm-input"></form>');
+      testContext.textarea = testContext.form.find('textarea');
+      jest.spyOn($.prototype, 'off').mockReturnValue(testContext.textarea);
+      jest.spyOn($.prototype, 'on').mockReturnValue(testContext.textarea);
+      jest.spyOn($.prototype, 'css').mockImplementation(() => {});
+
+      testContext.glForm = new GLForm(testContext.form, false);
+
+      setImmediate(() => {
+        $.prototype.off.mockClear();
+        $.prototype.on.mockClear();
+        $.prototype.css.mockClear();
         done();
       });
     });
 
     describe('setupAutosize', () => {
       beforeEach(done => {
-        this.glForm.setupAutosize();
-        setTimeout(() => {
+        testContext.glForm.setupAutosize();
+
+        setImmediate(() => {
           done();
         });
       });
 
       it('should register an autosize event handler on the textarea', () => {
         expect($.prototype.off).toHaveBeenCalledWith('autosize:resized');
-        expect($.prototype.on).toHaveBeenCalledWith('autosize:resized', jasmine.any(Function));
+        expect($.prototype.on).toHaveBeenCalledWith('autosize:resized', expect.any(Function));
       });
 
       it('should register a mouseup event handler on the textarea', () => {
         expect($.prototype.off).toHaveBeenCalledWith('mouseup.autosize');
-        expect($.prototype.on).toHaveBeenCalledWith('mouseup.autosize', jasmine.any(Function));
+        expect($.prototype.on).toHaveBeenCalledWith('mouseup.autosize', expect.any(Function));
       });
 
       it('should set the resize css property to vertical', () => {
+        jest.runOnlyPendingTimers();
         expect($.prototype.css).toHaveBeenCalledWith('resize', 'vertical');
       });
     });
 
     describe('setHeightData', () => {
       beforeEach(() => {
-        spyOn($.prototype, 'data');
-        spyOn($.prototype, 'outerHeight').and.returnValue(200);
-        this.glForm.setHeightData();
+        jest.spyOn($.prototype, 'data').mockImplementation(() => {});
+        jest.spyOn($.prototype, 'outerHeight').mockReturnValue(200);
+        testContext.glForm.setHeightData();
       });
 
       it('should set the height data attribute', () => {
@@ -64,12 +69,12 @@ describe('GLForm', () => {
     describe('destroyAutosize', () => {
       describe('when called', () => {
         beforeEach(() => {
-          spyOn($.prototype, 'data');
-          spyOn($.prototype, 'outerHeight').and.returnValue(200);
-          spyOn(window, 'outerHeight').and.returnValue(400);
-          spyOn(autosize, 'destroy');
+          jest.spyOn($.prototype, 'data').mockImplementation(() => {});
+          jest.spyOn($.prototype, 'outerHeight').mockReturnValue(200);
+          window.outerHeight = () => 400;
+          jest.spyOn(autosize, 'destroy').mockImplementation(() => {});
 
-          this.glForm.destroyAutosize();
+          testContext.glForm.destroyAutosize();
         });
 
         it('should call outerHeight', () => {
@@ -81,7 +86,7 @@ describe('GLForm', () => {
         });
 
         it('should call autosize destroy', () => {
-          expect(autosize.destroy).toHaveBeenCalledWith(this.textarea);
+          expect(autosize.destroy).toHaveBeenCalledWith(testContext.textarea);
         });
 
         it('should set the data-height attribute', () => {
@@ -98,11 +103,11 @@ describe('GLForm', () => {
       });
 
       it('should return undefined if the data-height equals the outerHeight', () => {
-        spyOn($.prototype, 'outerHeight').and.returnValue(200);
-        spyOn($.prototype, 'data').and.returnValue(200);
-        spyOn(autosize, 'destroy');
+        jest.spyOn($.prototype, 'outerHeight').mockReturnValue(200);
+        jest.spyOn($.prototype, 'data').mockReturnValue(200);
+        jest.spyOn(autosize, 'destroy').mockImplementation(() => {});
 
-        expect(this.glForm.destroyAutosize()).toBeUndefined();
+        expect(testContext.glForm.destroyAutosize()).toBeUndefined();
         expect(autosize.destroy).not.toHaveBeenCalled();
       });
     });
diff --git a/spec/javascripts/search_autocomplete_spec.js b/spec/frontend/global_search_input_spec.js
index 4f42d4880e8..8c00ea5f193 100644
--- a/spec/javascripts/search_autocomplete_spec.js
+++ b/spec/frontend/global_search_input_spec.js
@@ -2,10 +2,10 @@
 
 import $ from 'jquery';
 import '~/gl_dropdown';
-import initSearchAutocomplete from '~/search_autocomplete';
+import initGlobalSearchInput from '~/global_search_input';
 import '~/lib/utils/common_utils';
 
-describe('Search autocomplete dropdown', () => {
+describe('Global search input dropdown', () => {
   let widget = null;
 
   const userName = 'root';
@@ -28,7 +28,7 @@ describe('Search autocomplete dropdown', () => {
 
   const groupName = 'Gitlab Org';
 
-  const removeBodyAttributes = function() {
+  const removeBodyAttributes = () => {
     const $body = $('body');
 
     $body.removeAttr('data-page');
@@ -38,7 +38,7 @@ describe('Search autocomplete dropdown', () => {
 
   // Add required attributes to body before starting the test.
   // section would be dashboard|group|project
-  const addBodyAttributes = function(section) {
+  const addBodyAttributes = section => {
     if (section == null) {
       section = 'dashboard';
     }
@@ -57,12 +57,12 @@ describe('Search autocomplete dropdown', () => {
     }
   };
 
-  const disableProjectIssues = function() {
+  const disableProjectIssues = () => {
     document.querySelector('.js-search-project-options').setAttribute('data-issues-disabled', true);
   };
 
   // Mock `gl` object in window for dashboard specific page. App code will need it.
-  const mockDashboardOptions = function() {
+  const mockDashboardOptions = () => {
     window.gl || (window.gl = {});
     return (window.gl.dashboardOptions = {
       issuesPath: dashboardIssuesPath,
@@ -71,7 +71,7 @@ describe('Search autocomplete dropdown', () => {
   };
 
   // Mock `gl` object in window for project specific page. App code will need it.
-  const mockProjectOptions = function() {
+  const mockProjectOptions = () => {
     window.gl || (window.gl = {});
     return (window.gl.projectOptions = {
       'gitlab-ce': {
@@ -82,7 +82,7 @@ describe('Search autocomplete dropdown', () => {
     });
   };
 
-  const mockGroupOptions = function() {
+  const mockGroupOptions = () => {
     window.gl || (window.gl = {});
     return (window.gl.groupOptions = {
       'gitlab-org': {
@@ -93,7 +93,7 @@ describe('Search autocomplete dropdown', () => {
     });
   };
 
-  const assertLinks = function(list, issuesPath, mrsPath) {
+  const assertLinks = (list, issuesPath, mrsPath) => {
     if (issuesPath) {
       const issuesAssignedToMeLink = `a[href="${issuesPath}/?assignee_username=${userName}"]`;
       const issuesIHaveCreatedLink = `a[href="${issuesPath}/?author_username=${userName}"]`;
@@ -112,24 +112,24 @@ describe('Search autocomplete dropdown', () => {
     expect(list.find(mrsIHaveCreatedLink).text()).toBe("Merge requests I've created");
   };
 
-  preloadFixtures('static/search_autocomplete.html');
-  beforeEach(function() {
-    loadFixtures('static/search_autocomplete.html');
+  preloadFixtures('static/global_search_input.html');
+  beforeEach(() => {
+    loadFixtures('static/global_search_input.html');
 
     window.gon = {};
     window.gon.current_user_id = userId;
     window.gon.current_username = userName;
 
-    return (widget = initSearchAutocomplete());
+    return (widget = initGlobalSearchInput());
   });
 
-  afterEach(function() {
+  afterEach(() => {
     // Undo what we did to the shared <body>
     removeBodyAttributes();
     window.gon = {};
   });
 
-  it('should show Dashboard specific dropdown menu', function() {
+  it('should show Dashboard specific dropdown menu', () => {
     addBodyAttributes();
     mockDashboardOptions();
     widget.searchInput.triggerHandler('focus');
@@ -137,7 +137,7 @@ describe('Search autocomplete dropdown', () => {
     return assertLinks(list, dashboardIssuesPath, dashboardMRsPath);
   });
 
-  it('should show Group specific dropdown menu', function() {
+  it('should show Group specific dropdown menu', () => {
     addBodyAttributes('group');
     mockGroupOptions();
     widget.searchInput.triggerHandler('focus');
@@ -145,7 +145,7 @@ describe('Search autocomplete dropdown', () => {
     return assertLinks(list, groupIssuesPath, groupMRsPath);
   });
 
-  it('should show Project specific dropdown menu', function() {
+  it('should show Project specific dropdown menu', () => {
     addBodyAttributes('project');
     mockProjectOptions();
     widget.searchInput.triggerHandler('focus');
@@ -153,7 +153,7 @@ describe('Search autocomplete dropdown', () => {
     return assertLinks(list, projectIssuesPath, projectMRsPath);
   });
 
-  it('should show only Project mergeRequest dropdown menu items when project issues are disabled', function() {
+  it('should show only Project mergeRequest dropdown menu items when project issues are disabled', () => {
     addBodyAttributes('project');
     disableProjectIssues();
     mockProjectOptions();
@@ -162,7 +162,7 @@ describe('Search autocomplete dropdown', () => {
     assertLinks(list, null, projectMRsPath);
   });
 
-  it('should not show category related menu if there is text in the input', function() {
+  it('should not show category related menu if there is text in the input', () => {
     addBodyAttributes('project');
     mockProjectOptions();
     widget.searchInput.val('help');
@@ -173,12 +173,12 @@ describe('Search autocomplete dropdown', () => {
     expect(list.find(link).length).toBe(0);
   });
 
-  it('should not submit the search form when selecting an autocomplete row with the keyboard', function() {
+  it('should not submit the search form when selecting an autocomplete row with the keyboard', () => {
     const ENTER = 13;
     const DOWN = 40;
     addBodyAttributes();
     mockDashboardOptions(true);
-    const submitSpy = spyOnEvent('form', 'submit');
+    const submitSpy = jest.spyOn(document.querySelector('form'), 'submit');
     widget.searchInput.triggerHandler('focus');
     widget.wrap.trigger($.Event('keydown', { which: DOWN }));
     const enterKeyEvent = $.Event('keydown', { which: ENTER });
@@ -186,28 +186,28 @@ describe('Search autocomplete dropdown', () => {
     // This does not currently catch failing behavior. For security reasons,
     // browsers will not trigger default behavior (form submit, in this
     // example) on JavaScript-created keypresses.
-    expect(submitSpy).not.toHaveBeenTriggered();
+    expect(submitSpy).not.toHaveBeenCalled();
   });
 
-  describe('disableAutocomplete', function() {
-    beforeEach(function() {
-      widget.enableAutocomplete();
+  describe('disableDropdown', () => {
+    beforeEach(() => {
+      widget.enableDropdown();
     });
 
-    it('should close the Dropdown', function() {
-      const toggleSpy = spyOn(widget.dropdownToggle, 'dropdown');
+    it('should close the Dropdown', () => {
+      const toggleSpy = jest.spyOn(widget.dropdownToggle, 'dropdown');
 
       widget.dropdown.addClass('show');
-      widget.disableAutocomplete();
+      widget.disableDropdown();
 
       expect(toggleSpy).toHaveBeenCalledWith('toggle');
     });
   });
 
-  describe('enableAutocomplete', function() {
-    it('should open the Dropdown', function() {
-      const toggleSpy = spyOn(widget.dropdownToggle, 'dropdown');
-      widget.enableAutocomplete();
+  describe('enableDropdown', () => {
+    it('should open the Dropdown', () => {
+      const toggleSpy = jest.spyOn(widget.dropdownToggle, 'dropdown');
+      widget.enableDropdown();
 
       expect(toggleSpy).toHaveBeenCalledWith('toggle');
     });
diff --git a/spec/frontend/header_spec.js b/spec/frontend/header_spec.js
index 6d2d7976196..467d9678f69 100644
--- a/spec/frontend/header_spec.js
+++ b/spec/frontend/header_spec.js
@@ -60,7 +60,7 @@ describe('Header', () => {
     beforeEach(() => {
       setFixtures(`
       <li class="js-nav-user-dropdown">
-        <a class="js-buy-ci-minutes-link" data-track-event="click_buy_ci_minutes" data-track-label="free" data-track-property="user_dropdown">Buy CI minutes</a>
+        <a class="js-buy-pipeline-minutes-link" data-track-event="click_buy_ci_minutes" data-track-label="free" data-track-property="user_dropdown">Buy Pipeline minutes</a>
         <a class="js-upgrade-plan-link" data-track-event="click_upgrade_link" data-track-label="free" data-track-property="user_dropdown">Upgrade</a>
       </li>`);
 
@@ -74,7 +74,7 @@ describe('Header', () => {
       unmockTracking();
     });
 
-    it('sends a tracking event when the dropdown is opened and contains Buy CI minutes link', () => {
+    it('sends a tracking event when the dropdown is opened and contains Buy Pipeline minutes link', () => {
       $('.js-nav-user-dropdown').trigger('shown.bs.dropdown');
 
       expect(trackingSpy).toHaveBeenCalledWith('some:page', 'show_buy_ci_minutes', {
diff --git a/spec/frontend/helpers/dom_shims/element_scroll_to.js b/spec/frontend/helpers/dom_shims/element_scroll_to.js
new file mode 100644
index 00000000000..68f8a115865
--- /dev/null
+++ b/spec/frontend/helpers/dom_shims/element_scroll_to.js
@@ -0,0 +1,6 @@
+Element.prototype.scrollTo = jest.fn().mockImplementation(function scrollTo(x, y) {
+  this.scrollLeft = x;
+  this.scrollTop = y;
+
+  this.dispatchEvent(new Event('scroll'));
+});
diff --git a/spec/frontend/helpers/dom_shims/image_element_properties.js b/spec/frontend/helpers/dom_shims/image_element_properties.js
index 525246e6ade..d94c157e44d 100644
--- a/spec/frontend/helpers/dom_shims/image_element_properties.js
+++ b/spec/frontend/helpers/dom_shims/image_element_properties.js
@@ -1,6 +1,6 @@
 Object.defineProperty(global.HTMLImageElement.prototype, 'src', {
   get() {
-    return this.$_jest_src;
+    return this.$_jest_src || this.getAttribute('src');
   },
   set(val) {
     this.$_jest_src = val;
diff --git a/spec/frontend/helpers/dom_shims/index.js b/spec/frontend/helpers/dom_shims/index.js
index 17a2090d2f1..d18bb94c107 100644
--- a/spec/frontend/helpers/dom_shims/index.js
+++ b/spec/frontend/helpers/dom_shims/index.js
@@ -1,8 +1,10 @@
 import './element_scroll_into_view';
 import './element_scroll_by';
+import './element_scroll_to';
 import './form_element';
 import './get_client_rects';
 import './inner_text';
+import './mutation_observer';
 import './window_scroll_to';
 import './scroll_by';
 import './size_properties';
diff --git a/spec/frontend/helpers/dom_shims/mutation_observer.js b/spec/frontend/helpers/dom_shims/mutation_observer.js
new file mode 100644
index 00000000000..68c494f19ea
--- /dev/null
+++ b/spec/frontend/helpers/dom_shims/mutation_observer.js
@@ -0,0 +1,7 @@
+/* eslint-disable class-methods-use-this */
+class MutationObserverStub {
+  disconnect() {}
+  observe() {}
+}
+
+global.MutationObserver = MutationObserverStub;
diff --git a/spec/frontend/helpers/local_storage_helper.js b/spec/frontend/helpers/local_storage_helper.js
index 48e66b11767..a66c31d1353 100644
--- a/spec/frontend/helpers/local_storage_helper.js
+++ b/spec/frontend/helpers/local_storage_helper.js
@@ -28,12 +28,20 @@ const useLocalStorage = fn => {
 /**
  * Create an object with the localStorage interface but `jest.fn()` implementations.
  */
-export const createLocalStorageSpy = () => ({
-  clear: jest.fn(),
-  getItem: jest.fn(),
-  setItem: jest.fn(),
-  removeItem: jest.fn(),
-});
+export const createLocalStorageSpy = () => {
+  let storage = {};
+
+  return {
+    clear: jest.fn(() => {
+      storage = {};
+    }),
+    getItem: jest.fn(key => storage[key]),
+    setItem: jest.fn((key, value) => {
+      storage[key] = value;
+    }),
+    removeItem: jest.fn(key => delete storage[key]),
+  };
+};
 
 /**
  * Before each test, overwrite `window.localStorage` with a spy implementation.
diff --git a/spec/frontend/helpers/local_storage_helper_spec.js b/spec/frontend/helpers/local_storage_helper_spec.js
new file mode 100644
index 00000000000..18aec0f329a
--- /dev/null
+++ b/spec/frontend/helpers/local_storage_helper_spec.js
@@ -0,0 +1,21 @@
+import { useLocalStorageSpy } from './local_storage_helper';
+
+useLocalStorageSpy();
+
+describe('localStorage helper', () => {
+  it('mocks localStorage but works exactly like original localStorage', () => {
+    localStorage.setItem('test', 'testing');
+    localStorage.setItem('test2', 'testing');
+
+    expect(localStorage.getItem('test')).toBe('testing');
+
+    localStorage.removeItem('test', 'testing');
+
+    expect(localStorage.getItem('test')).toBeUndefined();
+    expect(localStorage.getItem('test2')).toBe('testing');
+
+    localStorage.clear();
+
+    expect(localStorage.getItem('test2')).toBeUndefined();
+  });
+});
diff --git a/spec/frontend/helpers/mock_dom_observer.js b/spec/frontend/helpers/mock_dom_observer.js
new file mode 100644
index 00000000000..7aac51f6264
--- /dev/null
+++ b/spec/frontend/helpers/mock_dom_observer.js
@@ -0,0 +1,94 @@
+/* eslint-disable class-methods-use-this, max-classes-per-file */
+import { isMatch } from 'lodash';
+
+/**
+ * This class gives us a JSDom friendly DOM observer which we can manually trigger in tests
+ *
+ * Use this in place of MutationObserver or IntersectionObserver
+ */
+class MockObserver {
+  constructor(cb) {
+    this.$_cb = cb;
+    this.$_observers = [];
+  }
+
+  observe(node, options = {}) {
+    this.$_observers.push([node, options]);
+  }
+
+  disconnect() {
+    this.$_observers = [];
+  }
+
+  takeRecords() {}
+
+  // eslint-disable-next-line babel/camelcase
+  $_triggerObserve(node, { entry = {}, options = {} } = {}) {
+    if (this.$_hasObserver(node, options)) {
+      this.$_cb([{ target: node, ...entry }]);
+    }
+  }
+
+  // eslint-disable-next-line babel/camelcase
+  $_hasObserver(node, options = {}) {
+    return this.$_observers.some(
+      ([obvNode, obvOptions]) => node === obvNode && isMatch(options, obvOptions),
+    );
+  }
+}
+
+class MockIntersectionObserver extends MockObserver {
+  unobserve(node) {
+    this.$_observers = this.$_observers.filter(([obvNode]) => node === obvNode);
+  }
+}
+
+/**
+ * Use this function to setup a mock observer instance in place of the given DOM Observer
+ *
+ * Example:
+ * ```
+ * describe('', () => {
+ *   const { trigger: triggerMutate } = useMockMutationObserver();
+ *
+ *   it('test', () => {
+ *     trigger(el, { options: { childList: true }, entry: { } });
+ *   });
+ * })
+ * ```
+ *
+ * @param {String} key
+ */
+const useMockObserver = (key, createMock) => {
+  let mockObserver;
+  let origObserver;
+
+  beforeEach(() => {
+    origObserver = global[key];
+    global[key] = jest.fn().mockImplementation((...args) => {
+      mockObserver = createMock(...args);
+      return mockObserver;
+    });
+  });
+
+  afterEach(() => {
+    mockObserver = null;
+    global[key] = origObserver;
+  });
+
+  const trigger = (...args) => {
+    if (!mockObserver) {
+      return;
+    }
+
+    mockObserver.$_triggerObserve(...args);
+  };
+
+  return { trigger };
+};
+
+export const useMockIntersectionObserver = () =>
+  useMockObserver('IntersectionObserver', (...args) => new MockIntersectionObserver(...args));
+
+export const useMockMutationObserver = () =>
+  useMockObserver('MutationObserver', (...args) => new MockObserver(...args));
diff --git a/spec/frontend/helpers/mock_window_location_helper.js b/spec/frontend/helpers/mock_window_location_helper.js
new file mode 100644
index 00000000000..175044d1fce
--- /dev/null
+++ b/spec/frontend/helpers/mock_window_location_helper.js
@@ -0,0 +1,43 @@
+/**
+ * Manage the instance of a custom `window.location`
+ *
+ * This only encapsulates the setup / teardown logic so that it can easily be
+ * reused with different implementations (i.e. a spy or a [fake][1])
+ *
+ * [1]: https://stackoverflow.com/a/41434763/1708147
+ *
+ * @param {() => any} fn Function that returns the object to use for window.location
+ */
+const useMockLocation = fn => {
+  const origWindowLocation = window.location;
+  let currentWindowLocation;
+
+  Object.defineProperty(window, 'location', {
+    get: () => currentWindowLocation,
+  });
+
+  beforeEach(() => {
+    currentWindowLocation = fn();
+  });
+
+  afterEach(() => {
+    currentWindowLocation = origWindowLocation;
+  });
+};
+
+/**
+ * Create an object with the location interface but `jest.fn()` implementations.
+ */
+export const createWindowLocationSpy = () => {
+  return {
+    assign: jest.fn(),
+    reload: jest.fn(),
+    replace: jest.fn(),
+    toString: jest.fn(),
+  };
+};
+
+/**
+ * Before each test, overwrite `window.location` with a spy implementation.
+ */
+export const useMockLocationHelper = () => useMockLocation(createWindowLocationSpy);
diff --git a/spec/frontend/helpers/scroll_into_view_promise.js b/spec/frontend/helpers/scroll_into_view_promise.js
deleted file mode 100644
index 0edea2103da..00000000000
--- a/spec/frontend/helpers/scroll_into_view_promise.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export default function scrollIntoViewPromise(intersectionTarget, timeout = 100, maxTries = 5) {
-  return new Promise((resolve, reject) => {
-    let intersectionObserver;
-    let retry = 0;
-
-    const intervalId = setInterval(() => {
-      if (retry >= maxTries) {
-        intersectionObserver.disconnect();
-        clearInterval(intervalId);
-        reject(new Error(`Could not scroll target into viewPort within ${timeout * maxTries} ms`));
-      }
-      retry += 1;
-      intersectionTarget.scrollIntoView();
-    }, timeout);
-
-    intersectionObserver = new IntersectionObserver(entries => {
-      if (entries[0].isIntersecting) {
-        intersectionObserver.disconnect();
-        clearInterval(intervalId);
-        resolve();
-      }
-    });
-
-    intersectionObserver.observe(intersectionTarget);
-
-    intersectionTarget.scrollIntoView();
-  });
-}
diff --git a/spec/frontend/helpers/set_window_location_helper_spec.js b/spec/frontend/helpers/set_window_location_helper_spec.js
index 2a2c024c824..da609b6bbf0 100644
--- a/spec/frontend/helpers/set_window_location_helper_spec.js
+++ b/spec/frontend/helpers/set_window_location_helper_spec.js
@@ -33,7 +33,7 @@ describe('setWindowLocation', () => {
   it.each([null, 1, undefined, false, '', 'gitlab.com'])(
     'throws an error when called with an invalid url: "%s"',
     invalidUrl => {
-      expect(() => setWindowLocation(invalidUrl)).toThrow(new TypeError('Invalid URL'));
+      expect(() => setWindowLocation(invalidUrl)).toThrow(/Invalid URL/);
       expect(window.location).toBe(originalLocation);
     },
   );
diff --git a/spec/frontend/helpers/vue_mock_directive.js b/spec/frontend/helpers/vue_mock_directive.js
new file mode 100644
index 00000000000..699fe3eab26
--- /dev/null
+++ b/spec/frontend/helpers/vue_mock_directive.js
@@ -0,0 +1,17 @@
+export const getKey = name => `$_gl_jest_${name}`;
+
+export const getBinding = (el, name) => el[getKey(name)];
+
+export const createMockDirective = () => ({
+  bind(el, { name, value, arg, modifiers }) {
+    el[getKey(name)] = {
+      value,
+      arg,
+      modifiers,
+    };
+  },
+
+  unbind(el, { name }) {
+    delete el[getKey(name)];
+  },
+});
diff --git a/spec/frontend/helpers/wait_for_attribute_change.js b/spec/frontend/helpers/wait_for_attribute_change.js
deleted file mode 100644
index 8f22d569222..00000000000
--- a/spec/frontend/helpers/wait_for_attribute_change.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export default (domElement, attributes, timeout = 1500) =>
-  new Promise((resolve, reject) => {
-    let observer;
-    const timeoutId = setTimeout(() => {
-      observer.disconnect();
-      reject(new Error(`Could not see an attribute update within ${timeout} ms`));
-    }, timeout);
-
-    observer = new MutationObserver(() => {
-      clearTimeout(timeoutId);
-      observer.disconnect();
-      resolve();
-    });
-
-    observer.observe(domElement, { attributes: true, attributeFilter: attributes });
-  });
diff --git a/spec/frontend/ide/commit_icon_spec.js b/spec/frontend/ide/commit_icon_spec.js
new file mode 100644
index 00000000000..90b8e34497c
--- /dev/null
+++ b/spec/frontend/ide/commit_icon_spec.js
@@ -0,0 +1,45 @@
+import { commitItemIconMap } from '~/ide/constants';
+import { decorateData } from '~/ide/stores/utils';
+import getCommitIconMap from '~/ide/commit_icon';
+
+const createFile = (name = 'name', id = name, type = '', parent = null) =>
+  decorateData({
+    id,
+    type,
+    icon: 'icon',
+    url: 'url',
+    name,
+    path: parent ? `${parent.path}/${name}` : name,
+    parentPath: parent ? parent.path : '',
+    lastCommit: {},
+  });
+
+describe('getCommitIconMap', () => {
+  let entry;
+
+  beforeEach(() => {
+    entry = createFile('Entry item');
+  });
+
+  it('renders "deleted" icon for deleted entries', () => {
+    entry.deleted = true;
+    expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.deleted);
+  });
+
+  it('renders "addition" icon for temp entries', () => {
+    entry.tempFile = true;
+    expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.addition);
+  });
+
+  it('renders "modified" icon for newly-renamed entries', () => {
+    entry.prevPath = 'foo/bar';
+    entry.tempFile = false;
+    expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.modified);
+  });
+
+  it('renders "modified" icon even for temp entries if they are newly-renamed', () => {
+    entry.prevPath = 'foo/bar';
+    entry.tempFile = true;
+    expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.modified);
+  });
+});
diff --git a/spec/frontend/ide/components/branches/item_spec.js b/spec/frontend/ide/components/branches/item_spec.js
index 138443b715e..d8175025755 100644
--- a/spec/frontend/ide/components/branches/item_spec.js
+++ b/spec/frontend/ide/components/branches/item_spec.js
@@ -1,5 +1,6 @@
 import { shallowMount } from '@vue/test-utils';
-import router from '~/ide/ide_router';
+import { createStore } from '~/ide/stores';
+import { createRouter } from '~/ide/ide_router';
 import Item from '~/ide/components/branches/item.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import Timeago from '~/vue_shared/components/time_ago_tooltip.vue';
@@ -13,6 +14,8 @@ const TEST_PROJECT_ID = projectData.name_with_namespace;
 
 describe('IDE branch item', () => {
   let wrapper;
+  let store;
+  let router;
 
   function createComponent(props = {}) {
     wrapper = shallowMount(Item, {
@@ -22,9 +25,15 @@ describe('IDE branch item', () => {
         isActive: false,
         ...props,
       },
+      router,
     });
   }
 
+  beforeEach(() => {
+    store = createStore();
+    router = createRouter(store);
+  });
+
   afterEach(() => {
     wrapper.destroy();
   });
diff --git a/spec/frontend/ide/components/commit_sidebar/form_spec.js b/spec/frontend/ide/components/commit_sidebar/form_spec.js
index 129180bb46e..c62df4a3795 100644
--- a/spec/frontend/ide/components/commit_sidebar/form_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/form_spec.js
@@ -5,11 +5,14 @@ import store from '~/ide/stores';
 import CommitForm from '~/ide/components/commit_sidebar/form.vue';
 import { leftSidebarViews } from '~/ide/constants';
 import { resetStore } from '../../helpers';
+import waitForPromises from 'helpers/wait_for_promises';
 
 describe('IDE commit form', () => {
   const Component = Vue.extend(CommitForm);
   let vm;
 
+  const beginCommitButton = () => vm.$el.querySelector('[data-testid="begin-commit-button"]');
+
   beforeEach(() => {
     store.state.changedFiles.push('test');
     store.state.currentProjectId = 'abcproject';
@@ -25,8 +28,15 @@ describe('IDE commit form', () => {
     resetStore(vm.$store);
   });
 
-  it('enables button when has changes', () => {
-    expect(vm.$el.querySelector('[disabled]')).toBe(null);
+  it('enables begin commit button when there are changes', () => {
+    expect(beginCommitButton()).not.toHaveAttr('disabled');
+  });
+
+  it('disables begin commit button when there are no changes', async () => {
+    store.state.changedFiles = [];
+    await vm.$nextTick();
+
+    expect(beginCommitButton()).toHaveAttr('disabled');
   });
 
   describe('compact', () => {
@@ -37,8 +47,8 @@ describe('IDE commit form', () => {
     });
 
     it('renders commit button in compact mode', () => {
-      expect(vm.$el.querySelector('.btn-primary')).not.toBeNull();
-      expect(vm.$el.querySelector('.btn-primary').textContent).toContain('Commit');
+      expect(beginCommitButton()).not.toBeNull();
+      expect(beginCommitButton().textContent).toContain('Commit');
     });
 
     it('does not render form', () => {
@@ -54,7 +64,7 @@ describe('IDE commit form', () => {
     });
 
     it('shows form when clicking commit button', () => {
-      vm.$el.querySelector('.btn-primary').click();
+      beginCommitButton().click();
 
       return vm.$nextTick(() => {
         expect(vm.$el.querySelector('form')).not.toBeNull();
@@ -62,31 +72,117 @@ describe('IDE commit form', () => {
     });
 
     it('toggles activity bar view when clicking commit button', () => {
-      vm.$el.querySelector('.btn-primary').click();
+      beginCommitButton().click();
 
       return vm.$nextTick(() => {
         expect(store.state.currentActivityView).toBe(leftSidebarViews.commit.name);
       });
     });
 
-    it('collapses if lastCommitMsg is set to empty and current view is not commit view', () => {
+    it('collapses if lastCommitMsg is set to empty and current view is not commit view', async () => {
       store.state.lastCommitMsg = 'abc';
       store.state.currentActivityView = leftSidebarViews.edit.name;
+      await vm.$nextTick();
 
-      return vm
-        .$nextTick()
-        .then(() => {
-          // if commit message is set, form is uncollapsed
-          expect(vm.isCompact).toBe(false);
+      // if commit message is set, form is uncollapsed
+      expect(vm.isCompact).toBe(false);
 
-          store.state.lastCommitMsg = '';
+      store.state.lastCommitMsg = '';
+      await vm.$nextTick();
 
-          return vm.$nextTick();
-        })
-        .then(() => {
-          // collapsed when set to empty
-          expect(vm.isCompact).toBe(true);
-        });
+      // collapsed when set to empty
+      expect(vm.isCompact).toBe(true);
+    });
+
+    it('collapses if in commit view but there are no changes and vice versa', async () => {
+      store.state.currentActivityView = leftSidebarViews.commit.name;
+      await vm.$nextTick();
+
+      // expanded by default if there are changes
+      expect(vm.isCompact).toBe(false);
+
+      store.state.changedFiles = [];
+      await vm.$nextTick();
+
+      expect(vm.isCompact).toBe(true);
+
+      store.state.changedFiles.push('test');
+      await vm.$nextTick();
+
+      // uncollapsed once again
+      expect(vm.isCompact).toBe(false);
+    });
+
+    it('collapses if switched from commit view to edit view and vice versa', async () => {
+      store.state.currentActivityView = leftSidebarViews.edit.name;
+      await vm.$nextTick();
+
+      expect(vm.isCompact).toBe(true);
+
+      store.state.currentActivityView = leftSidebarViews.commit.name;
+      await vm.$nextTick();
+
+      expect(vm.isCompact).toBe(false);
+
+      store.state.currentActivityView = leftSidebarViews.edit.name;
+      await vm.$nextTick();
+
+      expect(vm.isCompact).toBe(true);
+    });
+
+    describe('when window height is less than MAX_WINDOW_HEIGHT', () => {
+      let oldHeight;
+
+      beforeEach(() => {
+        oldHeight = window.innerHeight;
+        window.innerHeight = 700;
+      });
+
+      afterEach(() => {
+        window.innerHeight = oldHeight;
+      });
+
+      it('stays collapsed when switching from edit view to commit view and back', async () => {
+        store.state.currentActivityView = leftSidebarViews.edit.name;
+        await vm.$nextTick();
+
+        expect(vm.isCompact).toBe(true);
+
+        store.state.currentActivityView = leftSidebarViews.commit.name;
+        await vm.$nextTick();
+
+        expect(vm.isCompact).toBe(true);
+
+        store.state.currentActivityView = leftSidebarViews.edit.name;
+        await vm.$nextTick();
+
+        expect(vm.isCompact).toBe(true);
+      });
+
+      it('stays uncollapsed if changes are added or removed', async () => {
+        store.state.currentActivityView = leftSidebarViews.commit.name;
+        await vm.$nextTick();
+
+        expect(vm.isCompact).toBe(true);
+
+        store.state.changedFiles = [];
+        await vm.$nextTick();
+
+        expect(vm.isCompact).toBe(true);
+
+        store.state.changedFiles.push('test');
+        await vm.$nextTick();
+
+        expect(vm.isCompact).toBe(true);
+      });
+
+      it('uncollapses when clicked on Commit button in the edit view', async () => {
+        store.state.currentActivityView = leftSidebarViews.edit.name;
+        beginCommitButton().click();
+        await waitForPromises();
+
+        expect(vm.isCompact).toBe(false);
+      });
     });
   });
 
@@ -118,7 +214,7 @@ describe('IDE commit form', () => {
     });
 
     it('always opens itself in full view current activity view is not commit view when clicking commit button', () => {
-      vm.$el.querySelector('.btn-primary').click();
+      beginCommitButton().click();
 
       return vm.$nextTick(() => {
         expect(store.state.currentActivityView).toBe(leftSidebarViews.commit.name);
diff --git a/spec/frontend/ide/components/commit_sidebar/list_item_spec.js b/spec/frontend/ide/components/commit_sidebar/list_item_spec.js
index ebb41448905..7ce628d4da7 100644
--- a/spec/frontend/ide/components/commit_sidebar/list_item_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/list_item_spec.js
@@ -1,17 +1,22 @@
 import Vue from 'vue';
 import { trimText } from 'helpers/text_helper';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
-import store from '~/ide/stores';
+import { createStore } from '~/ide/stores';
 import listItem from '~/ide/components/commit_sidebar/list_item.vue';
-import router from '~/ide/ide_router';
-import { file, resetStore } from '../../helpers';
+import { createRouter } from '~/ide/ide_router';
+import { file } from '../../helpers';
 
 describe('Multi-file editor commit sidebar list item', () => {
   let vm;
   let f;
   let findPathEl;
+  let store;
+  let router;
 
   beforeEach(() => {
+    store = createStore();
+    router = createRouter(store);
+
     const Component = Vue.extend(listItem);
 
     f = file('test-file');
@@ -28,8 +33,6 @@ describe('Multi-file editor commit sidebar list item', () => {
 
   afterEach(() => {
     vm.$destroy();
-
-    resetStore(store);
   });
 
   const findPathText = () => trimText(findPathEl.textContent);
diff --git a/spec/javascripts/ide/components/commit_sidebar/message_field_spec.js b/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
index 53508f52b2f..d6ea8b9a4bd 100644
--- a/spec/javascripts/ide/components/commit_sidebar/message_field_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import createComponent from 'spec/helpers/vue_mount_component_helper';
+import createComponent from 'helpers/vue_mount_component_helper';
 import CommitMessageField from '~/ide/components/commit_sidebar/message_field.vue';
 
 describe('IDE commit message field', () => {
@@ -54,7 +54,7 @@ describe('IDE commit message field', () => {
   });
 
   it('emits input event on input', () => {
-    spyOn(vm, '$emit');
+    jest.spyOn(vm, '$emit').mockImplementation();
 
     const textarea = vm.$el.querySelector('textarea');
     textarea.value = 'testing';
@@ -160,7 +160,7 @@ describe('IDE commit message field', () => {
         .then(() => {
           expect(vm.scrollTop).toBe(50);
           expect(vm.$el.querySelector('.highlights').style.transform).toBe(
-            'translate3d(0px, -50px, 0px)',
+            'translate3d(0, -50px, 0)',
           );
         })
         .then(done)
diff --git a/spec/frontend/ide/components/ide_sidebar_nav_spec.js b/spec/frontend/ide/components/ide_sidebar_nav_spec.js
new file mode 100644
index 00000000000..49d476b56e4
--- /dev/null
+++ b/spec/frontend/ide/components/ide_sidebar_nav_spec.js
@@ -0,0 +1,118 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon } from '@gitlab/ui';
+import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
+import IdeSidebarNav from '~/ide/components/ide_sidebar_nav.vue';
+import { SIDE_RIGHT, SIDE_LEFT } from '~/ide/constants';
+
+const TEST_TABS = [
+  {
+    title: 'Lorem',
+    icon: 'angle-up',
+    views: [{ name: 'lorem-1' }, { name: 'lorem-2' }],
+  },
+  {
+    title: 'Ipsum',
+    icon: 'angle-down',
+    views: [{ name: 'ipsum-1' }, { name: 'ipsum-2' }],
+  },
+];
+const TEST_CURRENT_INDEX = 1;
+const TEST_CURRENT_VIEW = TEST_TABS[TEST_CURRENT_INDEX].views[1].name;
+const TEST_OPEN_VIEW = TEST_TABS[TEST_CURRENT_INDEX].views[0];
+
+describe('ide/components/ide_sidebar_nav', () => {
+  let wrapper;
+
+  const createComponent = (props = {}) => {
+    if (wrapper) {
+      throw new Error('wrapper already exists');
+    }
+
+    wrapper = shallowMount(IdeSidebarNav, {
+      propsData: {
+        tabs: TEST_TABS,
+        currentView: TEST_CURRENT_VIEW,
+        isOpen: false,
+        ...props,
+      },
+      directives: {
+        tooltip: createMockDirective(),
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  const findButtons = () => wrapper.findAll('li button');
+  const findButtonsData = () =>
+    findButtons().wrappers.map(button => {
+      return {
+        title: button.attributes('title'),
+        ariaLabel: button.attributes('aria-label'),
+        classes: button.classes(),
+        qaSelector: button.attributes('data-qa-selector'),
+        icon: button.find(GlIcon).props('name'),
+        tooltip: getBinding(button.element, 'tooltip').value,
+      };
+    });
+  const clickTab = () =>
+    findButtons()
+      .at(TEST_CURRENT_INDEX)
+      .trigger('click');
+
+  describe.each`
+    isOpen   | side          | otherSide     | classes         | classesObj                              | emitEvent  | emitArg
+    ${false} | ${SIDE_LEFT}  | ${SIDE_RIGHT} | ${[]}           | ${{}}                                   | ${'open'}  | ${[TEST_OPEN_VIEW]}
+    ${false} | ${SIDE_RIGHT} | ${SIDE_LEFT}  | ${['is-right']} | ${{}}                                   | ${'open'}  | ${[TEST_OPEN_VIEW]}
+    ${true}  | ${SIDE_RIGHT} | ${SIDE_LEFT}  | ${['is-right']} | ${{ [TEST_CURRENT_INDEX]: ['active'] }} | ${'close'} | ${[]}
+  `(
+    'with side = $side, isOpen = $isOpen',
+    ({ isOpen, side, otherSide, classes, classesObj, emitEvent, emitArg }) => {
+      let bsTooltipHide;
+
+      beforeEach(() => {
+        createComponent({ isOpen, side });
+
+        bsTooltipHide = jest.fn();
+        wrapper.vm.$root.$on('bv::hide::tooltip', bsTooltipHide);
+      });
+
+      it('renders buttons', () => {
+        expect(findButtonsData()).toEqual(
+          TEST_TABS.map((tab, index) => ({
+            title: tab.title,
+            ariaLabel: tab.title,
+            classes: ['ide-sidebar-link', ...classes, ...(classesObj[index] || [])],
+            qaSelector: `${tab.title.toLowerCase()}_tab_button`,
+            icon: tab.icon,
+            tooltip: {
+              container: 'body',
+              placement: otherSide,
+            },
+          })),
+        );
+      });
+
+      it('when tab clicked, emits event', () => {
+        expect(wrapper.emitted()).toEqual({});
+
+        clickTab();
+
+        expect(wrapper.emitted()).toEqual({
+          [emitEvent]: [emitArg],
+        });
+      });
+
+      it('when tab clicked, hides tooltip', () => {
+        expect(bsTooltipHide).not.toHaveBeenCalled();
+
+        clickTab();
+
+        expect(bsTooltipHide).toHaveBeenCalled();
+      });
+    },
+  );
+});
diff --git a/spec/frontend/ide/components/ide_spec.js b/spec/frontend/ide/components/ide_spec.js
index 78a280e6304..efc1d984dec 100644
--- a/spec/frontend/ide/components/ide_spec.js
+++ b/spec/frontend/ide/components/ide_spec.js
@@ -1,11 +1,18 @@
 import Vue from 'vue';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
-import store from '~/ide/stores';
+import { createStore } from '~/ide/stores';
 import ide from '~/ide/components/ide.vue';
 import { file, resetStore } from '../helpers';
 import { projectData } from '../mock_data';
+import extendStore from '~/ide/stores/extend';
+
+let store;
 
 function bootstrap(projData) {
+  store = createStore();
+
+  extendStore(store, document.createElement('div'));
+
   const Component = Vue.extend(ide);
 
   store.state.currentProjectId = 'abcproject';
diff --git a/spec/frontend/ide/components/ide_status_list_spec.js b/spec/frontend/ide/components/ide_status_list_spec.js
index 99c27ca30fb..847464ed806 100644
--- a/spec/frontend/ide/components/ide_status_list_spec.js
+++ b/spec/frontend/ide/components/ide_status_list_spec.js
@@ -1,13 +1,14 @@
 import Vuex from 'vuex';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import IdeStatusList from '~/ide/components/ide_status_list.vue';
+import TerminalSyncStatusSafe from '~/ide/components/terminal_sync/terminal_sync_status_safe.vue';
 
 const TEST_FILE = {
   name: 'lorem.md',
-  eol: 'LF',
   editorRow: 3,
   editorColumn: 23,
   fileLanguage: 'markdown',
+  content: 'abc\nndef',
 };
 
 const localVue = createLocalVue();
@@ -55,7 +56,8 @@ describe('ide/components/ide_status_list', () => {
     });
 
     it('shows file eol', () => {
-      expect(wrapper.text()).toContain(TEST_FILE.name);
+      expect(wrapper.text()).not.toContain('CRLF');
+      expect(wrapper.text()).toContain('LF');
     });
 
     it('shows file editor position', () => {
@@ -78,13 +80,9 @@ describe('ide/components/ide_status_list', () => {
     });
   });
 
-  it('adds slot as child of list', () => {
-    createComponent({
-      slots: {
-        default: ['<div class="js-test">Hello</div>', '<div class="js-test">World</div>'],
-      },
-    });
+  it('renders terminal sync status', () => {
+    createComponent();
 
-    expect(wrapper.find('.ide-status-list').findAll('.js-test').length).toEqual(2);
+    expect(wrapper.find(TerminalSyncStatusSafe).exists()).toBe(true);
   });
 });
diff --git a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap b/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
index db5175c3f7b..bdd3d439fd4 100644
--- a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
+++ b/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap
@@ -14,7 +14,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = `
     />
      
     <strong
-      class="prepend-left-8 text-truncate"
+      class="gl-ml-3 text-truncate"
       data-container="body"
       data-original-title=""
       title=""
@@ -25,7 +25,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = `
     </strong>
      
     <div
-      class="append-right-8 prepend-left-4"
+      class="gl-mr-3 gl-ml-2"
     >
       <span
         class="badge badge-pill"
diff --git a/spec/frontend/ide/components/jobs/detail_spec.js b/spec/frontend/ide/components/jobs/detail_spec.js
new file mode 100644
index 00000000000..8f3815d5aab
--- /dev/null
+++ b/spec/frontend/ide/components/jobs/detail_spec.js
@@ -0,0 +1,187 @@
+import Vue from 'vue';
+import JobDetail from '~/ide/components/jobs/detail.vue';
+import { createStore } from '~/ide/stores';
+import { createComponentWithStore } from '../../../helpers/vue_mount_component_helper';
+import { jobs } from '../../mock_data';
+import { TEST_HOST } from 'helpers/test_constants';
+
+describe('IDE jobs detail view', () => {
+  let vm;
+
+  const createComponent = () => {
+    const store = createStore();
+
+    store.state.pipelines.detailJob = {
+      ...jobs[0],
+      isLoading: true,
+      output: 'testing',
+      rawPath: `${TEST_HOST}/raw`,
+    };
+
+    return createComponentWithStore(Vue.extend(JobDetail), store);
+  };
+
+  beforeEach(() => {
+    vm = createComponent();
+
+    jest.spyOn(vm, 'fetchJobTrace').mockResolvedValue();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('mounted', () => {
+    beforeEach(() => {
+      vm = vm.$mount();
+    });
+
+    it('calls fetchJobTrace', () => {
+      expect(vm.fetchJobTrace).toHaveBeenCalled();
+    });
+
+    it('scrolls to bottom', () => {
+      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalled();
+    });
+
+    it('renders job output', () => {
+      expect(vm.$el.querySelector('.bash').textContent).toContain('testing');
+    });
+
+    it('renders empty message output', done => {
+      vm.$store.state.pipelines.detailJob.output = '';
+
+      vm.$nextTick(() => {
+        expect(vm.$el.querySelector('.bash').textContent).toContain('No messages were logged');
+
+        done();
+      });
+    });
+
+    it('renders loading icon', () => {
+      expect(vm.$el.querySelector('.build-loader-animation')).not.toBe(null);
+      expect(vm.$el.querySelector('.build-loader-animation').style.display).toBe('');
+    });
+
+    it('hides output when loading', () => {
+      expect(vm.$el.querySelector('.bash')).not.toBe(null);
+      expect(vm.$el.querySelector('.bash').style.display).toBe('none');
+    });
+
+    it('hide loading icon when isLoading is false', done => {
+      vm.$store.state.pipelines.detailJob.isLoading = false;
+
+      vm.$nextTick(() => {
+        expect(vm.$el.querySelector('.build-loader-animation').style.display).toBe('none');
+
+        done();
+      });
+    });
+
+    it('resets detailJob when clicking header button', () => {
+      jest.spyOn(vm, 'setDetailJob').mockImplementation();
+
+      vm.$el.querySelector('.btn').click();
+
+      expect(vm.setDetailJob).toHaveBeenCalledWith(null);
+    });
+
+    it('renders raw path link', () => {
+      expect(vm.$el.querySelector('.controllers-buttons').getAttribute('href')).toBe(
+        `${TEST_HOST}/raw`,
+      );
+    });
+  });
+
+  describe('scroll buttons', () => {
+    beforeEach(() => {
+      vm = createComponent();
+      jest.spyOn(vm, 'fetchJobTrace').mockResolvedValue();
+    });
+
+    afterEach(() => {
+      vm.$destroy();
+    });
+
+    it.each`
+      fnName          | btnName   | scrollPos
+      ${'scrollDown'} | ${'down'} | ${0}
+      ${'scrollUp'}   | ${'up'}   | ${1}
+    `('triggers $fnName when clicking $btnName button', ({ fnName, scrollPos }) => {
+      jest.spyOn(vm, fnName).mockImplementation();
+
+      vm = vm.$mount();
+
+      vm.scrollPos = scrollPos;
+
+      return vm.$nextTick().then(() => {
+        vm.$el.querySelector('.btn-scroll:not([disabled])').click();
+        expect(vm[fnName]).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('scrollDown', () => {
+    beforeEach(() => {
+      vm = vm.$mount();
+
+      jest.spyOn(vm.$refs.buildTrace, 'scrollTo').mockImplementation();
+    });
+
+    it('scrolls build trace to bottom', () => {
+      jest.spyOn(vm.$refs.buildTrace, 'scrollHeight', 'get').mockReturnValue(1000);
+
+      vm.scrollDown();
+
+      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalledWith(0, 1000);
+    });
+  });
+
+  describe('scrollUp', () => {
+    beforeEach(() => {
+      vm = vm.$mount();
+
+      jest.spyOn(vm.$refs.buildTrace, 'scrollTo').mockImplementation();
+    });
+
+    it('scrolls build trace to top', () => {
+      vm.scrollUp();
+
+      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalledWith(0, 0);
+    });
+  });
+
+  describe('scrollBuildLog', () => {
+    beforeEach(() => {
+      vm = vm.$mount();
+      jest.spyOn(vm.$refs.buildTrace, 'scrollTo').mockImplementation();
+      jest.spyOn(vm.$refs.buildTrace, 'offsetHeight', 'get').mockReturnValue(100);
+      jest.spyOn(vm.$refs.buildTrace, 'scrollHeight', 'get').mockReturnValue(200);
+    });
+
+    it('sets scrollPos to bottom when at the bottom', () => {
+      jest.spyOn(vm.$refs.buildTrace, 'scrollTop', 'get').mockReturnValue(100);
+
+      vm.scrollBuildLog();
+
+      expect(vm.scrollPos).toBe(1);
+    });
+
+    it('sets scrollPos to top when at the top', () => {
+      jest.spyOn(vm.$refs.buildTrace, 'scrollTop', 'get').mockReturnValue(0);
+      vm.scrollPos = 1;
+
+      vm.scrollBuildLog();
+
+      expect(vm.scrollPos).toBe(0);
+    });
+
+    it('resets scrollPos when not at top or bottom', () => {
+      jest.spyOn(vm.$refs.buildTrace, 'scrollTop', 'get').mockReturnValue(10);
+
+      vm.scrollBuildLog();
+
+      expect(vm.scrollPos).toBe('');
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/merge_requests/item_spec.js b/spec/frontend/ide/components/merge_requests/item_spec.js
index 6a2451ad263..b1da89d7a9b 100644
--- a/spec/frontend/ide/components/merge_requests/item_spec.js
+++ b/spec/frontend/ide/components/merge_requests/item_spec.js
@@ -1,63 +1,91 @@
-import Vue from 'vue';
-import router from '~/ide/ide_router';
+import Vuex from 'vuex';
+import { mount, createLocalVue } from '@vue/test-utils';
+import { createStore } from '~/ide/stores';
+import { createRouter } from '~/ide/ide_router';
 import Item from '~/ide/components/merge_requests/item.vue';
-import mountCompontent from '../../../helpers/vue_mount_component_helper';
+
+const TEST_ITEM = {
+  iid: 1,
+  projectPathWithNamespace: 'gitlab-org/gitlab-ce',
+  title: 'Merge request title',
+};
 
 describe('IDE merge request item', () => {
-  const Component = Vue.extend(Item);
-  let vm;
+  const localVue = createLocalVue();
+  localVue.use(Vuex);
 
-  beforeEach(() => {
-    vm = mountCompontent(Component, {
-      item: {
-        iid: 1,
-        projectPathWithNamespace: 'gitlab-org/gitlab-ce',
-        title: 'Merge request title',
+  let wrapper;
+  let store;
+  let router;
+
+  const createComponent = (props = {}) => {
+    wrapper = mount(Item, {
+      propsData: {
+        item: {
+          ...TEST_ITEM,
+        },
+        currentId: `${TEST_ITEM.iid}`,
+        currentProjectId: TEST_ITEM.projectPathWithNamespace,
+        ...props,
       },
-      currentId: '1',
-      currentProjectId: 'gitlab-org/gitlab-ce',
+      localVue,
+      router,
+      store,
     });
+  };
+  const findIcon = () => wrapper.find('.ic-mobile-issue-close');
+
+  beforeEach(() => {
+    store = createStore();
+    router = createRouter(store);
   });
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
+    wrapper = null;
   });
 
-  it('renders merge requests data', () => {
-    expect(vm.$el.textContent).toContain('Merge request title');
-    expect(vm.$el.textContent).toContain('gitlab-org/gitlab-ce!1');
-  });
+  describe('default', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('renders merge requests data', () => {
+      expect(wrapper.text()).toContain('Merge request title');
+      expect(wrapper.text()).toContain('gitlab-org/gitlab-ce!1');
+    });
 
-  it('renders link with href', () => {
-    const expectedHref = router.resolve(
-      `/project/${vm.item.projectPathWithNamespace}/merge_requests/${vm.item.iid}`,
-    ).href;
+    it('renders link with href', () => {
+      const expectedHref = router.resolve(
+        `/project/${TEST_ITEM.projectPathWithNamespace}/merge_requests/${TEST_ITEM.iid}`,
+      ).href;
 
-    expect(vm.$el.tagName.toLowerCase()).toBe('a');
-    expect(vm.$el).toHaveAttr('href', expectedHref);
-  });
+      expect(wrapper.element.tagName.toLowerCase()).toBe('a');
+      expect(wrapper.attributes('href')).toBe(expectedHref);
+    });
 
-  it('renders icon if ID matches currentId', () => {
-    expect(vm.$el.querySelector('.ic-mobile-issue-close')).not.toBe(null);
+    it('renders icon if ID matches currentId', () => {
+      expect(findIcon().exists()).toBe(true);
+    });
   });
 
-  it('does not render icon if ID does not match currentId', done => {
-    vm.currentId = '2';
-
-    vm.$nextTick(() => {
-      expect(vm.$el.querySelector('.ic-mobile-issue-close')).toBe(null);
+  describe('with different currentId', () => {
+    beforeEach(() => {
+      createComponent({ currentId: `${TEST_ITEM.iid + 1}` });
+    });
 
-      done();
+    it('does not render icon', () => {
+      expect(findIcon().exists()).toBe(false);
     });
   });
 
-  it('does not render icon if project ID does not match', done => {
-    vm.currentProjectId = 'test/test';
-
-    vm.$nextTick(() => {
-      expect(vm.$el.querySelector('.ic-mobile-issue-close')).toBe(null);
+  describe('with different project ID', () => {
+    beforeEach(() => {
+      createComponent({ currentProjectId: 'test/test' });
+    });
 
-      done();
+    it('does not render icon', () => {
+      expect(findIcon().exists()).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/ide/components/new_dropdown/modal_spec.js b/spec/frontend/ide/components/new_dropdown/modal_spec.js
index 62a59a76bf4..da17cc3601e 100644
--- a/spec/frontend/ide/components/new_dropdown/modal_spec.js
+++ b/spec/frontend/ide/components/new_dropdown/modal_spec.js
@@ -120,6 +120,46 @@ describe('new file modal component', () => {
     });
   });
 
+  describe('createFromTemplate', () => {
+    let store;
+
+    beforeEach(() => {
+      store = createStore();
+      store.state.entries = {
+        'test-path/test': {
+          name: 'test',
+          deleted: false,
+        },
+      };
+
+      vm = createComponentWithStore(Component, store).$mount();
+      vm.open('blob');
+
+      jest.spyOn(vm, 'createTempEntry').mockImplementation();
+    });
+
+    it.each`
+      entryName                  | newFilePath
+      ${''}                      | ${'.gitignore'}
+      ${'README.md'}             | ${'.gitignore'}
+      ${'test-path/test/'}       | ${'test-path/test/.gitignore'}
+      ${'test-path/test'}        | ${'test-path/.gitignore'}
+      ${'test-path/test/abc.md'} | ${'test-path/test/.gitignore'}
+    `(
+      'creates a new file with the given template name in appropriate directory for path: $path',
+      ({ entryName, newFilePath }) => {
+        vm.entryName = entryName;
+
+        vm.createFromTemplate({ name: '.gitignore' });
+
+        expect(vm.createTempEntry).toHaveBeenCalledWith({
+          name: newFilePath,
+          type: 'blob',
+        });
+      },
+    );
+  });
+
   describe('submitForm', () => {
     let store;
 
diff --git a/spec/frontend/ide/components/new_dropdown/upload_spec.js b/spec/frontend/ide/components/new_dropdown/upload_spec.js
index a418fdeb572..ad27954cd10 100644
--- a/spec/frontend/ide/components/new_dropdown/upload_spec.js
+++ b/spec/frontend/ide/components/new_dropdown/upload_spec.js
@@ -85,7 +85,6 @@ describe('new dropdown upload', () => {
             name: textFile.name,
             type: 'blob',
             content: 'plain text',
-            base64: false,
             binary: false,
             rawPath: '',
           });
@@ -103,7 +102,6 @@ describe('new dropdown upload', () => {
         name: binaryFile.name,
         type: 'blob',
         content: binaryTarget.result.split('base64,')[1],
-        base64: true,
         binary: true,
         rawPath: binaryTarget.result,
       });
diff --git a/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js b/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js
index 3bc89996978..e32abc98aae 100644
--- a/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js
+++ b/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js
@@ -2,6 +2,7 @@ import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { createStore } from '~/ide/stores';
 import paneModule from '~/ide/stores/modules/pane';
 import CollapsibleSidebar from '~/ide/components/panes/collapsible_sidebar.vue';
+import IdeSidebarNav from '~/ide/components/ide_sidebar_nav.vue';
 import Vuex from 'vuex';
 
 const localVue = createLocalVue();
@@ -24,19 +25,15 @@ describe('ide/components/panes/collapsible_sidebar.vue', () => {
         width,
         ...props,
       },
-      slots: {
-        'header-icon': '<div class=".header-icon-slot">SLOT ICON</div>',
-        header: '<div class=".header-slot"/>',
-        footer: '<div class=".footer-slot"/>',
-      },
     });
   };
 
-  const findTabButton = () => wrapper.find(`[data-qa-selector="${fakeComponentName}_tab_button"]`);
+  const findSidebarNav = () => wrapper.find(IdeSidebarNav);
 
   beforeEach(() => {
     store = createStore();
     store.registerModule('leftPane', paneModule());
+    jest.spyOn(store, 'dispatch').mockImplementation();
   });
 
   afterEach(() => {
@@ -75,92 +72,60 @@ describe('ide/components/panes/collapsible_sidebar.vue', () => {
       ${'left'}
       ${'right'}
     `('when side=$side', ({ side }) => {
-      it('correctly renders side specific attributes', () => {
+      beforeEach(() => {
         createComponent({ extensionTabs, side });
-        const button = findTabButton();
-
-        return wrapper.vm.$nextTick().then(() => {
-          expect(wrapper.classes()).toContain('multi-file-commit-panel');
-          expect(wrapper.classes()).toContain(`ide-${side}-sidebar`);
-          expect(wrapper.find('.multi-file-commit-panel-inner')).not.toBe(null);
-          expect(wrapper.find(`.ide-${side}-sidebar-${fakeComponentName}`)).not.toBe(null);
-          expect(button.attributes('data-placement')).toEqual(side === 'left' ? 'right' : 'left');
-          if (side === 'right') {
-            // this class is only needed on the right side; there is no 'is-left'
-            expect(button.classes()).toContain('is-right');
-          } else {
-            expect(button.classes()).not.toContain('is-right');
-          }
-        });
       });
-    });
-
-    describe('when default side', () => {
-      let button;
 
-      beforeEach(() => {
-        createComponent({ extensionTabs });
-
-        button = findTabButton();
+      it('correctly renders side specific attributes', () => {
+        expect(wrapper.classes()).toContain('multi-file-commit-panel');
+        expect(wrapper.classes()).toContain(`ide-${side}-sidebar`);
+        expect(wrapper.find('.multi-file-commit-panel-inner')).not.toBe(null);
+        expect(wrapper.find(`.ide-${side}-sidebar-${fakeComponentName}`)).not.toBe(null);
+        expect(findSidebarNav().props('side')).toBe(side);
       });
 
-      it('correctly renders tab-specific classes', () => {
-        store.state.rightPane.currentView = fakeComponentName;
-
-        return wrapper.vm.$nextTick().then(() => {
-          expect(button.classes()).toContain('button-class-1');
-          expect(button.classes()).toContain('button-class-2');
-        });
+      it('nothing is dispatched', () => {
+        expect(store.dispatch).not.toHaveBeenCalled();
       });
 
-      it('can show an open pane tab with an active view', () => {
-        store.state.rightPane.isOpen = true;
-        store.state.rightPane.currentView = fakeComponentName;
+      it('when sidebar emits open, dispatch open', () => {
+        const view = 'lorem-view';
 
-        return wrapper.vm.$nextTick().then(() => {
-          expect(button.classes()).toEqual(expect.arrayContaining(['ide-sidebar-link', 'active']));
-          expect(button.attributes('data-original-title')).toEqual(fakeComponentName);
-          expect(wrapper.find('.js-tab-view').exists()).toBe(true);
-        });
-      });
-
-      it('does not show a pane which is not open', () => {
-        store.state.rightPane.isOpen = false;
-        store.state.rightPane.currentView = fakeComponentName;
+        findSidebarNav().vm.$emit('open', view);
 
-        return wrapper.vm.$nextTick().then(() => {
-          expect(button.classes()).not.toEqual(
-            expect.arrayContaining(['ide-sidebar-link', 'active']),
-          );
-          expect(wrapper.find('.js-tab-view').exists()).toBe(false);
-        });
+        expect(store.dispatch).toHaveBeenCalledWith(`${side}Pane/open`, view);
       });
 
-      describe('when button is clicked', () => {
-        it('opens view', () => {
-          button.trigger('click');
-          expect(store.state.rightPane.isOpen).toBeTruthy();
-        });
-
-        it('toggles open view if tab is currently active', () => {
-          button.trigger('click');
-          expect(store.state.rightPane.isOpen).toBeTruthy();
+      it('when sidebar emits close, dispatch toggleOpen', () => {
+        findSidebarNav().vm.$emit('close');
 
-          button.trigger('click');
-          expect(store.state.rightPane.isOpen).toBeFalsy();
-        });
+        expect(store.dispatch).toHaveBeenCalledWith(`${side}Pane/toggleOpen`);
       });
+    });
 
-      it('shows header-icon', () => {
-        expect(wrapper.find('.header-icon-slot')).not.toBeNull();
+    describe.each`
+      isOpen
+      ${true}
+      ${false}
+    `('when isOpen=$isOpen', ({ isOpen }) => {
+      beforeEach(() => {
+        store.state.rightPane.isOpen = isOpen;
+        store.state.rightPane.currentView = fakeComponentName;
+
+        createComponent({ extensionTabs });
       });
 
-      it('shows header', () => {
-        expect(wrapper.find('.header-slot')).not.toBeNull();
+      it(`tab view is shown=${isOpen}`, () => {
+        expect(wrapper.find('.js-tab-view').exists()).toBe(isOpen);
       });
 
-      it('shows footer', () => {
-        expect(wrapper.find('.footer-slot')).not.toBeNull();
+      it('renders sidebar nav', () => {
+        expect(findSidebarNav().props()).toEqual({
+          tabs: extensionTabs,
+          side: 'right',
+          currentView: fakeComponentName,
+          isOpen,
+        });
       });
     });
   });
diff --git a/spec/frontend/ide/components/panes/right_spec.js b/spec/frontend/ide/components/panes/right_spec.js
index 84b2d440b60..203d35ed335 100644
--- a/spec/frontend/ide/components/panes/right_spec.js
+++ b/spec/frontend/ide/components/panes/right_spec.js
@@ -5,6 +5,7 @@ import { createStore } from '~/ide/stores';
 import RightPane from '~/ide/components/panes/right.vue';
 import CollapsibleSidebar from '~/ide/components/panes/collapsible_sidebar.vue';
 import { rightSidebarViews } from '~/ide/constants';
+import extendStore from '~/ide/stores/extend';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -14,6 +15,8 @@ describe('ide/components/panes/right.vue', () => {
   let store;
 
   const createComponent = props => {
+    extendStore(store, document.createElement('div'));
+
     wrapper = shallowMount(RightPane, {
       localVue,
       store,
@@ -32,26 +35,6 @@ describe('ide/components/panes/right.vue', () => {
     wrapper = null;
   });
 
-  it('allows tabs to be added via extensionTabs prop', () => {
-    createComponent({
-      extensionTabs: [
-        {
-          show: true,
-          title: 'FakeTab',
-        },
-      ],
-    });
-
-    expect(wrapper.find(CollapsibleSidebar).props('extensionTabs')).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          show: true,
-          title: 'FakeTab',
-        }),
-      ]),
-    );
-  });
-
   describe('pipelines tab', () => {
     it('is always shown', () => {
       createComponent();
@@ -99,4 +82,38 @@ describe('ide/components/panes/right.vue', () => {
       );
     });
   });
+
+  describe('terminal tab', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('adds terminal tab', () => {
+      store.state.terminal.isVisible = true;
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(wrapper.find(CollapsibleSidebar).props('extensionTabs')).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              show: true,
+              title: 'Terminal',
+            }),
+          ]),
+        );
+      });
+    });
+
+    it('hides terminal tab when not visible', () => {
+      store.state.terminal.isVisible = false;
+
+      expect(wrapper.find(CollapsibleSidebar).props('extensionTabs')).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            show: false,
+            title: 'Terminal',
+          }),
+        ]),
+      );
+    });
+  });
 });
diff --git a/spec/frontend/ide/components/pipelines/list_spec.js b/spec/frontend/ide/components/pipelines/list_spec.js
index d909a5e478e..795ded35d20 100644
--- a/spec/frontend/ide/components/pipelines/list_spec.js
+++ b/spec/frontend/ide/components/pipelines/list_spec.js
@@ -6,7 +6,7 @@ import List from '~/ide/components/pipelines/list.vue';
 import JobsList from '~/ide/components/jobs/list.vue';
 import Tab from '~/vue_shared/components/tabs/tab.vue';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
-import { pipelines } from '../../../../javascripts/ide/mock_data';
+import { pipelines } from 'jest/ide/mock_data';
 import IDEServices from '~/ide/services';
 
 const localVue = createLocalVue();
diff --git a/spec/frontend/ide/components/repo_commit_section_spec.js b/spec/frontend/ide/components/repo_commit_section_spec.js
index 237be018807..3b837622720 100644
--- a/spec/frontend/ide/components/repo_commit_section_spec.js
+++ b/spec/frontend/ide/components/repo_commit_section_spec.js
@@ -1,7 +1,8 @@
 import { mount } from '@vue/test-utils';
 import { createStore } from '~/ide/stores';
-import router from '~/ide/ide_router';
+import { createRouter } from '~/ide/ide_router';
 import RepoCommitSection from '~/ide/components/repo_commit_section.vue';
+import EmptyState from '~/ide/components/commit_sidebar/empty_state.vue';
 import { stageKeys } from '~/ide/constants';
 import { file } from '../helpers';
 
@@ -9,6 +10,7 @@ const TEST_NO_CHANGES_SVG = 'nochangessvg';
 
 describe('RepoCommitSection', () => {
   let wrapper;
+  let router;
   let store;
 
   function createComponent() {
@@ -54,6 +56,7 @@ describe('RepoCommitSection', () => {
 
   beforeEach(() => {
     store = createStore();
+    router = createRouter(store);
 
     jest.spyOn(store, 'dispatch');
     jest.spyOn(router, 'push').mockImplementation();
@@ -63,7 +66,7 @@ describe('RepoCommitSection', () => {
     wrapper.destroy();
   });
 
-  describe('empty Stage', () => {
+  describe('empty state', () => {
     beforeEach(() => {
       store.state.noChangesStateSvgPath = TEST_NO_CHANGES_SVG;
       store.state.committedStateSvgPath = 'svg';
@@ -74,11 +77,16 @@ describe('RepoCommitSection', () => {
     it('renders no changes text', () => {
       expect(
         wrapper
-          .find('.js-empty-state')
+          .find(EmptyState)
           .text()
           .trim(),
       ).toContain('No changes');
-      expect(wrapper.find('.js-empty-state img').attributes('src')).toBe(TEST_NO_CHANGES_SVG);
+      expect(
+        wrapper
+          .find(EmptyState)
+          .find('img')
+          .attributes('src'),
+      ).toBe(TEST_NO_CHANGES_SVG);
     });
   });
 
@@ -109,6 +117,32 @@ describe('RepoCommitSection', () => {
 
       expect(changedFileNames).toEqual(allFiles.map(x => x.path));
     });
+
+    it('does not show empty state', () => {
+      expect(wrapper.find(EmptyState).exists()).toBe(false);
+    });
+  });
+
+  describe('if nothing is changed or staged', () => {
+    beforeEach(() => {
+      setupDefaultState();
+
+      store.state.openFiles = [...Object.values(store.state.entries)];
+      store.state.openFiles[0].active = true;
+      store.state.stagedFiles = [];
+
+      createComponent();
+    });
+
+    it('opens currently active file', () => {
+      expect(store.state.openFiles.length).toBe(1);
+      expect(store.state.openFiles[0].pending).toBe(true);
+
+      expect(store.dispatch).toHaveBeenCalledWith('openPendingTab', {
+        file: store.state.entries[store.getters.activeFile.path],
+        keyPrefix: stageKeys.unstaged,
+      });
+    });
   });
 
   describe('with unstaged file', () => {
@@ -129,5 +163,9 @@ describe('RepoCommitSection', () => {
         keyPrefix: stageKeys.unstaged,
       });
     });
+
+    it('does not show empty state', () => {
+      expect(wrapper.find(EmptyState).exists()).toBe(false);
+    });
   });
 });
diff --git a/spec/frontend/ide/components/repo_editor_spec.js b/spec/frontend/ide/components/repo_editor_spec.js
new file mode 100644
index 00000000000..4967434dfd7
--- /dev/null
+++ b/spec/frontend/ide/components/repo_editor_spec.js
@@ -0,0 +1,664 @@
+import Vuex from 'vuex';
+import Vue from 'vue';
+import MockAdapter from 'axios-mock-adapter';
+import '~/behaviors/markdown/render_gfm';
+import { Range } from 'monaco-editor';
+import axios from '~/lib/utils/axios_utils';
+import { createStoreOptions } from '~/ide/stores';
+import RepoEditor from '~/ide/components/repo_editor.vue';
+import Editor from '~/ide/lib/editor';
+import { leftSidebarViews, FILE_VIEW_MODE_EDITOR, FILE_VIEW_MODE_PREVIEW } from '~/ide/constants';
+import { createComponentWithStore } from '../../helpers/vue_mount_component_helper';
+import waitForPromises from 'helpers/wait_for_promises';
+import { file } from '../helpers';
+import { exampleConfigs, exampleFiles } from '../lib/editorconfig/mock_data';
+
+describe('RepoEditor', () => {
+  let vm;
+  let store;
+  let mockActions;
+
+  const waitForEditorSetup = () =>
+    new Promise(resolve => {
+      vm.$once('editorSetup', resolve);
+    });
+
+  const createComponent = () => {
+    if (vm) {
+      throw new Error('vm already exists');
+    }
+    vm = createComponentWithStore(Vue.extend(RepoEditor), store, {
+      file: store.state.openFiles[0],
+    });
+    vm.$mount();
+  };
+
+  const createOpenFile = path => {
+    const origFile = store.state.openFiles[0];
+    const newFile = { ...origFile, path, key: path };
+
+    store.state.entries[path] = newFile;
+
+    store.state.openFiles = [newFile];
+  };
+
+  beforeEach(() => {
+    mockActions = {
+      getFileData: jest.fn().mockResolvedValue(),
+      getRawFileData: jest.fn().mockResolvedValue(),
+    };
+
+    const f = {
+      ...file(),
+      viewMode: FILE_VIEW_MODE_EDITOR,
+    };
+
+    const storeOptions = createStoreOptions();
+    storeOptions.actions = {
+      ...storeOptions.actions,
+      ...mockActions,
+    };
+    store = new Vuex.Store(storeOptions);
+
+    f.active = true;
+    f.tempFile = true;
+
+    store.state.openFiles.push(f);
+    store.state.projects = {
+      'gitlab-org/gitlab': {
+        branches: {
+          master: {
+            name: 'master',
+            commit: {
+              id: 'abcdefgh',
+            },
+          },
+        },
+      },
+    };
+    store.state.currentProjectId = 'gitlab-org/gitlab';
+    store.state.currentBranchId = 'master';
+
+    Vue.set(store.state.entries, f.path, f);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+    vm = null;
+
+    Editor.editorInstance.dispose();
+  });
+
+  const findEditor = () => vm.$el.querySelector('.multi-file-editor-holder');
+
+  describe('default', () => {
+    beforeEach(() => {
+      createComponent();
+
+      return waitForEditorSetup();
+    });
+
+    it('sets renderWhitespace to `all`', () => {
+      vm.$store.state.renderWhitespaceInCode = true;
+
+      expect(vm.editorOptions.renderWhitespace).toEqual('all');
+    });
+
+    it('sets renderWhitespace to `none`', () => {
+      vm.$store.state.renderWhitespaceInCode = false;
+
+      expect(vm.editorOptions.renderWhitespace).toEqual('none');
+    });
+
+    it('renders an ide container', () => {
+      expect(vm.shouldHideEditor).toBeFalsy();
+      expect(vm.showEditor).toBe(true);
+      expect(findEditor()).not.toHaveCss({ display: 'none' });
+    });
+
+    it('renders only an edit tab', done => {
+      Vue.nextTick(() => {
+        const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li');
+
+        expect(tabs.length).toBe(1);
+        expect(tabs[0].textContent.trim()).toBe('Edit');
+
+        done();
+      });
+    });
+
+    describe('when file is markdown', () => {
+      let mock;
+
+      beforeEach(() => {
+        mock = new MockAdapter(axios);
+
+        mock.onPost(/(.*)\/preview_markdown/).reply(200, {
+          body: '<p>testing 123</p>',
+        });
+
+        Vue.set(vm, 'file', {
+          ...vm.file,
+          projectId: 'namespace/project',
+          path: 'sample.md',
+          content: 'testing 123',
+        });
+
+        vm.$store.state.entries[vm.file.path] = vm.file;
+
+        return vm.$nextTick();
+      });
+
+      afterEach(() => {
+        mock.restore();
+      });
+
+      it('renders an Edit and a Preview Tab', done => {
+        Vue.nextTick(() => {
+          const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li');
+
+          expect(tabs.length).toBe(2);
+          expect(tabs[0].textContent.trim()).toBe('Edit');
+          expect(tabs[1].textContent.trim()).toBe('Preview Markdown');
+
+          done();
+        });
+      });
+
+      it('renders markdown for tempFile', done => {
+        vm.file.tempFile = true;
+
+        vm.$nextTick()
+          .then(() => {
+            vm.$el.querySelectorAll('.ide-mode-tabs .nav-links a')[1].click();
+          })
+          .then(waitForPromises)
+          .then(() => {
+            expect(vm.$el.querySelector('.preview-container').innerHTML).toContain(
+              '<p>testing 123</p>',
+            );
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+
+      describe('when not in edit mode', () => {
+        beforeEach(async () => {
+          await vm.$nextTick();
+
+          vm.$store.state.currentActivityView = leftSidebarViews.review.name;
+
+          return vm.$nextTick();
+        });
+
+        it('shows no tabs', () => {
+          expect(vm.$el.querySelectorAll('.ide-mode-tabs .nav-links a')).toHaveLength(0);
+        });
+      });
+    });
+
+    describe('when open file is binary and not raw', () => {
+      beforeEach(done => {
+        vm.file.binary = true;
+
+        vm.$nextTick(done);
+      });
+
+      it('does not render the IDE', () => {
+        expect(vm.shouldHideEditor).toBeTruthy();
+      });
+    });
+
+    describe('createEditorInstance', () => {
+      it('calls createInstance when viewer is editor', done => {
+        jest.spyOn(vm.editor, 'createInstance').mockImplementation();
+
+        vm.createEditorInstance();
+
+        vm.$nextTick(() => {
+          expect(vm.editor.createInstance).toHaveBeenCalled();
+
+          done();
+        });
+      });
+
+      it('calls createDiffInstance when viewer is diff', done => {
+        vm.$store.state.viewer = 'diff';
+
+        jest.spyOn(vm.editor, 'createDiffInstance').mockImplementation();
+
+        vm.createEditorInstance();
+
+        vm.$nextTick(() => {
+          expect(vm.editor.createDiffInstance).toHaveBeenCalled();
+
+          done();
+        });
+      });
+
+      it('calls createDiffInstance when viewer is a merge request diff', done => {
+        vm.$store.state.viewer = 'mrdiff';
+
+        jest.spyOn(vm.editor, 'createDiffInstance').mockImplementation();
+
+        vm.createEditorInstance();
+
+        vm.$nextTick(() => {
+          expect(vm.editor.createDiffInstance).toHaveBeenCalled();
+
+          done();
+        });
+      });
+    });
+
+    describe('setupEditor', () => {
+      it('creates new model', () => {
+        jest.spyOn(vm.editor, 'createModel');
+
+        Editor.editorInstance.modelManager.dispose();
+
+        vm.setupEditor();
+
+        expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, null);
+        expect(vm.model).not.toBeNull();
+      });
+
+      it('attaches model to editor', () => {
+        jest.spyOn(vm.editor, 'attachModel');
+
+        Editor.editorInstance.modelManager.dispose();
+
+        vm.setupEditor();
+
+        expect(vm.editor.attachModel).toHaveBeenCalledWith(vm.model);
+      });
+
+      it('attaches model to merge request editor', () => {
+        vm.$store.state.viewer = 'mrdiff';
+        vm.file.mrChange = true;
+        jest.spyOn(vm.editor, 'attachMergeRequestModel').mockImplementation();
+
+        Editor.editorInstance.modelManager.dispose();
+
+        vm.setupEditor();
+
+        expect(vm.editor.attachMergeRequestModel).toHaveBeenCalledWith(vm.model);
+      });
+
+      it('does not attach model to merge request editor when not a MR change', () => {
+        vm.$store.state.viewer = 'mrdiff';
+        vm.file.mrChange = false;
+        jest.spyOn(vm.editor, 'attachMergeRequestModel').mockImplementation();
+
+        Editor.editorInstance.modelManager.dispose();
+
+        vm.setupEditor();
+
+        expect(vm.editor.attachMergeRequestModel).not.toHaveBeenCalledWith(vm.model);
+      });
+
+      it('adds callback methods', () => {
+        jest.spyOn(vm.editor, 'onPositionChange');
+
+        Editor.editorInstance.modelManager.dispose();
+
+        vm.setupEditor();
+
+        expect(vm.editor.onPositionChange).toHaveBeenCalled();
+        expect(vm.model.events.size).toBe(2);
+      });
+
+      it('updates state with the value of the model', () => {
+        vm.model.setValue('testing 1234\n');
+
+        vm.setupEditor();
+
+        expect(vm.file.content).toBe('testing 1234\n');
+      });
+
+      it('sets head model as staged file', () => {
+        jest.spyOn(vm.editor, 'createModel');
+
+        Editor.editorInstance.modelManager.dispose();
+
+        vm.$store.state.stagedFiles.push({ ...vm.file, key: 'staged' });
+        vm.file.staged = true;
+        vm.file.key = `unstaged-${vm.file.key}`;
+
+        vm.setupEditor();
+
+        expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, vm.$store.state.stagedFiles[0]);
+      });
+    });
+
+    describe('editor updateDimensions', () => {
+      beforeEach(() => {
+        jest.spyOn(vm.editor, 'updateDimensions');
+        jest.spyOn(vm.editor, 'updateDiffView').mockImplementation();
+      });
+
+      it('calls updateDimensions when panelResizing is false', done => {
+        vm.$store.state.panelResizing = true;
+
+        vm.$nextTick()
+          .then(() => {
+            vm.$store.state.panelResizing = false;
+          })
+          .then(vm.$nextTick)
+          .then(() => {
+            expect(vm.editor.updateDimensions).toHaveBeenCalled();
+            expect(vm.editor.updateDiffView).toHaveBeenCalled();
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+
+      it('does not call updateDimensions when panelResizing is true', done => {
+        vm.$store.state.panelResizing = true;
+
+        vm.$nextTick(() => {
+          expect(vm.editor.updateDimensions).not.toHaveBeenCalled();
+          expect(vm.editor.updateDiffView).not.toHaveBeenCalled();
+
+          done();
+        });
+      });
+
+      it('calls updateDimensions when rightPane is opened', done => {
+        vm.$store.state.rightPane.isOpen = true;
+
+        vm.$nextTick(() => {
+          expect(vm.editor.updateDimensions).toHaveBeenCalled();
+          expect(vm.editor.updateDiffView).toHaveBeenCalled();
+
+          done();
+        });
+      });
+    });
+
+    describe('show tabs', () => {
+      it('shows tabs in edit mode', () => {
+        expect(vm.$el.querySelector('.nav-links')).not.toBe(null);
+      });
+
+      it('hides tabs in review mode', done => {
+        vm.$store.state.currentActivityView = leftSidebarViews.review.name;
+
+        vm.$nextTick(() => {
+          expect(vm.$el.querySelector('.nav-links')).toBe(null);
+
+          done();
+        });
+      });
+
+      it('hides tabs in commit mode', done => {
+        vm.$store.state.currentActivityView = leftSidebarViews.commit.name;
+
+        vm.$nextTick(() => {
+          expect(vm.$el.querySelector('.nav-links')).toBe(null);
+
+          done();
+        });
+      });
+    });
+
+    describe('when files view mode is preview', () => {
+      beforeEach(done => {
+        jest.spyOn(vm.editor, 'updateDimensions').mockImplementation();
+        vm.file.viewMode = FILE_VIEW_MODE_PREVIEW;
+        vm.$nextTick(done);
+      });
+
+      it('should hide editor', () => {
+        expect(vm.showEditor).toBe(false);
+        expect(findEditor()).toHaveCss({ display: 'none' });
+      });
+
+      describe('when file view mode changes to editor', () => {
+        it('should update dimensions', () => {
+          vm.file.viewMode = FILE_VIEW_MODE_EDITOR;
+
+          return vm.$nextTick().then(() => {
+            expect(vm.editor.updateDimensions).toHaveBeenCalled();
+          });
+        });
+      });
+    });
+
+    describe('initEditor', () => {
+      beforeEach(() => {
+        vm.file.tempFile = false;
+        jest.spyOn(vm.editor, 'createInstance').mockImplementation();
+        jest.spyOn(vm, 'shouldHideEditor', 'get').mockReturnValue(true);
+      });
+
+      it('does not fetch file information for temp entries', done => {
+        vm.file.tempFile = true;
+
+        vm.initEditor();
+        vm.$nextTick()
+          .then(() => {
+            expect(mockActions.getFileData).not.toHaveBeenCalled();
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+
+      it('is being initialised for files without content even if shouldHideEditor is `true`', done => {
+        vm.file.content = '';
+        vm.file.raw = '';
+
+        vm.initEditor();
+        vm.$nextTick()
+          .then(() => {
+            expect(mockActions.getFileData).toHaveBeenCalled();
+            expect(mockActions.getRawFileData).toHaveBeenCalled();
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+
+      it('does not initialize editor for files already with content', done => {
+        vm.file.content = 'foo';
+
+        vm.initEditor();
+        vm.$nextTick()
+          .then(() => {
+            expect(mockActions.getFileData).not.toHaveBeenCalled();
+            expect(mockActions.getRawFileData).not.toHaveBeenCalled();
+            expect(vm.editor.createInstance).not.toHaveBeenCalled();
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+    });
+
+    describe('updates on file changes', () => {
+      beforeEach(() => {
+        jest.spyOn(vm, 'initEditor').mockImplementation();
+      });
+
+      it('calls removePendingTab when old file is pending', done => {
+        jest.spyOn(vm, 'shouldHideEditor', 'get').mockReturnValue(true);
+        jest.spyOn(vm, 'removePendingTab').mockImplementation();
+
+        vm.file.pending = true;
+
+        vm.$nextTick()
+          .then(() => {
+            vm.file = file('testing');
+            vm.file.content = 'foo'; // need to prevent full cycle of initEditor
+
+            return vm.$nextTick();
+          })
+          .then(() => {
+            expect(vm.removePendingTab).toHaveBeenCalled();
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+
+      it('does not call initEditor if the file did not change', done => {
+        Vue.set(vm, 'file', vm.file);
+
+        vm.$nextTick()
+          .then(() => {
+            expect(vm.initEditor).not.toHaveBeenCalled();
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+
+      it('calls initEditor when file key is changed', done => {
+        expect(vm.initEditor).not.toHaveBeenCalled();
+
+        Vue.set(vm, 'file', {
+          ...vm.file,
+          key: 'new',
+        });
+
+        vm.$nextTick()
+          .then(() => {
+            expect(vm.initEditor).toHaveBeenCalled();
+          })
+          .then(done)
+          .catch(done.fail);
+      });
+    });
+
+    describe('onPaste', () => {
+      const setFileName = name => {
+        Vue.set(vm, 'file', {
+          ...vm.file,
+          content: 'hello world\n',
+          name,
+          path: `foo/${name}`,
+          key: 'new',
+        });
+
+        vm.$store.state.entries[vm.file.path] = vm.file;
+      };
+
+      const pasteImage = () => {
+        window.dispatchEvent(
+          Object.assign(new Event('paste'), {
+            clipboardData: {
+              files: [new File(['foo'], 'foo.png', { type: 'image/png' })],
+            },
+          }),
+        );
+      };
+
+      const watchState = watched =>
+        new Promise(resolve => {
+          const unwatch = vm.$store.watch(watched, () => {
+            unwatch();
+            resolve();
+          });
+        });
+
+      beforeEach(() => {
+        setFileName('bar.md');
+
+        vm.$store.state.trees['gitlab-org/gitlab'] = { tree: [] };
+        vm.$store.state.currentProjectId = 'gitlab-org';
+        vm.$store.state.currentBranchId = 'gitlab';
+
+        // create a new model each time, otherwise tests conflict with each other
+        // because of same model being used in multiple tests
+        Editor.editorInstance.modelManager.dispose();
+        vm.setupEditor();
+
+        return waitForPromises().then(() => {
+          // set cursor to line 2, column 1
+          vm.editor.instance.setSelection(new Range(2, 1, 2, 1));
+          vm.editor.instance.focus();
+        });
+      });
+
+      it('adds an image entry to the same folder for a pasted image in a markdown file', () => {
+        pasteImage();
+
+        return waitForPromises().then(() => {
+          expect(vm.$store.state.entries['foo/foo.png']).toMatchObject({
+            path: 'foo/foo.png',
+            type: 'blob',
+            content: 'Zm9v',
+            binary: true,
+            rawPath: 'data:image/png;base64,Zm9v',
+          });
+        });
+      });
+
+      it("adds a markdown image tag to the file's contents", () => {
+        pasteImage();
+
+        // Pasting an image does a lot of things like using the FileReader API,
+        // so, waitForPromises isn't very reliable (and causes a flaky spec)
+        // Read more about state.watch: https://vuex.vuejs.org/api/#watch
+        return watchState(s => s.entries['foo/bar.md'].content).then(() => {
+          expect(vm.file.content).toBe('hello world\n![foo.png](./foo.png)');
+        });
+      });
+
+      it("does not add file to state or set markdown image syntax if the file isn't markdown", () => {
+        setFileName('myfile.txt');
+        pasteImage();
+
+        return waitForPromises().then(() => {
+          expect(vm.$store.state.entries['foo/foo.png']).toBeUndefined();
+          expect(vm.file.content).toBe('hello world\n');
+        });
+      });
+    });
+  });
+
+  describe('fetchEditorconfigRules', () => {
+    beforeEach(() => {
+      exampleConfigs.forEach(({ path, content }) => {
+        store.state.entries[path] = { ...file(), path, content };
+      });
+    });
+
+    it.each(exampleFiles)(
+      'does not fetch content from remote for .editorconfig files present locally (case %#)',
+      ({ path, monacoRules }) => {
+        createOpenFile(path);
+        createComponent();
+
+        return waitForEditorSetup().then(() => {
+          expect(vm.rules).toEqual(monacoRules);
+          expect(vm.model.options).toMatchObject(monacoRules);
+          expect(mockActions.getFileData).not.toHaveBeenCalled();
+          expect(mockActions.getRawFileData).not.toHaveBeenCalled();
+        });
+      },
+    );
+
+    it('fetches content from remote for .editorconfig files not available locally', () => {
+      exampleConfigs.forEach(({ path }) => {
+        delete store.state.entries[path].content;
+        delete store.state.entries[path].raw;
+      });
+
+      // Include a "test" directory which does not exist in store. This one should be skipped.
+      createOpenFile('foo/bar/baz/test/my_spec.js');
+      createComponent();
+
+      return waitForEditorSetup().then(() => {
+        expect(mockActions.getFileData.mock.calls.map(([, args]) => args)).toEqual([
+          { makeFileActive: false, path: 'foo/bar/baz/.editorconfig' },
+          { makeFileActive: false, path: 'foo/bar/.editorconfig' },
+          { makeFileActive: false, path: 'foo/.editorconfig' },
+          { makeFileActive: false, path: '.editorconfig' },
+        ]);
+        expect(mockActions.getRawFileData.mock.calls.map(([, args]) => args)).toEqual([
+          { path: 'foo/bar/baz/.editorconfig' },
+          { path: 'foo/bar/.editorconfig' },
+          { path: 'foo/.editorconfig' },
+          { path: '.editorconfig' },
+        ]);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/repo_tab_spec.js b/spec/frontend/ide/components/repo_tab_spec.js
index 82ea73ffbb1..5a591d3dcd0 100644
--- a/spec/frontend/ide/components/repo_tab_spec.js
+++ b/spec/frontend/ide/components/repo_tab_spec.js
@@ -1,11 +1,13 @@
 import Vue from 'vue';
-import store from '~/ide/stores';
+import { createStore } from '~/ide/stores';
 import repoTab from '~/ide/components/repo_tab.vue';
-import router from '~/ide/ide_router';
-import { file, resetStore } from '../helpers';
+import { createRouter } from '~/ide/ide_router';
+import { file } from '../helpers';
 
 describe('RepoTab', () => {
   let vm;
+  let store;
+  let router;
 
   function createComponent(propsData) {
     const RepoTab = Vue.extend(repoTab);
@@ -17,13 +19,13 @@ describe('RepoTab', () => {
   }
 
   beforeEach(() => {
+    store = createStore();
+    router = createRouter(store);
     jest.spyOn(router, 'push').mockImplementation(() => {});
   });
 
   afterEach(() => {
     vm.$destroy();
-
-    resetStore(vm.$store);
   });
 
   it('renders a close link and a name link', () => {
diff --git a/spec/frontend/ide/components/repo_tabs_spec.js b/spec/frontend/ide/components/repo_tabs_spec.js
index 583f71e6121..df5b01770f5 100644
--- a/spec/frontend/ide/components/repo_tabs_spec.js
+++ b/spec/frontend/ide/components/repo_tabs_spec.js
@@ -16,9 +16,7 @@ describe('RepoTabs', () => {
     vm = createComponent(RepoTabs, {
       files: openedFiles,
       viewer: 'editor',
-      hasChanges: false,
       activeFile: file('activeFile'),
-      hasMergeRequest: false,
     });
     openedFiles[0].active = true;
 
diff --git a/spec/frontend/ide/components/resizable_panel_spec.js b/spec/frontend/ide/components/resizable_panel_spec.js
new file mode 100644
index 00000000000..7368de0cee7
--- /dev/null
+++ b/spec/frontend/ide/components/resizable_panel_spec.js
@@ -0,0 +1,114 @@
+import Vuex from 'vuex';
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import ResizablePanel from '~/ide/components/resizable_panel.vue';
+import PanelResizer from '~/vue_shared/components/panel_resizer.vue';
+import { SIDE_LEFT, SIDE_RIGHT } from '~/ide/constants';
+
+const TEST_WIDTH = 500;
+const TEST_MIN_WIDTH = 400;
+
+describe('~/ide/components/resizable_panel', () => {
+  const localVue = createLocalVue();
+  localVue.use(Vuex);
+
+  let wrapper;
+  let store;
+
+  beforeEach(() => {
+    store = new Vuex.Store({});
+    jest.spyOn(store, 'dispatch').mockImplementation();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(ResizablePanel, {
+      propsData: {
+        initialWidth: TEST_WIDTH,
+        minSize: TEST_MIN_WIDTH,
+        side: SIDE_LEFT,
+        ...props,
+      },
+      store,
+      localVue,
+    });
+  };
+  const findResizer = () => wrapper.find(PanelResizer);
+  const findInlineStyle = () => wrapper.element.style.cssText;
+  const createInlineStyle = width => `width: ${width}px;`;
+
+  describe.each`
+    props                                    | showResizer | resizerSide   | expectedStyle
+    ${{ resizable: true, side: SIDE_LEFT }}  | ${true}     | ${SIDE_RIGHT} | ${createInlineStyle(TEST_WIDTH)}
+    ${{ resizable: true, side: SIDE_RIGHT }} | ${true}     | ${SIDE_LEFT}  | ${createInlineStyle(TEST_WIDTH)}
+    ${{ resizable: false, side: SIDE_LEFT }} | ${false}    | ${SIDE_RIGHT} | ${''}
+  `('with props $props', ({ props, showResizer, resizerSide, expectedStyle }) => {
+    beforeEach(() => {
+      createComponent(props);
+    });
+
+    it(`show resizer is ${showResizer}`, () => {
+      const expectedDisplay = showResizer ? '' : 'none';
+      const resizer = findResizer();
+
+      expect(resizer.exists()).toBe(true);
+      expect(resizer.element.style.display).toBe(expectedDisplay);
+    });
+
+    it(`resizer side is '${resizerSide}'`, () => {
+      const resizer = findResizer();
+
+      expect(resizer.props('side')).toBe(resizerSide);
+    });
+
+    it(`has style '${expectedStyle}'`, () => {
+      expect(findInlineStyle()).toBe(expectedStyle);
+    });
+  });
+
+  describe('default', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('does not dispatch anything', () => {
+      expect(store.dispatch).not.toHaveBeenCalled();
+    });
+
+    it.each`
+      event             | dispatchArgs
+      ${'resize-start'} | ${['setResizingStatus', true]}
+      ${'resize-end'}   | ${['setResizingStatus', false]}
+    `('when resizer emits $event, dispatch $dispatchArgs', ({ event, dispatchArgs }) => {
+      const resizer = findResizer();
+
+      resizer.vm.$emit(event);
+
+      expect(store.dispatch).toHaveBeenCalledWith(...dispatchArgs);
+    });
+
+    it('renders resizer', () => {
+      const resizer = findResizer();
+
+      expect(resizer.props()).toMatchObject({
+        maxSize: window.innerWidth / 2,
+        minSize: TEST_MIN_WIDTH,
+        startSize: TEST_WIDTH,
+      });
+    });
+
+    it('when resizer emits update:size, changes inline width', () => {
+      const newSize = TEST_WIDTH - 100;
+      const resizer = findResizer();
+
+      resizer.vm.$emit('update:size', newSize);
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findInlineStyle()).toBe(createInlineStyle(newSize));
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/terminal/empty_state_spec.js b/spec/frontend/ide/components/terminal/empty_state_spec.js
new file mode 100644
index 00000000000..a3f2089608d
--- /dev/null
+++ b/spec/frontend/ide/components/terminal/empty_state_spec.js
@@ -0,0 +1,107 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlLoadingIcon } from '@gitlab/ui';
+import { TEST_HOST } from 'spec/test_constants';
+import TerminalEmptyState from '~/ide/components/terminal/empty_state.vue';
+
+const TEST_HELP_PATH = `${TEST_HOST}/help/test`;
+const TEST_PATH = `${TEST_HOST}/home.png`;
+const TEST_HTML_MESSAGE = 'lorem <strong>ipsum</strong>';
+
+describe('IDE TerminalEmptyState', () => {
+  let wrapper;
+
+  const factory = (options = {}) => {
+    wrapper = shallowMount(TerminalEmptyState, {
+      ...options,
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('does not show illustration, if no path specified', () => {
+    factory();
+
+    expect(wrapper.find('.svg-content').exists()).toBe(false);
+  });
+
+  it('shows illustration with path', () => {
+    factory({
+      propsData: {
+        illustrationPath: TEST_PATH,
+      },
+    });
+
+    const img = wrapper.find('.svg-content img');
+
+    expect(img.exists()).toBe(true);
+    expect(img.attributes('src')).toEqual(TEST_PATH);
+  });
+
+  it('when loading, shows loading icon', () => {
+    factory({
+      propsData: {
+        isLoading: true,
+      },
+    });
+
+    expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+  });
+
+  it('when not loading, does not show loading icon', () => {
+    factory({
+      propsData: {
+        isLoading: false,
+      },
+    });
+
+    expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
+  });
+
+  describe('when valid', () => {
+    let button;
+
+    beforeEach(() => {
+      factory({
+        propsData: {
+          isLoading: false,
+          isValid: true,
+          helpPath: TEST_HELP_PATH,
+        },
+      });
+
+      button = wrapper.find('button');
+    });
+
+    it('shows button', () => {
+      expect(button.text()).toEqual('Start Web Terminal');
+      expect(button.attributes('disabled')).toBeFalsy();
+    });
+
+    it('emits start when button is clicked', () => {
+      expect(wrapper.emitted().start).toBeFalsy();
+
+      button.trigger('click');
+
+      expect(wrapper.emitted().start).toHaveLength(1);
+    });
+
+    it('shows help path link', () => {
+      expect(wrapper.find('a').attributes('href')).toEqual(TEST_HELP_PATH);
+    });
+  });
+
+  it('when not valid, shows disabled button and message', () => {
+    factory({
+      propsData: {
+        isLoading: false,
+        isValid: false,
+        message: TEST_HTML_MESSAGE,
+      },
+    });
+
+    expect(wrapper.find('button').attributes('disabled')).not.toBe(null);
+    expect(wrapper.find('.bs-callout').element.innerHTML).toEqual(TEST_HTML_MESSAGE);
+  });
+});
diff --git a/spec/frontend/ide/components/terminal/session_spec.js b/spec/frontend/ide/components/terminal/session_spec.js
new file mode 100644
index 00000000000..2399446ed15
--- /dev/null
+++ b/spec/frontend/ide/components/terminal/session_spec.js
@@ -0,0 +1,96 @@
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import TerminalSession from '~/ide/components/terminal/session.vue';
+import Terminal from '~/ide/components/terminal/terminal.vue';
+import {
+  STARTING,
+  PENDING,
+  RUNNING,
+  STOPPING,
+  STOPPED,
+} from '~/ide/stores/modules/terminal/constants';
+
+const TEST_TERMINAL_PATH = 'terminal/path';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('IDE TerminalSession', () => {
+  let wrapper;
+  let actions;
+  let state;
+
+  const factory = (options = {}) => {
+    const store = new Vuex.Store({
+      modules: {
+        terminal: {
+          namespaced: true,
+          actions,
+          state,
+        },
+      },
+    });
+
+    wrapper = shallowMount(TerminalSession, {
+      localVue,
+      store,
+      ...options,
+    });
+  };
+
+  beforeEach(() => {
+    state = {
+      session: { status: RUNNING, terminalPath: TEST_TERMINAL_PATH },
+    };
+    actions = {
+      restartSession: jest.fn(),
+      stopSession: jest.fn(),
+    };
+  });
+
+  it('is empty if session is falsey', () => {
+    state.session = null;
+    factory();
+
+    expect(wrapper.isEmpty()).toBe(true);
+  });
+
+  it('shows terminal', () => {
+    factory();
+
+    expect(wrapper.find(Terminal).props()).toEqual({
+      terminalPath: TEST_TERMINAL_PATH,
+      status: RUNNING,
+    });
+  });
+
+  [STARTING, PENDING, RUNNING].forEach(status => {
+    it(`show stop button when status is ${status}`, () => {
+      state.session = { status };
+      factory();
+
+      const button = wrapper.find('button');
+      button.trigger('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(button.text()).toEqual('Stop Terminal');
+        expect(actions.stopSession).toHaveBeenCalled();
+      });
+    });
+  });
+
+  [STOPPING, STOPPED].forEach(status => {
+    it(`show stop button when status is ${status}`, () => {
+      state.session = { status };
+      factory();
+
+      const button = wrapper.find('button');
+      button.trigger('click');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(button.text()).toEqual('Restart Terminal');
+        expect(actions.restartSession).toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/terminal/terminal_controls_spec.js b/spec/frontend/ide/components/terminal/terminal_controls_spec.js
new file mode 100644
index 00000000000..6c2871abb46
--- /dev/null
+++ b/spec/frontend/ide/components/terminal/terminal_controls_spec.js
@@ -0,0 +1,65 @@
+import { shallowMount } from '@vue/test-utils';
+import TerminalControls from '~/ide/components/terminal/terminal_controls.vue';
+import ScrollButton from '~/ide/components/jobs/detail/scroll_button.vue';
+
+describe('IDE TerminalControls', () => {
+  let wrapper;
+  let buttons;
+
+  const factory = (options = {}) => {
+    wrapper = shallowMount(TerminalControls, {
+      ...options,
+    });
+
+    buttons = wrapper.findAll(ScrollButton);
+  };
+
+  it('shows an up and down scroll button', () => {
+    factory();
+
+    expect(buttons.wrappers.map(x => x.props())).toEqual([
+      expect.objectContaining({ direction: 'up', disabled: true }),
+      expect.objectContaining({ direction: 'down', disabled: true }),
+    ]);
+  });
+
+  it('enables up button with prop', () => {
+    factory({ propsData: { canScrollUp: true } });
+
+    expect(buttons.at(0).props()).toEqual(
+      expect.objectContaining({ direction: 'up', disabled: false }),
+    );
+  });
+
+  it('enables down button with prop', () => {
+    factory({ propsData: { canScrollDown: true } });
+
+    expect(buttons.at(1).props()).toEqual(
+      expect.objectContaining({ direction: 'down', disabled: false }),
+    );
+  });
+
+  it('emits "scroll-up" when click up button', () => {
+    factory({ propsData: { canScrollUp: true } });
+
+    expect(wrapper.emittedByOrder()).toEqual([]);
+
+    buttons.at(0).vm.$emit('click');
+
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.emittedByOrder()).toEqual([{ name: 'scroll-up', args: [] }]);
+    });
+  });
+
+  it('emits "scroll-down" when click down button', () => {
+    factory({ propsData: { canScrollDown: true } });
+
+    expect(wrapper.emittedByOrder()).toEqual([]);
+
+    buttons.at(1).vm.$emit('click');
+
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.emittedByOrder()).toEqual([{ name: 'scroll-down', args: [] }]);
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/terminal/terminal_spec.js b/spec/frontend/ide/components/terminal/terminal_spec.js
new file mode 100644
index 00000000000..3095288bb28
--- /dev/null
+++ b/spec/frontend/ide/components/terminal/terminal_spec.js
@@ -0,0 +1,225 @@
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import { GlLoadingIcon } from '@gitlab/ui';
+import Terminal from '~/ide/components/terminal/terminal.vue';
+import TerminalControls from '~/ide/components/terminal/terminal_controls.vue';
+import {
+  STARTING,
+  PENDING,
+  RUNNING,
+  STOPPING,
+  STOPPED,
+} from '~/ide/stores/modules/terminal/constants';
+import GLTerminal from '~/terminal/terminal';
+
+const TEST_TERMINAL_PATH = 'terminal/path';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+jest.mock('~/terminal/terminal', () =>
+  jest.fn().mockImplementation(() => ({
+    dispose: jest.fn(),
+    disable: jest.fn(),
+    addScrollListener: jest.fn(),
+    scrollToTop: jest.fn(),
+    scrollToBottom: jest.fn(),
+  })),
+);
+
+describe('IDE Terminal', () => {
+  let wrapper;
+  let state;
+
+  const factory = propsData => {
+    const store = new Vuex.Store({
+      state,
+      mutations: {
+        set(prevState, newState) {
+          Object.assign(prevState, newState);
+        },
+      },
+    });
+
+    wrapper = shallowMount(localVue.extend(Terminal), {
+      propsData: {
+        status: RUNNING,
+        terminalPath: TEST_TERMINAL_PATH,
+        ...propsData,
+      },
+      localVue,
+      store,
+    });
+  };
+
+  beforeEach(() => {
+    state = {
+      panelResizing: false,
+    };
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  describe('loading text', () => {
+    [STARTING, PENDING].forEach(status => {
+      it(`shows when starting (${status})`, () => {
+        factory({ status });
+
+        expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+        expect(wrapper.find('.top-bar').text()).toBe('Starting...');
+      });
+    });
+
+    it(`shows when stopping`, () => {
+      factory({ status: STOPPING });
+
+      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.find('.top-bar').text()).toBe('Stopping...');
+    });
+
+    [RUNNING, STOPPED].forEach(status => {
+      it('hides when not loading', () => {
+        factory({ status });
+
+        expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
+        expect(wrapper.find('.top-bar').text()).toBe('');
+      });
+    });
+  });
+
+  describe('refs.terminal', () => {
+    it('has terminal path in data', () => {
+      factory();
+
+      expect(wrapper.vm.$refs.terminal.dataset.projectPath).toBe(TEST_TERMINAL_PATH);
+    });
+  });
+
+  describe('terminal controls', () => {
+    beforeEach(() => {
+      factory();
+      wrapper.vm.createTerminal();
+
+      return localVue.nextTick();
+    });
+
+    it('is visible if terminal is created', () => {
+      expect(wrapper.find(TerminalControls).exists()).toBe(true);
+    });
+
+    it('scrolls glterminal on scroll-up', () => {
+      wrapper.find(TerminalControls).vm.$emit('scroll-up');
+
+      expect(wrapper.vm.glterminal.scrollToTop).toHaveBeenCalled();
+    });
+
+    it('scrolls glterminal on scroll-down', () => {
+      wrapper.find(TerminalControls).vm.$emit('scroll-down');
+
+      expect(wrapper.vm.glterminal.scrollToBottom).toHaveBeenCalled();
+    });
+
+    it('has props set', () => {
+      expect(wrapper.find(TerminalControls).props()).toEqual({
+        canScrollUp: false,
+        canScrollDown: false,
+      });
+
+      wrapper.setData({ canScrollUp: true, canScrollDown: true });
+
+      return localVue.nextTick().then(() => {
+        expect(wrapper.find(TerminalControls).props()).toEqual({
+          canScrollUp: true,
+          canScrollDown: true,
+        });
+      });
+    });
+  });
+
+  describe('refresh', () => {
+    let createTerminal;
+    let stopTerminal;
+
+    beforeEach(() => {
+      createTerminal = jest.fn().mockName('createTerminal');
+      stopTerminal = jest.fn().mockName('stopTerminal');
+    });
+
+    it('creates the terminal if running', () => {
+      factory({ status: RUNNING, terminalPath: TEST_TERMINAL_PATH });
+
+      wrapper.setMethods({ createTerminal });
+      wrapper.vm.refresh();
+
+      expect(createTerminal).toHaveBeenCalled();
+    });
+
+    it('stops the terminal if stopping', () => {
+      factory({ status: STOPPING });
+
+      wrapper.setMethods({ stopTerminal });
+      wrapper.vm.refresh();
+
+      expect(stopTerminal).toHaveBeenCalled();
+    });
+  });
+
+  describe('createTerminal', () => {
+    beforeEach(() => {
+      factory();
+      wrapper.vm.createTerminal();
+    });
+
+    it('creates the terminal', () => {
+      expect(GLTerminal).toHaveBeenCalledWith(wrapper.vm.$refs.terminal);
+      expect(wrapper.vm.glterminal).toBeTruthy();
+    });
+
+    describe('scroll listener', () => {
+      it('has been called', () => {
+        expect(wrapper.vm.glterminal.addScrollListener).toHaveBeenCalled();
+      });
+
+      it('updates scroll data when called', () => {
+        expect(wrapper.vm.canScrollUp).toBe(false);
+        expect(wrapper.vm.canScrollDown).toBe(false);
+
+        const listener = wrapper.vm.glterminal.addScrollListener.mock.calls[0][0];
+        listener({ canScrollUp: true, canScrollDown: true });
+
+        expect(wrapper.vm.canScrollUp).toBe(true);
+        expect(wrapper.vm.canScrollDown).toBe(true);
+      });
+    });
+  });
+
+  describe('destroyTerminal', () => {
+    it('calls dispose', () => {
+      factory();
+      wrapper.vm.createTerminal();
+      const disposeSpy = wrapper.vm.glterminal.dispose;
+
+      expect(disposeSpy).not.toHaveBeenCalled();
+
+      wrapper.vm.destroyTerminal();
+
+      expect(disposeSpy).toHaveBeenCalled();
+      expect(wrapper.vm.glterminal).toBe(null);
+    });
+  });
+
+  describe('stopTerminal', () => {
+    it('calls disable', () => {
+      factory();
+      wrapper.vm.createTerminal();
+
+      expect(wrapper.vm.glterminal.disable).not.toHaveBeenCalled();
+
+      wrapper.vm.stopTerminal();
+
+      expect(wrapper.vm.glterminal.disable).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/terminal/view_spec.js b/spec/frontend/ide/components/terminal/view_spec.js
new file mode 100644
index 00000000000..eff200550da
--- /dev/null
+++ b/spec/frontend/ide/components/terminal/view_spec.js
@@ -0,0 +1,91 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import { TEST_HOST } from 'spec/test_constants';
+import TerminalEmptyState from '~/ide/components/terminal/empty_state.vue';
+import TerminalView from '~/ide/components/terminal/view.vue';
+import TerminalSession from '~/ide/components/terminal/session.vue';
+
+const TEST_HELP_PATH = `${TEST_HOST}/help`;
+const TEST_SVG_PATH = `${TEST_HOST}/illustration.svg`;
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('IDE TerminalView', () => {
+  let state;
+  let actions;
+  let getters;
+  let wrapper;
+
+  const factory = () => {
+    const store = new Vuex.Store({
+      modules: {
+        terminal: {
+          namespaced: true,
+          state,
+          actions,
+          getters,
+        },
+      },
+    });
+
+    wrapper = shallowMount(TerminalView, { localVue, store });
+  };
+
+  beforeEach(() => {
+    state = {
+      isShowSplash: true,
+      paths: {
+        webTerminalHelpPath: TEST_HELP_PATH,
+        webTerminalSvgPath: TEST_SVG_PATH,
+      },
+    };
+
+    actions = {
+      hideSplash: jest.fn().mockName('hideSplash'),
+      startSession: jest.fn().mockName('startSession'),
+    };
+
+    getters = {
+      allCheck: () => ({
+        isLoading: false,
+        isValid: false,
+        message: 'bad',
+      }),
+    };
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('renders empty state', () => {
+    factory();
+
+    expect(wrapper.find(TerminalEmptyState).props()).toEqual({
+      helpPath: TEST_HELP_PATH,
+      illustrationPath: TEST_SVG_PATH,
+      ...getters.allCheck(),
+    });
+  });
+
+  it('hides splash and starts, when started', () => {
+    factory();
+
+    expect(actions.startSession).not.toHaveBeenCalled();
+    expect(actions.hideSplash).not.toHaveBeenCalled();
+
+    wrapper.find(TerminalEmptyState).vm.$emit('start');
+
+    expect(actions.startSession).toHaveBeenCalled();
+    expect(actions.hideSplash).toHaveBeenCalled();
+  });
+
+  it('shows Web Terminal when started', () => {
+    state.isShowSplash = false;
+    factory();
+
+    expect(wrapper.find(TerminalEmptyState).exists()).toBe(false);
+    expect(wrapper.find(TerminalSession).exists()).toBe(true);
+  });
+});
diff --git a/spec/frontend/ide/components/terminal_sync/terminal_sync_status_safe_spec.js b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_safe_spec.js
new file mode 100644
index 00000000000..afdecb7bbbd
--- /dev/null
+++ b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_safe_spec.js
@@ -0,0 +1,47 @@
+import Vuex from 'vuex';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import TerminalSyncStatus from '~/ide/components/terminal_sync/terminal_sync_status.vue';
+import TerminalSyncStatusSafe from '~/ide/components/terminal_sync/terminal_sync_status_safe.vue';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('ide/components/terminal_sync/terminal_sync_status_safe', () => {
+  let store;
+  let wrapper;
+
+  const createComponent = () => {
+    store = new Vuex.Store({
+      state: {},
+    });
+
+    wrapper = shallowMount(TerminalSyncStatusSafe, {
+      localVue,
+      store,
+    });
+  };
+
+  beforeEach(createComponent);
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  describe('with terminal sync module in store', () => {
+    beforeEach(() => {
+      store.registerModule('terminalSync', {
+        state: {},
+      });
+    });
+
+    it('renders terminal sync status', () => {
+      expect(wrapper.find(TerminalSyncStatus).exists()).toBe(true);
+    });
+  });
+
+  describe('without terminal sync module', () => {
+    it('does not render terminal sync status', () => {
+      expect(wrapper.find(TerminalSyncStatus).exists()).toBe(false);
+    });
+  });
+});
diff --git a/spec/frontend/ide/components/terminal_sync/terminal_sync_status_spec.js b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_spec.js
new file mode 100644
index 00000000000..16a76fae1dd
--- /dev/null
+++ b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_spec.js
@@ -0,0 +1,99 @@
+import Vuex from 'vuex';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { GlLoadingIcon } from '@gitlab/ui';
+import TerminalSyncStatus from '~/ide/components/terminal_sync/terminal_sync_status.vue';
+import {
+  MSG_TERMINAL_SYNC_CONNECTING,
+  MSG_TERMINAL_SYNC_UPLOADING,
+  MSG_TERMINAL_SYNC_RUNNING,
+} from '~/ide/stores/modules/terminal_sync/messages';
+import Icon from '~/vue_shared/components/icon.vue';
+
+const TEST_MESSAGE = 'lorem ipsum dolar sit';
+const START_LOADING = 'START_LOADING';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('ide/components/terminal_sync/terminal_sync_status', () => {
+  let moduleState;
+  let store;
+  let wrapper;
+
+  const createComponent = () => {
+    store = new Vuex.Store({
+      modules: {
+        terminalSync: {
+          namespaced: true,
+          state: moduleState,
+          mutations: {
+            [START_LOADING]: state => {
+              state.isLoading = true;
+            },
+          },
+        },
+      },
+    });
+
+    wrapper = shallowMount(TerminalSyncStatus, {
+      localVue,
+      store,
+    });
+  };
+
+  beforeEach(() => {
+    moduleState = {
+      isLoading: false,
+      isStarted: false,
+      isError: false,
+      message: '',
+    };
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  describe('when doing nothing', () => {
+    it('shows nothing', () => {
+      createComponent();
+
+      expect(wrapper.isEmpty()).toBe(true);
+    });
+  });
+
+  describe.each`
+    description                   | state                                       | statusMessage                   | icon
+    ${'when loading'}             | ${{ isLoading: true }}                      | ${MSG_TERMINAL_SYNC_CONNECTING} | ${''}
+    ${'when loading and started'} | ${{ isLoading: true, isStarted: true }}     | ${MSG_TERMINAL_SYNC_UPLOADING}  | ${''}
+    ${'when error'}               | ${{ isError: true, message: TEST_MESSAGE }} | ${TEST_MESSAGE}                 | ${'warning'}
+    ${'when started'}             | ${{ isStarted: true }}                      | ${MSG_TERMINAL_SYNC_RUNNING}    | ${'mobile-issue-close'}
+  `('$description', ({ state, statusMessage, icon }) => {
+    beforeEach(() => {
+      Object.assign(moduleState, state);
+      createComponent();
+    });
+
+    it('shows message', () => {
+      expect(wrapper.attributes('title')).toContain(statusMessage);
+    });
+
+    if (!icon) {
+      it('does not render icon', () => {
+        expect(wrapper.find(Icon).exists()).toBe(false);
+      });
+
+      it('renders loading icon', () => {
+        expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      });
+    } else {
+      it('renders icon', () => {
+        expect(wrapper.find(Icon).props('name')).toEqual(icon);
+      });
+
+      it('does not render loading icon', () => {
+        expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
+      });
+    }
+  });
+});
diff --git a/spec/frontend/ide/file_helpers.js b/spec/frontend/ide/file_helpers.js
new file mode 100644
index 00000000000..326f8b9716d
--- /dev/null
+++ b/spec/frontend/ide/file_helpers.js
@@ -0,0 +1,35 @@
+export const createFile = (path, content = '') => ({
+  id: path,
+  path,
+  content,
+  raw: content,
+});
+
+export const createNewFile = (path, content) =>
+  Object.assign(createFile(path, content), {
+    tempFile: true,
+    raw: '',
+  });
+
+export const createDeletedFile = (path, content) =>
+  Object.assign(createFile(path, content), {
+    deleted: true,
+  });
+
+export const createUpdatedFile = (path, oldContent, content) =>
+  Object.assign(createFile(path, content), {
+    raw: oldContent,
+  });
+
+export const createMovedFile = (path, prevPath, content) =>
+  Object.assign(createNewFile(path, content), {
+    prevPath,
+  });
+
+export const createEntries = path =>
+  path.split('/').reduce((acc, part, idx, parts) => {
+    const parentPath = parts.slice(0, idx).join('/');
+    const fullPath = parentPath ? `${parentPath}/${part}` : part;
+
+    return Object.assign(acc, { [fullPath]: { ...createFile(fullPath), parentPath } });
+  }, {});
diff --git a/spec/frontend/ide/ide_router_spec.js b/spec/frontend/ide/ide_router_spec.js
index 1461b756d13..b53e2019819 100644
--- a/spec/frontend/ide/ide_router_spec.js
+++ b/spec/frontend/ide/ide_router_spec.js
@@ -1,17 +1,20 @@
-import router from '~/ide/ide_router';
-import store from '~/ide/stores';
+import { createRouter } from '~/ide/ide_router';
+import { createStore } from '~/ide/stores';
+import waitForPromises from 'helpers/wait_for_promises';
 
 describe('IDE router', () => {
   const PROJECT_NAMESPACE = 'my-group/sub-group';
   const PROJECT_NAME = 'my-project';
+  const TEST_PATH = `/project/${PROJECT_NAMESPACE}/${PROJECT_NAME}/merge_requests/2`;
 
-  afterEach(() => {
-    router.push('/');
-  });
+  let store;
+  let router;
 
-  afterAll(() => {
-    // VueRouter leaves this window.history at the "base" url. We need to clean this up.
+  beforeEach(() => {
     window.history.replaceState({}, '', '/');
+    store = createStore();
+    router = createRouter(store);
+    jest.spyOn(store, 'dispatch').mockReturnValue(new Promise(() => {}));
   });
 
   [
@@ -31,8 +34,6 @@ describe('IDE router', () => {
     `/project/${PROJECT_NAMESPACE}/${PROJECT_NAME}`,
   ].forEach(route => {
     it(`finds project path when route is "${route}"`, () => {
-      jest.spyOn(store, 'dispatch').mockReturnValue(new Promise(() => {}));
-
       router.push(route);
 
       expect(store.dispatch).toHaveBeenCalledWith('getProjectData', {
@@ -41,4 +42,22 @@ describe('IDE router', () => {
       });
     });
   });
+
+  it('keeps router in sync when store changes', async () => {
+    expect(router.currentRoute.fullPath).toBe('/');
+
+    store.state.router.fullPath = TEST_PATH;
+
+    await waitForPromises();
+
+    expect(router.currentRoute.fullPath).toBe(TEST_PATH);
+  });
+
+  it('keeps store in sync when router changes', () => {
+    expect(store.dispatch).not.toHaveBeenCalled();
+
+    router.push(TEST_PATH);
+
+    expect(store.dispatch).toHaveBeenCalledWith('router/push', TEST_PATH, { root: true });
+  });
 });
diff --git a/spec/frontend/ide/lib/common/model_spec.js b/spec/frontend/ide/lib/common/model_spec.js
index 2ef2f0da6da..df46b7774b0 100644
--- a/spec/frontend/ide/lib/common/model_spec.js
+++ b/spec/frontend/ide/lib/common/model_spec.js
@@ -133,5 +133,77 @@ describe('Multi-file editor library model', () => {
 
       expect(disposeSpy).toHaveBeenCalled();
     });
+
+    it('applies custom options and triggers onChange callback', () => {
+      const changeSpy = jest.fn();
+      jest.spyOn(model, 'applyCustomOptions');
+
+      model.onChange(changeSpy);
+
+      model.dispose();
+
+      expect(model.applyCustomOptions).toHaveBeenCalled();
+      expect(changeSpy).toHaveBeenCalled();
+    });
+  });
+
+  describe('updateOptions', () => {
+    it('sets the options on the options object', () => {
+      model.updateOptions({ insertSpaces: true, someOption: 'some value' });
+
+      expect(model.options).toEqual({
+        endOfLine: 0,
+        insertFinalNewline: true,
+        insertSpaces: true,
+        someOption: 'some value',
+        trimTrailingWhitespace: false,
+      });
+    });
+
+    it.each`
+      option            | value
+      ${'insertSpaces'} | ${true}
+      ${'insertSpaces'} | ${false}
+      ${'indentSize'}   | ${4}
+      ${'tabSize'}      | ${3}
+    `("correctly sets option: $option=$value to Monaco's TextModel", ({ option, value }) => {
+      model.updateOptions({ [option]: value });
+
+      expect(model.getModel().getOptions()).toMatchObject({ [option]: value });
+    });
+
+    it('applies custom options immediately', () => {
+      jest.spyOn(model, 'applyCustomOptions');
+
+      model.updateOptions({ trimTrailingWhitespace: true, someOption: 'some value' });
+
+      expect(model.applyCustomOptions).toHaveBeenCalled();
+    });
+  });
+
+  describe('applyCustomOptions', () => {
+    it.each`
+      option                      | value    | contentBefore                   | contentAfter
+      ${'endOfLine'}              | ${0}     | ${'hello\nworld\n'}             | ${'hello\nworld\n'}
+      ${'endOfLine'}              | ${0}     | ${'hello\r\nworld\r\n'}         | ${'hello\nworld\n'}
+      ${'endOfLine'}              | ${1}     | ${'hello\nworld\n'}             | ${'hello\r\nworld\r\n'}
+      ${'endOfLine'}              | ${1}     | ${'hello\r\nworld\r\n'}         | ${'hello\r\nworld\r\n'}
+      ${'insertFinalNewline'}     | ${true}  | ${'hello\nworld'}               | ${'hello\nworld\n'}
+      ${'insertFinalNewline'}     | ${true}  | ${'hello\nworld\n'}             | ${'hello\nworld\n'}
+      ${'insertFinalNewline'}     | ${false} | ${'hello\nworld'}               | ${'hello\nworld'}
+      ${'trimTrailingWhitespace'} | ${true}  | ${'hello  \t\nworld  \t\n'}     | ${'hello\nworld\n'}
+      ${'trimTrailingWhitespace'} | ${true}  | ${'hello  \t\r\nworld  \t\r\n'} | ${'hello\nworld\n'}
+      ${'trimTrailingWhitespace'} | ${false} | ${'hello  \t\r\nworld  \t\r\n'} | ${'hello  \t\nworld  \t\n'}
+    `(
+      'correctly applies custom option $option=$value to content',
+      ({ option, value, contentBefore, contentAfter }) => {
+        model.options[option] = value;
+
+        model.updateNewContent(contentBefore);
+        model.applyCustomOptions();
+
+        expect(model.getModel().getValue()).toEqual(contentAfter);
+      },
+    );
   });
 });
diff --git a/spec/frontend/ide/lib/create_diff_spec.js b/spec/frontend/ide/lib/create_diff_spec.js
new file mode 100644
index 00000000000..273f9ee27bd
--- /dev/null
+++ b/spec/frontend/ide/lib/create_diff_spec.js
@@ -0,0 +1,182 @@
+import createDiff from '~/ide/lib/create_diff';
+import createFileDiff from '~/ide/lib/create_file_diff';
+import { commitActionTypes } from '~/ide/constants';
+import {
+  createNewFile,
+  createUpdatedFile,
+  createDeletedFile,
+  createMovedFile,
+  createEntries,
+} from '../file_helpers';
+
+const PATH_FOO = 'test/foo.md';
+const PATH_BAR = 'test/bar.md';
+const PATH_ZED = 'test/zed.md';
+const PATH_LOREM = 'test/lipsum/nested/lorem.md';
+const PATH_IPSUM = 'test/lipsum/ipsum.md';
+const TEXT = `Lorem ipsum dolor sit amet,
+consectetur adipiscing elit.
+Morbi ex dolor, euismod nec rutrum nec, egestas at ligula.
+Praesent scelerisque ut nisi eu eleifend.
+Suspendisse potenti.
+`;
+const LINES = TEXT.trim().split('\n');
+
+const joinDiffs = (...patches) => patches.join('');
+
+describe('IDE lib/create_diff', () => {
+  it('with created files, generates patch', () => {
+    const changedFiles = [createNewFile(PATH_FOO, TEXT), createNewFile(PATH_BAR, '')];
+    const result = createDiff({ changedFiles });
+
+    expect(result).toEqual({
+      patch: joinDiffs(
+        createFileDiff(changedFiles[0], commitActionTypes.create),
+        createFileDiff(changedFiles[1], commitActionTypes.create),
+      ),
+      toDelete: [],
+    });
+  });
+
+  it('with deleted files, adds to delete', () => {
+    const changedFiles = [createDeletedFile(PATH_FOO, TEXT), createDeletedFile(PATH_BAR, '')];
+
+    const result = createDiff({ changedFiles });
+
+    expect(result).toEqual({
+      patch: '',
+      toDelete: [PATH_FOO, PATH_BAR],
+    });
+  });
+
+  it('with updated files, generates patch', () => {
+    const changedFiles = [createUpdatedFile(PATH_FOO, TEXT, 'A change approaches!')];
+
+    const result = createDiff({ changedFiles });
+
+    expect(result).toEqual({
+      patch: createFileDiff(changedFiles[0], commitActionTypes.update),
+      toDelete: [],
+    });
+  });
+
+  it('with files in both staged and changed, prefer changed', () => {
+    const changedFiles = [
+      createUpdatedFile(PATH_FOO, TEXT, 'Do a change!'),
+      createDeletedFile(PATH_LOREM),
+    ];
+
+    const result = createDiff({
+      changedFiles,
+      stagedFiles: [createUpdatedFile(PATH_LOREM, TEXT, ''), createDeletedFile(PATH_FOO, TEXT)],
+    });
+
+    expect(result).toEqual({
+      patch: createFileDiff(changedFiles[0], commitActionTypes.update),
+      toDelete: [PATH_LOREM],
+    });
+  });
+
+  it('with file created in staging and deleted in changed, do nothing', () => {
+    const result = createDiff({
+      changedFiles: [createDeletedFile(PATH_FOO)],
+      stagedFiles: [createNewFile(PATH_FOO, TEXT)],
+    });
+
+    expect(result).toEqual({
+      patch: '',
+      toDelete: [],
+    });
+  });
+
+  it('with file deleted in both staged and changed, delete', () => {
+    const result = createDiff({
+      changedFiles: [createDeletedFile(PATH_LOREM)],
+      stagedFiles: [createDeletedFile(PATH_LOREM)],
+    });
+
+    expect(result).toEqual({
+      patch: '',
+      toDelete: [PATH_LOREM],
+    });
+  });
+
+  it('with file moved, create and delete', () => {
+    const changedFiles = [createMovedFile(PATH_BAR, PATH_FOO, TEXT)];
+
+    const result = createDiff({
+      changedFiles,
+      stagedFiles: [createDeletedFile(PATH_FOO)],
+    });
+
+    expect(result).toEqual({
+      patch: createFileDiff(changedFiles[0], commitActionTypes.create),
+      toDelete: [PATH_FOO],
+    });
+  });
+
+  it('with file moved and no content, move', () => {
+    const changedFiles = [createMovedFile(PATH_BAR, PATH_FOO)];
+
+    const result = createDiff({
+      changedFiles,
+      stagedFiles: [createDeletedFile(PATH_FOO)],
+    });
+
+    expect(result).toEqual({
+      patch: createFileDiff(changedFiles[0], commitActionTypes.move),
+      toDelete: [],
+    });
+  });
+
+  it('creates a well formatted patch', () => {
+    const changedFiles = [
+      createMovedFile(PATH_BAR, PATH_FOO),
+      createDeletedFile(PATH_ZED),
+      createNewFile(PATH_LOREM, TEXT),
+      createUpdatedFile(PATH_IPSUM, TEXT, "That's all folks!"),
+    ];
+
+    const expectedPatch = `diff --git "a/${PATH_FOO}" "b/${PATH_BAR}"
+rename from ${PATH_FOO}
+rename to ${PATH_BAR}
+diff --git "a/${PATH_LOREM}" "b/${PATH_LOREM}"
+new file mode 100644
+--- /dev/null
++++ b/${PATH_LOREM}
+@@ -0,0 +1,${LINES.length} @@
+${LINES.map(line => `+${line}`).join('\n')}
+diff --git "a/${PATH_IPSUM}" "b/${PATH_IPSUM}"
+--- a/${PATH_IPSUM}
++++ b/${PATH_IPSUM}
+@@ -1,${LINES.length} +1,1 @@
+${LINES.map(line => `-${line}`).join('\n')}
++That's all folks!
+\\ No newline at end of file
+`;
+
+    const result = createDiff({ changedFiles });
+
+    expect(result).toEqual({
+      patch: expectedPatch,
+      toDelete: [PATH_ZED],
+    });
+  });
+
+  it('deletes deleted parent directories', () => {
+    const deletedFiles = ['foo/bar/zed/test.md', 'foo/bar/zed/test2.md'];
+    const entries = deletedFiles.reduce((acc, path) => Object.assign(acc, createEntries(path)), {});
+    const allDeleted = [...deletedFiles, 'foo/bar/zed', 'foo/bar'];
+    allDeleted.forEach(path => {
+      entries[path].deleted = true;
+    });
+    const changedFiles = deletedFiles.map(x => entries[x]);
+
+    const result = createDiff({ changedFiles, entries });
+
+    expect(result).toEqual({
+      patch: '',
+      toDelete: allDeleted,
+    });
+  });
+});
diff --git a/spec/frontend/ide/lib/create_file_diff_spec.js b/spec/frontend/ide/lib/create_file_diff_spec.js
new file mode 100644
index 00000000000..4b428468a6d
--- /dev/null
+++ b/spec/frontend/ide/lib/create_file_diff_spec.js
@@ -0,0 +1,163 @@
+import createFileDiff from '~/ide/lib/create_file_diff';
+import { commitActionTypes } from '~/ide/constants';
+import {
+  createUpdatedFile,
+  createNewFile,
+  createMovedFile,
+  createDeletedFile,
+} from '../file_helpers';
+
+const PATH = 'test/numbers.md';
+const PATH_FOO = 'test/foo.md';
+const TEXT_LINE_COUNT = 100;
+const TEXT = Array(TEXT_LINE_COUNT)
+  .fill(0)
+  .map((_, idx) => `${idx + 1}`)
+  .join('\n');
+
+const spliceLines = (content, lineNumber, deleteCount = 0, newLines = []) => {
+  const lines = content.split('\n');
+  lines.splice(lineNumber, deleteCount, ...newLines);
+  return lines.join('\n');
+};
+
+const mapLines = (content, mapFn) =>
+  content
+    .split('\n')
+    .map(mapFn)
+    .join('\n');
+
+describe('IDE lib/create_file_diff', () => {
+  it('returns empty string with "garbage" action', () => {
+    const result = createFileDiff(createNewFile(PATH, ''), 'garbage');
+
+    expect(result).toBe('');
+  });
+
+  it('preserves ending whitespace in file', () => {
+    const oldContent = spliceLines(TEXT, 99, 1, ['100 ']);
+    const newContent = spliceLines(oldContent, 99, 0, ['Lorem', 'Ipsum']);
+    const expected = `
+ 99
++Lorem
++Ipsum
+ 100 `;
+
+    const result = createFileDiff(
+      createUpdatedFile(PATH, oldContent, newContent),
+      commitActionTypes.update,
+    );
+
+    expect(result).toContain(expected);
+  });
+
+  describe('with "create" action', () => {
+    const expectedHead = `diff --git "a/${PATH}" "b/${PATH}"
+new file mode 100644`;
+
+    const expectedChunkHead = lineCount => `--- /dev/null
++++ b/${PATH}
+@@ -0,0 +1,${lineCount} @@`;
+
+    it('with empty file, does not include diff body', () => {
+      const result = createFileDiff(createNewFile(PATH, ''), commitActionTypes.create);
+
+      expect(result).toBe(`${expectedHead}\n`);
+    });
+
+    it('with single line, includes diff body', () => {
+      const result = createFileDiff(createNewFile(PATH, '\n'), commitActionTypes.create);
+
+      expect(result).toBe(`${expectedHead}
+${expectedChunkHead(1)}
++
+`);
+    });
+
+    it('without newline, includes no newline comment', () => {
+      const result = createFileDiff(createNewFile(PATH, 'Lorem ipsum'), commitActionTypes.create);
+
+      expect(result).toBe(`${expectedHead}
+${expectedChunkHead(1)}
++Lorem ipsum
+\\ No newline at end of file
+`);
+    });
+
+    it('with content, includes diff body', () => {
+      const content = `${TEXT}\n`;
+      const result = createFileDiff(createNewFile(PATH, content), commitActionTypes.create);
+
+      expect(result).toBe(`${expectedHead}
+${expectedChunkHead(TEXT_LINE_COUNT)}
+${mapLines(TEXT, line => `+${line}`)}
+`);
+    });
+  });
+
+  describe('with "delete" action', () => {
+    const expectedHead = `diff --git "a/${PATH}" "b/${PATH}"
+deleted file mode 100644`;
+
+    const expectedChunkHead = lineCount => `--- a/${PATH}
++++ /dev/null
+@@ -1,${lineCount} +0,0 @@`;
+
+    it('with empty file, does not include diff body', () => {
+      const result = createFileDiff(createDeletedFile(PATH, ''), commitActionTypes.delete);
+
+      expect(result).toBe(`${expectedHead}\n`);
+    });
+
+    it('with content, includes diff body', () => {
+      const content = `${TEXT}\n`;
+      const result = createFileDiff(createDeletedFile(PATH, content), commitActionTypes.delete);
+
+      expect(result).toBe(`${expectedHead}
+${expectedChunkHead(TEXT_LINE_COUNT)}
+${mapLines(TEXT, line => `-${line}`)}
+`);
+    });
+  });
+
+  describe('with "update" action', () => {
+    it('includes diff body', () => {
+      const oldContent = `${TEXT}\n`;
+      const newContent = `${spliceLines(TEXT, 50, 3, ['Lorem'])}\n`;
+
+      const result = createFileDiff(
+        createUpdatedFile(PATH, oldContent, newContent),
+        commitActionTypes.update,
+      );
+
+      expect(result).toBe(`diff --git "a/${PATH}" "b/${PATH}"
+--- a/${PATH}
++++ b/${PATH}
+@@ -47,11 +47,9 @@
+ 47
+ 48
+ 49
+ 50
+-51
+-52
+-53
++Lorem
+ 54
+ 55
+ 56
+ 57
+`);
+    });
+  });
+
+  describe('with "move" action', () => {
+    it('returns rename head', () => {
+      const result = createFileDiff(createMovedFile(PATH, PATH_FOO), commitActionTypes.move);
+
+      expect(result).toBe(`diff --git "a/${PATH_FOO}" "b/${PATH}"
+rename from ${PATH_FOO}
+rename to ${PATH}
+`);
+    });
+  });
+});
diff --git a/spec/frontend/ide/lib/diff/diff_spec.js b/spec/frontend/ide/lib/diff/diff_spec.js
index d9b088e2c12..901f9e7cfd1 100644
--- a/spec/frontend/ide/lib/diff/diff_spec.js
+++ b/spec/frontend/ide/lib/diff/diff_spec.js
@@ -73,5 +73,13 @@ describe('Multi-file editor library diff calculator', () => {
 
       expect(diff.endLineNumber).toBe(1);
     });
+
+    it('disregards changes for EOL type changes', () => {
+      const text1 = 'line1\nline2\nline3\n';
+      const text2 = 'line1\r\nline2\r\nline3\r\n';
+
+      expect(computeDiff(text1, text2)).toEqual([]);
+      expect(computeDiff(text2, text1)).toEqual([]);
+    });
   });
 });
diff --git a/spec/frontend/ide/lib/editor_options_spec.js b/spec/frontend/ide/lib/editor_options_spec.js
deleted file mode 100644
index b07a583b7c8..00000000000
--- a/spec/frontend/ide/lib/editor_options_spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import editorOptions from '~/ide/lib/editor_options';
-
-describe('Multi-file editor library editor options', () => {
-  it('returns an array', () => {
-    expect(editorOptions).toEqual(expect.any(Array));
-  });
-
-  it('contains readOnly option', () => {
-    expect(editorOptions[0].readOnly).toBeDefined();
-  });
-});
diff --git a/spec/frontend/ide/lib/editor_spec.js b/spec/frontend/ide/lib/editor_spec.js
index 36d4c3c26ee..f5815771cdf 100644
--- a/spec/frontend/ide/lib/editor_spec.js
+++ b/spec/frontend/ide/lib/editor_spec.js
@@ -1,4 +1,9 @@
-import { editor as monacoEditor, languages as monacoLanguages } from 'monaco-editor';
+import {
+  editor as monacoEditor,
+  languages as monacoLanguages,
+  Range,
+  Selection,
+} from 'monaco-editor';
 import Editor from '~/ide/lib/editor';
 import { defaultEditorOptions } from '~/ide/lib/editor_options';
 import { file } from '../helpers';
@@ -72,12 +77,13 @@ describe('Multi-file editor library', () => {
 
       expect(monacoEditor.createDiffEditor).toHaveBeenCalledWith(holder, {
         ...defaultEditorOptions,
+        ignoreTrimWhitespace: false,
         quickSuggestions: false,
         occurrencesHighlight: false,
         renderSideBySide: false,
-        readOnly: true,
-        renderLineHighlight: 'all',
-        hideCursorInOverviewRuler: false,
+        readOnly: false,
+        renderLineHighlight: 'none',
+        hideCursorInOverviewRuler: true,
       });
     });
   });
@@ -193,6 +199,38 @@ describe('Multi-file editor library', () => {
     });
   });
 
+  describe('replaceSelectedText', () => {
+    let model;
+    let editor;
+
+    beforeEach(() => {
+      instance.createInstance(holder);
+
+      model = instance.createModel({
+        ...file(),
+        key: 'index.md',
+        path: 'index.md',
+      });
+
+      instance.attachModel(model);
+
+      editor = instance.instance;
+      editor.getModel().setValue('foo bar baz');
+      editor.setSelection(new Range(1, 5, 1, 8));
+
+      instance.replaceSelectedText('hello');
+    });
+
+    it('replaces the text selected in editor with the one provided', () => {
+      expect(editor.getModel().getValue()).toBe('foo hello baz');
+    });
+
+    it('sets cursor to end of the replaced string', () => {
+      const selection = editor.getSelection();
+      expect(selection).toEqual(new Selection(1, 10, 1, 10));
+    });
+  });
+
   describe('dispose', () => {
     it('calls disposble dispose method', () => {
       jest.spyOn(instance.disposable, 'dispose');
diff --git a/spec/frontend/ide/lib/editorconfig/mock_data.js b/spec/frontend/ide/lib/editorconfig/mock_data.js
new file mode 100644
index 00000000000..b21f4a5b735
--- /dev/null
+++ b/spec/frontend/ide/lib/editorconfig/mock_data.js
@@ -0,0 +1,146 @@
+export const exampleConfigs = [
+  {
+    path: 'foo/bar/baz/.editorconfig',
+    content: `
+[*]
+tab_width = 6
+indent_style = tab
+`,
+  },
+  {
+    path: 'foo/bar/.editorconfig',
+    content: `
+root = false
+
+[*]
+indent_size = 5
+indent_style = space
+trim_trailing_whitespace = true
+
+[*_spec.{js,py}]
+end_of_line = crlf
+    `,
+  },
+  {
+    path: 'foo/.editorconfig',
+    content: `
+[*]
+tab_width = 4
+indent_style = tab
+    `,
+  },
+  {
+    path: '.editorconfig',
+    content: `
+root = true
+
+[*]
+indent_size = 3
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+
+[*.js]
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.txt]
+end_of_line = crlf
+    `,
+  },
+  {
+    path: 'foo/bar/root/.editorconfig',
+    content: `
+root = true
+
+[*]
+tab_width = 1
+indent_style = tab
+    `,
+  },
+];
+
+export const exampleFiles = [
+  {
+    path: 'foo/bar/root/README.md',
+    rules: {
+      indent_style: 'tab', // foo/bar/root/.editorconfig
+      tab_width: '1', // foo/bar/root/.editorconfig
+    },
+    monacoRules: {
+      insertSpaces: false,
+      tabSize: 1,
+    },
+  },
+  {
+    path: 'foo/bar/baz/my_spec.js',
+    rules: {
+      end_of_line: 'crlf', // foo/bar/.editorconfig (for _spec.js files)
+      indent_size: '5', // foo/bar/.editorconfig
+      indent_style: 'tab', // foo/bar/baz/.editorconfig
+      insert_final_newline: 'true', // .editorconfig
+      tab_width: '6', // foo/bar/baz/.editorconfig
+      trim_trailing_whitespace: 'true', // .editorconfig (for .js files)
+    },
+    monacoRules: {
+      endOfLine: 1,
+      insertFinalNewline: true,
+      insertSpaces: false,
+      tabSize: 6,
+      trimTrailingWhitespace: true,
+    },
+  },
+  {
+    path: 'foo/my_file.js',
+    rules: {
+      end_of_line: 'lf', // .editorconfig
+      indent_size: '2', // .editorconfig (for .js files)
+      indent_style: 'tab', // foo/.editorconfig
+      insert_final_newline: 'true', // .editorconfig
+      tab_width: '4', // foo/.editorconfig
+      trim_trailing_whitespace: 'true', // .editorconfig (for .js files)
+    },
+    monacoRules: {
+      endOfLine: 0,
+      insertFinalNewline: true,
+      insertSpaces: false,
+      tabSize: 4,
+      trimTrailingWhitespace: true,
+    },
+  },
+  {
+    path: 'foo/my_file.md',
+    rules: {
+      end_of_line: 'lf', // .editorconfig
+      indent_size: '3', // .editorconfig
+      indent_style: 'tab', // foo/.editorconfig
+      insert_final_newline: 'true', // .editorconfig
+      tab_width: '4', // foo/.editorconfig
+    },
+    monacoRules: {
+      endOfLine: 0,
+      insertFinalNewline: true,
+      insertSpaces: false,
+      tabSize: 4,
+    },
+  },
+  {
+    path: 'foo/bar/my_file.txt',
+    rules: {
+      end_of_line: 'crlf', // .editorconfig (for .txt files)
+      indent_size: '5', // foo/bar/.editorconfig
+      indent_style: 'space', // foo/bar/.editorconfig
+      insert_final_newline: 'true', // .editorconfig
+      tab_width: '4', // foo/.editorconfig
+      trim_trailing_whitespace: 'true', // foo/bar/.editorconfig
+    },
+    monacoRules: {
+      endOfLine: 1,
+      insertFinalNewline: true,
+      insertSpaces: true,
+      tabSize: 4,
+      trimTrailingWhitespace: true,
+    },
+  },
+];
diff --git a/spec/frontend/ide/lib/editorconfig/parser_spec.js b/spec/frontend/ide/lib/editorconfig/parser_spec.js
new file mode 100644
index 00000000000..f99410236e1
--- /dev/null
+++ b/spec/frontend/ide/lib/editorconfig/parser_spec.js
@@ -0,0 +1,18 @@
+import { getRulesWithTraversal } from '~/ide/lib/editorconfig/parser';
+import { exampleConfigs, exampleFiles } from './mock_data';
+
+describe('~/ide/lib/editorconfig/parser', () => {
+  const getExampleConfigContent = path =>
+    Promise.resolve(exampleConfigs.find(x => x.path === path)?.content);
+
+  describe('getRulesWithTraversal', () => {
+    it.each(exampleFiles)(
+      'traverses through all editorconfig files in parent directories (until root=true is hit) and finds rules for this file (case %#)',
+      ({ path, rules }) => {
+        return getRulesWithTraversal(path, getExampleConfigContent).then(result => {
+          expect(result).toEqual(rules);
+        });
+      },
+    );
+  });
+});
diff --git a/spec/frontend/ide/lib/editorconfig/rules_mapper_spec.js b/spec/frontend/ide/lib/editorconfig/rules_mapper_spec.js
new file mode 100644
index 00000000000..536b1409435
--- /dev/null
+++ b/spec/frontend/ide/lib/editorconfig/rules_mapper_spec.js
@@ -0,0 +1,43 @@
+import mapRulesToMonaco from '~/ide/lib/editorconfig/rules_mapper';
+
+describe('mapRulesToMonaco', () => {
+  const multipleEntries = {
+    input: { indent_style: 'tab', indent_size: '4', insert_final_newline: 'true' },
+    output: { insertSpaces: false, tabSize: 4, insertFinalNewline: true },
+  };
+
+  // tab width takes precedence
+  const tabWidthAndIndent = {
+    input: { indent_style: 'tab', indent_size: '4', tab_width: '3' },
+    output: { insertSpaces: false, tabSize: 3 },
+  };
+
+  it.each`
+    rule                                     | monacoOption
+    ${{ indent_style: 'tab' }}               | ${{ insertSpaces: false }}
+    ${{ indent_style: 'space' }}             | ${{ insertSpaces: true }}
+    ${{ indent_style: 'unset' }}             | ${{}}
+    ${{ indent_size: '4' }}                  | ${{ tabSize: 4 }}
+    ${{ indent_size: '4.4' }}                | ${{ tabSize: 4 }}
+    ${{ indent_size: '0' }}                  | ${{}}
+    ${{ indent_size: '-10' }}                | ${{}}
+    ${{ indent_size: 'NaN' }}                | ${{}}
+    ${{ tab_width: '4' }}                    | ${{ tabSize: 4 }}
+    ${{ tab_width: '5.4' }}                  | ${{ tabSize: 5 }}
+    ${{ tab_width: '-10' }}                  | ${{}}
+    ${{ trim_trailing_whitespace: 'true' }}  | ${{ trimTrailingWhitespace: true }}
+    ${{ trim_trailing_whitespace: 'false' }} | ${{ trimTrailingWhitespace: false }}
+    ${{ trim_trailing_whitespace: 'unset' }} | ${{}}
+    ${{ end_of_line: 'lf' }}                 | ${{ endOfLine: 0 }}
+    ${{ end_of_line: 'crlf' }}               | ${{ endOfLine: 1 }}
+    ${{ end_of_line: 'cr' }}                 | ${{}}
+    ${{ end_of_line: 'unset' }}              | ${{}}
+    ${{ insert_final_newline: 'true' }}      | ${{ insertFinalNewline: true }}
+    ${{ insert_final_newline: 'false' }}     | ${{ insertFinalNewline: false }}
+    ${{ insert_final_newline: 'unset' }}     | ${{}}
+    ${multipleEntries.input}                 | ${multipleEntries.output}
+    ${tabWidthAndIndent.input}               | ${tabWidthAndIndent.output}
+  `('correctly maps editorconfig rule to monaco option: $rule', ({ rule, monacoOption }) => {
+    expect(mapRulesToMonaco(rule)).toEqual(monacoOption);
+  });
+});
diff --git a/spec/frontend/ide/lib/files_spec.js b/spec/frontend/ide/lib/files_spec.js
index 2b15aef6454..6974cdc4074 100644
--- a/spec/frontend/ide/lib/files_spec.js
+++ b/spec/frontend/ide/lib/files_spec.js
@@ -11,7 +11,6 @@ const createEntries = paths => {
     const createUrl = base => (type === 'tree' ? `${base}/` : base);
 
     const { name, parent } = splitParent(path);
-    const parentEntry = acc[parent];
     const previewMode = viewerInformationForPath(name);
 
     acc[path] = {
@@ -26,9 +25,6 @@ const createEntries = paths => {
         previewMode,
         binary: (previewMode && previewMode.binary) || false,
         parentPath: parent,
-        parentTreeUrl: parentEntry
-          ? parentEntry.url
-          : createUrl(`/${TEST_PROJECT_ID}/${type}/${TEST_BRANCH_ID}`),
       }),
       tree: children.map(childName => expect.objectContaining({ name: childName })),
     };
diff --git a/spec/frontend/ide/lib/mirror_spec.js b/spec/frontend/ide/lib/mirror_spec.js
new file mode 100644
index 00000000000..21bed5948f3
--- /dev/null
+++ b/spec/frontend/ide/lib/mirror_spec.js
@@ -0,0 +1,184 @@
+import createDiff from '~/ide/lib/create_diff';
+import {
+  canConnect,
+  createMirror,
+  SERVICE_NAME,
+  PROTOCOL,
+  MSG_CONNECTION_ERROR,
+  SERVICE_DELAY,
+} from '~/ide/lib/mirror';
+import { getWebSocketUrl } from '~/lib/utils/url_utility';
+
+jest.mock('~/ide/lib/create_diff', () => jest.fn());
+
+const TEST_PATH = '/project/ide/proxy/path';
+const TEST_DIFF = {
+  patch: 'lorem ipsum',
+  toDelete: ['foo.md'],
+};
+const TEST_ERROR = 'Something bad happened...';
+const TEST_SUCCESS_RESPONSE = {
+  data: JSON.stringify({ error: { code: 0 }, payload: { status_code: 200 } }),
+};
+const TEST_ERROR_RESPONSE = {
+  data: JSON.stringify({ error: { code: 1, Message: TEST_ERROR }, payload: { status_code: 200 } }),
+};
+const TEST_ERROR_PAYLOAD_RESPONSE = {
+  data: JSON.stringify({
+    error: { code: 0 },
+    payload: { status_code: 500, error_message: TEST_ERROR },
+  }),
+};
+
+const buildUploadMessage = ({ toDelete, patch }) =>
+  JSON.stringify({
+    code: 'EVENT',
+    namespace: '/files',
+    event: 'PATCH',
+    payload: { diff: patch, delete_files: toDelete },
+  });
+
+describe('ide/lib/mirror', () => {
+  describe('canConnect', () => {
+    it('can connect if the session has the expected service', () => {
+      const result = canConnect({ services: ['test1', SERVICE_NAME, 'test2'] });
+
+      expect(result).toBe(true);
+    });
+
+    it('cannot connect if the session does not have the expected service', () => {
+      const result = canConnect({ services: ['test1', 'test2'] });
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('createMirror', () => {
+    const origWebSocket = global.WebSocket;
+    let mirror;
+    let mockWebSocket;
+
+    beforeEach(() => {
+      mockWebSocket = {
+        close: jest.fn(),
+        send: jest.fn(),
+      };
+      global.WebSocket = jest.fn().mockImplementation(() => mockWebSocket);
+      mirror = createMirror();
+    });
+
+    afterEach(() => {
+      global.WebSocket = origWebSocket;
+    });
+
+    const waitForConnection = (delay = SERVICE_DELAY) => {
+      const wait = new Promise(resolve => {
+        setTimeout(resolve, 10);
+      });
+
+      jest.advanceTimersByTime(delay);
+
+      return wait;
+    };
+    const connectPass = () => waitForConnection().then(() => mockWebSocket.onopen());
+    const connectFail = () => waitForConnection().then(() => mockWebSocket.onerror());
+    const sendResponse = msg => {
+      mockWebSocket.onmessage(msg);
+    };
+
+    describe('connect', () => {
+      let connection;
+
+      beforeEach(() => {
+        connection = mirror.connect(TEST_PATH);
+      });
+
+      it('waits before creating web socket', () => {
+        // ignore error when test suite terminates
+        connection.catch(() => {});
+
+        return waitForConnection(SERVICE_DELAY - 10).then(() => {
+          expect(global.WebSocket).not.toHaveBeenCalled();
+        });
+      });
+
+      it('is canceled when disconnected before finished waiting', () => {
+        mirror.disconnect();
+
+        return waitForConnection(SERVICE_DELAY).then(() => {
+          expect(global.WebSocket).not.toHaveBeenCalled();
+        });
+      });
+
+      describe('when connection is successful', () => {
+        beforeEach(connectPass);
+
+        it('connects to service', () => {
+          const expectedPath = `${getWebSocketUrl(TEST_PATH)}?service=${SERVICE_NAME}`;
+
+          return connection.then(() => {
+            expect(global.WebSocket).toHaveBeenCalledWith(expectedPath, [PROTOCOL]);
+          });
+        });
+
+        it('disconnects when connected again', () => {
+          const result = connection
+            .then(() => {
+              // https://gitlab.com/gitlab-org/gitlab/issues/33024
+              // eslint-disable-next-line promise/no-nesting
+              mirror.connect(TEST_PATH).catch(() => {});
+            })
+            .then(() => {
+              expect(mockWebSocket.close).toHaveBeenCalled();
+            });
+
+          return result;
+        });
+      });
+
+      describe('when connection fails', () => {
+        beforeEach(connectFail);
+
+        it('rejects with error', () => {
+          return expect(connection).rejects.toEqual(new Error(MSG_CONNECTION_ERROR));
+        });
+      });
+    });
+
+    describe('upload', () => {
+      let state;
+
+      beforeEach(() => {
+        state = { changedFiles: [] };
+        createDiff.mockReturnValue(TEST_DIFF);
+
+        const connection = mirror.connect(TEST_PATH);
+
+        return connectPass().then(() => connection);
+      });
+
+      it('creates a diff from the given state', () => {
+        const result = mirror.upload(state);
+
+        sendResponse(TEST_SUCCESS_RESPONSE);
+
+        return result.then(() => {
+          expect(createDiff).toHaveBeenCalledWith(state);
+          expect(mockWebSocket.send).toHaveBeenCalledWith(buildUploadMessage(TEST_DIFF));
+        });
+      });
+
+      it.each`
+        response                       | description
+        ${TEST_ERROR_RESPONSE}         | ${'error in error'}
+        ${TEST_ERROR_PAYLOAD_RESPONSE} | ${'error in payload'}
+      `('rejects if response has $description', ({ response }) => {
+        const result = mirror.upload(state);
+
+        sendResponse(response);
+
+        return expect(result).rejects.toEqual({ message: TEST_ERROR });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/actions/file_spec.js b/spec/frontend/ide/stores/actions/file_spec.js
index 43cb06f5d92..e2dc7626c67 100644
--- a/spec/frontend/ide/stores/actions/file_spec.js
+++ b/spec/frontend/ide/stores/actions/file_spec.js
@@ -5,7 +5,7 @@ import { createStore } from '~/ide/stores';
 import * as actions from '~/ide/stores/actions/file';
 import * as types from '~/ide/stores/mutation_types';
 import service from '~/ide/services';
-import router from '~/ide/ide_router';
+import { createRouter } from '~/ide/ide_router';
 import eventHub from '~/ide/eventhub';
 import { file } from '../../helpers';
 
@@ -16,6 +16,7 @@ describe('IDE store file actions', () => {
   let mock;
   let originalGon;
   let store;
+  let router;
 
   beforeEach(() => {
     mock = new MockAdapter(axios);
@@ -26,6 +27,7 @@ describe('IDE store file actions', () => {
     };
 
     store = createStore();
+    router = createRouter(store);
 
     jest.spyOn(store, 'commit');
     jest.spyOn(store, 'dispatch');
@@ -44,7 +46,6 @@ describe('IDE store file actions', () => {
       localFile = file('testFile');
       localFile.active = true;
       localFile.opened = true;
-      localFile.parentTreeUrl = 'parentTreeUrl';
 
       store.state.openFiles.push(localFile);
       store.state.entries[localFile.path] = localFile;
@@ -254,13 +255,8 @@ describe('IDE store file actions', () => {
         mock.onGet(`${RELATIVE_URL_ROOT}/test/test/-/7297abc/${localFile.path}`).replyOnce(
           200,
           {
-            blame_path: 'blame_path',
-            commits_path: 'commits_path',
-            permalink: 'permalink',
             raw_path: 'raw_path',
             binary: false,
-            html: '123',
-            render_error: '',
           },
           {
             'page-title': 'testing getFileData',
@@ -281,17 +277,6 @@ describe('IDE store file actions', () => {
           .catch(done.fail);
       });
 
-      it('sets the file data', done => {
-        store
-          .dispatch('getFileData', { path: localFile.path })
-          .then(() => {
-            expect(localFile.blamePath).toBe('blame_path');
-
-            done();
-          })
-          .catch(done.fail);
-      });
-
       it('sets document title with the branchId', done => {
         store
           .dispatch('getFileData', { path: localFile.path })
@@ -348,13 +333,8 @@ describe('IDE store file actions', () => {
         mock.onGet(`${RELATIVE_URL_ROOT}/test/test/-/7297abc/old-dull-file`).replyOnce(
           200,
           {
-            blame_path: 'blame_path',
-            commits_path: 'commits_path',
-            permalink: 'permalink',
             raw_path: 'raw_path',
             binary: false,
-            html: '123',
-            render_error: '',
           },
           {
             'page-title': 'testing old-dull-file',
@@ -587,20 +567,6 @@ describe('IDE store file actions', () => {
         })
         .catch(done.fail);
     });
-
-    it('bursts unused seal', done => {
-      store
-        .dispatch('changeFileContent', {
-          path: tmpFile.path,
-          content: 'content',
-        })
-        .then(() => {
-          expect(store.state.unusedSeal).toBe(false);
-
-          done();
-        })
-        .catch(done.fail);
-    });
   });
 
   describe('with changed file', () => {
diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/frontend/ide/stores/actions/merge_request_spec.js
index ce09cf51ac5..cb4eebd97d9 100644
--- a/spec/javascripts/ide/stores/actions/merge_request_spec.js
+++ b/spec/frontend/ide/stores/actions/merge_request_spec.js
@@ -1,7 +1,8 @@
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import store from '~/ide/stores';
-import actions, {
+import createFlash from '~/flash';
+import {
   getMergeRequestData,
   getMergeRequestChanges,
   getMergeRequestVersions,
@@ -14,6 +15,8 @@ import { resetStore } from '../../helpers';
 const TEST_PROJECT = 'abcproject';
 const TEST_PROJECT_ID = 17;
 
+jest.mock('~/flash');
+
 describe('IDE store merge request actions', () => {
   let mock;
 
@@ -41,7 +44,7 @@ describe('IDE store merge request actions', () => {
 
       describe('base case', () => {
         beforeEach(() => {
-          spyOn(service, 'getProjectMergeRequests').and.callThrough();
+          jest.spyOn(service, 'getProjectMergeRequests');
           mock.onGet(/api\/(.*)\/projects\/abcproject\/merge_requests/).reply(200, mockData);
         });
 
@@ -66,7 +69,7 @@ describe('IDE store merge request actions', () => {
             .dispatch('getMergeRequestsForBranch', { projectId: TEST_PROJECT, branchId: 'bar' })
             .then(() => {
               expect(store.state.projects.abcproject.mergeRequests).toEqual({
-                '2': jasmine.objectContaining(mrData),
+                '2': expect.objectContaining(mrData),
               });
               done();
             })
@@ -99,7 +102,7 @@ describe('IDE store merge request actions', () => {
 
       describe('no merge requests for branch available case', () => {
         beforeEach(() => {
-          spyOn(service, 'getProjectMergeRequests').and.callThrough();
+          jest.spyOn(service, 'getProjectMergeRequests');
           mock.onGet(/api\/(.*)\/projects\/abcproject\/merge_requests/).reply(200, []);
         });
 
@@ -122,16 +125,11 @@ describe('IDE store merge request actions', () => {
       });
 
       it('flashes message, if error', done => {
-        const flashSpy = spyOnDependency(actions, 'flash');
-
         store
           .dispatch('getMergeRequestsForBranch', { projectId: TEST_PROJECT, branchId: 'bar' })
-          .then(() => {
-            fail('Expected getMergeRequestsForBranch to throw an error');
-          })
           .catch(() => {
-            expect(flashSpy).toHaveBeenCalled();
-            expect(flashSpy.calls.argsFor(0)[0]).toEqual('Error fetching merge requests for bar');
+            expect(createFlash).toHaveBeenCalled();
+            expect(createFlash.mock.calls[0][0]).toBe('Error fetching merge requests for bar');
           })
           .then(done)
           .catch(done.fail);
@@ -142,7 +140,7 @@ describe('IDE store merge request actions', () => {
   describe('getMergeRequestData', () => {
     describe('success', () => {
       beforeEach(() => {
-        spyOn(service, 'getProjectMergeRequestData').and.callThrough();
+        jest.spyOn(service, 'getProjectMergeRequestData');
 
         mock
           .onGet(/api\/(.*)\/projects\/abcproject\/merge_requests\/1/)
@@ -181,7 +179,7 @@ describe('IDE store merge request actions', () => {
       });
 
       it('dispatches error action', done => {
-        const dispatch = jasmine.createSpy('dispatch');
+        const dispatch = jest.fn();
 
         getMergeRequestData(
           {
@@ -195,7 +193,7 @@ describe('IDE store merge request actions', () => {
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
               text: 'An error occurred while loading the merge request.',
-              action: jasmine.any(Function),
+              action: expect.any(Function),
               actionText: 'Please try again',
               actionPayload: {
                 projectId: TEST_PROJECT,
@@ -217,7 +215,7 @@ describe('IDE store merge request actions', () => {
 
     describe('success', () => {
       beforeEach(() => {
-        spyOn(service, 'getProjectMergeRequestChanges').and.callThrough();
+        jest.spyOn(service, 'getProjectMergeRequestChanges');
 
         mock
           .onGet(/api\/(.*)\/projects\/abcproject\/merge_requests\/1\/changes/)
@@ -254,7 +252,7 @@ describe('IDE store merge request actions', () => {
       });
 
       it('dispatches error action', done => {
-        const dispatch = jasmine.createSpy('dispatch');
+        const dispatch = jest.fn();
 
         getMergeRequestChanges(
           {
@@ -268,7 +266,7 @@ describe('IDE store merge request actions', () => {
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
               text: 'An error occurred while loading the merge request changes.',
-              action: jasmine.any(Function),
+              action: expect.any(Function),
               actionText: 'Please try again',
               actionPayload: {
                 projectId: TEST_PROJECT,
@@ -293,7 +291,7 @@ describe('IDE store merge request actions', () => {
         mock
           .onGet(/api\/(.*)\/projects\/abcproject\/merge_requests\/1\/versions/)
           .reply(200, [{ id: 789 }]);
-        spyOn(service, 'getProjectMergeRequestVersions').and.callThrough();
+        jest.spyOn(service, 'getProjectMergeRequestVersions');
       });
 
       it('calls getProjectMergeRequestVersions service method', done => {
@@ -324,7 +322,7 @@ describe('IDE store merge request actions', () => {
       });
 
       it('dispatches error action', done => {
-        const dispatch = jasmine.createSpy('dispatch');
+        const dispatch = jest.fn();
 
         getMergeRequestVersions(
           {
@@ -338,7 +336,7 @@ describe('IDE store merge request actions', () => {
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
               text: 'An error occurred while loading the merge request version data.',
-              action: jasmine.any(Function),
+              action: expect.any(Function),
               actionText: 'Please try again',
               actionPayload: {
                 projectId: TEST_PROJECT,
@@ -400,7 +398,7 @@ describe('IDE store merge request actions', () => {
 
       const originalDispatch = store.dispatch;
 
-      spyOn(store, 'dispatch').and.callFake((type, payload) => {
+      jest.spyOn(store, 'dispatch').mockImplementation((type, payload) => {
         switch (type) {
           case 'getMergeRequestData':
             return Promise.resolve(testMergeRequest);
@@ -415,7 +413,7 @@ describe('IDE store merge request actions', () => {
             return originalDispatch(type, payload);
         }
       });
-      spyOn(service, 'getFileData').and.callFake(() =>
+      jest.spyOn(service, 'getFileData').mockImplementation(() =>
         Promise.resolve({
           headers: {},
         }),
@@ -425,7 +423,7 @@ describe('IDE store merge request actions', () => {
     it('dispatches actions for merge request data', done => {
       openMergeRequest({ state: store.state, dispatch: store.dispatch, getters: mockGetters }, mr)
         .then(() => {
-          expect(store.dispatch.calls.allArgs()).toEqual([
+          expect(store.dispatch.mock.calls).toEqual([
             ['getMergeRequestData', mr],
             ['setCurrentBranchId', testMergeRequest.source_branch],
             [
@@ -493,15 +491,11 @@ describe('IDE store merge request actions', () => {
     });
 
     it('flashes message, if error', done => {
-      const flashSpy = spyOnDependency(actions, 'flash');
-      store.dispatch.and.returnValue(Promise.reject());
+      store.dispatch.mockRejectedValue();
 
       openMergeRequest(store, mr)
-        .then(() => {
-          fail('Expected openMergeRequest to throw an error');
-        })
         .catch(() => {
-          expect(flashSpy).toHaveBeenCalledWith(jasmine.any(String));
+          expect(createFlash).toHaveBeenCalledWith(expect.any(String));
         })
         .then(done)
         .catch(done.fail);
diff --git a/spec/javascripts/ide/stores/actions/project_spec.js b/spec/frontend/ide/stores/actions/project_spec.js
index e962224d1ad..64024c12903 100644
--- a/spec/javascripts/ide/stores/actions/project_spec.js
+++ b/spec/frontend/ide/stores/actions/project_spec.js
@@ -1,5 +1,6 @@
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
+import { createStore } from '~/ide/stores';
 import {
   refreshLastCommitData,
   showBranchNotFoundError,
@@ -9,12 +10,10 @@ import {
   loadFile,
   loadBranch,
 } from '~/ide/stores/actions';
-import { createStore } from '~/ide/stores';
 import service from '~/ide/services';
 import api from '~/api';
-import router from '~/ide/ide_router';
-import { resetStore } from '../../helpers';
-import testAction from '../../../helpers/vuex_action_helper';
+import testAction from 'helpers/vuex_action_helper';
+import { useMockLocationHelper } from 'helpers/mock_window_location_helper';
 
 const TEST_PROJECT_ID = 'abc/def';
 
@@ -33,8 +32,6 @@ describe('IDE store project actions', () => {
 
   afterEach(() => {
     mock.restore();
-
-    resetStore(store);
   });
 
   describe('refreshLastCommitData', () => {
@@ -49,13 +46,11 @@ describe('IDE store project actions', () => {
           },
         },
       };
-      spyOn(service, 'getBranchData').and.returnValue(
-        Promise.resolve({
-          data: {
-            commit: { id: '123' },
-          },
-        }),
-      );
+      jest.spyOn(service, 'getBranchData').mockResolvedValue({
+        data: {
+          commit: { id: '123' },
+        },
+      });
     });
 
     it('calls the service', done => {
@@ -110,7 +105,7 @@ describe('IDE store project actions', () => {
             type: 'setErrorMessage',
             payload: {
               text: "Branch <strong>master</strong> was not found in this project's repository.",
-              action: jasmine.any(Function),
+              action: expect.any(Function),
               actionText: 'Create branch',
               actionPayload: 'master',
             },
@@ -122,10 +117,13 @@ describe('IDE store project actions', () => {
   });
 
   describe('createNewBranchFromDefault', () => {
-    it('calls API', done => {
-      spyOn(api, 'createBranch').and.returnValue(Promise.resolve());
-      spyOn(router, 'push');
+    useMockLocationHelper();
+
+    beforeEach(() => {
+      jest.spyOn(api, 'createBranch').mockResolvedValue();
+    });
 
+    it('calls API', done => {
       createNewBranchFromDefault(
         {
           state: {
@@ -151,9 +149,7 @@ describe('IDE store project actions', () => {
     });
 
     it('clears error message', done => {
-      const dispatchSpy = jasmine.createSpy('dispatch');
-      spyOn(api, 'createBranch').and.returnValue(Promise.resolve());
-      spyOn(router, 'push');
+      const dispatchSpy = jest.fn().mockName('dispatch');
 
       createNewBranchFromDefault(
         {
@@ -177,9 +173,6 @@ describe('IDE store project actions', () => {
     });
 
     it('reloads window', done => {
-      spyOn(api, 'createBranch').and.returnValue(Promise.resolve());
-      spyOn(router, 'push');
-
       createNewBranchFromDefault(
         {
           state: {
@@ -195,7 +188,7 @@ describe('IDE store project actions', () => {
         'new-branch-name',
       )
         .then(() => {
-          expect(router.push).toHaveBeenCalled();
+          expect(window.location.reload).toHaveBeenCalled();
         })
         .then(done)
         .catch(done.fail);
@@ -215,7 +208,7 @@ describe('IDE store project actions', () => {
             payload: { entry: store.state.trees[`${TEST_PROJECT_ID}/master`], forceValue: false },
           },
         ],
-        jasmine.any(Object),
+        expect.any(Object),
         done,
       );
     });
@@ -243,7 +236,7 @@ describe('IDE store project actions', () => {
           'foo/bar': { pending: false },
         },
       });
-      spyOn(store, 'dispatch');
+      jest.spyOn(store, 'dispatch').mockImplementation();
     });
 
     it('does nothing, if basePath is not given', () => {
@@ -264,15 +257,15 @@ describe('IDE store project actions', () => {
     it('does not handle tree entry action, if entry is pending', () => {
       loadFile(store, { basePath: 'foo/bar-pending/' });
 
-      expect(store.dispatch).not.toHaveBeenCalledWith('handleTreeEntryAction', jasmine.anything());
+      expect(store.dispatch).not.toHaveBeenCalledWith('handleTreeEntryAction', expect.anything());
     });
 
     it('creates a new temp file supplied via URL if the file does not exist yet', () => {
       loadFile(store, { basePath: 'not-existent.md' });
 
-      expect(store.dispatch.calls.count()).toBe(1);
+      expect(store.dispatch.mock.calls).toHaveLength(1);
 
-      expect(store.dispatch).not.toHaveBeenCalledWith('handleTreeEntryAction', jasmine.anything());
+      expect(store.dispatch).not.toHaveBeenCalledWith('handleTreeEntryAction', expect.anything());
 
       expect(store.dispatch).toHaveBeenCalledWith('createTempEntry', {
         name: 'not-existent.md',
@@ -307,14 +300,14 @@ describe('IDE store project actions', () => {
 
     it('fetches branch data', done => {
       const mockGetters = { findBranch: () => ({ commit: { id: ref } }) };
-      spyOn(store, 'dispatch').and.returnValue(Promise.resolve());
+      jest.spyOn(store, 'dispatch').mockResolvedValue();
 
       loadBranch(
         { getters: mockGetters, state: store.state, dispatch: store.dispatch },
         { projectId, branchId },
       )
         .then(() => {
-          expect(store.dispatch.calls.allArgs()).toEqual([
+          expect(store.dispatch.mock.calls).toEqual([
             ['getBranchData', { projectId, branchId }],
             ['getMergeRequestsForBranch', { projectId, branchId }],
             ['getFiles', { projectId, branchId, ref }],
@@ -325,12 +318,12 @@ describe('IDE store project actions', () => {
     });
 
     it('shows an error if branch can not be fetched', done => {
-      spyOn(store, 'dispatch').and.returnValue(Promise.reject());
+      jest.spyOn(store, 'dispatch').mockReturnValue(Promise.reject());
 
       loadBranch(store, { projectId, branchId })
         .then(done.fail)
         .catch(() => {
-          expect(store.dispatch.calls.allArgs()).toEqual([
+          expect(store.dispatch.mock.calls).toEqual([
             ['getBranchData', { projectId, branchId }],
             ['showBranchNotFoundError', branchId],
           ]);
@@ -360,13 +353,13 @@ describe('IDE store project actions', () => {
 
     describe('existing branch', () => {
       beforeEach(() => {
-        spyOn(store, 'dispatch').and.returnValue(Promise.resolve());
+        jest.spyOn(store, 'dispatch').mockResolvedValue();
       });
 
       it('dispatches branch actions', done => {
         openBranch(store, branch)
           .then(() => {
-            expect(store.dispatch.calls.allArgs()).toEqual([
+            expect(store.dispatch.mock.calls).toEqual([
               ['setCurrentBranchId', branchId],
               ['loadBranch', { projectId, branchId }],
               ['loadFile', { basePath: undefined }],
@@ -379,13 +372,13 @@ describe('IDE store project actions', () => {
 
     describe('non-existent branch', () => {
       beforeEach(() => {
-        spyOn(store, 'dispatch').and.returnValue(Promise.reject());
+        jest.spyOn(store, 'dispatch').mockReturnValue(Promise.reject());
       });
 
       it('dispatches correct branch actions', done => {
         openBranch(store, branch)
           .then(val => {
-            expect(store.dispatch.calls.allArgs()).toEqual([
+            expect(store.dispatch.mock.calls).toEqual([
               ['setCurrentBranchId', branchId],
               ['loadBranch', { projectId, branchId }],
             ]);
diff --git a/spec/javascripts/ide/stores/actions/tree_spec.js b/spec/frontend/ide/stores/actions/tree_spec.js
index 2201a3b4b57..44e2fcab436 100644
--- a/spec/javascripts/ide/stores/actions/tree_spec.js
+++ b/spec/frontend/ide/stores/actions/tree_spec.js
@@ -1,16 +1,18 @@
 import MockAdapter from 'axios-mock-adapter';
-import testAction from 'spec/helpers/vuex_action_helper';
+import testAction from 'helpers/vuex_action_helper';
 import { showTreeEntry, getFiles, setDirectoryData } from '~/ide/stores/actions/tree';
 import * as types from '~/ide/stores/mutation_types';
 import axios from '~/lib/utils/axios_utils';
-import store from '~/ide/stores';
+import { createStore } from '~/ide/stores';
 import service from '~/ide/services';
-import router from '~/ide/ide_router';
-import { file, resetStore, createEntriesFromPaths } from '../../helpers';
+import { createRouter } from '~/ide/ide_router';
+import { file, createEntriesFromPaths } from '../../helpers';
 
 describe('Multi-file store tree actions', () => {
   let projectTree;
   let mock;
+  let store;
+  let router;
 
   const basicCallParameters = {
     endpoint: 'rootEndpoint',
@@ -21,8 +23,9 @@ describe('Multi-file store tree actions', () => {
   };
 
   beforeEach(() => {
-    jasmine.clock().install();
-    spyOn(router, 'push');
+    store = createStore();
+    router = createRouter(store);
+    jest.spyOn(router, 'push').mockImplementation();
 
     mock = new MockAdapter(axios);
 
@@ -35,15 +38,13 @@ describe('Multi-file store tree actions', () => {
   });
 
   afterEach(() => {
-    jasmine.clock().uninstall();
     mock.restore();
-    resetStore(store);
   });
 
   describe('getFiles', () => {
     describe('success', () => {
       beforeEach(() => {
-        spyOn(service, 'getFiles').and.callThrough();
+        jest.spyOn(service, 'getFiles');
 
         mock
           .onGet(/(.*)/)
@@ -54,15 +55,16 @@ describe('Multi-file store tree actions', () => {
           ]);
       });
 
-      it('calls service getFiles', done => {
-        store
-          .dispatch('getFiles', basicCallParameters)
-          .then(() => {
-            expect(service.getFiles).toHaveBeenCalledWith('foo/abcproject', '12345678');
-
-            done();
-          })
-          .catch(done.fail);
+      it('calls service getFiles', () => {
+        return (
+          store
+            .dispatch('getFiles', basicCallParameters)
+            // getFiles actions calls lodash.defer
+            .then(() => jest.runOnlyPendingTimers())
+            .then(() => {
+              expect(service.getFiles).toHaveBeenCalledWith('foo/abcproject', '12345678');
+            })
+        );
       });
 
       it('adds data into tree', done => {
@@ -71,7 +73,7 @@ describe('Multi-file store tree actions', () => {
           .then(() => {
             // The populating of the tree is deferred for performance reasons.
             // See this merge request for details: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/25700
-            jasmine.clock().tick(1);
+            jest.advanceTimersByTime(1);
           })
           .then(() => {
             projectTree = store.state.trees['abcproject/master'];
@@ -91,7 +93,7 @@ describe('Multi-file store tree actions', () => {
 
     describe('error', () => {
       it('dispatches error action', done => {
-        const dispatch = jasmine.createSpy('dispatchSpy');
+        const dispatch = jest.fn();
 
         store.state.projects = {
           'abc/def': {
@@ -127,7 +129,7 @@ describe('Multi-file store tree actions', () => {
           .catch(() => {
             expect(dispatch).toHaveBeenCalledWith('setErrorMessage', {
               text: 'An error occurred while loading all the files.',
-              action: jasmine.any(Function),
+              action: expect.any(Function),
               actionText: 'Please try again',
               actionPayload: { projectId: 'abc/def', branchId: 'master-testing' },
             });
diff --git a/spec/javascripts/ide/stores/actions_spec.js b/spec/frontend/ide/stores/actions_spec.js
index 364c8421b6b..f77dbd80025 100644
--- a/spec/javascripts/ide/stores/actions_spec.js
+++ b/spec/frontend/ide/stores/actions_spec.js
@@ -1,5 +1,8 @@
 import MockAdapter from 'axios-mock-adapter';
-import actions, {
+import { visitUrl } from '~/lib/utils/url_utility';
+import { createStore } from '~/ide/stores';
+import { createRouter } from '~/ide/ide_router';
+import {
   stageAllChanges,
   unstageAllChanges,
   toggleFileFinder,
@@ -15,28 +18,31 @@ import actions, {
   discardAllChanges,
 } from '~/ide/stores/actions';
 import axios from '~/lib/utils/axios_utils';
-import { createStore } from '~/ide/stores';
 import * as types from '~/ide/stores/mutation_types';
-import router from '~/ide/ide_router';
 import { file } from '../helpers';
 import testAction from '../../helpers/vuex_action_helper';
 import eventHub from '~/ide/eventhub';
 
+jest.mock('~/lib/utils/url_utility', () => ({
+  visitUrl: jest.fn(),
+  joinPaths: jest.requireActual('~/lib/utils/url_utility').joinPaths,
+}));
+
 describe('Multi-file store actions', () => {
   let store;
+  let router;
 
   beforeEach(() => {
     store = createStore();
+    router = createRouter(store);
 
-    spyOn(store, 'commit').and.callThrough();
-    spyOn(store, 'dispatch').and.callThrough();
-    spyOn(router, 'push');
+    jest.spyOn(store, 'commit');
+    jest.spyOn(store, 'dispatch');
+    jest.spyOn(router, 'push').mockImplementation();
   });
 
   describe('redirectToUrl', () => {
     it('calls visitUrl', done => {
-      const visitUrl = spyOnDependency(actions, 'visitUrl');
-
       store
         .dispatch('redirectToUrl', 'test')
         .then(() => {
@@ -79,7 +85,7 @@ describe('Multi-file store actions', () => {
 
       discardAllChanges(store);
 
-      expect(store.dispatch.calls.allArgs()).toEqual(jasmine.arrayContaining(expectedCalls));
+      expect(store.dispatch.mock.calls).toEqual(expect.arrayContaining(expectedCalls));
     });
 
     it('removes all files from changedFiles state', done => {
@@ -94,26 +100,6 @@ describe('Multi-file store actions', () => {
     });
   });
 
-  describe('closeAllFiles', () => {
-    beforeEach(() => {
-      const f = file('closeAll');
-      store.state.openFiles.push(f);
-      store.state.openFiles[0].opened = true;
-      store.state.entries[f.path] = f;
-    });
-
-    it('closes all open files', done => {
-      store
-        .dispatch('closeAllFiles')
-        .then(() => {
-          expect(store.state.openFiles.length).toBe(0);
-
-          done();
-        })
-        .catch(done.fail);
-    });
-  });
-
   describe('createTempEntry', () => {
     beforeEach(() => {
       document.body.innerHTML += '<div class="flash-container"></div>';
@@ -255,7 +241,7 @@ describe('Multi-file store actions', () => {
             type: 'blob',
           })
           .then(() => {
-            expect(store.state.stagedFiles).toEqual([jasmine.objectContaining({ name })]);
+            expect(store.state.stagedFiles).toEqual([expect.objectContaining({ name })]);
 
             done();
           })
@@ -288,21 +274,6 @@ describe('Multi-file store actions', () => {
           })
           .catch(done.fail);
       });
-
-      it('bursts unused seal', done => {
-        store
-          .dispatch('createTempEntry', {
-            name: 'test',
-            branchId: 'mybranch',
-            type: 'blob',
-          })
-          .then(() => {
-            expect(store.state.unusedSeal).toBe(false);
-
-            done();
-          })
-          .catch(done.fail);
-      });
     });
   });
 
@@ -311,12 +282,12 @@ describe('Multi-file store actions', () => {
       document.body.innerHTML +=
         '<div id="tabs"><div class="active"><div class="repo-tab"></div></div></div>';
       const el = document.querySelector('.repo-tab');
-      spyOn(el, 'focus');
+      jest.spyOn(el, 'focus').mockImplementation();
 
       store
         .dispatch('scrollToTab')
         .then(() => {
-          setTimeout(() => {
+          setImmediate(() => {
             expect(el.focus).toHaveBeenCalled();
 
             document.getElementById('tabs').remove();
@@ -350,16 +321,18 @@ describe('Multi-file store actions', () => {
       it('adds all files from changedFiles to stagedFiles', () => {
         stageAllChanges(store);
 
-        expect(store.commit.calls.allArgs()).toEqual([
-          [types.SET_LAST_COMMIT_MSG, ''],
-          [types.STAGE_CHANGE, jasmine.objectContaining({ path: file1.path })],
-        ]);
+        expect(store.commit.mock.calls).toEqual(
+          expect.arrayContaining([
+            [types.SET_LAST_COMMIT_MSG, ''],
+            [types.STAGE_CHANGE, expect.objectContaining({ path: file1.path })],
+          ]),
+        );
       });
 
       it('opens pending tab if a change exists in that file', () => {
         stageAllChanges(store);
 
-        expect(store.dispatch.calls.allArgs()).toEqual([
+        expect(store.dispatch.mock.calls).toEqual([
           [
             'openPendingTab',
             { file: { ...file1, staged: true, changed: true }, keyPrefix: 'staged' },
@@ -382,15 +355,17 @@ describe('Multi-file store actions', () => {
       it('removes all files from stagedFiles after unstaging', () => {
         unstageAllChanges(store);
 
-        expect(store.commit.calls.allArgs()).toEqual([
-          [types.UNSTAGE_CHANGE, jasmine.objectContaining({ path: file2.path })],
-        ]);
+        expect(store.commit.mock.calls).toEqual(
+          expect.arrayContaining([
+            [types.UNSTAGE_CHANGE, expect.objectContaining({ path: file2.path })],
+          ]),
+        );
       });
 
       it('opens pending tab if a change exists in that file', () => {
         unstageAllChanges(store);
 
-        expect(store.dispatch.calls.allArgs()).toEqual([
+        expect(store.dispatch.mock.calls).toEqual([
           ['openPendingTab', { file: file1, keyPrefix: 'unstaged' }],
         ]);
       });
@@ -678,25 +653,12 @@ describe('Multi-file store actions', () => {
         });
       });
     });
-
-    it('bursts unused seal', done => {
-      store.state.entries.test = file('test');
-
-      store
-        .dispatch('deleteEntry', 'test')
-        .then(() => {
-          expect(store.state.unusedSeal).toBe(false);
-
-          done();
-        })
-        .catch(done.fail);
-    });
   });
 
   describe('renameEntry', () => {
     describe('purging of file model cache', () => {
       beforeEach(() => {
-        spyOn(eventHub, '$emit');
+        jest.spyOn(eventHub, '$emit').mockImplementation();
       });
 
       it('does not purge model cache for temporary entries that got renamed', done => {
@@ -715,9 +677,7 @@ describe('Multi-file store actions', () => {
             name: 'new',
           })
           .then(() => {
-            expect(eventHub.$emit.calls.allArgs()).not.toContain(
-              'editor.update.model.dispose.foo-bar',
-            );
+            expect(eventHub.$emit.mock.calls).not.toContain('editor.update.model.dispose.foo-bar');
           })
           .then(done)
           .catch(done.fail);
@@ -768,17 +728,17 @@ describe('Multi-file store actions', () => {
       });
 
       it('by default renames an entry and stages it', () => {
-        const dispatch = jasmine.createSpy();
-        const commit = jasmine.createSpy();
+        const dispatch = jest.fn();
+        const commit = jest.fn();
 
         renameEntry(
           { dispatch, commit, state: store.state, getters: store.getters },
           { path: 'orig', name: 'renamed' },
         );
 
-        expect(commit.calls.allArgs()).toEqual([
+        expect(commit.mock.calls).toEqual([
           [types.RENAME_ENTRY, { path: 'orig', name: 'renamed', parentPath: undefined }],
-          [types.STAGE_CHANGE, jasmine.objectContaining({ path: 'renamed' })],
+          [types.STAGE_CHANGE, expect.objectContaining({ path: 'renamed' })],
         ]);
       });
 
@@ -813,7 +773,7 @@ describe('Multi-file store actions', () => {
           renameEntry,
           { path: 'orig', name: 'renamed' },
           store.state,
-          [jasmine.objectContaining({ type: types.RENAME_ENTRY })],
+          [expect.objectContaining({ type: types.RENAME_ENTRY })],
           [{ type: 'triggerFilesChange' }],
           done,
         );
@@ -831,26 +791,12 @@ describe('Multi-file store actions', () => {
             name: 'renamed',
           })
           .then(() => {
-            expect(router.push.calls.count()).toBe(1);
+            expect(router.push.mock.calls).toHaveLength(1);
             expect(router.push).toHaveBeenCalledWith(`/project/foo-bar.md`);
           })
           .then(done)
           .catch(done.fail);
       });
-
-      it('bursts unused seal', done => {
-        store
-          .dispatch('renameEntry', {
-            path: 'orig',
-            name: 'renamed',
-          })
-          .then(() => {
-            expect(store.state.unusedSeal).toBe(false);
-
-            done();
-          })
-          .catch(done.fail);
-      });
     });
 
     describe('folder', () => {
@@ -918,7 +864,7 @@ describe('Multi-file store actions', () => {
 
             expect(entries['new-folder']).toBeDefined();
             expect(entries['new-folder/test']).toEqual(
-              jasmine.objectContaining({
+              expect.objectContaining({
                 path: 'new-folder/test',
                 name: 'test',
                 prevPath: 'old-folder/test',
@@ -941,7 +887,7 @@ describe('Multi-file store actions', () => {
 
             expect(entries['old-folder']).toBeDefined();
             expect(entries['old-folder/test']).toEqual(
-              jasmine.objectContaining({
+              expect.objectContaining({
                 path: 'old-folder/test',
                 name: 'test',
                 prevPath: undefined,
@@ -989,10 +935,10 @@ describe('Multi-file store actions', () => {
             .dispatch('renameEntry', { path: filePath, name: fileName, parentPath: newParentPath })
             .then(() => {
               expect(store.state.entries[newParentPath]).toEqual(
-                jasmine.objectContaining({
+                expect.objectContaining({
                   path: newParentPath,
                   type: 'tree',
-                  tree: jasmine.arrayContaining([
+                  tree: expect.arrayContaining([
                     store.state.entries[`${newParentPath}/${fileName}`],
                   ]),
                 }),
@@ -1078,7 +1024,7 @@ describe('Multi-file store actions', () => {
             branchId: 'master-testing',
           },
         ];
-        dispatch = jasmine.createSpy('dispatchSpy');
+        dispatch = jest.fn();
         document.body.innerHTML += '<div class="flash-container"></div>';
       });
 
@@ -1092,7 +1038,7 @@ describe('Multi-file store actions', () => {
         getBranchData(...callParams)
           .then(done.fail)
           .catch(e => {
-            expect(dispatch.calls.count()).toEqual(0);
+            expect(dispatch.mock.calls).toHaveLength(0);
             expect(e.response.status).toEqual(404);
             expect(document.querySelector('.flash-alert')).toBeNull();
             done();
@@ -1105,7 +1051,7 @@ describe('Multi-file store actions', () => {
         getBranchData(...callParams)
           .then(done.fail)
           .catch(e => {
-            expect(dispatch.calls.count()).toEqual(0);
+            expect(dispatch.mock.calls).toHaveLength(0);
             expect(e.response).toBeUndefined();
             expect(document.querySelector('.flash-alert')).not.toBeNull();
             done();
diff --git a/spec/frontend/ide/stores/extend_spec.js b/spec/frontend/ide/stores/extend_spec.js
new file mode 100644
index 00000000000..b0f1063153e
--- /dev/null
+++ b/spec/frontend/ide/stores/extend_spec.js
@@ -0,0 +1,74 @@
+import extendStore from '~/ide/stores/extend';
+import terminalPlugin from '~/ide/stores/plugins/terminal';
+import terminalSyncPlugin from '~/ide/stores/plugins/terminal_sync';
+
+jest.mock('~/ide/stores/plugins/terminal', () => jest.fn());
+jest.mock('~/ide/stores/plugins/terminal_sync', () => jest.fn());
+
+describe('ide/stores/extend', () => {
+  let prevGon;
+  let store;
+  let el;
+
+  beforeEach(() => {
+    prevGon = global.gon;
+    store = {};
+    el = {};
+
+    [terminalPlugin, terminalSyncPlugin].forEach(x => {
+      const plugin = jest.fn();
+
+      x.mockImplementation(() => plugin);
+    });
+  });
+
+  afterEach(() => {
+    global.gon = prevGon;
+    terminalPlugin.mockClear();
+    terminalSyncPlugin.mockClear();
+  });
+
+  const withGonFeatures = features => {
+    global.gon = { ...global.gon, features };
+  };
+
+  describe('terminalPlugin', () => {
+    beforeEach(() => {
+      extendStore(store, el);
+    });
+
+    it('is created', () => {
+      expect(terminalPlugin).toHaveBeenCalledWith(el);
+    });
+
+    it('is called with store', () => {
+      expect(terminalPlugin()).toHaveBeenCalledWith(store);
+    });
+  });
+
+  describe('terminalSyncPlugin', () => {
+    describe('when buildServiceProxy feature is enabled', () => {
+      beforeEach(() => {
+        withGonFeatures({ buildServiceProxy: true });
+
+        extendStore(store, el);
+      });
+
+      it('is created', () => {
+        expect(terminalSyncPlugin).toHaveBeenCalledWith(el);
+      });
+
+      it('is called with store', () => {
+        expect(terminalSyncPlugin()).toHaveBeenCalledWith(store);
+      });
+    });
+
+    describe('when buildServiceProxy feature is disabled', () => {
+      it('is not created', () => {
+        extendStore(store, el);
+
+        expect(terminalSyncPlugin).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/getters_spec.js b/spec/frontend/ide/stores/getters_spec.js
index 408ea2b2939..dcf05329ce0 100644
--- a/spec/frontend/ide/stores/getters_spec.js
+++ b/spec/frontend/ide/stores/getters_spec.js
@@ -417,4 +417,69 @@ describe('IDE store getters', () => {
       expect(localStore.getters[getterName]).toBe(val);
     });
   });
+
+  describe('entryExists', () => {
+    beforeEach(() => {
+      localState.entries = {
+        foo: file('foo', 'foo', 'tree'),
+        'foo/bar.png': file(),
+      };
+    });
+
+    it.each`
+      path             | deleted  | value
+      ${'foo/bar.png'} | ${false} | ${true}
+      ${'foo/bar.png'} | ${true}  | ${false}
+      ${'foo'}         | ${false} | ${true}
+    `(
+      'returns $value for an existing entry path: $path (deleted: $deleted)',
+      ({ path, deleted, value }) => {
+        localState.entries[path].deleted = deleted;
+
+        expect(localStore.getters.entryExists(path)).toBe(value);
+      },
+    );
+
+    it('returns false for a non existing entry path', () => {
+      expect(localStore.getters.entryExists('bar.baz')).toBe(false);
+    });
+  });
+
+  describe('getAvailableFileName', () => {
+    it.each`
+      path                                          | newPath
+      ${'foo'}                                      | ${'foo_1'}
+      ${'foo__93.png'}                              | ${'foo__94.png'}
+      ${'foo/bar.png'}                              | ${'foo/bar_1.png'}
+      ${'foo/bar--34.png'}                          | ${'foo/bar--35.png'}
+      ${'foo/bar 2.png'}                            | ${'foo/bar 3.png'}
+      ${'foo/bar-621.png'}                          | ${'foo/bar-622.png'}
+      ${'jquery.min.js'}                            | ${'jquery_1.min.js'}
+      ${'my_spec_22.js.snap'}                       | ${'my_spec_23.js.snap'}
+      ${'subtitles5.mp4.srt'}                       | ${'subtitles_6.mp4.srt'}
+      ${'sample_file.mp3'}                          | ${'sample_file_1.mp3'}
+      ${'Screenshot 2020-05-26 at 10.53.08 PM.png'} | ${'Screenshot 2020-05-26 at 11.53.08 PM.png'}
+    `('suffixes the path with a number if the path already exists', ({ path, newPath }) => {
+      localState.entries[path] = file();
+
+      expect(localStore.getters.getAvailableFileName(path)).toBe(newPath);
+    });
+
+    it('loops through all incremented entries and keeps trying until a file path that does not exist is found', () => {
+      localState.entries = {
+        'bar/baz_1.png': file(),
+        'bar/baz_2.png': file(),
+        'bar/baz_3.png': file(),
+        'bar/baz_4.png': file(),
+        'bar/baz_5.png': file(),
+        'bar/baz_72.png': file(),
+      };
+
+      expect(localStore.getters.getAvailableFileName('bar/baz_1.png')).toBe('bar/baz_6.png');
+    });
+
+    it('returns the entry path as is if the path does not exist', () => {
+      expect(localStore.getters.getAvailableFileName('foo-bar1.jpg')).toBe('foo-bar1.jpg');
+    });
+  });
 });
diff --git a/spec/javascripts/ide/stores/modules/commit/actions_spec.js b/spec/frontend/ide/stores/modules/commit/actions_spec.js
index fb8cb300209..a14879112fd 100644
--- a/spec/javascripts/ide/stores/modules/commit/actions_spec.js
+++ b/spec/frontend/ide/stores/modules/commit/actions_spec.js
@@ -1,8 +1,10 @@
-import { resetStore, file } from 'spec/ide/helpers';
-import rootActions from '~/ide/stores/actions';
+import { file } from 'jest/ide/helpers';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+import { visitUrl } from '~/lib/utils/url_utility';
 import { createStore } from '~/ide/stores';
 import service from '~/ide/services';
-import router from '~/ide/ide_router';
+import { createRouter } from '~/ide/ide_router';
 import eventHub from '~/ide/eventhub';
 import consts from '~/ide/stores/modules/commit/constants';
 import * as mutationTypes from '~/ide/stores/modules/commit/mutation_types';
@@ -10,16 +12,31 @@ import * as actions from '~/ide/stores/modules/commit/actions';
 import { commitActionTypes, PERMISSION_CREATE_MR } from '~/ide/constants';
 import testAction from '../../../../helpers/vuex_action_helper';
 
+jest.mock('~/lib/utils/url_utility', () => ({
+  ...jest.requireActual('~/lib/utils/url_utility'),
+  visitUrl: jest.fn(),
+}));
+
 const TEST_COMMIT_SHA = '123456789';
-const store = createStore();
 
 describe('IDE commit module actions', () => {
+  let mock;
+  let store;
+  let router;
+
   beforeEach(() => {
-    spyOn(router, 'push');
+    store = createStore();
+    router = createRouter(store);
+    gon.api_version = 'v1';
+    mock = new MockAdapter(axios);
+    jest.spyOn(router, 'push').mockImplementation();
+
+    mock.onGet('/api/v1/projects/abcproject/repository/branches/master').reply(200);
   });
 
   afterEach(() => {
-    resetStore(store);
+    delete gon.api_version;
+    mock.restore();
   });
 
   describe('updateCommitMessage', () => {
@@ -71,7 +88,7 @@ describe('IDE commit module actions', () => {
         [
           {
             type: mutationTypes.UPDATE_COMMIT_ACTION,
-            payload: { commitAction: jasmine.anything() },
+            payload: { commitAction: expect.anything() },
           },
           { type: mutationTypes.TOGGLE_SHOULD_CREATE_MR, payload: true },
         ],
@@ -92,7 +109,7 @@ describe('IDE commit module actions', () => {
         [
           {
             type: mutationTypes.UPDATE_COMMIT_ACTION,
-            payload: { commitAction: jasmine.anything() },
+            payload: { commitAction: expect.anything() },
           },
           { type: mutationTypes.TOGGLE_SHOULD_CREATE_MR, payload: false },
         ],
@@ -168,7 +185,7 @@ describe('IDE commit module actions', () => {
     let f;
 
     beforeEach(() => {
-      spyOn(eventHub, '$emit');
+      jest.spyOn(eventHub, '$emit').mockImplementation();
 
       f = file('changedFile');
       Object.assign(f, {
@@ -200,9 +217,9 @@ describe('IDE commit module actions', () => {
             changed: true,
           },
         ],
-        openFiles: store.state.stagedFiles,
       });
 
+      store.state.openFiles = store.state.stagedFiles;
       store.state.stagedFiles.forEach(stagedFile => {
         store.state.entries[stagedFile.path] = stagedFile;
       });
@@ -280,11 +297,7 @@ describe('IDE commit module actions', () => {
   });
 
   describe('commitChanges', () => {
-    let visitUrl;
-
     beforeEach(() => {
-      visitUrl = spyOnDependency(rootActions, 'visitUrl');
-
       document.body.innerHTML += '<div class="flash-container"></div>';
 
       const f = {
@@ -346,11 +359,7 @@ describe('IDE commit module actions', () => {
       };
 
       beforeEach(() => {
-        spyOn(service, 'commit').and.returnValue(
-          Promise.resolve({
-            data: COMMIT_RESPONSE,
-          }),
-        );
+        jest.spyOn(service, 'commit').mockResolvedValue({ data: COMMIT_RESPONSE });
       });
 
       it('calls service', done => {
@@ -358,14 +367,14 @@ describe('IDE commit module actions', () => {
           .dispatch('commit/commitChanges')
           .then(() => {
             expect(service.commit).toHaveBeenCalledWith('abcproject', {
-              branch: jasmine.anything(),
+              branch: expect.anything(),
               commit_message: 'testing 123',
               actions: [
                 {
                   action: commitActionTypes.update,
-                  file_path: jasmine.anything(),
+                  file_path: expect.anything(),
                   content: '\n',
-                  encoding: jasmine.anything(),
+                  encoding: expect.anything(),
                   last_commit_id: undefined,
                   previous_path: undefined,
                 },
@@ -385,14 +394,14 @@ describe('IDE commit module actions', () => {
           .dispatch('commit/commitChanges')
           .then(() => {
             expect(service.commit).toHaveBeenCalledWith('abcproject', {
-              branch: jasmine.anything(),
+              branch: expect.anything(),
               commit_message: 'testing 123',
               actions: [
                 {
                   action: commitActionTypes.update,
-                  file_path: jasmine.anything(),
+                  file_path: expect.anything(),
                   content: '\n',
-                  encoding: jasmine.anything(),
+                  encoding: expect.anything(),
                   last_commit_id: TEST_COMMIT_SHA,
                   previous_path: undefined,
                 },
@@ -455,7 +464,7 @@ describe('IDE commit module actions', () => {
 
       describe('merge request', () => {
         it('redirects to new merge request page', done => {
-          spyOn(eventHub, '$on');
+          jest.spyOn(eventHub, '$on').mockImplementation();
 
           store.state.commit.commitAction = consts.COMMIT_TO_NEW_BRANCH;
           store.state.commit.shouldCreateMR = true;
@@ -475,7 +484,7 @@ describe('IDE commit module actions', () => {
         });
 
         it('does not redirect to new merge request page when shouldCreateMR is not checked', done => {
-          spyOn(eventHub, '$on');
+          jest.spyOn(eventHub, '$on').mockImplementation();
 
           store.state.commit.commitAction = consts.COMMIT_TO_NEW_BRANCH;
           store.state.commit.shouldCreateMR = false;
@@ -489,30 +498,25 @@ describe('IDE commit module actions', () => {
             .catch(done.fail);
         });
 
-        it('resets changed files before redirecting', done => {
-          visitUrl = visitUrl.and.callFake(() => {
-            expect(store.state.stagedFiles.length).toBe(0);
-            done();
-          });
-
-          spyOn(eventHub, '$on');
+        it('resets changed files before redirecting', () => {
+          jest.spyOn(eventHub, '$on').mockImplementation();
 
           store.state.commit.commitAction = '3';
 
-          store.dispatch('commit/commitChanges').catch(done.fail);
+          return store.dispatch('commit/commitChanges').then(() => {
+            expect(store.state.stagedFiles.length).toBe(0);
+          });
         });
       });
     });
 
     describe('failed', () => {
       beforeEach(() => {
-        spyOn(service, 'commit').and.returnValue(
-          Promise.resolve({
-            data: {
-              message: 'failed message',
-            },
-          }),
-        );
+        jest.spyOn(service, 'commit').mockResolvedValue({
+          data: {
+            message: 'failed message',
+          },
+        });
       });
 
       it('shows failed message', done => {
@@ -543,20 +547,15 @@ describe('IDE commit module actions', () => {
       };
 
       it('commits TOGGLE_EMPTY_STATE mutation on empty repo', done => {
-        spyOn(service, 'commit').and.returnValue(
-          Promise.resolve({
-            data: COMMIT_RESPONSE,
-          }),
-        );
-
-        spyOn(store, 'commit').and.callThrough();
+        jest.spyOn(service, 'commit').mockResolvedValue({ data: COMMIT_RESPONSE });
+        jest.spyOn(store, 'commit');
 
         store
           .dispatch('commit/commitChanges')
           .then(() => {
-            expect(store.commit.calls.allArgs()).toEqual(
-              jasmine.arrayContaining([
-                ['TOGGLE_EMPTY_STATE', jasmine.any(Object), jasmine.any(Object)],
+            expect(store.commit.mock.calls).toEqual(
+              expect.arrayContaining([
+                ['TOGGLE_EMPTY_STATE', expect.any(Object), expect.any(Object)],
               ]),
             );
             done();
@@ -566,19 +565,15 @@ describe('IDE commit module actions', () => {
 
       it('does not commmit TOGGLE_EMPTY_STATE mutation on existing project', done => {
         COMMIT_RESPONSE.parent_ids.push('1234');
-        spyOn(service, 'commit').and.returnValue(
-          Promise.resolve({
-            data: COMMIT_RESPONSE,
-          }),
-        );
-        spyOn(store, 'commit').and.callThrough();
+        jest.spyOn(service, 'commit').mockResolvedValue({ data: COMMIT_RESPONSE });
+        jest.spyOn(store, 'commit');
 
         store
           .dispatch('commit/commitChanges')
           .then(() => {
-            expect(store.commit.calls.allArgs()).not.toEqual(
-              jasmine.arrayContaining([
-                ['TOGGLE_EMPTY_STATE', jasmine.any(Object), jasmine.any(Object)],
+            expect(store.commit.mock.calls).not.toEqual(
+              expect.arrayContaining([
+                ['TOGGLE_EMPTY_STATE', expect.any(Object), expect.any(Object)],
               ]),
             );
             done();
diff --git a/spec/frontend/ide/stores/modules/pane/getters_spec.js b/spec/frontend/ide/stores/modules/pane/getters_spec.js
index 8a213323de0..a321571f058 100644
--- a/spec/frontend/ide/stores/modules/pane/getters_spec.js
+++ b/spec/frontend/ide/stores/modules/pane/getters_spec.js
@@ -7,20 +7,6 @@ describe('IDE pane module getters', () => {
     [TEST_VIEW]: true,
   };
 
-  describe('isActiveView', () => {
-    it('returns true if given view matches currentView', () => {
-      const result = getters.isActiveView({ currentView: 'A' })('A');
-
-      expect(result).toBe(true);
-    });
-
-    it('returns false if given view does not match currentView', () => {
-      const result = getters.isActiveView({ currentView: 'A' })('B');
-
-      expect(result).toBe(false);
-    });
-  });
-
   describe('isAliveView', () => {
     it('returns true if given view is in keepAliveViews', () => {
       const result = getters.isAliveView({ keepAliveViews: TEST_KEEP_ALIVE_VIEWS }, {})(TEST_VIEW);
@@ -29,25 +15,25 @@ describe('IDE pane module getters', () => {
     });
 
     it('returns true if given view is active view and open', () => {
-      const result = getters.isAliveView(
-        { ...state(), isOpen: true },
-        { isActiveView: () => true },
-      )(TEST_VIEW);
+      const result = getters.isAliveView({ ...state(), isOpen: true, currentView: TEST_VIEW })(
+        TEST_VIEW,
+      );
 
       expect(result).toBe(true);
     });
 
     it('returns false if given view is active view and closed', () => {
-      const result = getters.isAliveView(state(), { isActiveView: () => true })(TEST_VIEW);
+      const result = getters.isAliveView({ ...state(), currentView: TEST_VIEW })(TEST_VIEW);
 
       expect(result).toBe(false);
     });
 
     it('returns false if given view is not activeView', () => {
-      const result = getters.isAliveView(
-        { ...state(), isOpen: true },
-        { isActiveView: () => false },
-      )(TEST_VIEW);
+      const result = getters.isAliveView({
+        ...state(),
+        isOpen: true,
+        currentView: `${TEST_VIEW}_other`,
+      })(TEST_VIEW);
 
       expect(result).toBe(false);
     });
diff --git a/spec/frontend/ide/stores/modules/router/actions_spec.js b/spec/frontend/ide/stores/modules/router/actions_spec.js
new file mode 100644
index 00000000000..4795eae2b79
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/router/actions_spec.js
@@ -0,0 +1,19 @@
+import * as actions from '~/ide/stores/modules/router/actions';
+import * as types from '~/ide/stores/modules/router/mutation_types';
+import testAction from 'helpers/vuex_action_helper';
+
+const TEST_PATH = 'test/path/abc';
+
+describe('ide/stores/modules/router/actions', () => {
+  describe('push', () => {
+    it('commits mutation', () => {
+      return testAction(
+        actions.push,
+        TEST_PATH,
+        {},
+        [{ type: types.PUSH, payload: TEST_PATH }],
+        [],
+      );
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/router/mutations_spec.js b/spec/frontend/ide/stores/modules/router/mutations_spec.js
new file mode 100644
index 00000000000..a4a83c9344d
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/router/mutations_spec.js
@@ -0,0 +1,23 @@
+import mutations from '~/ide/stores/modules/router/mutations';
+import * as types from '~/ide/stores/modules/router/mutation_types';
+import createState from '~/ide/stores/modules/router/state';
+
+const TEST_PATH = 'test/path/abc';
+
+describe('ide/stores/modules/router/mutations', () => {
+  let state;
+
+  beforeEach(() => {
+    state = createState();
+  });
+
+  describe(types.PUSH, () => {
+    it('updates state', () => {
+      expect(state.fullPath).toBe('');
+
+      mutations[types.PUSH](state, TEST_PATH);
+
+      expect(state.fullPath).toBe(TEST_PATH);
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal/actions/checks_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/checks_spec.js
new file mode 100644
index 00000000000..242b1579be7
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal/actions/checks_spec.js
@@ -0,0 +1,289 @@
+import MockAdapter from 'axios-mock-adapter';
+import testAction from 'helpers/vuex_action_helper';
+import { TEST_HOST } from 'spec/test_constants';
+import {
+  CHECK_CONFIG,
+  CHECK_RUNNERS,
+  RETRY_RUNNERS_INTERVAL,
+} from '~/ide/stores/modules/terminal/constants';
+import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types';
+import * as messages from '~/ide/stores/modules/terminal/messages';
+import * as actions from '~/ide/stores/modules/terminal/actions/checks';
+import axios from '~/lib/utils/axios_utils';
+import httpStatus from '~/lib/utils/http_status';
+
+const TEST_PROJECT_PATH = 'lorem/root';
+const TEST_BRANCH_ID = 'master';
+const TEST_YAML_HELP_PATH = `${TEST_HOST}/test/yaml/help`;
+const TEST_RUNNERS_HELP_PATH = `${TEST_HOST}/test/runners/help`;
+
+describe('IDE store terminal check actions', () => {
+  let mock;
+  let state;
+  let rootState;
+  let rootGetters;
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+    state = {
+      paths: {
+        webTerminalConfigHelpPath: TEST_YAML_HELP_PATH,
+        webTerminalRunnersHelpPath: TEST_RUNNERS_HELP_PATH,
+      },
+      checks: {
+        config: { isLoading: true },
+      },
+    };
+    rootState = {
+      currentBranchId: TEST_BRANCH_ID,
+    };
+    rootGetters = {
+      currentProject: {
+        id: 7,
+        path_with_namespace: TEST_PROJECT_PATH,
+      },
+    };
+  });
+
+  afterEach(() => {
+    mock.restore();
+  });
+
+  describe('requestConfigCheck', () => {
+    it('handles request loading', () => {
+      return testAction(
+        actions.requestConfigCheck,
+        null,
+        {},
+        [{ type: mutationTypes.REQUEST_CHECK, payload: CHECK_CONFIG }],
+        [],
+      );
+    });
+  });
+
+  describe('receiveConfigCheckSuccess', () => {
+    it('handles successful response', () => {
+      return testAction(
+        actions.receiveConfigCheckSuccess,
+        null,
+        {},
+        [
+          { type: mutationTypes.SET_VISIBLE, payload: true },
+          { type: mutationTypes.RECEIVE_CHECK_SUCCESS, payload: CHECK_CONFIG },
+        ],
+        [],
+      );
+    });
+  });
+
+  describe('receiveConfigCheckError', () => {
+    it('handles error response', () => {
+      const status = httpStatus.UNPROCESSABLE_ENTITY;
+      const payload = { response: { status } };
+
+      return testAction(
+        actions.receiveConfigCheckError,
+        payload,
+        state,
+        [
+          {
+            type: mutationTypes.SET_VISIBLE,
+            payload: true,
+          },
+          {
+            type: mutationTypes.RECEIVE_CHECK_ERROR,
+            payload: {
+              type: CHECK_CONFIG,
+              message: messages.configCheckError(status, TEST_YAML_HELP_PATH),
+            },
+          },
+        ],
+        [],
+      );
+    });
+
+    [httpStatus.FORBIDDEN, httpStatus.NOT_FOUND].forEach(status => {
+      it(`hides tab, when status is ${status}`, () => {
+        const payload = { response: { status } };
+
+        return testAction(
+          actions.receiveConfigCheckError,
+          payload,
+          state,
+          [
+            {
+              type: mutationTypes.SET_VISIBLE,
+              payload: false,
+            },
+            expect.objectContaining({ type: mutationTypes.RECEIVE_CHECK_ERROR }),
+          ],
+          [],
+        );
+      });
+    });
+  });
+
+  describe('fetchConfigCheck', () => {
+    it('dispatches request and receive', () => {
+      mock.onPost(/.*\/ide_terminals\/check_config/).reply(200, {});
+
+      return testAction(
+        actions.fetchConfigCheck,
+        null,
+        {
+          ...rootGetters,
+          ...rootState,
+        },
+        [],
+        [{ type: 'requestConfigCheck' }, { type: 'receiveConfigCheckSuccess' }],
+      );
+    });
+
+    it('when error, dispatches request and receive', () => {
+      mock.onPost(/.*\/ide_terminals\/check_config/).reply(400, {});
+
+      return testAction(
+        actions.fetchConfigCheck,
+        null,
+        {
+          ...rootGetters,
+          ...rootState,
+        },
+        [],
+        [
+          { type: 'requestConfigCheck' },
+          { type: 'receiveConfigCheckError', payload: expect.any(Error) },
+        ],
+      );
+    });
+  });
+
+  describe('requestRunnersCheck', () => {
+    it('handles request loading', () => {
+      return testAction(
+        actions.requestRunnersCheck,
+        null,
+        {},
+        [{ type: mutationTypes.REQUEST_CHECK, payload: CHECK_RUNNERS }],
+        [],
+      );
+    });
+  });
+
+  describe('receiveRunnersCheckSuccess', () => {
+    it('handles successful response, with data', () => {
+      const payload = [{}];
+
+      return testAction(
+        actions.receiveRunnersCheckSuccess,
+        payload,
+        state,
+        [{ type: mutationTypes.RECEIVE_CHECK_SUCCESS, payload: CHECK_RUNNERS }],
+        [],
+      );
+    });
+
+    it('handles successful response, with empty data', () => {
+      const commitPayload = {
+        type: CHECK_RUNNERS,
+        message: messages.runnersCheckEmpty(TEST_RUNNERS_HELP_PATH),
+      };
+
+      return testAction(
+        actions.receiveRunnersCheckSuccess,
+        [],
+        state,
+        [{ type: mutationTypes.RECEIVE_CHECK_ERROR, payload: commitPayload }],
+        [{ type: 'retryRunnersCheck' }],
+      );
+    });
+  });
+
+  describe('receiveRunnersCheckError', () => {
+    it('dispatches handle with message', () => {
+      const commitPayload = {
+        type: CHECK_RUNNERS,
+        message: messages.UNEXPECTED_ERROR_RUNNERS,
+      };
+
+      return testAction(
+        actions.receiveRunnersCheckError,
+        null,
+        {},
+        [{ type: mutationTypes.RECEIVE_CHECK_ERROR, payload: commitPayload }],
+        [],
+      );
+    });
+  });
+
+  describe('retryRunnersCheck', () => {
+    it('dispatches fetch again after timeout', () => {
+      const dispatch = jest.fn().mockName('dispatch');
+
+      actions.retryRunnersCheck({ dispatch, state });
+
+      expect(dispatch).not.toHaveBeenCalled();
+
+      jest.advanceTimersByTime(RETRY_RUNNERS_INTERVAL + 1);
+
+      expect(dispatch).toHaveBeenCalledWith('fetchRunnersCheck', { background: true });
+    });
+
+    it('does not dispatch fetch if config check is error', () => {
+      const dispatch = jest.fn().mockName('dispatch');
+      state.checks.config = {
+        isLoading: false,
+        isValid: false,
+      };
+
+      actions.retryRunnersCheck({ dispatch, state });
+
+      expect(dispatch).not.toHaveBeenCalled();
+
+      jest.advanceTimersByTime(RETRY_RUNNERS_INTERVAL + 1);
+
+      expect(dispatch).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('fetchRunnersCheck', () => {
+    it('dispatches request and receive', () => {
+      mock.onGet(/api\/.*\/projects\/.*\/runners/, { params: { scope: 'active' } }).reply(200, []);
+
+      return testAction(
+        actions.fetchRunnersCheck,
+        {},
+        rootGetters,
+        [],
+        [{ type: 'requestRunnersCheck' }, { type: 'receiveRunnersCheckSuccess', payload: [] }],
+      );
+    });
+
+    it('does not dispatch request when background is true', () => {
+      mock.onGet(/api\/.*\/projects\/.*\/runners/, { params: { scope: 'active' } }).reply(200, []);
+
+      return testAction(
+        actions.fetchRunnersCheck,
+        { background: true },
+        rootGetters,
+        [],
+        [{ type: 'receiveRunnersCheckSuccess', payload: [] }],
+      );
+    });
+
+    it('dispatches request and receive, when error', () => {
+      mock.onGet(/api\/.*\/projects\/.*\/runners/, { params: { scope: 'active' } }).reply(500, []);
+
+      return testAction(
+        actions.fetchRunnersCheck,
+        {},
+        rootGetters,
+        [],
+        [
+          { type: 'requestRunnersCheck' },
+          { type: 'receiveRunnersCheckError', payload: expect.any(Error) },
+        ],
+      );
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js
new file mode 100644
index 00000000000..4bc937b4784
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js
@@ -0,0 +1,300 @@
+import MockAdapter from 'axios-mock-adapter';
+import testAction from 'helpers/vuex_action_helper';
+import { STARTING, PENDING, STOPPING, STOPPED } from '~/ide/stores/modules/terminal/constants';
+import * as messages from '~/ide/stores/modules/terminal/messages';
+import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types';
+import * as actions from '~/ide/stores/modules/terminal/actions/session_controls';
+import httpStatus from '~/lib/utils/http_status';
+import axios from '~/lib/utils/axios_utils';
+import createFlash from '~/flash';
+
+jest.mock('~/flash');
+
+const TEST_PROJECT_PATH = 'lorem/root';
+const TEST_BRANCH_ID = 'master';
+const TEST_SESSION = {
+  id: 7,
+  status: PENDING,
+  show_path: 'path/show',
+  cancel_path: 'path/cancel',
+  retry_path: 'path/retry',
+  terminal_path: 'path/terminal',
+  proxy_websocket_path: 'path/proxy',
+  services: ['test-service'],
+};
+
+describe('IDE store terminal session controls actions', () => {
+  let mock;
+  let dispatch;
+  let rootState;
+  let rootGetters;
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+    dispatch = jest.fn().mockName('dispatch');
+    rootState = {
+      currentBranchId: TEST_BRANCH_ID,
+    };
+    rootGetters = {
+      currentProject: {
+        id: 7,
+        path_with_namespace: TEST_PROJECT_PATH,
+      },
+    };
+  });
+
+  afterEach(() => {
+    mock.restore();
+  });
+
+  describe('requestStartSession', () => {
+    it('sets session status', () => {
+      return testAction(
+        actions.requestStartSession,
+        null,
+        {},
+        [{ type: mutationTypes.SET_SESSION_STATUS, payload: STARTING }],
+        [],
+      );
+    });
+  });
+
+  describe('receiveStartSessionSuccess', () => {
+    it('sets session and starts polling status', () => {
+      return testAction(
+        actions.receiveStartSessionSuccess,
+        TEST_SESSION,
+        {},
+        [
+          {
+            type: mutationTypes.SET_SESSION,
+            payload: {
+              id: TEST_SESSION.id,
+              status: TEST_SESSION.status,
+              showPath: TEST_SESSION.show_path,
+              cancelPath: TEST_SESSION.cancel_path,
+              retryPath: TEST_SESSION.retry_path,
+              terminalPath: TEST_SESSION.terminal_path,
+              proxyWebsocketPath: TEST_SESSION.proxy_websocket_path,
+              services: TEST_SESSION.services,
+            },
+          },
+        ],
+        [{ type: 'pollSessionStatus' }],
+      );
+    });
+  });
+
+  describe('receiveStartSessionError', () => {
+    it('flashes message', () => {
+      actions.receiveStartSessionError({ dispatch });
+
+      expect(createFlash).toHaveBeenCalledWith(messages.UNEXPECTED_ERROR_STARTING);
+    });
+
+    it('sets session status', () => {
+      return testAction(actions.receiveStartSessionError, null, {}, [], [{ type: 'killSession' }]);
+    });
+  });
+
+  describe('startSession', () => {
+    it('does nothing if session is already starting', () => {
+      const state = {
+        session: { status: STARTING },
+      };
+
+      actions.startSession({ state, dispatch });
+
+      expect(dispatch).not.toHaveBeenCalled();
+    });
+
+    it('dispatches request and receive on success', () => {
+      mock.onPost(/.*\/ide_terminals/).reply(200, TEST_SESSION);
+
+      return testAction(
+        actions.startSession,
+        null,
+        { ...rootGetters, ...rootState },
+        [],
+        [
+          { type: 'requestStartSession' },
+          { type: 'receiveStartSessionSuccess', payload: TEST_SESSION },
+        ],
+      );
+    });
+
+    it('dispatches request and receive on error', () => {
+      mock.onPost(/.*\/ide_terminals/).reply(400);
+
+      return testAction(
+        actions.startSession,
+        null,
+        { ...rootGetters, ...rootState },
+        [],
+        [
+          { type: 'requestStartSession' },
+          { type: 'receiveStartSessionError', payload: expect.any(Error) },
+        ],
+      );
+    });
+  });
+
+  describe('requestStopSession', () => {
+    it('sets session status', () => {
+      return testAction(
+        actions.requestStopSession,
+        null,
+        {},
+        [{ type: mutationTypes.SET_SESSION_STATUS, payload: STOPPING }],
+        [],
+      );
+    });
+  });
+
+  describe('receiveStopSessionSuccess', () => {
+    it('kills the session', () => {
+      return testAction(actions.receiveStopSessionSuccess, null, {}, [], [{ type: 'killSession' }]);
+    });
+  });
+
+  describe('receiveStopSessionError', () => {
+    it('flashes message', () => {
+      actions.receiveStopSessionError({ dispatch });
+
+      expect(createFlash).toHaveBeenCalledWith(messages.UNEXPECTED_ERROR_STOPPING);
+    });
+
+    it('kills the session', () => {
+      return testAction(actions.receiveStopSessionError, null, {}, [], [{ type: 'killSession' }]);
+    });
+  });
+
+  describe('stopSession', () => {
+    it('dispatches request and receive on success', () => {
+      mock.onPost(TEST_SESSION.cancel_path).reply(200, {});
+
+      const state = {
+        session: { cancelPath: TEST_SESSION.cancel_path },
+      };
+
+      return testAction(
+        actions.stopSession,
+        null,
+        state,
+        [],
+        [{ type: 'requestStopSession' }, { type: 'receiveStopSessionSuccess' }],
+      );
+    });
+
+    it('dispatches request and receive on error', () => {
+      mock.onPost(TEST_SESSION.cancel_path).reply(400);
+
+      const state = {
+        session: { cancelPath: TEST_SESSION.cancel_path },
+      };
+
+      return testAction(
+        actions.stopSession,
+        null,
+        state,
+        [],
+        [
+          { type: 'requestStopSession' },
+          { type: 'receiveStopSessionError', payload: expect.any(Error) },
+        ],
+      );
+    });
+  });
+
+  describe('killSession', () => {
+    it('stops polling and sets status', () => {
+      return testAction(
+        actions.killSession,
+        null,
+        {},
+        [{ type: mutationTypes.SET_SESSION_STATUS, payload: STOPPED }],
+        [{ type: 'stopPollingSessionStatus' }],
+      );
+    });
+  });
+
+  describe('restartSession', () => {
+    let state;
+
+    beforeEach(() => {
+      state = {
+        session: { status: STOPPED, retryPath: 'test/retry' },
+      };
+    });
+
+    it('does nothing if current not stopped', () => {
+      state.session.status = STOPPING;
+
+      actions.restartSession({ state, dispatch, rootState });
+
+      expect(dispatch).not.toHaveBeenCalled();
+    });
+
+    it('dispatches startSession if retryPath is empty', () => {
+      state.session.retryPath = '';
+
+      return testAction(
+        actions.restartSession,
+        null,
+        { ...state, ...rootState },
+        [],
+        [{ type: 'startSession' }],
+      );
+    });
+
+    it('dispatches request and receive on success', () => {
+      mock
+        .onPost(state.session.retryPath, { branch: rootState.currentBranchId, format: 'json' })
+        .reply(200, TEST_SESSION);
+
+      return testAction(
+        actions.restartSession,
+        null,
+        { ...state, ...rootState },
+        [],
+        [
+          { type: 'requestStartSession' },
+          { type: 'receiveStartSessionSuccess', payload: TEST_SESSION },
+        ],
+      );
+    });
+
+    it('dispatches request and receive on error', () => {
+      mock
+        .onPost(state.session.retryPath, { branch: rootState.currentBranchId, format: 'json' })
+        .reply(400);
+
+      return testAction(
+        actions.restartSession,
+        null,
+        { ...state, ...rootState },
+        [],
+        [
+          { type: 'requestStartSession' },
+          { type: 'receiveStartSessionError', payload: expect.any(Error) },
+        ],
+      );
+    });
+
+    [httpStatus.NOT_FOUND, httpStatus.UNPROCESSABLE_ENTITY].forEach(status => {
+      it(`dispatches request and startSession on ${status}`, () => {
+        mock
+          .onPost(state.session.retryPath, { branch: rootState.currentBranchId, format: 'json' })
+          .reply(status);
+
+        return testAction(
+          actions.restartSession,
+          null,
+          { ...state, ...rootState },
+          [],
+          [{ type: 'requestStartSession' }, { type: 'startSession' }],
+        );
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js
new file mode 100644
index 00000000000..7909f828124
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js
@@ -0,0 +1,169 @@
+import MockAdapter from 'axios-mock-adapter';
+import testAction from 'helpers/vuex_action_helper';
+import { PENDING, RUNNING, STOPPING, STOPPED } from '~/ide/stores/modules/terminal/constants';
+import * as messages from '~/ide/stores/modules/terminal/messages';
+import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types';
+import * as actions from '~/ide/stores/modules/terminal/actions/session_status';
+import axios from '~/lib/utils/axios_utils';
+import createFlash from '~/flash';
+
+jest.mock('~/flash');
+
+const TEST_SESSION = {
+  id: 7,
+  status: PENDING,
+  show_path: 'path/show',
+  cancel_path: 'path/cancel',
+  retry_path: 'path/retry',
+  terminal_path: 'path/terminal',
+};
+
+describe('IDE store terminal session controls actions', () => {
+  let mock;
+  let dispatch;
+  let commit;
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+    dispatch = jest.fn().mockName('dispatch');
+    commit = jest.fn().mockName('commit');
+  });
+
+  afterEach(() => {
+    mock.restore();
+  });
+
+  describe('pollSessionStatus', () => {
+    it('starts interval to poll status', () => {
+      return testAction(
+        actions.pollSessionStatus,
+        null,
+        {},
+        [{ type: mutationTypes.SET_SESSION_STATUS_INTERVAL, payload: expect.any(Number) }],
+        [{ type: 'stopPollingSessionStatus' }, { type: 'fetchSessionStatus' }],
+      );
+    });
+
+    it('on interval, stops polling if no session', () => {
+      const state = {
+        session: null,
+      };
+
+      actions.pollSessionStatus({ state, dispatch, commit });
+      dispatch.mockClear();
+
+      jest.advanceTimersByTime(5001);
+
+      expect(dispatch).toHaveBeenCalledWith('stopPollingSessionStatus');
+    });
+
+    it('on interval, fetches status', () => {
+      const state = {
+        session: TEST_SESSION,
+      };
+
+      actions.pollSessionStatus({ state, dispatch, commit });
+      dispatch.mockClear();
+
+      jest.advanceTimersByTime(5001);
+
+      expect(dispatch).toHaveBeenCalledWith('fetchSessionStatus');
+    });
+  });
+
+  describe('stopPollingSessionStatus', () => {
+    it('does nothing if sessionStatusInterval is empty', () => {
+      return testAction(actions.stopPollingSessionStatus, null, {}, [], []);
+    });
+
+    it('clears interval', () => {
+      return testAction(
+        actions.stopPollingSessionStatus,
+        null,
+        { sessionStatusInterval: 7 },
+        [{ type: mutationTypes.SET_SESSION_STATUS_INTERVAL, payload: 0 }],
+        [],
+      );
+    });
+  });
+
+  describe('receiveSessionStatusSuccess', () => {
+    it('sets session status', () => {
+      return testAction(
+        actions.receiveSessionStatusSuccess,
+        { status: RUNNING },
+        {},
+        [{ type: mutationTypes.SET_SESSION_STATUS, payload: RUNNING }],
+        [],
+      );
+    });
+
+    [STOPPING, STOPPED, 'unexpected'].forEach(status => {
+      it(`kills session if status is ${status}`, () => {
+        return testAction(
+          actions.receiveSessionStatusSuccess,
+          { status },
+          {},
+          [{ type: mutationTypes.SET_SESSION_STATUS, payload: status }],
+          [{ type: 'killSession' }],
+        );
+      });
+    });
+  });
+
+  describe('receiveSessionStatusError', () => {
+    it('flashes message', () => {
+      actions.receiveSessionStatusError({ dispatch });
+
+      expect(createFlash).toHaveBeenCalledWith(messages.UNEXPECTED_ERROR_STATUS);
+    });
+
+    it('kills the session', () => {
+      return testAction(actions.receiveSessionStatusError, null, {}, [], [{ type: 'killSession' }]);
+    });
+  });
+
+  describe('fetchSessionStatus', () => {
+    let state;
+
+    beforeEach(() => {
+      state = {
+        session: {
+          showPath: TEST_SESSION.show_path,
+        },
+      };
+    });
+
+    it('does nothing if session is falsey', () => {
+      state.session = null;
+
+      actions.fetchSessionStatus({ dispatch, state });
+
+      expect(dispatch).not.toHaveBeenCalled();
+    });
+
+    it('dispatches success on success', () => {
+      mock.onGet(state.session.showPath).reply(200, TEST_SESSION);
+
+      return testAction(
+        actions.fetchSessionStatus,
+        null,
+        state,
+        [],
+        [{ type: 'receiveSessionStatusSuccess', payload: TEST_SESSION }],
+      );
+    });
+
+    it('dispatches error on error', () => {
+      mock.onGet(state.session.showPath).reply(400);
+
+      return testAction(
+        actions.fetchSessionStatus,
+        null,
+        state,
+        [],
+        [{ type: 'receiveSessionStatusError', payload: expect.any(Error) }],
+      );
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal/actions/setup_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/setup_spec.js
new file mode 100644
index 00000000000..8bf3b58228e
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal/actions/setup_spec.js
@@ -0,0 +1,40 @@
+import testAction from 'helpers/vuex_action_helper';
+import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types';
+import * as actions from '~/ide/stores/modules/terminal/actions/setup';
+
+describe('IDE store terminal setup actions', () => {
+  describe('init', () => {
+    it('dispatches checks', () => {
+      return testAction(
+        actions.init,
+        null,
+        {},
+        [],
+        [{ type: 'fetchConfigCheck' }, { type: 'fetchRunnersCheck' }],
+      );
+    });
+  });
+
+  describe('hideSplash', () => {
+    it('commits HIDE_SPLASH', () => {
+      return testAction(actions.hideSplash, null, {}, [{ type: mutationTypes.HIDE_SPLASH }], []);
+    });
+  });
+
+  describe('setPaths', () => {
+    it('commits SET_PATHS', () => {
+      const paths = {
+        foo: 'bar',
+        lorem: 'ipsum',
+      };
+
+      return testAction(
+        actions.setPaths,
+        paths,
+        {},
+        [{ type: mutationTypes.SET_PATHS, payload: paths }],
+        [],
+      );
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal/getters_spec.js b/spec/frontend/ide/stores/modules/terminal/getters_spec.js
new file mode 100644
index 00000000000..b5d6a4bc746
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal/getters_spec.js
@@ -0,0 +1,50 @@
+import { CHECK_CONFIG, CHECK_RUNNERS } from '~/ide/stores/modules/terminal/constants';
+import * as getters from '~/ide/stores/modules/terminal/getters';
+
+describe('IDE store terminal getters', () => {
+  describe('allCheck', () => {
+    it('is loading if one check is loading', () => {
+      const checks = {
+        [CHECK_CONFIG]: { isLoading: false, isValid: true },
+        [CHECK_RUNNERS]: { isLoading: true },
+      };
+
+      const result = getters.allCheck({ checks });
+
+      expect(result).toEqual({
+        isLoading: true,
+      });
+    });
+
+    it('is invalid if one check is invalid', () => {
+      const message = 'lorem ipsum';
+      const checks = {
+        [CHECK_CONFIG]: { isLoading: false, isValid: false, message },
+        [CHECK_RUNNERS]: { isLoading: false, isValid: true },
+      };
+
+      const result = getters.allCheck({ checks });
+
+      expect(result).toEqual({
+        isLoading: false,
+        isValid: false,
+        message,
+      });
+    });
+
+    it('is valid if all checks are valid', () => {
+      const checks = {
+        [CHECK_CONFIG]: { isLoading: false, isValid: true },
+        [CHECK_RUNNERS]: { isLoading: false, isValid: true },
+      };
+
+      const result = getters.allCheck({ checks });
+
+      expect(result).toEqual({
+        isLoading: false,
+        isValid: true,
+        message: '',
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal/messages_spec.js b/spec/frontend/ide/stores/modules/terminal/messages_spec.js
new file mode 100644
index 00000000000..966158999da
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal/messages_spec.js
@@ -0,0 +1,38 @@
+import { escape } from 'lodash';
+import { TEST_HOST } from 'spec/test_constants';
+import * as messages from '~/ide/stores/modules/terminal/messages';
+import { sprintf } from '~/locale';
+import httpStatus from '~/lib/utils/http_status';
+
+const TEST_HELP_URL = `${TEST_HOST}/help`;
+
+describe('IDE store terminal messages', () => {
+  describe('configCheckError', () => {
+    it('returns job error, with status UNPROCESSABLE_ENTITY', () => {
+      const result = messages.configCheckError(httpStatus.UNPROCESSABLE_ENTITY, TEST_HELP_URL);
+
+      expect(result).toBe(
+        sprintf(
+          messages.ERROR_CONFIG,
+          {
+            helpStart: `<a href="${escape(TEST_HELP_URL)}" target="_blank">`,
+            helpEnd: '</a>',
+          },
+          false,
+        ),
+      );
+    });
+
+    it('returns permission error, with status FORBIDDEN', () => {
+      const result = messages.configCheckError(httpStatus.FORBIDDEN, TEST_HELP_URL);
+
+      expect(result).toBe(messages.ERROR_PERMISSION);
+    });
+
+    it('returns unexpected error, with unexpected status', () => {
+      const result = messages.configCheckError(httpStatus.NOT_FOUND, TEST_HELP_URL);
+
+      expect(result).toBe(messages.UNEXPECTED_ERROR_CONFIG);
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal/mutations_spec.js b/spec/frontend/ide/stores/modules/terminal/mutations_spec.js
new file mode 100644
index 00000000000..e9933bdd7be
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal/mutations_spec.js
@@ -0,0 +1,142 @@
+import {
+  CHECK_CONFIG,
+  CHECK_RUNNERS,
+  RUNNING,
+  STOPPING,
+} from '~/ide/stores/modules/terminal/constants';
+import createState from '~/ide/stores/modules/terminal/state';
+import * as types from '~/ide/stores/modules/terminal/mutation_types';
+import mutations from '~/ide/stores/modules/terminal/mutations';
+
+describe('IDE store terminal mutations', () => {
+  let state;
+
+  beforeEach(() => {
+    state = createState();
+  });
+
+  describe(types.SET_VISIBLE, () => {
+    it('sets isVisible', () => {
+      state.isVisible = false;
+
+      mutations[types.SET_VISIBLE](state, true);
+
+      expect(state.isVisible).toBe(true);
+    });
+  });
+
+  describe(types.HIDE_SPLASH, () => {
+    it('sets isShowSplash', () => {
+      state.isShowSplash = true;
+
+      mutations[types.HIDE_SPLASH](state);
+
+      expect(state.isShowSplash).toBe(false);
+    });
+  });
+
+  describe(types.SET_PATHS, () => {
+    it('sets paths', () => {
+      const paths = {
+        test: 'foo',
+      };
+
+      mutations[types.SET_PATHS](state, paths);
+
+      expect(state.paths).toBe(paths);
+    });
+  });
+
+  describe(types.REQUEST_CHECK, () => {
+    it('sets isLoading for check', () => {
+      const type = CHECK_CONFIG;
+
+      state.checks[type] = {};
+      mutations[types.REQUEST_CHECK](state, type);
+
+      expect(state.checks[type]).toEqual({
+        isLoading: true,
+      });
+    });
+  });
+
+  describe(types.RECEIVE_CHECK_ERROR, () => {
+    it('sets error for check', () => {
+      const type = CHECK_RUNNERS;
+      const message = 'lorem ipsum';
+
+      state.checks[type] = {};
+      mutations[types.RECEIVE_CHECK_ERROR](state, { type, message });
+
+      expect(state.checks[type]).toEqual({
+        isLoading: false,
+        isValid: false,
+        message,
+      });
+    });
+  });
+
+  describe(types.RECEIVE_CHECK_SUCCESS, () => {
+    it('sets success for check', () => {
+      const type = CHECK_CONFIG;
+
+      state.checks[type] = {};
+      mutations[types.RECEIVE_CHECK_SUCCESS](state, type);
+
+      expect(state.checks[type]).toEqual({
+        isLoading: false,
+        isValid: true,
+        message: null,
+      });
+    });
+  });
+
+  describe(types.SET_SESSION, () => {
+    it('sets session', () => {
+      const session = {
+        terminalPath: 'terminal/foo',
+        status: RUNNING,
+      };
+
+      mutations[types.SET_SESSION](state, session);
+
+      expect(state.session).toBe(session);
+    });
+  });
+
+  describe(types.SET_SESSION_STATUS, () => {
+    it('sets session if a session does not exists', () => {
+      const status = RUNNING;
+
+      mutations[types.SET_SESSION_STATUS](state, status);
+
+      expect(state.session).toEqual({
+        status,
+      });
+    });
+
+    it('sets session status', () => {
+      state.session = {
+        terminalPath: 'terminal/foo',
+        status: RUNNING,
+      };
+
+      mutations[types.SET_SESSION_STATUS](state, STOPPING);
+
+      expect(state.session).toEqual({
+        terminalPath: 'terminal/foo',
+        status: STOPPING,
+      });
+    });
+  });
+
+  describe(types.SET_SESSION_STATUS_INTERVAL, () => {
+    it('sets sessionStatusInterval', () => {
+      const val = 7;
+
+      mutations[types.SET_SESSION_STATUS_INTERVAL](state, val);
+
+      expect(state.sessionStatusInterval).toEqual(val);
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js b/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js
new file mode 100644
index 00000000000..ac976300ed0
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js
@@ -0,0 +1,118 @@
+import * as actions from '~/ide/stores/modules/terminal_sync/actions';
+import mirror, { canConnect, SERVICE_NAME } from '~/ide/lib/mirror';
+import * as types from '~/ide/stores/modules/terminal_sync/mutation_types';
+import testAction from 'helpers/vuex_action_helper';
+
+jest.mock('~/ide/lib/mirror');
+
+const TEST_SESSION = {
+  proxyWebsocketPath: 'test/path',
+  services: [SERVICE_NAME],
+};
+
+describe('ide/stores/modules/terminal_sync/actions', () => {
+  let rootState;
+
+  beforeEach(() => {
+    canConnect.mockReturnValue(true);
+    rootState = {
+      changedFiles: [],
+      terminal: {},
+    };
+  });
+
+  describe('upload', () => {
+    it('uploads to mirror and sets success', done => {
+      mirror.upload.mockReturnValue(Promise.resolve());
+
+      testAction(
+        actions.upload,
+        null,
+        rootState,
+        [{ type: types.START_LOADING }, { type: types.SET_SUCCESS }],
+        [],
+        () => {
+          expect(mirror.upload).toHaveBeenCalledWith(rootState);
+          done();
+        },
+      );
+    });
+
+    it('sets error when failed', done => {
+      const err = { message: 'it failed!' };
+      mirror.upload.mockReturnValue(Promise.reject(err));
+
+      testAction(
+        actions.upload,
+        null,
+        rootState,
+        [{ type: types.START_LOADING }, { type: types.SET_ERROR, payload: err }],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('stop', () => {
+    it('disconnects from mirror', done => {
+      testAction(actions.stop, null, rootState, [{ type: types.STOP }], [], () => {
+        expect(mirror.disconnect).toHaveBeenCalled();
+        done();
+      });
+    });
+  });
+
+  describe('start', () => {
+    it.each`
+      session                                | canConnectMock | description
+      ${null}                                | ${true}        | ${'does not exist'}
+      ${{}}                                  | ${true}        | ${'does not have proxyWebsocketPath'}
+      ${{ proxyWebsocketPath: 'test/path' }} | ${false}       | ${'can not connect service'}
+    `('rejects if session $description', ({ session, canConnectMock }) => {
+      canConnect.mockReturnValue(canConnectMock);
+
+      const result = actions.start({ rootState: { terminal: { session } } });
+
+      return expect(result).rejects.toBe(undefined);
+    });
+
+    describe('with terminal session in state', () => {
+      beforeEach(() => {
+        rootState = {
+          terminal: { session: TEST_SESSION },
+        };
+      });
+
+      it('connects to mirror and sets success', done => {
+        mirror.connect.mockReturnValue(Promise.resolve());
+
+        testAction(
+          actions.start,
+          null,
+          rootState,
+          [{ type: types.START_LOADING }, { type: types.SET_SUCCESS }],
+          [],
+          () => {
+            expect(mirror.connect).toHaveBeenCalledWith(TEST_SESSION.proxyWebsocketPath);
+            done();
+          },
+        );
+      });
+
+      it('sets error if connection fails', () => {
+        const commit = jest.fn();
+        const err = new Error('test');
+        mirror.connect.mockReturnValue(Promise.reject(err));
+
+        const result = actions.start({ rootState, commit });
+
+        return Promise.all([
+          expect(result).rejects.toEqual(err),
+          result.catch(() => {
+            expect(commit).toHaveBeenCalledWith(types.SET_ERROR, err);
+          }),
+        ]);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/modules/terminal_sync/mutations_spec.js b/spec/frontend/ide/stores/modules/terminal_sync/mutations_spec.js
new file mode 100644
index 00000000000..ecf35d60e96
--- /dev/null
+++ b/spec/frontend/ide/stores/modules/terminal_sync/mutations_spec.js
@@ -0,0 +1,89 @@
+import createState from '~/ide/stores/modules/terminal_sync/state';
+import * as types from '~/ide/stores/modules/terminal_sync/mutation_types';
+import mutations from '~/ide/stores/modules/terminal_sync/mutations';
+
+const TEST_MESSAGE = 'lorem ipsum dolar sit';
+
+describe('ide/stores/modules/terminal_sync/mutations', () => {
+  let state;
+
+  beforeEach(() => {
+    state = createState();
+  });
+
+  describe(types.START_LOADING, () => {
+    it('sets isLoading and resets error', () => {
+      Object.assign(state, {
+        isLoading: false,
+        isError: true,
+      });
+
+      mutations[types.START_LOADING](state);
+
+      expect(state).toEqual(
+        expect.objectContaining({
+          isLoading: true,
+          isError: false,
+        }),
+      );
+    });
+  });
+
+  describe(types.SET_ERROR, () => {
+    it('sets isLoading and error message', () => {
+      Object.assign(state, {
+        isLoading: true,
+        isError: false,
+        message: '',
+      });
+
+      mutations[types.SET_ERROR](state, { message: TEST_MESSAGE });
+
+      expect(state).toEqual(
+        expect.objectContaining({
+          isLoading: false,
+          isError: true,
+          message: TEST_MESSAGE,
+        }),
+      );
+    });
+  });
+
+  describe(types.SET_SUCCESS, () => {
+    it('sets isLoading and resets error and is started', () => {
+      Object.assign(state, {
+        isLoading: true,
+        isError: true,
+        isStarted: false,
+      });
+
+      mutations[types.SET_SUCCESS](state);
+
+      expect(state).toEqual(
+        expect.objectContaining({
+          isLoading: false,
+          isError: false,
+          isStarted: true,
+        }),
+      );
+    });
+  });
+
+  describe(types.STOP, () => {
+    it('sets stop values', () => {
+      Object.assign(state, {
+        isLoading: true,
+        isStarted: true,
+      });
+
+      mutations[types.STOP](state);
+
+      expect(state).toEqual(
+        expect.objectContaining({
+          isLoading: false,
+          isStarted: false,
+        }),
+      );
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/mutations/file_spec.js b/spec/frontend/ide/stores/mutations/file_spec.js
index 9b96b910fcb..ff904bbc9cd 100644
--- a/spec/frontend/ide/stores/mutations/file_spec.js
+++ b/spec/frontend/ide/stores/mutations/file_spec.js
@@ -60,22 +60,14 @@ describe('IDE store file mutations', () => {
     it('sets extra file data', () => {
       mutations.SET_FILE_DATA(localState, {
         data: {
-          blame_path: 'blame',
-          commits_path: 'commits',
-          permalink: 'permalink',
           raw_path: 'raw',
           binary: true,
-          render_error: 'render_error',
         },
         file: localFile,
       });
 
-      expect(localFile.blamePath).toBe('blame');
-      expect(localFile.commitsPath).toBe('commits');
-      expect(localFile.permalink).toBe('permalink');
       expect(localFile.rawPath).toBe('raw');
       expect(localFile.binary).toBeTruthy();
-      expect(localFile.renderError).toBe('render_error');
       expect(localFile.raw).toBeNull();
       expect(localFile.baseRaw).toBeNull();
     });
@@ -356,14 +348,6 @@ describe('IDE store file mutations', () => {
 
       expect(localState.changedFiles.length).toBe(1);
     });
-
-    it('bursts unused seal', () => {
-      expect(localState.unusedSeal).toBe(true);
-
-      mutations.ADD_FILE_TO_CHANGED(localState, localFile.path);
-
-      expect(localState.unusedSeal).toBe(false);
-    });
   });
 
   describe('REMOVE_FILE_FROM_CHANGED', () => {
@@ -374,14 +358,6 @@ describe('IDE store file mutations', () => {
 
       expect(localState.changedFiles.length).toBe(0);
     });
-
-    it('bursts unused seal', () => {
-      expect(localState.unusedSeal).toBe(true);
-
-      mutations.REMOVE_FILE_FROM_CHANGED(localState, localFile.path);
-
-      expect(localState.unusedSeal).toBe(false);
-    });
   });
 
   describe.each`
@@ -533,19 +509,6 @@ describe('IDE store file mutations', () => {
     },
   );
 
-  describe('STAGE_CHANGE', () => {
-    it('bursts unused seal', () => {
-      expect(localState.unusedSeal).toBe(true);
-
-      mutations.STAGE_CHANGE(localState, {
-        path: localFile.path,
-        diffInfo: localStore.getters.getDiffInfo(localFile.path),
-      });
-
-      expect(localState.unusedSeal).toBe(false);
-    });
-  });
-
   describe('TOGGLE_FILE_CHANGED', () => {
     it('updates file changed status', () => {
       mutations.TOGGLE_FILE_CHANGED(localState, {
diff --git a/spec/frontend/ide/stores/mutations_spec.js b/spec/frontend/ide/stores/mutations_spec.js
index 2eca9acb8d8..1b29648fb8b 100644
--- a/spec/frontend/ide/stores/mutations_spec.js
+++ b/spec/frontend/ide/stores/mutations_spec.js
@@ -120,24 +120,6 @@ describe('Multi-file store mutations', () => {
       expect(localState.trees['gitlab-ce/master'].tree.length).toEqual(1);
       expect(localState.entries.test.tempFile).toEqual(true);
     });
-
-    it('marks entry as replacing previous entry if the old one has been deleted', () => {
-      const tmpFile = file('test');
-      localState.entries.test = { ...tmpFile, deleted: true };
-      mutations.CREATE_TMP_ENTRY(localState, {
-        data: {
-          entries: {
-            test: { ...tmpFile, tempFile: true, changed: true },
-          },
-          treeList: [tmpFile],
-        },
-        projectId: 'gitlab-ce',
-        branchId: 'master',
-      });
-
-      expect(localState.trees['gitlab-ce/master'].tree.length).toEqual(1);
-      expect(localState.entries.test.replaces).toEqual(true);
-    });
   });
 
   describe('UPDATE_TEMP_FLAG', () => {
@@ -265,16 +247,6 @@ describe('Multi-file store mutations', () => {
       expect(localState.changedFiles).toEqual([]);
       expect(localState.stagedFiles).toEqual([]);
     });
-
-    it('bursts unused seal', () => {
-      localState.entries.test = file('test');
-
-      expect(localState.unusedSeal).toBe(true);
-
-      mutations.DELETE_ENTRY(localState, 'test');
-
-      expect(localState.unusedSeal).toBe(false);
-    });
   });
 
   describe('UPDATE_FILE_AFTER_COMMIT', () => {
@@ -283,10 +255,6 @@ describe('Multi-file store mutations', () => {
         ...file('test'),
         prevPath: 'testing-123',
         rawPath: `${TEST_HOST}/testing-123`,
-        permalink: `${TEST_HOST}/testing-123`,
-        commitsPath: `${TEST_HOST}/testing-123`,
-        blamePath: `${TEST_HOST}/testing-123`,
-        replaces: true,
       };
       localState.entries.test = f;
       localState.changedFiles.push(f);
@@ -301,10 +269,6 @@ describe('Multi-file store mutations', () => {
       expect(f).toEqual(
         expect.objectContaining({
           rawPath: `${TEST_HOST}/test`,
-          permalink: `${TEST_HOST}/test`,
-          commitsPath: `${TEST_HOST}/test`,
-          blamePath: `${TEST_HOST}/test`,
-          replaces: false,
           prevId: undefined,
           prevPath: undefined,
           prevName: undefined,
diff --git a/spec/frontend/ide/stores/plugins/terminal_spec.js b/spec/frontend/ide/stores/plugins/terminal_spec.js
new file mode 100644
index 00000000000..948c2131fd8
--- /dev/null
+++ b/spec/frontend/ide/stores/plugins/terminal_spec.js
@@ -0,0 +1,58 @@
+import { createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import { TEST_HOST } from 'helpers/test_constants';
+import terminalModule from '~/ide/stores/modules/terminal';
+import createTerminalPlugin from '~/ide/stores/plugins/terminal';
+import { SET_BRANCH_WORKING_REFERENCE } from '~/ide/stores/mutation_types';
+
+const TEST_DATASET = {
+  eeWebTerminalSvgPath: `${TEST_HOST}/web/terminal/svg`,
+  eeWebTerminalHelpPath: `${TEST_HOST}/web/terminal/help`,
+  eeWebTerminalConfigHelpPath: `${TEST_HOST}/web/terminal/config/help`,
+  eeWebTerminalRunnersHelpPath: `${TEST_HOST}/web/terminal/runners/help`,
+};
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('ide/stores/extend', () => {
+  let store;
+
+  beforeEach(() => {
+    const el = document.createElement('div');
+    Object.assign(el.dataset, TEST_DATASET);
+
+    store = new Vuex.Store({
+      mutations: {
+        [SET_BRANCH_WORKING_REFERENCE]: () => {},
+      },
+    });
+
+    jest.spyOn(store, 'registerModule').mockImplementation();
+    jest.spyOn(store, 'dispatch').mockImplementation();
+
+    const plugin = createTerminalPlugin(el);
+
+    plugin(store);
+  });
+
+  it('registers terminal module', () => {
+    expect(store.registerModule).toHaveBeenCalledWith('terminal', terminalModule());
+  });
+
+  it('dispatches terminal/setPaths', () => {
+    expect(store.dispatch).toHaveBeenCalledWith('terminal/setPaths', {
+      webTerminalSvgPath: TEST_DATASET.eeWebTerminalSvgPath,
+      webTerminalHelpPath: TEST_DATASET.eeWebTerminalHelpPath,
+      webTerminalConfigHelpPath: TEST_DATASET.eeWebTerminalConfigHelpPath,
+      webTerminalRunnersHelpPath: TEST_DATASET.eeWebTerminalRunnersHelpPath,
+    });
+  });
+
+  it(`dispatches terminal/init on ${SET_BRANCH_WORKING_REFERENCE}`, () => {
+    store.dispatch.mockReset();
+
+    store.commit(SET_BRANCH_WORKING_REFERENCE);
+
+    expect(store.dispatch).toHaveBeenCalledWith('terminal/init');
+  });
+});
diff --git a/spec/frontend/ide/stores/plugins/terminal_sync_spec.js b/spec/frontend/ide/stores/plugins/terminal_sync_spec.js
new file mode 100644
index 00000000000..2aa3e770e7d
--- /dev/null
+++ b/spec/frontend/ide/stores/plugins/terminal_sync_spec.js
@@ -0,0 +1,72 @@
+import createTerminalPlugin from '~/ide/stores/plugins/terminal';
+import createTerminalSyncPlugin from '~/ide/stores/plugins/terminal_sync';
+import { SET_SESSION_STATUS } from '~/ide/stores/modules/terminal/mutation_types';
+import { RUNNING, STOPPING } from '~/ide/stores/modules/terminal/constants';
+import { createStore } from '~/ide/stores';
+import eventHub from '~/ide/eventhub';
+
+jest.mock('~/ide/lib/mirror');
+
+const ACTION_START = 'terminalSync/start';
+const ACTION_STOP = 'terminalSync/stop';
+const ACTION_UPLOAD = 'terminalSync/upload';
+const FILES_CHANGE_EVENT = 'ide.files.change';
+
+describe('IDE stores/plugins/mirror', () => {
+  let store;
+
+  beforeEach(() => {
+    const root = document.createElement('div');
+
+    store = createStore();
+    createTerminalPlugin(root)(store);
+
+    store.dispatch = jest.fn(() => Promise.resolve());
+
+    createTerminalSyncPlugin(root)(store);
+  });
+
+  it('does nothing on ide.files.change event', () => {
+    eventHub.$emit(FILES_CHANGE_EVENT);
+
+    expect(store.dispatch).not.toHaveBeenCalled();
+  });
+
+  describe('when session starts running', () => {
+    beforeEach(() => {
+      store.commit(`terminal/${SET_SESSION_STATUS}`, RUNNING);
+    });
+
+    it('starts', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(ACTION_START);
+    });
+
+    it('uploads when ide.files.change is emitted', () => {
+      expect(store.dispatch).not.toHaveBeenCalledWith(ACTION_UPLOAD);
+
+      eventHub.$emit(FILES_CHANGE_EVENT);
+
+      jest.runAllTimers();
+
+      expect(store.dispatch).toHaveBeenCalledWith(ACTION_UPLOAD);
+    });
+
+    describe('when session stops', () => {
+      beforeEach(() => {
+        store.commit(`terminal/${SET_SESSION_STATUS}`, STOPPING);
+      });
+
+      it('stops', () => {
+        expect(store.dispatch).toHaveBeenCalledWith(ACTION_STOP);
+      });
+
+      it('does not upload anymore', () => {
+        eventHub.$emit(FILES_CHANGE_EVENT);
+
+        jest.runAllTimers();
+
+        expect(store.dispatch).not.toHaveBeenCalledWith(ACTION_UPLOAD);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/stores/utils_spec.js b/spec/frontend/ide/stores/utils_spec.js
index b87f6c1f05a..d1eb4304c79 100644
--- a/spec/frontend/ide/stores/utils_spec.js
+++ b/spec/frontend/ide/stores/utils_spec.js
@@ -28,61 +28,6 @@ describe('Multi-file store utils', () => {
     });
   });
 
-  describe('findIndexOfFile', () => {
-    let localState;
-
-    beforeEach(() => {
-      localState = [
-        {
-          path: '1',
-        },
-        {
-          path: '2',
-        },
-      ];
-    });
-
-    it('finds in the index of an entry by path', () => {
-      const index = utils.findIndexOfFile(localState, {
-        path: '2',
-      });
-
-      expect(index).toBe(1);
-    });
-  });
-
-  describe('findEntry', () => {
-    let localState;
-
-    beforeEach(() => {
-      localState = {
-        tree: [
-          {
-            type: 'tree',
-            name: 'test',
-          },
-          {
-            type: 'blob',
-            name: 'file',
-          },
-        ],
-      };
-    });
-
-    it('returns an entry found by name', () => {
-      const foundEntry = utils.findEntry(localState.tree, 'tree', 'test');
-
-      expect(foundEntry.type).toBe('tree');
-      expect(foundEntry.name).toBe('test');
-    });
-
-    it('returns undefined when no entry found', () => {
-      const foundEntry = utils.findEntry(localState.tree, 'blob', 'test');
-
-      expect(foundEntry).toBeUndefined();
-    });
-  });
-
   describe('createCommitPayload', () => {
     it('returns API payload', () => {
       const state = {
@@ -101,12 +46,11 @@ describe('Multi-file store utils', () => {
             path: 'added',
             tempFile: true,
             content: 'new file content',
-            base64: true,
+            rawPath: 'data:image/png;base64,abc',
             lastCommitSha: '123456789',
           },
           { ...file('deletedFile'), path: 'deletedFile', deleted: true },
           { ...file('renamedFile'), path: 'renamedFile', prevPath: 'prevPath' },
-          { ...file('replacingFile'), path: 'replacingFile', replaces: true },
         ],
         currentBranchId: 'master',
       };
@@ -154,14 +98,6 @@ describe('Multi-file store utils', () => {
             last_commit_id: undefined,
             previous_path: 'prevPath',
           },
-          {
-            action: commitActionTypes.update,
-            file_path: 'replacingFile',
-            content: undefined,
-            encoding: 'text',
-            last_commit_id: undefined,
-            previous_path: undefined,
-          },
         ],
         start_sha: undefined,
       });
@@ -181,7 +117,7 @@ describe('Multi-file store utils', () => {
             path: 'added',
             tempFile: true,
             content: 'new file content',
-            base64: true,
+            rawPath: 'data:image/png;base64,abc',
             lastCommitSha: '123456789',
           },
         ],
@@ -661,31 +597,6 @@ describe('Multi-file store utils', () => {
     });
   });
 
-  describe('addFinalNewlineIfNeeded', () => {
-    it('adds a newline if it doesnt already exist', () => {
-      [
-        {
-          input: 'some text',
-          output: 'some text\n',
-        },
-        {
-          input: 'some text\n',
-          output: 'some text\n',
-        },
-        {
-          input: 'some text\n\n',
-          output: 'some text\n\n',
-        },
-        {
-          input: 'some\n text',
-          output: 'some\n text\n',
-        },
-      ].forEach(({ input, output }) => {
-        expect(utils.addFinalNewlineIfNeeded(input)).toEqual(output);
-      });
-    });
-  });
-
   describe('extractMarkdownImagesFromEntries', () => {
     let mdFile;
     let entries;
diff --git a/spec/frontend/ide/sync_router_and_store_spec.js b/spec/frontend/ide/sync_router_and_store_spec.js
new file mode 100644
index 00000000000..c4ce92b99cc
--- /dev/null
+++ b/spec/frontend/ide/sync_router_and_store_spec.js
@@ -0,0 +1,150 @@
+import VueRouter from 'vue-router';
+import { createStore } from '~/ide/stores';
+import { syncRouterAndStore } from '~/ide/sync_router_and_store';
+import waitForPromises from 'helpers/wait_for_promises';
+
+const TEST_ROUTE = '/test/lorem/ipsum';
+
+describe('~/ide/sync_router_and_store', () => {
+  let unsync;
+  let router;
+  let store;
+  let onRouterChange;
+
+  const createSync = () => {
+    unsync = syncRouterAndStore(router, store);
+  };
+
+  const getRouterCurrentPath = () => router.currentRoute.fullPath;
+  const getStoreCurrentPath = () => store.state.router.fullPath;
+  const updateRouter = path => {
+    router.push(path);
+    return waitForPromises();
+  };
+  const updateStore = path => {
+    store.dispatch('router/push', path);
+    return waitForPromises();
+  };
+
+  beforeEach(() => {
+    router = new VueRouter();
+    store = createStore();
+    jest.spyOn(store, 'dispatch');
+
+    onRouterChange = jest.fn();
+    router.beforeEach((to, from, next) => {
+      onRouterChange(to, from);
+      next();
+    });
+  });
+
+  afterEach(() => {
+    unsync();
+    unsync = null;
+  });
+
+  it('keeps store and router in sync', async () => {
+    createSync();
+
+    await updateRouter('/test/test');
+    await updateRouter('/test/test');
+    await updateStore('123/abc');
+    await updateRouter('def');
+
+    // Even though we pused relative paths, the store and router kept track of the resulting fullPath
+    expect(getRouterCurrentPath()).toBe('/test/123/def');
+    expect(getStoreCurrentPath()).toBe('/test/123/def');
+  });
+
+  describe('default', () => {
+    beforeEach(() => {
+      createSync();
+    });
+
+    it('store is default', () => {
+      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(getStoreCurrentPath()).toBe('');
+    });
+
+    it('router is default', () => {
+      expect(onRouterChange).not.toHaveBeenCalled();
+      expect(getRouterCurrentPath()).toBe('/');
+    });
+
+    describe('when store changes', () => {
+      beforeEach(() => {
+        updateStore(TEST_ROUTE);
+      });
+
+      it('store is updated', () => {
+        // let's make sure the action isn't dispatched more than necessary
+        expect(store.dispatch).toHaveBeenCalledTimes(1);
+        expect(getStoreCurrentPath()).toBe(TEST_ROUTE);
+      });
+
+      it('router is updated', () => {
+        expect(onRouterChange).toHaveBeenCalledTimes(1);
+        expect(getRouterCurrentPath()).toBe(TEST_ROUTE);
+      });
+
+      describe('when store changes again to the same thing', () => {
+        beforeEach(() => {
+          onRouterChange.mockClear();
+          updateStore(TEST_ROUTE);
+        });
+
+        it('doesnt change router again', () => {
+          expect(onRouterChange).not.toHaveBeenCalled();
+        });
+      });
+    });
+
+    describe('when router changes', () => {
+      beforeEach(() => {
+        updateRouter(TEST_ROUTE);
+      });
+
+      it('store is updated', () => {
+        expect(store.dispatch).toHaveBeenCalledTimes(1);
+        expect(getStoreCurrentPath()).toBe(TEST_ROUTE);
+      });
+
+      it('router is updated', () => {
+        // let's make sure the router change isn't triggered more than necessary
+        expect(onRouterChange).toHaveBeenCalledTimes(1);
+        expect(getRouterCurrentPath()).toBe(TEST_ROUTE);
+      });
+
+      describe('when router changes again to the same thing', () => {
+        beforeEach(() => {
+          store.dispatch.mockClear();
+          updateRouter(TEST_ROUTE);
+        });
+
+        it('doesnt change store again', () => {
+          expect(store.dispatch).not.toHaveBeenCalled();
+        });
+      });
+    });
+
+    describe('when disposed', () => {
+      beforeEach(() => {
+        unsync();
+      });
+
+      it('a store change does not trigger a router change', () => {
+        updateStore(TEST_ROUTE);
+
+        expect(getRouterCurrentPath()).toBe('/');
+        expect(onRouterChange).not.toHaveBeenCalled();
+      });
+
+      it('a router change does not trigger a store change', () => {
+        updateRouter(TEST_ROUTE);
+
+        expect(getStoreCurrentPath()).toBe('');
+        expect(store.dispatch).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/spec/frontend/ide/utils_spec.js b/spec/frontend/ide/utils_spec.js
index ea975500e8d..15baeca7f36 100644
--- a/spec/frontend/ide/utils_spec.js
+++ b/spec/frontend/ide/utils_spec.js
@@ -1,6 +1,13 @@
-import { commitItemIconMap } from '~/ide/constants';
-import { getCommitIconMap, isTextFile, registerLanguages, trimPathComponents } from '~/ide/utils';
-import { decorateData } from '~/ide/stores/utils';
+import {
+  isTextFile,
+  registerLanguages,
+  trimPathComponents,
+  insertFinalNewline,
+  trimTrailingWhitespace,
+  getPathParents,
+  getPathParent,
+  readFileAsDataURL,
+} from '~/ide/utils';
 import { languages } from 'monaco-editor';
 
 describe('WebIDE utils', () => {
@@ -62,48 +69,6 @@ describe('WebIDE utils', () => {
     });
   });
 
-  const createFile = (name = 'name', id = name, type = '', parent = null) =>
-    decorateData({
-      id,
-      type,
-      icon: 'icon',
-      url: 'url',
-      name,
-      path: parent ? `${parent.path}/${name}` : name,
-      parentPath: parent ? parent.path : '',
-      lastCommit: {},
-    });
-
-  describe('getCommitIconMap', () => {
-    let entry;
-
-    beforeEach(() => {
-      entry = createFile('Entry item');
-    });
-
-    it('renders "deleted" icon for deleted entries', () => {
-      entry.deleted = true;
-      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.deleted);
-    });
-
-    it('renders "addition" icon for temp entries', () => {
-      entry.tempFile = true;
-      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.addition);
-    });
-
-    it('renders "modified" icon for newly-renamed entries', () => {
-      entry.prevPath = 'foo/bar';
-      entry.tempFile = false;
-      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.modified);
-    });
-
-    it('renders "modified" icon even for temp entries if they are newly-renamed', () => {
-      entry.prevPath = 'foo/bar';
-      entry.tempFile = true;
-      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.modified);
-    });
-  });
-
   describe('trimPathComponents', () => {
     it.each`
       input                           | output
@@ -192,4 +157,86 @@ describe('WebIDE utils', () => {
       ]);
     });
   });
+
+  describe('trimTrailingWhitespace', () => {
+    it.each`
+      input                                                            | output
+      ${'text     \n   more text   \n'}                                | ${'text\n   more text\n'}
+      ${'text     \n   more text   \n\n   \n'}                         | ${'text\n   more text\n\n\n'}
+      ${'text  \t\t   \n   more text   \n\t\ttext\n   \n\t\t'}         | ${'text\n   more text\n\t\ttext\n\n'}
+      ${'text     \r\n   more text   \r\n'}                            | ${'text\r\n   more text\r\n'}
+      ${'text     \r\n   more text   \r\n\r\n   \r\n'}                 | ${'text\r\n   more text\r\n\r\n\r\n'}
+      ${'text  \t\t   \r\n   more text   \r\n\t\ttext\r\n   \r\n\t\t'} | ${'text\r\n   more text\r\n\t\ttext\r\n\r\n'}
+    `("trims trailing whitespace in each line of file's contents: $input", ({ input, output }) => {
+      expect(trimTrailingWhitespace(input)).toBe(output);
+    });
+  });
+
+  describe('addFinalNewline', () => {
+    it.each`
+      input              | output
+      ${'some text'}     | ${'some text\n'}
+      ${'some text\n'}   | ${'some text\n'}
+      ${'some text\n\n'} | ${'some text\n\n'}
+      ${'some\n text'}   | ${'some\n text\n'}
+    `('adds a newline if it doesnt already exist for input: $input', ({ input, output }) => {
+      expect(insertFinalNewline(input)).toBe(output);
+    });
+
+    it.each`
+      input                  | output
+      ${'some text'}         | ${'some text\r\n'}
+      ${'some text\r\n'}     | ${'some text\r\n'}
+      ${'some text\n'}       | ${'some text\n\r\n'}
+      ${'some text\r\n\r\n'} | ${'some text\r\n\r\n'}
+      ${'some\r\n text'}     | ${'some\r\n text\r\n'}
+    `('works with CRLF newline style; input: $input', ({ input, output }) => {
+      expect(insertFinalNewline(input, '\r\n')).toBe(output);
+    });
+  });
+
+  describe('getPathParents', () => {
+    it.each`
+      path                                  | parents
+      ${'foo/bar/baz/index.md'}             | ${['foo/bar/baz', 'foo/bar', 'foo']}
+      ${'foo/bar/baz'}                      | ${['foo/bar', 'foo']}
+      ${'index.md'}                         | ${[]}
+      ${'path with/spaces to/something.md'} | ${['path with/spaces to', 'path with']}
+    `('gets all parent directory names for path: $path', ({ path, parents }) => {
+      expect(getPathParents(path)).toEqual(parents);
+    });
+
+    it.each`
+      path                      | depth | parents
+      ${'foo/bar/baz/index.md'} | ${0}  | ${[]}
+      ${'foo/bar/baz/index.md'} | ${1}  | ${['foo/bar/baz']}
+      ${'foo/bar/baz/index.md'} | ${2}  | ${['foo/bar/baz', 'foo/bar']}
+      ${'foo/bar/baz/index.md'} | ${3}  | ${['foo/bar/baz', 'foo/bar', 'foo']}
+      ${'foo/bar/baz/index.md'} | ${4}  | ${['foo/bar/baz', 'foo/bar', 'foo']}
+    `('gets only the immediate $depth parents if when depth=$depth', ({ path, depth, parents }) => {
+      expect(getPathParents(path, depth)).toEqual(parents);
+    });
+  });
+
+  describe('getPathParent', () => {
+    it.each`
+      path                                  | parents
+      ${'foo/bar/baz/index.md'}             | ${'foo/bar/baz'}
+      ${'foo/bar/baz'}                      | ${'foo/bar'}
+      ${'index.md'}                         | ${undefined}
+      ${'path with/spaces to/something.md'} | ${'path with/spaces to'}
+    `('gets the immediate parent for path: $path', ({ path, parents }) => {
+      expect(getPathParent(path)).toEqual(parents);
+    });
+  });
+
+  describe('readFileAsDataURL', () => {
+    it('reads a file and returns its output as a data url', () => {
+      const file = new File(['foo'], 'foo.png', { type: 'image/png' });
+
+      return readFileAsDataURL(file).then(contents => {
+        expect(contents).toBe('data:image/png;base64,Zm9v');
+      });
+    });
+  });
 });
diff --git a/spec/frontend/import_projects/components/bitbucket_status_table_spec.js b/spec/frontend/import_projects/components/bitbucket_status_table_spec.js
new file mode 100644
index 00000000000..132ccd0e324
--- /dev/null
+++ b/spec/frontend/import_projects/components/bitbucket_status_table_spec.js
@@ -0,0 +1,59 @@
+import { nextTick } from 'vue';
+import { shallowMount } from '@vue/test-utils';
+
+import { GlAlert } from '@gitlab/ui';
+import BitbucketStatusTable from '~/import_projects/components/bitbucket_status_table.vue';
+import ImportProjectsTable from '~/import_projects/components/import_projects_table.vue';
+
+const ImportProjectsTableStub = {
+  name: 'ImportProjectsTable',
+  template:
+    '<div><slot name="incompatible-repos-warning"></slot><slot name="actions"></slot></div>',
+};
+
+describe('BitbucketStatusTable', () => {
+  let wrapper;
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
+  });
+
+  function createComponent(propsData, importProjectsTableStub = true, slots) {
+    wrapper = shallowMount(BitbucketStatusTable, {
+      propsData,
+      stubs: {
+        ImportProjectsTable: importProjectsTableStub,
+      },
+      slots,
+    });
+  }
+
+  it('renders import table component', () => {
+    createComponent({ providerTitle: 'Test' });
+    expect(wrapper.contains(ImportProjectsTable)).toBe(true);
+  });
+
+  it('passes alert in incompatible-repos-warning slot', () => {
+    createComponent({ providerTitle: 'Test' }, ImportProjectsTableStub);
+    expect(wrapper.find(GlAlert).exists()).toBe(true);
+  });
+
+  it('passes actions slot to import project table component', () => {
+    const actionsSlotContent = 'DEMO';
+    createComponent({ providerTitle: 'Test' }, ImportProjectsTableStub, {
+      actions: actionsSlotContent,
+    });
+    expect(wrapper.find(ImportProjectsTable).text()).toBe(actionsSlotContent);
+  });
+
+  it('dismisses alert when requested', async () => {
+    createComponent({ providerTitle: 'Test' }, ImportProjectsTableStub);
+    wrapper.find(GlAlert).vm.$emit('dismiss');
+    await nextTick();
+
+    expect(wrapper.find(GlAlert).exists()).toBe(false);
+  });
+});
diff --git a/spec/frontend/import_projects/components/import_projects_table_spec.js b/spec/frontend/import_projects/components/import_projects_table_spec.js
index 9491b52c888..419d67e239f 100644
--- a/spec/frontend/import_projects/components/import_projects_table_spec.js
+++ b/spec/frontend/import_projects/components/import_projects_table_spec.js
@@ -1,11 +1,24 @@
+import { nextTick } from 'vue';
 import Vuex from 'vuex';
-import { createLocalVue, mount } from '@vue/test-utils';
-import { state, actions, getters, mutations } from '~/import_projects/store';
-import importProjectsTable from '~/import_projects/components/import_projects_table.vue';
-import STATUS_MAP from '~/import_projects/constants';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { GlLoadingIcon, GlButton } from '@gitlab/ui';
+import { state, getters } from '~/import_projects/store';
+import eventHub from '~/import_projects/event_hub';
+import ImportProjectsTable from '~/import_projects/components/import_projects_table.vue';
+import ImportedProjectTableRow from '~/import_projects/components/imported_project_table_row.vue';
+import ProviderRepoTableRow from '~/import_projects/components/provider_repo_table_row.vue';
+import IncompatibleRepoTableRow from '~/import_projects/components/incompatible_repo_table_row.vue';
+
+jest.mock('~/import_projects/event_hub', () => ({
+  $emit: jest.fn(),
+}));
 
 describe('ImportProjectsTable', () => {
-  let vm;
+  let wrapper;
+
+  const findFilterField = () =>
+    wrapper.find('input[data-qa-selector="githubish_import_filter_field"]');
+
   const providerTitle = 'THE PROVIDER';
   const providerRepo = { id: 10, sanitizedName: 'sanitizedName', fullName: 'fullName' };
   const importedProject = {
@@ -16,176 +29,175 @@ describe('ImportProjectsTable', () => {
     importSource: 'importSource',
   };
 
-  function initStore() {
-    const stubbedActions = {
-      ...actions,
-      fetchJobs: jest.fn(),
-      fetchRepos: jest.fn(actions.requestRepos),
-      fetchImport: jest.fn(actions.requestImport),
-    };
-
-    const store = new Vuex.Store({
-      state: state(),
-      actions: stubbedActions,
-      mutations,
-      getters,
-    });
-
-    return store;
-  }
-
-  function mountComponent() {
+  const findImportAllButton = () =>
+    wrapper
+      .findAll(GlButton)
+      .filter(w => w.props().variant === 'success')
+      .at(0);
+
+  function createComponent({
+    state: initialState,
+    getters: customGetters,
+    slots,
+    filterable,
+  } = {}) {
     const localVue = createLocalVue();
     localVue.use(Vuex);
 
-    const store = initStore();
+    const store = new Vuex.Store({
+      state: { ...state(), ...initialState },
+      getters: {
+        ...getters,
+        ...customGetters,
+      },
+      actions: {
+        fetchRepos: jest.fn(),
+        fetchReposFiltered: jest.fn(),
+        fetchJobs: jest.fn(),
+        stopJobsPolling: jest.fn(),
+        clearJobsEtagPoll: jest.fn(),
+        setFilter: jest.fn(),
+      },
+    });
 
-    const component = mount(importProjectsTable, {
+    wrapper = shallowMount(ImportProjectsTable, {
       localVue,
       store,
       propsData: {
         providerTitle,
+        filterable,
       },
+      slots,
     });
-
-    return component.vm;
   }
 
-  beforeEach(() => {
-    vm = mountComponent();
-  });
-
   afterEach(() => {
-    vm.$destroy();
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
   });
 
-  it('renders a loading icon while repos are loading', () =>
-    vm.$nextTick().then(() => {
-      expect(vm.$el.querySelector('.js-loading-button-icon')).not.toBeNull();
-    }));
-
-  it('renders a table with imported projects and provider repos', () => {
-    vm.$store.dispatch('receiveReposSuccess', {
-      importedProjects: [importedProject],
-      providerRepos: [providerRepo],
-      namespaces: [{ path: 'path' }],
+  it('renders a loading icon while repos are loading', () => {
+    createComponent({
+      state: {
+        isLoadingRepos: true,
+      },
     });
 
-    return vm.$nextTick().then(() => {
-      expect(vm.$el.querySelector('.js-loading-button-icon')).toBeNull();
-      expect(vm.$el.querySelector('.table')).not.toBeNull();
-      expect(vm.$el.querySelector('.import-jobs-from-col').innerText).toMatch(
-        `From ${providerTitle}`,
-      );
-
-      expect(vm.$el.querySelector('.js-imported-project')).not.toBeNull();
-      expect(vm.$el.querySelector('.js-provider-repo')).not.toBeNull();
-    });
+    expect(wrapper.contains(GlLoadingIcon)).toBe(true);
   });
 
-  it('renders an empty state if there are no imported projects or provider repos', () => {
-    vm.$store.dispatch('receiveReposSuccess', {
-      importedProjects: [],
-      providerRepos: [],
-      namespaces: [],
+  it('renders a table with imported projects and provider repos', () => {
+    createComponent({
+      state: {
+        importedProjects: [importedProject],
+        providerRepos: [providerRepo],
+        incompatibleRepos: [{ ...providerRepo, id: 11 }],
+        namespaces: [{ path: 'path' }],
+      },
     });
 
-    return vm.$nextTick().then(() => {
-      expect(vm.$el.querySelector('.js-loading-button-icon')).toBeNull();
-      expect(vm.$el.querySelector('.table')).toBeNull();
-      expect(vm.$el.innerText).toMatch(`No ${providerTitle} repositories found`);
-    });
+    expect(wrapper.contains(GlLoadingIcon)).toBe(false);
+    expect(wrapper.contains('table')).toBe(true);
+    expect(
+      wrapper
+        .findAll('th')
+        .filter(w => w.text() === `From ${providerTitle}`)
+        .isEmpty(),
+    ).toBe(false);
+
+    expect(wrapper.contains(ProviderRepoTableRow)).toBe(true);
+    expect(wrapper.contains(ImportedProjectTableRow)).toBe(true);
+    expect(wrapper.contains(IncompatibleRepoTableRow)).toBe(true);
   });
 
-  it('shows loading spinner when bulk import button is clicked', () => {
-    vm.$store.dispatch('receiveReposSuccess', {
-      importedProjects: [],
-      providerRepos: [providerRepo],
-      namespaces: [{ path: 'path' }],
-    });
-
-    return vm
-      .$nextTick()
-      .then(() => {
-        expect(vm.$el.querySelector('.js-imported-project')).toBeNull();
-        expect(vm.$el.querySelector('.js-provider-repo')).not.toBeNull();
-
-        vm.$el.querySelector('.js-import-all').click();
-      })
-      .then(() => vm.$nextTick())
-      .then(() => {
-        expect(vm.$el.querySelector('.js-import-all .js-loading-button-icon')).not.toBeNull();
+  it.each`
+    hasIncompatibleRepos | buttonText
+    ${false}             | ${'Import all repositories'}
+    ${true}              | ${'Import all compatible repositories'}
+  `(
+    'import all button has "$buttonText" text when hasIncompatibleRepos is $hasIncompatibleRepos',
+    ({ hasIncompatibleRepos, buttonText }) => {
+      createComponent({
+        state: {
+          providerRepos: [providerRepo],
+        },
+        getters: {
+          hasIncompatibleRepos: () => hasIncompatibleRepos,
+        },
       });
-  });
 
-  it('imports provider repos if bulk import button is clicked', () => {
-    mountComponent();
+      expect(findImportAllButton().text()).toBe(buttonText);
+    },
+  );
 
-    vm.$store.dispatch('receiveReposSuccess', {
-      importedProjects: [],
-      providerRepos: [providerRepo],
-      namespaces: [{ path: 'path' }],
+  it('renders an empty state if there are no projects available', () => {
+    createComponent({
+      state: {
+        importedProjects: [],
+        providerRepos: [],
+        incompatibleProjects: [],
+      },
     });
 
-    return vm
-      .$nextTick()
-      .then(() => {
-        expect(vm.$el.querySelector('.js-imported-project')).toBeNull();
-        expect(vm.$el.querySelector('.js-provider-repo')).not.toBeNull();
-
-        vm.$store.dispatch('receiveImportSuccess', { importedProject, repoId: providerRepo.id });
-      })
-      .then(() => vm.$nextTick())
-      .then(() => {
-        expect(vm.$el.querySelector('.js-imported-project')).not.toBeNull();
-        expect(vm.$el.querySelector('.js-provider-repo')).toBeNull();
-      });
+    expect(wrapper.contains(ProviderRepoTableRow)).toBe(false);
+    expect(wrapper.contains(ImportedProjectTableRow)).toBe(false);
+    expect(wrapper.text()).toContain(`No ${providerTitle} repositories found`);
   });
 
-  it('polls to update the status of imported projects', () => {
-    const updatedProjects = [
-      {
-        id: importedProject.id,
-        importStatus: 'finished',
+  it('sends importAll event when import button is clicked', async () => {
+    createComponent({
+      state: {
+        providerRepos: [providerRepo],
       },
-    ];
-
-    vm.$store.dispatch('receiveReposSuccess', {
-      importedProjects: [importedProject],
-      providerRepos: [],
-      namespaces: [{ path: 'path' }],
     });
 
-    return vm
-      .$nextTick()
-      .then(() => {
-        const statusObject = STATUS_MAP[importedProject.importStatus];
+    findImportAllButton().vm.$emit('click');
+    await nextTick();
+    expect(eventHub.$emit).toHaveBeenCalledWith('importAll');
+  });
 
-        expect(vm.$el.querySelector('.js-imported-project')).not.toBeNull();
-        expect(vm.$el.querySelector(`.${statusObject.textClass}`).textContent).toMatch(
-          statusObject.text,
-        );
+  it('shows loading spinner when import is in progress', () => {
+    createComponent({
+      getters: {
+        isImportingAnyRepo: () => true,
+      },
+    });
 
-        expect(vm.$el.querySelector(`.ic-status_${statusObject.icon}`)).not.toBeNull();
+    expect(findImportAllButton().props().loading).toBe(true);
+  });
 
-        vm.$store.dispatch('receiveJobsSuccess', updatedProjects);
-      })
-      .then(() => vm.$nextTick())
-      .then(() => {
-        const statusObject = STATUS_MAP[updatedProjects[0].importStatus];
+  it('renders filtering input field by default', () => {
+    createComponent();
+    expect(findFilterField().exists()).toBe(true);
+  });
 
-        expect(vm.$el.querySelector('.js-imported-project')).not.toBeNull();
-        expect(vm.$el.querySelector(`.${statusObject.textClass}`).textContent).toMatch(
-          statusObject.text,
-        );
+  it('does not render filtering input field when filterable is false', () => {
+    createComponent({ filterable: false });
+    expect(findFilterField().exists()).toBe(false);
+  });
 
-        expect(vm.$el.querySelector(`.ic-status_${statusObject.icon}`)).not.toBeNull();
+  it.each`
+    hasIncompatibleRepos | shouldRenderSlot | action
+    ${false}             | ${false}         | ${'does not render'}
+    ${true}              | ${true}          | ${'render'}
+  `(
+    '$action incompatible-repos-warning slot if hasIncompatibleRepos is $hasIncompatibleRepos',
+    ({ hasIncompatibleRepos, shouldRenderSlot }) => {
+      const INCOMPATIBLE_TEXT = 'INCOMPATIBLE!';
+
+      createComponent({
+        getters: {
+          hasIncompatibleRepos: () => hasIncompatibleRepos,
+        },
+
+        slots: {
+          'incompatible-repos-warning': INCOMPATIBLE_TEXT,
+        },
       });
-  });
 
-  it('renders filtering input field', () => {
-    expect(
-      vm.$el.querySelector('input[data-qa-selector="githubish_import_filter_field"]'),
-    ).not.toBeNull();
-  });
+      expect(wrapper.text().includes(INCOMPATIBLE_TEXT)).toBe(shouldRenderSlot);
+    },
+  );
 });
diff --git a/spec/frontend/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_projects/components/provider_repo_table_row_spec.js
index 8be645c496f..f5e5141eac8 100644
--- a/spec/frontend/import_projects/components/provider_repo_table_row_spec.js
+++ b/spec/frontend/import_projects/components/provider_repo_table_row_spec.js
@@ -6,7 +6,7 @@ import STATUS_MAP, { STATUSES } from '~/import_projects/constants';
 
 describe('ProviderRepoTableRow', () => {
   let vm;
-  const fetchImport = jest.fn((context, data) => actions.requestImport(context, data));
+  const fetchImport = jest.fn();
   const importPath = '/import-path';
   const defaultTargetNamespace = 'user';
   const ciCdOnly = true;
@@ -17,11 +17,11 @@ describe('ProviderRepoTableRow', () => {
     providerLink: 'providerLink',
   };
 
-  function initStore() {
+  function initStore(initialState) {
     const stubbedActions = { ...actions, fetchImport };
 
     const store = new Vuex.Store({
-      state: state(),
+      state: { ...state(), ...initialState },
       actions: stubbedActions,
       mutations,
       getters,
@@ -30,12 +30,11 @@ describe('ProviderRepoTableRow', () => {
     return store;
   }
 
-  function mountComponent() {
+  function mountComponent(initialState) {
     const localVue = createLocalVue();
     localVue.use(Vuex);
 
-    const store = initStore();
-    store.dispatch('setInitialData', { importPath, defaultTargetNamespace, ciCdOnly });
+    const store = initStore({ importPath, defaultTargetNamespace, ciCdOnly, ...initialState });
 
     const component = mount(providerRepoTableRow, {
       localVue,
diff --git a/spec/frontend/import_projects/store/actions_spec.js b/spec/frontend/import_projects/store/actions_spec.js
index 4954513715e..1f2882a2532 100644
--- a/spec/frontend/import_projects/store/actions_spec.js
+++ b/spec/frontend/import_projects/store/actions_spec.js
@@ -4,7 +4,6 @@ import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import {
-  SET_INITIAL_DATA,
   REQUEST_REPOS,
   RECEIVE_REPOS_SUCCESS,
   RECEIVE_REPOS_ERROR,
@@ -14,14 +13,7 @@ import {
   RECEIVE_JOBS_SUCCESS,
 } from '~/import_projects/store/mutation_types';
 import {
-  setInitialData,
-  requestRepos,
-  receiveReposSuccess,
-  receiveReposError,
   fetchRepos,
-  requestImport,
-  receiveImportSuccess,
-  receiveImportError,
   fetchImport,
   receiveJobsSuccess,
   fetchJobs,
@@ -32,7 +24,6 @@ import state from '~/import_projects/store/state';
 
 describe('import_projects store actions', () => {
   let localState;
-  const repoId = 1;
   const repos = [{ id: 1 }, { id: 2 }];
   const importPayload = { newName: 'newName', targetNamespace: 'targetNamespace', repo: { id: 1 } };
 
@@ -40,61 +31,6 @@ describe('import_projects store actions', () => {
     localState = state();
   });
 
-  describe('setInitialData', () => {
-    it(`commits ${SET_INITIAL_DATA} mutation`, done => {
-      const initialData = {
-        reposPath: 'reposPath',
-        provider: 'provider',
-        jobsPath: 'jobsPath',
-        importPath: 'impapp/assets/javascripts/vue_shared/components/select2_select.vueortPath',
-        defaultTargetNamespace: 'defaultTargetNamespace',
-        ciCdOnly: 'ciCdOnly',
-        canSelectNamespace: 'canSelectNamespace',
-      };
-
-      testAction(
-        setInitialData,
-        initialData,
-        localState,
-        [{ type: SET_INITIAL_DATA, payload: initialData }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('requestRepos', () => {
-    it(`requestRepos commits ${REQUEST_REPOS} mutation`, done => {
-      testAction(
-        requestRepos,
-        null,
-        localState,
-        [{ type: REQUEST_REPOS, payload: null }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('receiveReposSuccess', () => {
-    it(`commits ${RECEIVE_REPOS_SUCCESS} mutation`, done => {
-      testAction(
-        receiveReposSuccess,
-        repos,
-        localState,
-        [{ type: RECEIVE_REPOS_SUCCESS, payload: repos }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('receiveReposError', () => {
-    it(`commits ${RECEIVE_REPOS_ERROR} mutation`, done => {
-      testAction(receiveReposError, repos, localState, [{ type: RECEIVE_REPOS_ERROR }], [], done);
-    });
-  });
-
   describe('fetchRepos', () => {
     let mock;
     const payload = { imported_projects: [{}], provider_repos: [{}], namespaces: [{}] };
@@ -106,39 +42,33 @@ describe('import_projects store actions', () => {
 
     afterEach(() => mock.restore());
 
-    it('dispatches stopJobsPolling, requestRepos and receiveReposSuccess actions on a successful request', done => {
+    it('dispatches stopJobsPolling actions and commits REQUEST_REPOS, RECEIVE_REPOS_SUCCESS mutations on a successful request', () => {
       mock.onGet(`${TEST_HOST}/endpoint.json`).reply(200, payload);
 
-      testAction(
+      return testAction(
         fetchRepos,
         null,
         localState,
-        [],
         [
-          { type: 'stopJobsPolling' },
-          { type: 'requestRepos' },
+          { type: REQUEST_REPOS },
           {
-            type: 'receiveReposSuccess',
+            type: RECEIVE_REPOS_SUCCESS,
             payload: convertObjectPropsToCamelCase(payload, { deep: true }),
           },
-          {
-            type: 'fetchJobs',
-          },
         ],
-        done,
+        [{ type: 'stopJobsPolling' }, { type: 'fetchJobs' }],
       );
     });
 
-    it('dispatches stopJobsPolling, requestRepos and receiveReposError actions on an unsuccessful request', done => {
+    it('dispatches stopJobsPolling action and commits REQUEST_REPOS, RECEIVE_REPOS_ERROR mutations on an unsuccessful request', () => {
       mock.onGet(`${TEST_HOST}/endpoint.json`).reply(500);
 
-      testAction(
+      return testAction(
         fetchRepos,
         null,
         localState,
-        [],
-        [{ type: 'stopJobsPolling' }, { type: 'requestRepos' }, { type: 'receiveReposError' }],
-        done,
+        [{ type: REQUEST_REPOS }, { type: RECEIVE_REPOS_ERROR }],
+        [{ type: 'stopJobsPolling' }],
       );
     });
 
@@ -147,72 +77,26 @@ describe('import_projects store actions', () => {
         localState.filter = 'filter';
       });
 
-      it('fetches repos with filter applied', done => {
+      it('fetches repos with filter applied', () => {
         mock.onGet(`${TEST_HOST}/endpoint.json?filter=filter`).reply(200, payload);
 
-        testAction(
+        return testAction(
           fetchRepos,
           null,
           localState,
-          [],
           [
-            { type: 'stopJobsPolling' },
-            { type: 'requestRepos' },
+            { type: REQUEST_REPOS },
             {
-              type: 'receiveReposSuccess',
+              type: RECEIVE_REPOS_SUCCESS,
               payload: convertObjectPropsToCamelCase(payload, { deep: true }),
             },
-            {
-              type: 'fetchJobs',
-            },
           ],
-          done,
+          [{ type: 'stopJobsPolling' }, { type: 'fetchJobs' }],
         );
       });
     });
   });
 
-  describe('requestImport', () => {
-    it(`commits ${REQUEST_IMPORT} mutation`, done => {
-      testAction(
-        requestImport,
-        repoId,
-        localState,
-        [{ type: REQUEST_IMPORT, payload: repoId }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('receiveImportSuccess', () => {
-    it(`commits ${RECEIVE_IMPORT_SUCCESS} mutation`, done => {
-      const payload = { importedProject: { name: 'imported/project' }, repoId: 2 };
-
-      testAction(
-        receiveImportSuccess,
-        payload,
-        localState,
-        [{ type: RECEIVE_IMPORT_SUCCESS, payload }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('receiveImportError', () => {
-    it(`commits ${RECEIVE_IMPORT_ERROR} mutation`, done => {
-      testAction(
-        receiveImportError,
-        repoId,
-        localState,
-        [{ type: RECEIVE_IMPORT_ERROR, payload: repoId }],
-        [],
-        done,
-      );
-    });
-  });
-
   describe('fetchImport', () => {
     let mock;
 
@@ -223,56 +107,53 @@ describe('import_projects store actions', () => {
 
     afterEach(() => mock.restore());
 
-    it('dispatches requestImport and receiveImportSuccess actions on a successful request', done => {
+    it('commits REQUEST_IMPORT and REQUEST_IMPORT_SUCCESS mutations on a successful request', () => {
       const importedProject = { name: 'imported/project' };
       const importRepoId = importPayload.repo.id;
       mock.onPost(`${TEST_HOST}/endpoint.json`).reply(200, importedProject);
 
-      testAction(
+      return testAction(
         fetchImport,
         importPayload,
         localState,
-        [],
         [
-          { type: 'requestImport', payload: importRepoId },
+          { type: REQUEST_IMPORT, payload: importRepoId },
           {
-            type: 'receiveImportSuccess',
+            type: RECEIVE_IMPORT_SUCCESS,
             payload: {
               importedProject: convertObjectPropsToCamelCase(importedProject, { deep: true }),
               repoId: importRepoId,
             },
           },
         ],
-        done,
+        [],
       );
     });
 
-    it('dispatches requestImport and receiveImportSuccess actions on an unsuccessful request', done => {
+    it('commits REQUEST_IMPORT and RECEIVE_IMPORT_ERROR  on an unsuccessful request', () => {
       mock.onPost(`${TEST_HOST}/endpoint.json`).reply(500);
 
-      testAction(
+      return testAction(
         fetchImport,
         importPayload,
         localState,
-        [],
         [
-          { type: 'requestImport', payload: importPayload.repo.id },
-          { type: 'receiveImportError', payload: { repoId: importPayload.repo.id } },
+          { type: REQUEST_IMPORT, payload: importPayload.repo.id },
+          { type: RECEIVE_IMPORT_ERROR, payload: importPayload.repo.id },
         ],
-        done,
+        [],
       );
     });
   });
 
   describe('receiveJobsSuccess', () => {
-    it(`commits ${RECEIVE_JOBS_SUCCESS} mutation`, done => {
-      testAction(
+    it(`commits ${RECEIVE_JOBS_SUCCESS} mutation`, () => {
+      return testAction(
         receiveJobsSuccess,
         repos,
         localState,
         [{ type: RECEIVE_JOBS_SUCCESS, payload: repos }],
         [],
-        done,
       );
     });
   });
@@ -293,21 +174,20 @@ describe('import_projects store actions', () => {
 
     afterEach(() => mock.restore());
 
-    it('dispatches requestJobs and receiveJobsSuccess actions on a successful request', done => {
+    it('commits RECEIVE_JOBS_SUCCESS mutation on a successful request', async () => {
       mock.onGet(`${TEST_HOST}/endpoint.json`).reply(200, updatedProjects);
 
-      testAction(
+      await testAction(
         fetchJobs,
         null,
         localState,
-        [],
         [
           {
-            type: 'receiveJobsSuccess',
+            type: RECEIVE_JOBS_SUCCESS,
             payload: convertObjectPropsToCamelCase(updatedProjects, { deep: true }),
           },
         ],
-        done,
+        [],
       );
     });
 
@@ -316,21 +196,20 @@ describe('import_projects store actions', () => {
         localState.filter = 'filter';
       });
 
-      it('fetches realtime changes with filter applied', done => {
+      it('fetches realtime changes with filter applied', () => {
         mock.onGet(`${TEST_HOST}/endpoint.json?filter=filter`).reply(200, updatedProjects);
 
-        testAction(
+        return testAction(
           fetchJobs,
           null,
           localState,
-          [],
           [
             {
-              type: 'receiveJobsSuccess',
+              type: RECEIVE_JOBS_SUCCESS,
               payload: convertObjectPropsToCamelCase(updatedProjects, { deep: true }),
             },
           ],
-          done,
+          [],
         );
       });
     });
diff --git a/spec/frontend/import_projects/store/getters_spec.js b/spec/frontend/import_projects/store/getters_spec.js
index e5e4a95f473..93d1ed89783 100644
--- a/spec/frontend/import_projects/store/getters_spec.js
+++ b/spec/frontend/import_projects/store/getters_spec.js
@@ -2,6 +2,7 @@ import {
   namespaceSelectOptions,
   isImportingAnyRepo,
   hasProviderRepos,
+  hasIncompatibleRepos,
   hasImportedProjects,
 } from '~/import_projects/store/getters';
 import state from '~/import_projects/store/state';
@@ -80,4 +81,18 @@ describe('import_projects store getters', () => {
       expect(hasImportedProjects(localState)).toBe(false);
     });
   });
+
+  describe('hasIncompatibleRepos', () => {
+    it('returns true if there are any incompatibleProjects', () => {
+      localState.incompatibleRepos = new Array(1);
+
+      expect(hasIncompatibleRepos(localState)).toBe(true);
+    });
+
+    it('returns false if there are no incompatibleProjects', () => {
+      localState.incompatibleRepos = [];
+
+      expect(hasIncompatibleRepos(localState)).toBe(false);
+    });
+  });
 });
diff --git a/spec/javascripts/importer_status_spec.js b/spec/frontend/importer_status_spec.js
index 90835e1cc21..4ef74a2fe84 100644
--- a/spec/javascripts/importer_status_spec.js
+++ b/spec/frontend/importer_status_spec.js
@@ -16,9 +16,8 @@ describe('Importer Status', () => {
 
   describe('addToImport', () => {
     const importUrl = '/import_url';
-
-    beforeEach(() => {
-      setFixtures(`
+    const fixtures = `
+      <table>
         <tr id="repo_123">
           <td class="import-target"></td>
           <td class="import-actions job-status">
@@ -26,9 +25,13 @@ describe('Importer Status', () => {
             </button>
           </td>
         </tr>
-      `);
-      spyOn(ImporterStatus.prototype, 'initStatusPage').and.callFake(() => {});
-      spyOn(ImporterStatus.prototype, 'setAutoUpdate').and.callFake(() => {});
+      </table>
+    `;
+
+    beforeEach(() => {
+      setFixtures(fixtures);
+      jest.spyOn(ImporterStatus.prototype, 'initStatusPage').mockImplementation(() => {});
+      jest.spyOn(ImporterStatus.prototype, 'setAutoUpdate').mockImplementation(() => {});
       instance = new ImporterStatus({
         jobsUrl: '',
         importUrl,
@@ -53,7 +56,7 @@ describe('Importer Status', () => {
     });
 
     it('shows error message after failed POST request', done => {
-      appendSetFixtures('<div class="flash-container"></div>');
+      setFixtures(`${fixtures}<div class="flash-container"></div>`);
 
       mock.onPost(importUrl).reply(422, {
         errors: 'You forgot your lunch',
@@ -89,8 +92,8 @@ describe('Importer Status', () => {
 
       document.body.appendChild(div);
 
-      spyOn(ImporterStatus.prototype, 'initStatusPage').and.callFake(() => {});
-      spyOn(ImporterStatus.prototype, 'setAutoUpdate').and.callFake(() => {});
+      jest.spyOn(ImporterStatus.prototype, 'initStatusPage').mockImplementation(() => {});
+      jest.spyOn(ImporterStatus.prototype, 'setAutoUpdate').mockImplementation(() => {});
       instance = new ImporterStatus({
         jobsUrl,
       });
diff --git a/spec/frontend/integrations/edit/components/dynamic_field_spec.js b/spec/frontend/integrations/edit/components/dynamic_field_spec.js
new file mode 100644
index 00000000000..e5710641f81
--- /dev/null
+++ b/spec/frontend/integrations/edit/components/dynamic_field_spec.js
@@ -0,0 +1,179 @@
+import { mount } from '@vue/test-utils';
+import DynamicField from '~/integrations/edit/components/dynamic_field.vue';
+import { GlFormGroup, GlFormCheckbox, GlFormInput, GlFormSelect, GlFormTextarea } from '@gitlab/ui';
+
+describe('DynamicField', () => {
+  let wrapper;
+
+  const defaultProps = {
+    help: 'The URL of the project',
+    name: 'project_url',
+    placeholder: 'https://jira.example.com',
+    title: 'Project URL',
+    type: 'text',
+    value: '1',
+  };
+
+  const createComponent = props => {
+    wrapper = mount(DynamicField, {
+      propsData: { ...defaultProps, ...props },
+    });
+  };
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
+  });
+
+  const findGlFormGroup = () => wrapper.find(GlFormGroup);
+  const findGlFormCheckbox = () => wrapper.find(GlFormCheckbox);
+  const findGlFormInput = () => wrapper.find(GlFormInput);
+  const findGlFormSelect = () => wrapper.find(GlFormSelect);
+  const findGlFormTextarea = () => wrapper.find(GlFormTextarea);
+
+  describe('template', () => {
+    describe('dynamic field', () => {
+      describe('type is checkbox', () => {
+        beforeEach(() => {
+          createComponent({
+            type: 'checkbox',
+          });
+        });
+
+        it('renders GlFormCheckbox', () => {
+          expect(findGlFormCheckbox().exists()).toBe(true);
+        });
+
+        it('does not render other types of input', () => {
+          expect(findGlFormSelect().exists()).toBe(false);
+          expect(findGlFormTextarea().exists()).toBe(false);
+          expect(findGlFormInput().exists()).toBe(false);
+        });
+      });
+
+      describe('type is select', () => {
+        beforeEach(() => {
+          createComponent({
+            type: 'select',
+            choices: [['all', 'All details'], ['standard', 'Standard']],
+          });
+        });
+
+        it('renders findGlFormSelect', () => {
+          expect(findGlFormSelect().exists()).toBe(true);
+          expect(findGlFormSelect().findAll('option')).toHaveLength(2);
+        });
+
+        it('does not render other types of input', () => {
+          expect(findGlFormCheckbox().exists()).toBe(false);
+          expect(findGlFormTextarea().exists()).toBe(false);
+          expect(findGlFormInput().exists()).toBe(false);
+        });
+      });
+
+      describe('type is textarea', () => {
+        beforeEach(() => {
+          createComponent({
+            type: 'textarea',
+          });
+        });
+
+        it('renders findGlFormTextarea', () => {
+          expect(findGlFormTextarea().exists()).toBe(true);
+        });
+
+        it('does not render other types of input', () => {
+          expect(findGlFormCheckbox().exists()).toBe(false);
+          expect(findGlFormSelect().exists()).toBe(false);
+          expect(findGlFormInput().exists()).toBe(false);
+        });
+      });
+
+      describe('type is password', () => {
+        beforeEach(() => {
+          createComponent({
+            type: 'password',
+          });
+        });
+
+        it('renders GlFormInput', () => {
+          expect(findGlFormInput().exists()).toBe(true);
+          expect(findGlFormInput().attributes('type')).toBe('password');
+        });
+
+        it('does not render other types of input', () => {
+          expect(findGlFormCheckbox().exists()).toBe(false);
+          expect(findGlFormSelect().exists()).toBe(false);
+          expect(findGlFormTextarea().exists()).toBe(false);
+        });
+      });
+
+      describe('type is text', () => {
+        beforeEach(() => {
+          createComponent({
+            type: 'text',
+            required: true,
+          });
+        });
+
+        it('renders GlFormInput', () => {
+          expect(findGlFormInput().exists()).toBe(true);
+          expect(findGlFormInput().attributes()).toMatchObject({
+            type: 'text',
+            id: 'service_project_url',
+            name: 'service[project_url]',
+            placeholder: defaultProps.placeholder,
+            required: 'required',
+          });
+        });
+
+        it('does not render other types of input', () => {
+          expect(findGlFormCheckbox().exists()).toBe(false);
+          expect(findGlFormSelect().exists()).toBe(false);
+          expect(findGlFormTextarea().exists()).toBe(false);
+        });
+      });
+    });
+
+    describe('help text', () => {
+      it('renders description with help text', () => {
+        createComponent();
+
+        expect(
+          findGlFormGroup()
+            .find('small')
+            .text(),
+        ).toBe(defaultProps.help);
+      });
+    });
+
+    describe('label text', () => {
+      it('renders label with title', () => {
+        createComponent();
+
+        expect(
+          findGlFormGroup()
+            .find('label')
+            .text(),
+        ).toBe(defaultProps.title);
+      });
+
+      describe('for password field with some value (hidden by backend)', () => {
+        it('renders label with new password title', () => {
+          createComponent({
+            type: 'password',
+            value: 'true',
+          });
+
+          expect(
+            findGlFormGroup()
+              .find('label')
+              .text(),
+          ).toBe(`Enter new ${defaultProps.title}`);
+        });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/integrations/edit/components/integration_form_spec.js b/spec/frontend/integrations/edit/components/integration_form_spec.js
index c93f63b11d0..b598a71cea8 100644
--- a/spec/frontend/integrations/edit/components/integration_form_spec.js
+++ b/spec/frontend/integrations/edit/components/integration_form_spec.js
@@ -3,6 +3,7 @@ import IntegrationForm from '~/integrations/edit/components/integration_form.vue
 import ActiveToggle from '~/integrations/edit/components/active_toggle.vue';
 import JiraTriggerFields from '~/integrations/edit/components/jira_trigger_fields.vue';
 import TriggerFields from '~/integrations/edit/components/trigger_fields.vue';
+import DynamicField from '~/integrations/edit/components/dynamic_field.vue';
 
 describe('IntegrationForm', () => {
   let wrapper;
@@ -95,5 +96,25 @@ describe('IntegrationForm', () => {
         expect(findTriggerFields().props('type')).toBe(type);
       });
     });
+
+    describe('fields is present', () => {
+      it('renders DynamicField for each field', () => {
+        const fields = [
+          { name: 'username', type: 'text' },
+          { name: 'API token', type: 'password' },
+        ];
+
+        createComponent({
+          fields,
+        });
+
+        const dynamicFields = wrapper.findAll(DynamicField);
+
+        expect(dynamicFields).toHaveLength(2);
+        dynamicFields.wrappers.forEach((field, index) => {
+          expect(field.props()).toMatchObject(fields[index]);
+        });
+      });
+    });
   });
 });
diff --git a/spec/frontend/issue_show/components/app_spec.js b/spec/frontend/issue_show/components/app_spec.js
index a59d6d35ded..d970fd349e7 100644
--- a/spec/frontend/issue_show/components/app_spec.js
+++ b/spec/frontend/issue_show/components/app_spec.js
@@ -1,10 +1,11 @@
-import Vue from 'vue';
+import { GlIntersectionObserver } from '@gitlab/ui';
+import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import '~/behaviors/markdown/render_gfm';
-import issuableApp from '~/issue_show/components/app.vue';
+import IssuableApp from '~/issue_show/components/app.vue';
 import eventHub from '~/issue_show/event_hub';
 import { initialRequest, secondRequest } from '../mock_data';
 
@@ -17,10 +18,15 @@ jest.mock('~/issue_show/event_hub');
 
 const REALTIME_REQUEST_STACK = [initialRequest, secondRequest];
 
+const zoomMeetingUrl = 'https://gitlab.zoom.us/j/95919234811';
+const publishedIncidentUrl = 'https://status.com/';
+
 describe('Issuable output', () => {
   let mock;
   let realtimeRequestCount = 0;
-  let vm;
+  let wrapper;
+
+  const findStickyHeader = () => wrapper.find('[data-testid="issue-sticky-header"]');
 
   beforeEach(() => {
     setFixtures(`
@@ -39,7 +45,10 @@ describe('Issuable output', () => {
       </div>
     `);
 
-    const IssuableDescriptionComponent = Vue.extend(issuableApp);
+    window.IntersectionObserver = class {
+      disconnect = jest.fn();
+      observe = jest.fn();
+    };
 
     mock = new MockAdapter(axios);
     mock
@@ -50,13 +59,14 @@ describe('Issuable output', () => {
         return res;
       });
 
-    vm = new IssuableDescriptionComponent({
+    wrapper = mount(IssuableApp, {
       propsData: {
         canUpdate: true,
         canDestroy: true,
         endpoint: '/gitlab-org/gitlab-shell/-/issues/9/realtime_changes',
         updateEndpoint: TEST_HOST,
         issuableRef: '#1',
+        issuableStatus: 'opened',
         initialTitleHtml: '',
         initialTitleText: '',
         initialDescriptionHtml: 'test',
@@ -67,16 +77,20 @@ describe('Issuable output', () => {
         projectNamespace: '/',
         projectPath: '/',
         issuableTemplateNamesPath: '/issuable-templates-path',
+        zoomMeetingUrl,
+        publishedIncidentUrl,
       },
-    }).$mount();
+    });
   });
 
   afterEach(() => {
+    delete window.IntersectionObserver;
     mock.restore();
     realtimeRequestCount = 0;
 
-    vm.poll.stop();
-    vm.$destroy();
+    wrapper.vm.poll.stop();
+    wrapper.destroy();
+    wrapper = null;
   });
 
   it('should render a title/description/edited and update title/description/edited on update', () => {
@@ -84,196 +98,209 @@ describe('Issuable output', () => {
     return axios
       .waitForAll()
       .then(() => {
-        editedText = vm.$el.querySelector('.edited-text');
+        editedText = wrapper.find('.edited-text');
       })
       .then(() => {
         expect(document.querySelector('title').innerText).toContain('this is a title (#1)');
-        expect(vm.$el.querySelector('.title').innerHTML).toContain('<p>this is a title</p>');
-        expect(vm.$el.querySelector('.md').innerHTML).toContain('<p>this is a description!</p>');
-        expect(vm.$el.querySelector('.js-task-list-field').value).toContain(
+        expect(wrapper.find('.title').text()).toContain('this is a title');
+        expect(wrapper.find('.md').text()).toContain('this is a description!');
+        expect(wrapper.find('.js-task-list-field').element.value).toContain(
           'this is a description',
         );
 
-        expect(formatText(editedText.innerText)).toMatch(/Edited[\s\S]+?by Some User/);
-        expect(editedText.querySelector('.author-link').href).toMatch(/\/some_user$/);
-        expect(editedText.querySelector('time')).toBeTruthy();
-        expect(vm.state.lock_version).toEqual(1);
+        expect(formatText(editedText.text())).toMatch(/Edited[\s\S]+?by Some User/);
+        expect(editedText.find('.author-link').attributes('href')).toMatch(/\/some_user$/);
+        expect(editedText.find('time').text()).toBeTruthy();
+        expect(wrapper.vm.state.lock_version).toEqual(1);
       })
       .then(() => {
-        vm.poll.makeRequest();
+        wrapper.vm.poll.makeRequest();
         return axios.waitForAll();
       })
       .then(() => {
         expect(document.querySelector('title').innerText).toContain('2 (#1)');
-        expect(vm.$el.querySelector('.title').innerHTML).toContain('<p>2</p>');
-        expect(vm.$el.querySelector('.md').innerHTML).toContain('<p>42</p>');
-        expect(vm.$el.querySelector('.js-task-list-field').value).toContain('42');
-        expect(vm.$el.querySelector('.edited-text')).toBeTruthy();
-        expect(formatText(vm.$el.querySelector('.edited-text').innerText)).toMatch(
+        expect(wrapper.find('.title').text()).toContain('2');
+        expect(wrapper.find('.md').text()).toContain('42');
+        expect(wrapper.find('.js-task-list-field').element.value).toContain('42');
+        expect(wrapper.find('.edited-text').text()).toBeTruthy();
+        expect(formatText(wrapper.find('.edited-text').text())).toMatch(
           /Edited[\s\S]+?by Other User/,
         );
 
-        expect(editedText.querySelector('.author-link').href).toMatch(/\/other_user$/);
-        expect(editedText.querySelector('time')).toBeTruthy();
-        expect(vm.state.lock_version).toEqual(2);
+        expect(editedText.find('.author-link').attributes('href')).toMatch(/\/other_user$/);
+        expect(editedText.find('time').text()).toBeTruthy();
+        expect(wrapper.vm.state.lock_version).toEqual(2);
       });
   });
 
   it('shows actions if permissions are correct', () => {
-    vm.showForm = true;
+    wrapper.vm.showForm = true;
 
-    return vm.$nextTick().then(() => {
-      expect(vm.$el.querySelector('.btn')).not.toBeNull();
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.contains('.markdown-selector')).toBe(true);
     });
   });
 
   it('does not show actions if permissions are incorrect', () => {
-    vm.showForm = true;
-    vm.canUpdate = false;
+    wrapper.vm.showForm = true;
+    wrapper.setProps({ canUpdate: false });
 
-    return vm.$nextTick().then(() => {
-      expect(vm.$el.querySelector('.btn')).toBeNull();
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.contains('.markdown-selector')).toBe(false);
     });
   });
 
   it('does not update formState if form is already open', () => {
-    vm.updateAndShowForm();
+    wrapper.vm.updateAndShowForm();
 
-    vm.state.titleText = 'testing 123';
+    wrapper.vm.state.titleText = 'testing 123';
 
-    vm.updateAndShowForm();
+    wrapper.vm.updateAndShowForm();
 
-    return vm.$nextTick().then(() => {
-      expect(vm.store.formState.title).not.toBe('testing 123');
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.vm.store.formState.title).not.toBe('testing 123');
     });
   });
 
   it('opens reCAPTCHA modal if update rejected as spam', () => {
     let modal;
 
-    jest.spyOn(vm.service, 'updateIssuable').mockResolvedValue({
+    jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
       data: {
         recaptcha_html: '<div class="g-recaptcha">recaptcha_html</div>',
       },
     });
 
-    vm.canUpdate = true;
-    vm.showForm = true;
+    wrapper.vm.canUpdate = true;
+    wrapper.vm.showForm = true;
 
-    return vm
+    return wrapper.vm
       .$nextTick()
       .then(() => {
-        vm.$refs.recaptchaModal.scriptSrc = '//scriptsrc';
-        return vm.updateIssuable();
+        wrapper.vm.$refs.recaptchaModal.scriptSrc = '//scriptsrc';
+        return wrapper.vm.updateIssuable();
       })
       .then(() => {
-        modal = vm.$el.querySelector('.js-recaptcha-modal');
-
-        expect(modal.style.display).not.toEqual('none');
-        expect(modal.querySelector('.g-recaptcha').textContent).toEqual('recaptcha_html');
+        modal = wrapper.find('.js-recaptcha-modal');
+        expect(modal.isVisible()).toBe(true);
+        expect(modal.find('.g-recaptcha').text()).toEqual('recaptcha_html');
         expect(document.body.querySelector('.js-recaptcha-script').src).toMatch('//scriptsrc');
       })
       .then(() => {
-        modal.querySelector('.close').click();
-        return vm.$nextTick();
+        modal.find('.close').trigger('click');
+        return wrapper.vm.$nextTick();
       })
       .then(() => {
-        expect(modal.style.display).toEqual('none');
+        expect(modal.isVisible()).toBe(false);
         expect(document.body.querySelector('.js-recaptcha-script')).toBeNull();
       });
   });
 
+  describe('Pinned links propagated', () => {
+    it.each`
+      prop                      | value
+      ${'zoomMeetingUrl'}       | ${zoomMeetingUrl}
+      ${'publishedIncidentUrl'} | ${publishedIncidentUrl}
+    `('sets the $prop correctly on underlying pinned links', ({ prop, value }) => {
+      expect(wrapper.vm[prop]).toEqual(value);
+      expect(wrapper.find(`[data-testid="${prop}"]`).attributes('href')).toBe(value);
+    });
+  });
+
   describe('updateIssuable', () => {
     it('fetches new data after update', () => {
-      const updateStoreSpy = jest.spyOn(vm, 'updateStoreState');
-      const getDataSpy = jest.spyOn(vm.service, 'getData');
-      jest.spyOn(vm.service, 'updateIssuable').mockResolvedValue({
+      const updateStoreSpy = jest.spyOn(wrapper.vm, 'updateStoreState');
+      const getDataSpy = jest.spyOn(wrapper.vm.service, 'getData');
+      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
         data: { web_url: window.location.pathname },
       });
 
-      return vm.updateIssuable().then(() => {
+      return wrapper.vm.updateIssuable().then(() => {
         expect(updateStoreSpy).toHaveBeenCalled();
         expect(getDataSpy).toHaveBeenCalled();
       });
     });
 
     it('correctly updates issuable data', () => {
-      const spy = jest.spyOn(vm.service, 'updateIssuable').mockResolvedValue({
+      const spy = jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
         data: { web_url: window.location.pathname },
       });
 
-      return vm.updateIssuable().then(() => {
-        expect(spy).toHaveBeenCalledWith(vm.formState);
+      return wrapper.vm.updateIssuable().then(() => {
+        expect(spy).toHaveBeenCalledWith(wrapper.vm.formState);
         expect(eventHub.$emit).toHaveBeenCalledWith('close.form');
       });
     });
 
     it('does not redirect if issue has not moved', () => {
-      jest.spyOn(vm.service, 'updateIssuable').mockResolvedValue({
+      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
         data: {
           web_url: window.location.pathname,
-          confidential: vm.isConfidential,
+          confidential: wrapper.vm.isConfidential,
         },
       });
 
-      return vm.updateIssuable().then(() => {
+      return wrapper.vm.updateIssuable().then(() => {
         expect(visitUrl).not.toHaveBeenCalled();
       });
     });
 
     it('does not redirect if issue has not moved and user has switched tabs', () => {
-      jest.spyOn(vm.service, 'updateIssuable').mockResolvedValue({
+      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
         data: {
           web_url: '',
-          confidential: vm.isConfidential,
+          confidential: wrapper.vm.isConfidential,
         },
       });
 
-      return vm.updateIssuable().then(() => {
+      return wrapper.vm.updateIssuable().then(() => {
         expect(visitUrl).not.toHaveBeenCalled();
       });
     });
 
     it('redirects if returned web_url has changed', () => {
-      jest.spyOn(vm.service, 'updateIssuable').mockResolvedValue({
+      jest.spyOn(wrapper.vm.service, 'updateIssuable').mockResolvedValue({
         data: {
           web_url: '/testing-issue-move',
-          confidential: vm.isConfidential,
+          confidential: wrapper.vm.isConfidential,
         },
       });
 
-      vm.updateIssuable();
+      wrapper.vm.updateIssuable();
 
-      return vm.updateIssuable().then(() => {
+      return wrapper.vm.updateIssuable().then(() => {
         expect(visitUrl).toHaveBeenCalledWith('/testing-issue-move');
       });
     });
 
     describe('shows dialog when issue has unsaved changed', () => {
       it('confirms on title change', () => {
-        vm.showForm = true;
-        vm.state.titleText = 'title has changed';
+        wrapper.vm.showForm = true;
+        wrapper.vm.state.titleText = 'title has changed';
         const e = { returnValue: null };
-        vm.handleBeforeUnloadEvent(e);
-        return vm.$nextTick().then(() => {
+        wrapper.vm.handleBeforeUnloadEvent(e);
+
+        return wrapper.vm.$nextTick().then(() => {
           expect(e.returnValue).not.toBeNull();
         });
       });
 
       it('confirms on description change', () => {
-        vm.showForm = true;
-        vm.state.descriptionText = 'description has changed';
+        wrapper.vm.showForm = true;
+        wrapper.vm.state.descriptionText = 'description has changed';
         const e = { returnValue: null };
-        vm.handleBeforeUnloadEvent(e);
-        return vm.$nextTick().then(() => {
+        wrapper.vm.handleBeforeUnloadEvent(e);
+
+        return wrapper.vm.$nextTick().then(() => {
           expect(e.returnValue).not.toBeNull();
         });
       });
 
       it('does nothing when nothing has changed', () => {
         const e = { returnValue: null };
-        vm.handleBeforeUnloadEvent(e);
-        return vm.$nextTick().then(() => {
+        wrapper.vm.handleBeforeUnloadEvent(e);
+
+        return wrapper.vm.$nextTick().then(() => {
           expect(e.returnValue).toBeNull();
         });
       });
@@ -281,8 +308,9 @@ describe('Issuable output', () => {
 
     describe('error when updating', () => {
       it('closes form on error', () => {
-        jest.spyOn(vm.service, 'updateIssuable').mockRejectedValue();
-        return vm.updateIssuable().then(() => {
+        jest.spyOn(wrapper.vm.service, 'updateIssuable').mockRejectedValue();
+
+        return wrapper.vm.updateIssuable().then(() => {
           expect(eventHub.$emit).not.toHaveBeenCalledWith('close.form');
           expect(document.querySelector('.flash-container .flash-text').innerText.trim()).toBe(
             `Error updating issue`,
@@ -291,12 +319,12 @@ describe('Issuable output', () => {
       });
 
       it('returns the correct error message for issuableType', () => {
-        jest.spyOn(vm.service, 'updateIssuable').mockRejectedValue();
-        vm.issuableType = 'merge request';
+        jest.spyOn(wrapper.vm.service, 'updateIssuable').mockRejectedValue();
+        wrapper.setProps({ issuableType: 'merge request' });
 
-        return vm
+        return wrapper.vm
           .$nextTick()
-          .then(vm.updateIssuable)
+          .then(wrapper.vm.updateIssuable)
           .then(() => {
             expect(eventHub.$emit).not.toHaveBeenCalledWith('close.form');
             expect(document.querySelector('.flash-container .flash-text').innerText.trim()).toBe(
@@ -308,12 +336,12 @@ describe('Issuable output', () => {
       it('shows error message from backend if exists', () => {
         const msg = 'Custom error message from backend';
         jest
-          .spyOn(vm.service, 'updateIssuable')
+          .spyOn(wrapper.vm.service, 'updateIssuable')
           .mockRejectedValue({ response: { data: { errors: [msg] } } });
 
-        return vm.updateIssuable().then(() => {
+        return wrapper.vm.updateIssuable().then(() => {
           expect(document.querySelector('.flash-container .flash-text').innerText.trim()).toBe(
-            `${vm.defaultErrorMessage}. ${msg}`,
+            `${wrapper.vm.defaultErrorMessage}. ${msg}`,
           );
         });
       });
@@ -322,34 +350,34 @@ describe('Issuable output', () => {
 
   describe('deleteIssuable', () => {
     it('changes URL when deleted', () => {
-      jest.spyOn(vm.service, 'deleteIssuable').mockResolvedValue({
+      jest.spyOn(wrapper.vm.service, 'deleteIssuable').mockResolvedValue({
         data: {
           web_url: '/test',
         },
       });
 
-      return vm.deleteIssuable().then(() => {
+      return wrapper.vm.deleteIssuable().then(() => {
         expect(visitUrl).toHaveBeenCalledWith('/test');
       });
     });
 
     it('stops polling when deleting', () => {
-      const spy = jest.spyOn(vm.poll, 'stop');
-      jest.spyOn(vm.service, 'deleteIssuable').mockResolvedValue({
+      const spy = jest.spyOn(wrapper.vm.poll, 'stop');
+      jest.spyOn(wrapper.vm.service, 'deleteIssuable').mockResolvedValue({
         data: {
           web_url: '/test',
         },
       });
 
-      return vm.deleteIssuable().then(() => {
+      return wrapper.vm.deleteIssuable().then(() => {
         expect(spy).toHaveBeenCalledWith();
       });
     });
 
     it('closes form on error', () => {
-      jest.spyOn(vm.service, 'deleteIssuable').mockRejectedValue();
+      jest.spyOn(wrapper.vm.service, 'deleteIssuable').mockRejectedValue();
 
-      return vm.deleteIssuable().then(() => {
+      return wrapper.vm.deleteIssuable().then(() => {
         expect(eventHub.$emit).not.toHaveBeenCalledWith('close.form');
         expect(document.querySelector('.flash-container .flash-text').innerText.trim()).toBe(
           'Error deleting issue',
@@ -360,23 +388,25 @@ describe('Issuable output', () => {
 
   describe('updateAndShowForm', () => {
     it('shows locked warning if form is open & data is different', () => {
-      return vm
+      return wrapper.vm
         .$nextTick()
         .then(() => {
-          vm.updateAndShowForm();
+          wrapper.vm.updateAndShowForm();
 
-          vm.poll.makeRequest();
+          wrapper.vm.poll.makeRequest();
 
           return new Promise(resolve => {
-            vm.$watch('formState.lockedWarningVisible', value => {
-              if (value) resolve();
+            wrapper.vm.$watch('formState.lockedWarningVisible', value => {
+              if (value) {
+                resolve();
+              }
             });
           });
         })
         .then(() => {
-          expect(vm.formState.lockedWarningVisible).toEqual(true);
-          expect(vm.formState.lock_version).toEqual(1);
-          expect(vm.$el.querySelector('.alert')).not.toBeNull();
+          expect(wrapper.vm.formState.lockedWarningVisible).toEqual(true);
+          expect(wrapper.vm.formState.lock_version).toEqual(1);
+          expect(wrapper.contains('.alert')).toBe(true);
         });
     });
   });
@@ -385,14 +415,14 @@ describe('Issuable output', () => {
     let formSpy;
 
     beforeEach(() => {
-      formSpy = jest.spyOn(vm, 'updateAndShowForm');
+      formSpy = jest.spyOn(wrapper.vm, 'updateAndShowForm');
     });
 
     it('shows the form if template names request is successful', () => {
       const mockData = [{ name: 'Bug' }];
       mock.onGet('/issuable-templates-path').reply(() => Promise.resolve([200, mockData]));
 
-      return vm.requestTemplatesAndShowForm().then(() => {
+      return wrapper.vm.requestTemplatesAndShowForm().then(() => {
         expect(formSpy).toHaveBeenCalledWith(mockData);
       });
     });
@@ -402,7 +432,7 @@ describe('Issuable output', () => {
         .onGet('/issuable-templates-path')
         .reply(() => Promise.reject(new Error('something went wrong')));
 
-      return vm.requestTemplatesAndShowForm().then(() => {
+      return wrapper.vm.requestTemplatesAndShowForm().then(() => {
         expect(document.querySelector('.flash-container .flash-text').textContent).toContain(
           'Error updating issue',
         );
@@ -414,35 +444,39 @@ describe('Issuable output', () => {
 
   describe('show inline edit button', () => {
     it('should not render by default', () => {
-      expect(vm.$el.querySelector('.title-container .note-action-button')).toBeDefined();
+      expect(wrapper.contains('.btn-edit')).toBe(true);
     });
 
     it('should render if showInlineEditButton', () => {
-      vm.showInlineEditButton = true;
+      wrapper.setProps({ showInlineEditButton: true });
 
-      expect(vm.$el.querySelector('.title-container .note-action-button')).toBeDefined();
+      return wrapper.vm.$nextTick(() => {
+        expect(wrapper.contains('.btn-edit')).toBe(true);
+      });
     });
   });
 
   describe('updateStoreState', () => {
     it('should make a request and update the state of the store', () => {
       const data = { foo: 1 };
-      const getDataSpy = jest.spyOn(vm.service, 'getData').mockResolvedValue({ data });
-      const updateStateSpy = jest.spyOn(vm.store, 'updateState').mockImplementation(jest.fn);
+      const getDataSpy = jest.spyOn(wrapper.vm.service, 'getData').mockResolvedValue({ data });
+      const updateStateSpy = jest
+        .spyOn(wrapper.vm.store, 'updateState')
+        .mockImplementation(jest.fn);
 
-      return vm.updateStoreState().then(() => {
+      return wrapper.vm.updateStoreState().then(() => {
         expect(getDataSpy).toHaveBeenCalled();
         expect(updateStateSpy).toHaveBeenCalledWith(data);
       });
     });
 
     it('should show error message if store update fails', () => {
-      jest.spyOn(vm.service, 'getData').mockRejectedValue();
-      vm.issuableType = 'merge request';
+      jest.spyOn(wrapper.vm.service, 'getData').mockRejectedValue();
+      wrapper.setProps({ issuableType: 'merge request' });
 
-      return vm.updateStoreState().then(() => {
+      return wrapper.vm.updateStoreState().then(() => {
         expect(document.querySelector('.flash-container .flash-text').innerText.trim()).toBe(
-          `Error updating ${vm.issuableType}`,
+          `Error updating ${wrapper.vm.issuableType}`,
         );
       });
     });
@@ -450,48 +484,85 @@ describe('Issuable output', () => {
 
   describe('issueChanged', () => {
     beforeEach(() => {
-      vm.store.formState.title = '';
-      vm.store.formState.description = '';
-      vm.initialDescriptionText = '';
-      vm.initialTitleText = '';
+      wrapper.vm.store.formState.title = '';
+      wrapper.vm.store.formState.description = '';
+      wrapper.setProps({
+        initialDescriptionText: '',
+        initialTitleText: '',
+      });
     });
 
     it('returns true when title is changed', () => {
-      vm.store.formState.title = 'RandomText';
+      wrapper.vm.store.formState.title = 'RandomText';
 
-      expect(vm.issueChanged).toBe(true);
+      expect(wrapper.vm.issueChanged).toBe(true);
     });
 
     it('returns false when title is empty null', () => {
-      vm.store.formState.title = null;
+      wrapper.vm.store.formState.title = null;
 
-      expect(vm.issueChanged).toBe(false);
+      expect(wrapper.vm.issueChanged).toBe(false);
     });
 
     it('returns false when `initialTitleText` is null and `formState.title` is empty string', () => {
-      vm.store.formState.title = '';
-      vm.initialTitleText = null;
+      wrapper.vm.store.formState.title = '';
+      wrapper.setProps({ initialTitleText: null });
 
-      expect(vm.issueChanged).toBe(false);
+      expect(wrapper.vm.issueChanged).toBe(false);
     });
 
     it('returns true when description is changed', () => {
-      vm.store.formState.description = 'RandomText';
+      wrapper.vm.store.formState.description = 'RandomText';
 
-      expect(vm.issueChanged).toBe(true);
+      expect(wrapper.vm.issueChanged).toBe(true);
     });
 
     it('returns false when description is empty null', () => {
-      vm.store.formState.title = null;
+      wrapper.vm.store.formState.description = null;
 
-      expect(vm.issueChanged).toBe(false);
+      expect(wrapper.vm.issueChanged).toBe(false);
     });
 
     it('returns false when `initialDescriptionText` is null and `formState.description` is empty string', () => {
-      vm.store.formState.description = '';
-      vm.initialDescriptionText = null;
+      wrapper.vm.store.formState.description = '';
+      wrapper.setProps({ initialDescriptionText: null });
 
-      expect(vm.issueChanged).toBe(false);
+      expect(wrapper.vm.issueChanged).toBe(false);
+    });
+  });
+
+  describe('sticky header', () => {
+    describe('when title is in view', () => {
+      it('is not shown', () => {
+        expect(wrapper.contains('.issue-sticky-header')).toBe(false);
+      });
+    });
+
+    describe('when title is not in view', () => {
+      beforeEach(() => {
+        wrapper.vm.state.titleText = 'Sticky header title';
+        wrapper.find(GlIntersectionObserver).vm.$emit('disappear');
+      });
+
+      it('is shown with title', () => {
+        expect(findStickyHeader().text()).toContain('Sticky header title');
+      });
+
+      it('is shown with Open when status is opened', () => {
+        wrapper.setProps({ issuableStatus: 'opened' });
+
+        return wrapper.vm.$nextTick(() => {
+          expect(findStickyHeader().text()).toContain('Open');
+        });
+      });
+
+      it('is shown with Closed when status is closed', () => {
+        wrapper.setProps({ issuableStatus: 'closed' });
+
+        return wrapper.vm.$nextTick(() => {
+          expect(findStickyHeader().text()).toContain('Closed');
+        });
+      });
     });
   });
 });
diff --git a/spec/frontend/issue_show/components/pinned_links_spec.js b/spec/frontend/issue_show/components/pinned_links_spec.js
index 59c919c85d5..007ad4c9a1b 100644
--- a/spec/frontend/issue_show/components/pinned_links_spec.js
+++ b/spec/frontend/issue_show/components/pinned_links_spec.js
@@ -3,23 +3,18 @@ import { GlLink } from '@gitlab/ui';
 import PinnedLinks from '~/issue_show/components/pinned_links.vue';
 
 const plainZoomUrl = 'https://zoom.us/j/123456789';
+const plainStatusUrl = 'https://status.com';
 
 describe('PinnedLinks', () => {
   let wrapper;
 
-  const link = {
-    get text() {
-      return wrapper.find(GlLink).text();
-    },
-    get href() {
-      return wrapper.find(GlLink).attributes('href');
-    },
-  };
+  const findLinks = () => wrapper.findAll(GlLink);
 
   const createComponent = props => {
     wrapper = shallowMount(PinnedLinks, {
       propsData: {
-        zoomMeetingUrl: null,
+        zoomMeetingUrl: '',
+        publishedIncidentUrl: '',
         ...props,
       },
     });
@@ -30,12 +25,29 @@ describe('PinnedLinks', () => {
       zoomMeetingUrl: `<a href="${plainZoomUrl}">Zoom</a>`,
     });
 
-    expect(link.text).toBe('Join Zoom meeting');
+    expect(
+      findLinks()
+        .at(0)
+        .text(),
+    ).toBe('Join Zoom meeting');
+  });
+
+  it('displays Status link', () => {
+    createComponent({
+      publishedIncidentUrl: `<a href="${plainStatusUrl}">Status</a>`,
+    });
+
+    expect(
+      findLinks()
+        .at(0)
+        .text(),
+    ).toBe('Published on status page');
   });
 
   it('does not render if there are no links', () => {
     createComponent({
-      zoomMeetingUrl: null,
+      zoomMeetingUrl: '',
+      publishedIncidentUrl: '',
     });
 
     expect(wrapper.find(GlLink).exists()).toBe(false);
diff --git a/spec/frontend/jira_import/components/jira_import_app_spec.js b/spec/frontend/jira_import/components/jira_import_app_spec.js
index 0040e71c192..a21b89f6517 100644
--- a/spec/frontend/jira_import/components/jira_import_app_spec.js
+++ b/spec/frontend/jira_import/components/jira_import_app_spec.js
@@ -6,14 +6,13 @@ import JiraImportForm from '~/jira_import/components/jira_import_form.vue';
 import JiraImportProgress from '~/jira_import/components/jira_import_progress.vue';
 import JiraImportSetup from '~/jira_import/components/jira_import_setup.vue';
 import initiateJiraImportMutation from '~/jira_import/queries/initiate_jira_import.mutation.graphql';
-import { IMPORT_STATE } from '~/jira_import/utils';
 
 const mountComponent = ({
   isJiraConfigured = true,
   errorMessage = '',
   selectedProject = 'MTG',
   showAlert = false,
-  status = IMPORT_STATE.NONE,
+  isInProgress = false,
   loading = false,
   mutate = jest.fn(() => Promise.resolve()),
   mountType,
@@ -22,14 +21,9 @@ const mountComponent = ({
 
   return mountFunction(JiraImportApp, {
     propsData: {
-      isJiraConfigured,
       inProgressIllustration: 'in-progress-illustration.svg',
+      isJiraConfigured,
       issuesPath: 'gitlab-org/gitlab-test/-/issues',
-      jiraProjects: [
-        ['My Jira Project', 'MJP'],
-        ['My Second Jira Project', 'MSJP'],
-        ['Migrate to GitLab', 'MTG'],
-      ],
       jiraIntegrationPath: 'gitlab-org/gitlab-test/-/services/jira/edit',
       projectPath: 'gitlab-org/gitlab-test',
       setupIllustration: 'setup-illustration.svg',
@@ -40,7 +34,7 @@ const mountComponent = ({
         showAlert,
         selectedProject,
         jiraImportDetails: {
-          status,
+          isInProgress,
           imports: [
             {
               jiraProjectKey: 'MTG',
@@ -64,6 +58,18 @@ const mountComponent = ({
               },
             },
           ],
+          mostRecentImport: {
+            jiraProjectKey: 'MTG',
+            scheduledAt: '2020-04-09T16:17:18+00:00',
+            scheduledBy: {
+              name: 'Jane Doe',
+            },
+          },
+          projects: [
+            { text: 'My Jira Project (MJP)', value: 'MJP' },
+            { text: 'My Second Jira Project (MSJP)', value: 'MSJP' },
+            { text: 'Migrate to GitLab (MTG)', value: 'MTG' },
+          ],
         },
       };
     },
@@ -140,7 +146,7 @@ describe('JiraImportApp', () => {
 
   describe('when Jira integration is configured but import is in progress', () => {
     beforeEach(() => {
-      wrapper = mountComponent({ status: IMPORT_STATE.SCHEDULED });
+      wrapper = mountComponent({ isInProgress: true });
     });
 
     it('does not show the "Set up Jira integration" screen', () => {
@@ -184,7 +190,7 @@ describe('JiraImportApp', () => {
 
   describe('import in progress screen', () => {
     beforeEach(() => {
-      wrapper = mountComponent({ status: IMPORT_STATE.SCHEDULED });
+      wrapper = mountComponent({ isInProgress: true });
     });
 
     it('shows the illustration', () => {
diff --git a/spec/frontend/jira_import/mock_data.js b/spec/frontend/jira_import/mock_data.js
new file mode 100644
index 00000000000..e82ab53cb6f
--- /dev/null
+++ b/spec/frontend/jira_import/mock_data.js
@@ -0,0 +1,72 @@
+import getJiraImportDetailsQuery from '~/jira_import/queries/get_jira_import_details.query.graphql';
+import { IMPORT_STATE } from '~/jira_import/utils/jira_import_utils';
+
+export const fullPath = 'gitlab-org/gitlab-test';
+
+export const queryDetails = {
+  query: getJiraImportDetailsQuery,
+  variables: {
+    fullPath,
+  },
+};
+
+export const jiraImportDetailsQueryResponse = {
+  project: {
+    jiraImportStatus: IMPORT_STATE.NONE,
+    jiraImports: {
+      nodes: [
+        {
+          jiraProjectKey: 'MJP',
+          scheduledAt: '2020-01-01T12:34:56Z',
+          scheduledBy: {
+            name: 'Jane Doe',
+            __typename: 'User',
+          },
+          __typename: 'JiraImport',
+        },
+      ],
+      __typename: 'JiraImportConnection',
+    },
+    services: {
+      nodes: [
+        {
+          projects: {
+            nodes: [
+              {
+                key: 'MJP',
+                name: 'My Jira Project',
+                __typename: 'JiraProject',
+              },
+              {
+                key: 'MTG',
+                name: 'Migrate To GitLab',
+                __typename: 'JiraProject',
+              },
+            ],
+            __typename: 'JiraProjectConnection',
+          },
+          __typename: 'JiraService',
+        },
+      ],
+      __typename: 'ServiceConnection',
+    },
+    __typename: 'Project',
+  },
+};
+
+export const jiraImportMutationResponse = {
+  jiraImportStart: {
+    clientMutationId: null,
+    jiraImport: {
+      jiraProjectKey: 'MTG',
+      scheduledAt: '2020-02-02T20:20:20Z',
+      scheduledBy: {
+        name: 'John Doe',
+        __typename: 'User',
+      },
+      __typename: 'JiraImport',
+    },
+    errors: [],
+    __typename: 'JiraImportStartPayload',
+  },
+};
diff --git a/spec/frontend/jira_import/utils/cache_update_spec.js b/spec/frontend/jira_import/utils/cache_update_spec.js
new file mode 100644
index 00000000000..4812510f9b8
--- /dev/null
+++ b/spec/frontend/jira_import/utils/cache_update_spec.js
@@ -0,0 +1,64 @@
+import { addInProgressImportToStore } from '~/jira_import/utils/cache_update';
+import { IMPORT_STATE } from '~/jira_import/utils/jira_import_utils';
+import {
+  fullPath,
+  queryDetails,
+  jiraImportDetailsQueryResponse,
+  jiraImportMutationResponse,
+} from '../mock_data';
+
+describe('addInProgressImportToStore', () => {
+  const store = {
+    readQuery: jest.fn(() => jiraImportDetailsQueryResponse),
+    writeQuery: jest.fn(),
+  };
+
+  describe('when updating the cache', () => {
+    beforeEach(() => {
+      addInProgressImportToStore(store, jiraImportMutationResponse.jiraImportStart, fullPath);
+    });
+
+    it('reads the cache with the correct query', () => {
+      expect(store.readQuery).toHaveBeenCalledWith(queryDetails);
+    });
+
+    it('writes to the cache with the expected arguments', () => {
+      const expected = {
+        ...queryDetails,
+        data: {
+          project: {
+            ...jiraImportDetailsQueryResponse.project,
+            jiraImportStatus: IMPORT_STATE.SCHEDULED,
+            jiraImports: {
+              ...jiraImportDetailsQueryResponse.project.jiraImports,
+              nodes: jiraImportDetailsQueryResponse.project.jiraImports.nodes.concat(
+                jiraImportMutationResponse.jiraImportStart.jiraImport,
+              ),
+            },
+          },
+        },
+      };
+
+      expect(store.writeQuery).toHaveBeenCalledWith(expected);
+    });
+  });
+
+  describe('when there are errors', () => {
+    beforeEach(() => {
+      const jiraImportStart = {
+        ...jiraImportMutationResponse.jiraImportStart,
+        errors: ['There was an error'],
+      };
+
+      addInProgressImportToStore(store, jiraImportStart, fullPath);
+    });
+
+    it('does not read from the store', () => {
+      expect(store.readQuery).not.toHaveBeenCalled();
+    });
+
+    it('does not write to the store', () => {
+      expect(store.writeQuery).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/frontend/jira_import/utils_spec.js b/spec/frontend/jira_import/utils/jira_import_utils_spec.js
index 0b1edd6550a..504d399217a 100644
--- a/spec/frontend/jira_import/utils_spec.js
+++ b/spec/frontend/jira_import/utils/jira_import_utils_spec.js
@@ -1,9 +1,10 @@
 import {
   calculateJiraImportLabel,
+  extractJiraProjectsOptions,
   IMPORT_STATE,
   isFinished,
   isInProgress,
-} from '~/jira_import/utils';
+} from '~/jira_import/utils/jira_import_utils';
 
 describe('isInProgress', () => {
   it.each`
@@ -33,6 +34,34 @@ describe('isFinished', () => {
   });
 });
 
+describe('extractJiraProjectsOptions', () => {
+  const jiraProjects = [
+    {
+      key: 'MJP',
+      name: 'My Jira project',
+    },
+    {
+      key: 'MTG',
+      name: 'Migrate to GitLab',
+    },
+  ];
+
+  const expected = [
+    {
+      text: 'My Jira project (MJP)',
+      value: 'MJP',
+    },
+    {
+      text: 'Migrate to GitLab (MTG)',
+      value: 'MTG',
+    },
+  ];
+
+  it('returns a list of Jira projects in a format suitable for GlFormSelect', () => {
+    expect(extractJiraProjectsOptions(jiraProjects)).toEqual(expected);
+  });
+});
+
 describe('calculateJiraImportLabel', () => {
   const jiraImports = [
     { jiraProjectKey: 'MTG' },
diff --git a/spec/frontend/jobs/components/artifacts_block_spec.js b/spec/frontend/jobs/components/artifacts_block_spec.js
index 9cb56737f3e..11bd645916e 100644
--- a/spec/frontend/jobs/components/artifacts_block_spec.js
+++ b/spec/frontend/jobs/components/artifacts_block_spec.js
@@ -1,20 +1,32 @@
-import Vue from 'vue';
+import { mount } from '@vue/test-utils';
 import { getTimeago } from '~/lib/utils/datetime_utility';
-import component from '~/jobs/components/artifacts_block.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
+import ArtifactsBlock from '~/jobs/components/artifacts_block.vue';
 import { trimText } from '../../helpers/text_helper';
 
 describe('Artifacts block', () => {
-  const Component = Vue.extend(component);
-  let vm;
+  let wrapper;
+
+  const createWrapper = propsData =>
+    mount(ArtifactsBlock, {
+      propsData,
+    });
+
+  const findArtifactRemoveElt = () => wrapper.find('[data-testid="artifacts-remove-timeline"]');
+  const findJobLockedElt = () => wrapper.find('[data-testid="job-locked-message"]');
+  const findKeepBtn = () => wrapper.find('[data-testid="keep-artifacts"]');
+  const findDownloadBtn = () => wrapper.find('[data-testid="download-artifacts"]');
+  const findBrowseBtn = () => wrapper.find('[data-testid="browse-artifacts"]');
 
   const expireAt = '2018-08-14T09:38:49.157Z';
   const timeago = getTimeago();
   const formattedDate = timeago.format(expireAt);
+  const lockedText =
+    'These artifacts are the latest. They will not be deleted (even if expired) until newer artifacts are available.';
 
   const expiredArtifact = {
     expire_at: expireAt,
     expired: true,
+    locked: false,
   };
 
   const nonExpiredArtifact = {
@@ -23,97 +35,127 @@ describe('Artifacts block', () => {
     keep_path: '/gitlab-org/gitlab-foss/-/jobs/98314558/artifacts/keep',
     expire_at: expireAt,
     expired: false,
+    locked: false,
+  };
+
+  const lockedExpiredArtifact = {
+    ...expiredArtifact,
+    download_path: '/gitlab-org/gitlab-foss/-/jobs/98314558/artifacts/download',
+    browse_path: '/gitlab-org/gitlab-foss/-/jobs/98314558/artifacts/browse',
+    expired: true,
+    locked: true,
+  };
+
+  const lockedNonExpiredArtifact = {
+    ...nonExpiredArtifact,
+    keep_path: undefined,
+    locked: true,
   };
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
+    wrapper = null;
   });
 
-  describe('with expired artifacts', () => {
-    it('renders expired artifact date and info', () => {
-      vm = mountComponent(Component, {
+  describe('with expired artifacts that are not locked', () => {
+    beforeEach(() => {
+      wrapper = createWrapper({
         artifact: expiredArtifact,
       });
+    });
 
-      expect(vm.$el.querySelector('.js-artifacts-removed')).not.toBeNull();
-      expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).toBeNull();
-      expect(trimText(vm.$el.querySelector('.js-artifacts-removed').textContent)).toEqual(
+    it('renders expired artifact date and info', () => {
+      expect(trimText(findArtifactRemoveElt().text())).toBe(
         `The artifacts were removed ${formattedDate}`,
       );
     });
+
+    it('does not show the keep button', () => {
+      expect(findKeepBtn().exists()).toBe(false);
+    });
+
+    it('does not show the download button', () => {
+      expect(findDownloadBtn().exists()).toBe(false);
+    });
+
+    it('does not show the browse button', () => {
+      expect(findBrowseBtn().exists()).toBe(false);
+    });
   });
 
   describe('with artifacts that will expire', () => {
-    it('renders will expire artifact date and info', () => {
-      vm = mountComponent(Component, {
+    beforeEach(() => {
+      wrapper = createWrapper({
         artifact: nonExpiredArtifact,
       });
+    });
 
-      expect(vm.$el.querySelector('.js-artifacts-removed')).toBeNull();
-      expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).not.toBeNull();
-      expect(trimText(vm.$el.querySelector('.js-artifacts-will-be-removed').textContent)).toEqual(
+    it('renders will expire artifact date and info', () => {
+      expect(trimText(findArtifactRemoveElt().text())).toBe(
         `The artifacts will be removed ${formattedDate}`,
       );
     });
-  });
 
-  describe('with keep path', () => {
     it('renders the keep button', () => {
-      vm = mountComponent(Component, {
-        artifact: nonExpiredArtifact,
-      });
-
-      expect(vm.$el.querySelector('.js-keep-artifacts')).not.toBeNull();
+      expect(findKeepBtn().exists()).toBe(true);
     });
-  });
 
-  describe('without keep path', () => {
-    it('does not render the keep button', () => {
-      vm = mountComponent(Component, {
-        artifact: expiredArtifact,
-      });
+    it('renders the download button', () => {
+      expect(findDownloadBtn().exists()).toBe(true);
+    });
 
-      expect(vm.$el.querySelector('.js-keep-artifacts')).toBeNull();
+    it('renders the browse button', () => {
+      expect(findBrowseBtn().exists()).toBe(true);
     });
   });
 
-  describe('with download path', () => {
-    it('renders the download button', () => {
-      vm = mountComponent(Component, {
-        artifact: nonExpiredArtifact,
+  describe('with expired locked artifacts', () => {
+    beforeEach(() => {
+      wrapper = createWrapper({
+        artifact: lockedExpiredArtifact,
       });
+    });
 
-      expect(vm.$el.querySelector('.js-download-artifacts')).not.toBeNull();
+    it('renders the information that the artefacts are locked', () => {
+      expect(findArtifactRemoveElt().exists()).toBe(false);
+      expect(trimText(findJobLockedElt().text())).toBe(lockedText);
     });
-  });
 
-  describe('without download path', () => {
     it('does not render the keep button', () => {
-      vm = mountComponent(Component, {
-        artifact: expiredArtifact,
-      });
+      expect(findKeepBtn().exists()).toBe(false);
+    });
 
-      expect(vm.$el.querySelector('.js-download-artifacts')).toBeNull();
+    it('renders the download button', () => {
+      expect(findDownloadBtn().exists()).toBe(true);
+    });
+
+    it('renders the browse button', () => {
+      expect(findBrowseBtn().exists()).toBe(true);
     });
   });
 
-  describe('with browse path', () => {
-    it('does not render the browse button', () => {
-      vm = mountComponent(Component, {
-        artifact: nonExpiredArtifact,
+  describe('with non expired locked artifacts', () => {
+    beforeEach(() => {
+      wrapper = createWrapper({
+        artifact: lockedNonExpiredArtifact,
       });
+    });
 
-      expect(vm.$el.querySelector('.js-browse-artifacts')).not.toBeNull();
+    it('renders the information that the artefacts are locked', () => {
+      expect(findArtifactRemoveElt().exists()).toBe(false);
+      expect(trimText(findJobLockedElt().text())).toBe(lockedText);
     });
-  });
 
-  describe('without browse path', () => {
-    it('does not render the browse button', () => {
-      vm = mountComponent(Component, {
-        artifact: expiredArtifact,
-      });
+    it('does not render the keep button', () => {
+      expect(findKeepBtn().exists()).toBe(false);
+    });
+
+    it('renders the download button', () => {
+      expect(findDownloadBtn().exists()).toBe(true);
+    });
 
-      expect(vm.$el.querySelector('.js-browse-artifacts')).toBeNull();
+    it('renders the browse button', () => {
+      expect(findBrowseBtn().exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/jobs/components/job_log_spec.js b/spec/frontend/jobs/components/job_log_spec.js
index 2bb1e0af3a2..a167fe8a134 100644
--- a/spec/frontend/jobs/components/job_log_spec.js
+++ b/spec/frontend/jobs/components/job_log_spec.js
@@ -10,7 +10,7 @@ describe('Job Log', () => {
   let vm;
 
   const trace =
-    '<span>Running with gitlab-runner 12.1.0 (de7731dd)<br/></span><span>  on docker-auto-scale-com d5ae8d25<br/></span><div class="append-right-8" data-timestamp="1565502765" data-section="prepare-executor" role="button"></div><span class="section section-header js-s-prepare-executor">Using Docker executor with image ruby:2.6 ...<br/></span>';
+    '<span>Running with gitlab-runner 12.1.0 (de7731dd)<br/></span><span>  on docker-auto-scale-com d5ae8d25<br/></span><div class="gl-mr-3" data-timestamp="1565502765" data-section="prepare-executor" role="button"></div><span class="section section-header js-s-prepare-executor">Using Docker executor with image ruby:2.6 ...<br/></span>';
 
   beforeEach(() => {
     store = createStore();
diff --git a/spec/frontend/jobs/components/log/mock_data.js b/spec/frontend/jobs/components/log/mock_data.js
index d92c009756a..a6a767f7921 100644
--- a/spec/frontend/jobs/components/log/mock_data.js
+++ b/spec/frontend/jobs/components/log/mock_data.js
@@ -34,7 +34,7 @@ export const utilsMockData = [
     content: [
       {
         text:
-          'Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.34',
+          'Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34',
       },
     ],
     section: 'prepare-executor',
diff --git a/spec/javascripts/labels_issue_sidebar_spec.js b/spec/frontend/labels_issue_sidebar_spec.js
index 94e833ec83b..fafefca94df 100644
--- a/spec/javascripts/labels_issue_sidebar_spec.js
+++ b/spec/frontend/labels_issue_sidebar_spec.js
@@ -21,7 +21,9 @@ function testLabelClicks(labelOrder, done) {
     .get(0)
     .click();
 
-  setTimeout(() => {
+  jest.runOnlyPendingTimers();
+
+  setImmediate(() => {
     const labelsInDropdown = $('.dropdown-content a');
 
     expect(labelsInDropdown.length).toBe(10);
@@ -38,11 +40,11 @@ function testLabelClicks(labelOrder, done) {
       .get(0)
       .click();
 
-    setTimeout(() => {
+    setImmediate(() => {
       expect($('.sidebar-collapsed-icon').attr('data-original-title')).toBe(labelOrder);
       done();
-    }, 0);
-  }, 0);
+    });
+  });
 }
 
 describe('Issue dropdown sidebar', () => {
diff --git a/spec/frontend/lazy_loader_spec.js b/spec/frontend/lazy_loader_spec.js
new file mode 100644
index 00000000000..79a49aedf37
--- /dev/null
+++ b/spec/frontend/lazy_loader_spec.js
@@ -0,0 +1,153 @@
+import { noop } from 'lodash';
+import LazyLoader from '~/lazy_loader';
+import { TEST_HOST } from 'helpers/test_constants';
+import waitForPromises from './helpers/wait_for_promises';
+import { useMockMutationObserver, useMockIntersectionObserver } from 'helpers/mock_dom_observer';
+
+const execImmediately = callback => {
+  callback();
+};
+
+const TEST_PATH = `${TEST_HOST}/img/testimg.png`;
+
+describe('LazyLoader', () => {
+  let lazyLoader = null;
+
+  const { trigger: triggerMutation } = useMockMutationObserver();
+  const { trigger: triggerIntersection } = useMockIntersectionObserver();
+
+  const triggerChildMutation = () => {
+    triggerMutation(document.body, { options: { childList: true, subtree: true } });
+  };
+
+  const triggerIntersectionWithRatio = img => {
+    triggerIntersection(img, { entry: { intersectionRatio: 0.1 } });
+  };
+
+  const createLazyLoadImage = () => {
+    const newImg = document.createElement('img');
+    newImg.className = 'lazy';
+    newImg.setAttribute('data-src', TEST_PATH);
+
+    document.body.appendChild(newImg);
+    triggerChildMutation();
+
+    return newImg;
+  };
+
+  const createImage = () => {
+    const newImg = document.createElement('img');
+    newImg.setAttribute('src', TEST_PATH);
+
+    document.body.appendChild(newImg);
+    triggerChildMutation();
+
+    return newImg;
+  };
+
+  beforeEach(() => {
+    jest.spyOn(window, 'requestAnimationFrame').mockImplementation(execImmediately);
+    jest.spyOn(window, 'requestIdleCallback').mockImplementation(execImmediately);
+    jest.spyOn(LazyLoader, 'loadImage');
+  });
+
+  afterEach(() => {
+    document.body.innerHTML = '';
+  });
+
+  describe.each`
+    hasIntersectionObserver | trigger
+    ${true}                 | ${triggerIntersectionWithRatio}
+    ${false}                | ${noop}
+  `(
+    'with hasIntersectionObserver=$hasIntersectionObserver',
+    ({ hasIntersectionObserver, trigger }) => {
+      let origIntersectionObserver;
+
+      beforeEach(() => {
+        origIntersectionObserver = global.IntersectionObserver;
+        global.IntersectionObserver = hasIntersectionObserver
+          ? global.IntersectionObserver
+          : undefined;
+
+        lazyLoader = new LazyLoader({
+          observerNode: 'foobar',
+        });
+      });
+
+      afterEach(() => {
+        global.IntersectionObserver = origIntersectionObserver;
+        lazyLoader.unregister();
+      });
+
+      it('determines intersection observer support', () => {
+        expect(LazyLoader.supportsIntersectionObserver()).toBe(hasIntersectionObserver);
+      });
+
+      it('should copy value from data-src to src for img 1', () => {
+        const img = createLazyLoadImage();
+
+        // Doing everything that happens normally in onload
+        lazyLoader.register();
+
+        trigger(img);
+
+        expect(LazyLoader.loadImage).toHaveBeenCalledWith(img);
+        expect(img.getAttribute('src')).toBe(TEST_PATH);
+        expect(img.getAttribute('data-src')).toBe(null);
+        expect(img).toHaveClass('js-lazy-loaded');
+      });
+
+      it('should lazy load dynamically added data-src images', async () => {
+        lazyLoader.register();
+
+        const newImg = createLazyLoadImage();
+
+        trigger(newImg);
+
+        await waitForPromises();
+
+        expect(LazyLoader.loadImage).toHaveBeenCalledWith(newImg);
+        expect(newImg.getAttribute('src')).toBe(TEST_PATH);
+        expect(newImg).toHaveClass('js-lazy-loaded');
+      });
+
+      it('should not alter normal images', () => {
+        const newImg = createImage();
+
+        lazyLoader.register();
+
+        expect(LazyLoader.loadImage).not.toHaveBeenCalled();
+        expect(newImg).not.toHaveClass('js-lazy-loaded');
+      });
+
+      it('should not load dynamically added pictures if content observer is turned off', async () => {
+        lazyLoader.register();
+        lazyLoader.stopContentObserver();
+
+        const newImg = createLazyLoadImage();
+
+        await waitForPromises();
+
+        expect(LazyLoader.loadImage).not.toHaveBeenCalledWith(newImg);
+        expect(newImg).not.toHaveClass('js-lazy-loaded');
+      });
+
+      it('should load dynamically added pictures if content observer is turned off and on again', async () => {
+        lazyLoader.register();
+        lazyLoader.stopContentObserver();
+        lazyLoader.startContentObserver();
+
+        const newImg = createLazyLoadImage();
+
+        trigger(newImg);
+
+        await waitForPromises();
+
+        expect(LazyLoader.loadImage).toHaveBeenCalledWith(newImg);
+        expect(newImg.getAttribute('src')).toBe(TEST_PATH);
+        expect(newImg).toHaveClass('js-lazy-loaded');
+      });
+    },
+  );
+});
diff --git a/spec/frontend/lib/utils/common_utils_spec.js b/spec/frontend/lib/utils/common_utils_spec.js
index c8dc90c9ace..f597255538c 100644
--- a/spec/frontend/lib/utils/common_utils_spec.js
+++ b/spec/frontend/lib/utils/common_utils_spec.js
@@ -1,4 +1,5 @@
 import * as commonUtils from '~/lib/utils/common_utils';
+import $ from 'jquery';
 
 describe('common_utils', () => {
   describe('parseUrl', () => {
@@ -211,6 +212,59 @@ describe('common_utils', () => {
     });
   });
 
+  describe('scrollToElement*', () => {
+    let elem;
+    const windowHeight = 1000;
+    const elemTop = 100;
+
+    beforeEach(() => {
+      elem = document.createElement('div');
+      window.innerHeight = windowHeight;
+      jest.spyOn($.fn, 'animate');
+      jest.spyOn($.fn, 'offset').mockReturnValue({ top: elemTop });
+    });
+
+    afterEach(() => {
+      $.fn.animate.mockRestore();
+      $.fn.offset.mockRestore();
+    });
+
+    describe('scrollToElement', () => {
+      it('scrolls to element', () => {
+        commonUtils.scrollToElement(elem);
+        expect($.fn.animate).toHaveBeenCalledWith(
+          {
+            scrollTop: elemTop,
+          },
+          expect.any(Number),
+        );
+      });
+
+      it('scrolls to element with offset', () => {
+        const offset = 50;
+        commonUtils.scrollToElement(elem, { offset });
+        expect($.fn.animate).toHaveBeenCalledWith(
+          {
+            scrollTop: elemTop + offset,
+          },
+          expect.any(Number),
+        );
+      });
+    });
+
+    describe('scrollToElementWithContext', () => {
+      it('scrolls with context', () => {
+        commonUtils.scrollToElementWithContext();
+        expect($.fn.animate).toHaveBeenCalledWith(
+          {
+            scrollTop: elemTop - windowHeight * 0.1,
+          },
+          expect.any(Number),
+        );
+      });
+    });
+  });
+
   describe('debounceByAnimationFrame', () => {
     it('debounces a function to allow a maximum of one call per animation frame', done => {
       const spy = jest.fn();
@@ -535,6 +589,7 @@ describe('common_utils', () => {
           id: 1,
           group_name: 'GitLab.org',
           absolute_web_url: 'https://gitlab.com/gitlab-org/',
+          milestones: ['12.3', '12.4'],
         },
         objNested: {
           project_name: 'GitLab CE',
@@ -545,6 +600,7 @@ describe('common_utils', () => {
             frontend_framework: 'Vue',
             database: 'PostgreSQL',
           },
+          milestones: ['12.3', '12.4'],
         },
       },
       convertObjectPropsToCamelCase: {
@@ -552,6 +608,7 @@ describe('common_utils', () => {
           id: 1,
           group_name: 'GitLab.org',
           absolute_web_url: 'https://gitlab.com/gitlab-org/',
+          milestones: ['12.3', '12.4'],
         },
         objNested: {
           project_name: 'GitLab CE',
@@ -562,6 +619,7 @@ describe('common_utils', () => {
             frontend_framework: 'Vue',
             database: 'PostgreSQL',
           },
+          milestones: ['12.3', '12.4'],
         },
       },
       convertObjectPropsToSnakeCase: {
@@ -569,6 +627,7 @@ describe('common_utils', () => {
           id: 1,
           groupName: 'GitLab.org',
           absoluteWebUrl: 'https://gitlab.com/gitlab-org/',
+          milestones: ['12.3', '12.4'],
         },
         objNested: {
           projectName: 'GitLab CE',
@@ -579,6 +638,7 @@ describe('common_utils', () => {
             frontendFramework: 'Vue',
             database: 'PostgreSQL',
           },
+          milestones: ['12.3', '12.4'],
         },
       },
     };
@@ -615,16 +675,19 @@ describe('common_utils', () => {
             id_converted: 1,
             group_name_converted: 'GitLab.org',
             absolute_web_url_converted: 'https://gitlab.com/gitlab-org/',
+            milestones_converted: ['12.3', '12.4'],
           },
           convertObjectPropsToCamelCase: {
             id: 1,
             groupName: 'GitLab.org',
             absoluteWebUrl: 'https://gitlab.com/gitlab-org/',
+            milestones: ['12.3', '12.4'],
           },
           convertObjectPropsToSnakeCase: {
             id: 1,
             group_name: 'GitLab.org',
             absolute_web_url: 'https://gitlab.com/gitlab-org/',
+            milestones: ['12.3', '12.4'],
           },
         };
 
@@ -642,6 +705,7 @@ describe('common_utils', () => {
               frontend_framework: 'Vue',
               database: 'PostgreSQL',
             },
+            milestones_converted: ['12.3', '12.4'],
           },
           convertObjectPropsToCamelCase: {
             projectName: 'GitLab CE',
@@ -652,6 +716,7 @@ describe('common_utils', () => {
               frontend_framework: 'Vue',
               database: 'PostgreSQL',
             },
+            milestones: ['12.3', '12.4'],
           },
           convertObjectPropsToSnakeCase: {
             project_name: 'GitLab CE',
@@ -662,6 +727,7 @@ describe('common_utils', () => {
               frontendFramework: 'Vue',
               database: 'PostgreSQL',
             },
+            milestones: ['12.3', '12.4'],
           },
         };
 
@@ -680,6 +746,7 @@ describe('common_utils', () => {
                 frontend_framework_converted: 'Vue',
                 database_converted: 'PostgreSQL',
               },
+              milestones_converted: ['12.3', '12.4'],
             },
             convertObjectPropsToCamelCase: {
               projectName: 'GitLab CE',
@@ -690,6 +757,7 @@ describe('common_utils', () => {
                 frontendFramework: 'Vue',
                 database: 'PostgreSQL',
               },
+              milestones: ['12.3', '12.4'],
             },
             convertObjectPropsToSnakeCase: {
               project_name: 'GitLab CE',
@@ -700,6 +768,7 @@ describe('common_utils', () => {
                 frontend_framework: 'Vue',
                 database: 'PostgreSQL',
               },
+              milestones: ['12.3', '12.4'],
             },
           };
 
@@ -729,6 +798,7 @@ describe('common_utils', () => {
                   frontend_framework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones_converted: ['12.3', '12.4'],
               },
               convertObjectPropsToCamelCase: {
                 projectName: 'GitLab CE',
@@ -738,6 +808,7 @@ describe('common_utils', () => {
                   frontend_framework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones: ['12.3', '12.4'],
               },
               convertObjectPropsToSnakeCase: {
                 project_name: 'GitLab CE',
@@ -747,6 +818,7 @@ describe('common_utils', () => {
                   frontendFramework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones: ['12.3', '12.4'],
               },
             };
 
@@ -772,6 +844,7 @@ describe('common_utils', () => {
                   backend_converted: 'Ruby',
                   frontend_framework_converted: 'Vue',
                 },
+                milestones_converted: ['12.3', '12.4'],
               },
               convertObjectPropsToCamelCase: {
                 projectName: 'GitLab CE',
@@ -780,6 +853,7 @@ describe('common_utils', () => {
                   backend: 'Ruby',
                   frontendFramework: 'Vue',
                 },
+                milestones: ['12.3', '12.4'],
               },
               convertObjectPropsToSnakeCase: {
                 project_name: 'GitLab CE',
@@ -788,6 +862,7 @@ describe('common_utils', () => {
                   backend: 'Ruby',
                   frontend_framework: 'Vue',
                 },
+                milestones: ['12.3', '12.4'],
               },
             };
 
@@ -818,6 +893,7 @@ describe('common_utils', () => {
                   frontend_framework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones_converted: ['12.3', '12.4'],
               },
               convertObjectPropsToCamelCase: {
                 projectName: 'GitLab CE',
@@ -828,6 +904,7 @@ describe('common_utils', () => {
                   frontend_framework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones: ['12.3', '12.4'],
               },
               convertObjectPropsToSnakeCase: {
                 project_name: 'GitLab CE',
@@ -838,6 +915,7 @@ describe('common_utils', () => {
                   frontendFramework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones: ['12.3', '12.4'],
               },
             };
 
@@ -865,6 +943,7 @@ describe('common_utils', () => {
                   frontend_framework: 'Vue',
                   database_converted: 'PostgreSQL',
                 },
+                milestones_converted: ['12.3', '12.4'],
               },
               convertObjectPropsToCamelCase: {
                 projectName: 'GitLab CE',
@@ -875,6 +954,7 @@ describe('common_utils', () => {
                   frontend_framework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones: ['12.3', '12.4'],
               },
               convertObjectPropsToSnakeCase: {
                 project_name: 'GitLab CE',
@@ -885,6 +965,7 @@ describe('common_utils', () => {
                   frontendFramework: 'Vue',
                   database: 'PostgreSQL',
                 },
+                milestones: ['12.3', '12.4'],
               },
             };
 
diff --git a/spec/frontend/lib/utils/text_markdown_spec.js b/spec/frontend/lib/utils/text_markdown_spec.js
index 1d616a7da0b..aca299aea0f 100644
--- a/spec/frontend/lib/utils/text_markdown_spec.js
+++ b/spec/frontend/lib/utils/text_markdown_spec.js
@@ -25,13 +25,13 @@ describe('init markdown', () => {
         insertMarkdownText({
           textArea,
           text: textArea.value,
-          tag: '* ',
+          tag: '- ',
           blockTag: null,
           selected: '',
           wrap: false,
         });
 
-        expect(textArea.value).toEqual(`${initialValue}* `);
+        expect(textArea.value).toEqual(`${initialValue}- `);
       });
 
       it('inserts the tag on a new line if the current one is not empty', () => {
@@ -43,13 +43,13 @@ describe('init markdown', () => {
         insertMarkdownText({
           textArea,
           text: textArea.value,
-          tag: '* ',
+          tag: '- ',
           blockTag: null,
           selected: '',
           wrap: false,
         });
 
-        expect(textArea.value).toEqual(`${initialValue}\n* `);
+        expect(textArea.value).toEqual(`${initialValue}\n- `);
       });
 
       it('inserts the tag on the same line if the current line only contains spaces', () => {
@@ -61,13 +61,13 @@ describe('init markdown', () => {
         insertMarkdownText({
           textArea,
           text: textArea.value,
-          tag: '* ',
+          tag: '- ',
           blockTag: null,
           selected: '',
           wrap: false,
         });
 
-        expect(textArea.value).toEqual(`${initialValue}* `);
+        expect(textArea.value).toEqual(`${initialValue}- `);
       });
 
       it('inserts the tag on the same line if the current line only contains tabs', () => {
@@ -79,13 +79,13 @@ describe('init markdown', () => {
         insertMarkdownText({
           textArea,
           text: textArea.value,
-          tag: '* ',
+          tag: '- ',
           blockTag: null,
           selected: '',
           wrap: false,
         });
 
-        expect(textArea.value).toEqual(`${initialValue}* `);
+        expect(textArea.value).toEqual(`${initialValue}- `);
       });
 
       it('places the cursor inside the tags', () => {
diff --git a/spec/frontend/lib/utils/text_utility_spec.js b/spec/frontend/lib/utils/text_utility_spec.js
index 4969c591dcd..76e0e435860 100644
--- a/spec/frontend/lib/utils/text_utility_spec.js
+++ b/spec/frontend/lib/utils/text_utility_spec.js
@@ -126,6 +126,8 @@ describe('text_utility', () => {
       ${'snake case'}          | ${'snake_case'}
       ${'snake_case'}          | ${'snake_case'}
       ${'snakeCasesnake Case'} | ${'snake_casesnake_case'}
+      ${'123'}                 | ${'123'}
+      ${'123 456'}             | ${'123_456'}
     `('converts string $txt to $result string', ({ txt, result }) => {
       expect(textUtils.convertToSnakeCase(txt)).toEqual(result);
     });
@@ -190,6 +192,20 @@ describe('text_utility', () => {
         'app/…/…/diff',
       );
     });
+
+    describe('given a path too long for the maxWidth', () => {
+      it.each`
+        path          | maxWidth | result
+        ${'aa/bb/cc'} | ${1}     | ${'…'}
+        ${'aa/bb/cc'} | ${2}     | ${'…'}
+        ${'aa/bb/cc'} | ${3}     | ${'…/…'}
+        ${'aa/bb/cc'} | ${4}     | ${'…/…'}
+        ${'aa/bb/cc'} | ${5}     | ${'…/…/…'}
+      `('truncates ($path, $maxWidth) to $result', ({ path, maxWidth, result }) => {
+        expect(result.length).toBeLessThanOrEqual(maxWidth);
+        expect(textUtils.truncatePathMiddleToLength(path, maxWidth)).toEqual(result);
+      });
+    });
   });
 
   describe('slugifyWithUnderscore', () => {
diff --git a/spec/frontend/lib/utils/url_utility_spec.js b/spec/frontend/lib/utils/url_utility_spec.js
index c494033badd..85e680fe216 100644
--- a/spec/frontend/lib/utils/url_utility_spec.js
+++ b/spec/frontend/lib/utils/url_utility_spec.js
@@ -371,6 +371,23 @@ describe('URL utility', () => {
     });
   });
 
+  describe('isBase64DataUrl', () => {
+    it.each`
+      url                                                      | valid
+      ${undefined}                                             | ${false}
+      ${'http://gitlab.com'}                                   | ${false}
+      ${'data:image/png;base64,abcdef'}                        | ${true}
+      ${'data:application/smil+xml;base64,abcdef'}             | ${true}
+      ${'data:application/vnd.syncml+xml;base64,abcdef'}       | ${true}
+      ${'data:application/vnd.3m.post-it-notes;base64,abcdef'} | ${true}
+      ${'notaurl'}                                             | ${false}
+      ${'../relative_url'}                                     | ${false}
+      ${'<a></a>'}                                             | ${false}
+    `('returns $valid for $url', ({ url, valid }) => {
+      expect(urlUtils.isBase64DataUrl(url)).toBe(valid);
+    });
+  });
+
   describe('relativePathToAbsolute', () => {
     it.each`
       path                       | base                                  | result
diff --git a/spec/frontend/line_highlighter_spec.js b/spec/frontend/line_highlighter_spec.js
new file mode 100644
index 00000000000..0da1ea1df2d
--- /dev/null
+++ b/spec/frontend/line_highlighter_spec.js
@@ -0,0 +1,268 @@
+/* eslint-disable no-return-assign, no-new, no-underscore-dangle */
+
+import $ from 'jquery';
+import LineHighlighter from '~/line_highlighter';
+
+describe('LineHighlighter', () => {
+  const testContext = {};
+
+  preloadFixtures('static/line_highlighter.html');
+  const clickLine = (number, eventData = {}) => {
+    if ($.isEmptyObject(eventData)) {
+      return $(`#L${number}`).click();
+    }
+    const e = $.Event('click', eventData);
+    return $(`#L${number}`).trigger(e);
+  };
+  beforeEach(() => {
+    loadFixtures('static/line_highlighter.html');
+    testContext.class = new LineHighlighter();
+    testContext.css = testContext.class.highlightLineClass;
+    return (testContext.spies = {
+      __setLocationHash__: jest
+        .spyOn(testContext.class, '__setLocationHash__')
+        .mockImplementation(() => {}),
+    });
+  });
+
+  describe('behavior', () => {
+    it('highlights one line given in the URL hash', () => {
+      new LineHighlighter({ hash: '#L13' });
+
+      expect($('#LC13')).toHaveClass(testContext.css);
+    });
+
+    it('highlights one line given in the URL hash with given CSS class name', () => {
+      const hiliter = new LineHighlighter({ hash: '#L13', highlightLineClass: 'hilite' });
+
+      expect(hiliter.highlightLineClass).toBe('hilite');
+      expect($('#LC13')).toHaveClass('hilite');
+      expect($('#LC13')).not.toHaveClass('hll');
+    });
+
+    it('highlights a range of lines given in the URL hash', () => {
+      new LineHighlighter({ hash: '#L5-25' });
+
+      expect($(`.${testContext.css}`).length).toBe(21);
+      for (let line = 5; line <= 25; line += 1) {
+        expect($(`#LC${line}`)).toHaveClass(testContext.css);
+      }
+    });
+
+    it('scrolls to the first highlighted line on initial load', () => {
+      const spy = jest.spyOn($, 'scrollTo');
+      new LineHighlighter({ hash: '#L5-25' });
+
+      expect(spy).toHaveBeenCalledWith('#L5', expect.anything());
+    });
+
+    it('discards click events', () => {
+      const clickSpy = jest.fn();
+
+      $('a[data-line-number]').click(clickSpy);
+
+      clickLine(13);
+
+      expect(clickSpy.mock.calls[0][0].isDefaultPrevented()).toEqual(true);
+    });
+
+    it('handles garbage input from the hash', () => {
+      const func = () => {
+        return new LineHighlighter({ fileHolderSelector: '#blob-content-holder' });
+      };
+
+      expect(func).not.toThrow();
+    });
+
+    it('handles hashchange event', () => {
+      const highlighter = new LineHighlighter();
+
+      jest.spyOn(highlighter, 'highlightHash').mockImplementation(() => {});
+
+      window.dispatchEvent(new Event('hashchange'), 'L15');
+
+      expect(highlighter.highlightHash).toHaveBeenCalled();
+    });
+  });
+
+  describe('clickHandler', () => {
+    it('handles clicking on a child icon element', () => {
+      const spy = jest.spyOn(testContext.class, 'setHash');
+      $('#L13 i')
+        .mousedown()
+        .click();
+
+      expect(spy).toHaveBeenCalledWith(13);
+      expect($('#LC13')).toHaveClass(testContext.css);
+    });
+
+    describe('without shiftKey', () => {
+      it('highlights one line when clicked', () => {
+        clickLine(13);
+
+        expect($('#LC13')).toHaveClass(testContext.css);
+      });
+
+      it('unhighlights previously highlighted lines', () => {
+        clickLine(13);
+        clickLine(20);
+
+        expect($('#LC13')).not.toHaveClass(testContext.css);
+        expect($('#LC20')).toHaveClass(testContext.css);
+      });
+
+      it('sets the hash', () => {
+        const spy = jest.spyOn(testContext.class, 'setHash');
+        clickLine(13);
+
+        expect(spy).toHaveBeenCalledWith(13);
+      });
+    });
+
+    describe('with shiftKey', () => {
+      it('sets the hash', () => {
+        const spy = jest.spyOn(testContext.class, 'setHash');
+        clickLine(13);
+        clickLine(20, {
+          shiftKey: true,
+        });
+
+        expect(spy).toHaveBeenCalledWith(13);
+        expect(spy).toHaveBeenCalledWith(13, 20);
+      });
+
+      describe('without existing highlight', () => {
+        it('highlights the clicked line', () => {
+          clickLine(13, {
+            shiftKey: true,
+          });
+
+          expect($('#LC13')).toHaveClass(testContext.css);
+          expect($(`.${testContext.css}`).length).toBe(1);
+        });
+
+        it('sets the hash', () => {
+          const spy = jest.spyOn(testContext.class, 'setHash');
+          clickLine(13, {
+            shiftKey: true,
+          });
+
+          expect(spy).toHaveBeenCalledWith(13);
+        });
+      });
+
+      describe('with existing single-line highlight', () => {
+        it('uses existing line as last line when target is lesser', () => {
+          clickLine(20);
+          clickLine(15, {
+            shiftKey: true,
+          });
+
+          expect($(`.${testContext.css}`).length).toBe(6);
+          for (let line = 15; line <= 20; line += 1) {
+            expect($(`#LC${line}`)).toHaveClass(testContext.css);
+          }
+        });
+
+        it('uses existing line as first line when target is greater', () => {
+          clickLine(5);
+          clickLine(10, {
+            shiftKey: true,
+          });
+
+          expect($(`.${testContext.css}`).length).toBe(6);
+          for (let line = 5; line <= 10; line += 1) {
+            expect($(`#LC${line}`)).toHaveClass(testContext.css);
+          }
+        });
+      });
+
+      describe('with existing multi-line highlight', () => {
+        beforeEach(() => {
+          clickLine(10, {
+            shiftKey: true,
+          });
+          clickLine(13, {
+            shiftKey: true,
+          });
+        });
+
+        it('uses target as first line when it is less than existing first line', () => {
+          clickLine(5, {
+            shiftKey: true,
+          });
+
+          expect($(`.${testContext.css}`).length).toBe(6);
+          for (let line = 5; line <= 10; line += 1) {
+            expect($(`#LC${line}`)).toHaveClass(testContext.css);
+          }
+        });
+
+        it('uses target as last line when it is greater than existing first line', () => {
+          clickLine(15, {
+            shiftKey: true,
+          });
+
+          expect($(`.${testContext.css}`).length).toBe(6);
+          for (let line = 10; line <= 15; line += 1) {
+            expect($(`#LC${line}`)).toHaveClass(testContext.css);
+          }
+        });
+      });
+    });
+  });
+
+  describe('hashToRange', () => {
+    beforeEach(() => {
+      testContext.subject = testContext.class.hashToRange;
+    });
+
+    it('extracts a single line number from the hash', () => {
+      expect(testContext.subject('#L5')).toEqual([5, null]);
+    });
+
+    it('extracts a range of line numbers from the hash', () => {
+      expect(testContext.subject('#L5-15')).toEqual([5, 15]);
+    });
+
+    it('returns [null, null] when the hash is not a line number', () => {
+      expect(testContext.subject('#foo')).toEqual([null, null]);
+    });
+  });
+
+  describe('highlightLine', () => {
+    beforeEach(() => {
+      testContext.subject = testContext.class.highlightLine;
+    });
+
+    it('highlights the specified line', () => {
+      testContext.subject(13);
+
+      expect($('#LC13')).toHaveClass(testContext.css);
+    });
+
+    it('accepts a String-based number', () => {
+      testContext.subject('13');
+
+      expect($('#LC13')).toHaveClass(testContext.css);
+    });
+  });
+
+  describe('setHash', () => {
+    beforeEach(() => {
+      testContext.subject = testContext.class.setHash;
+    });
+
+    it('sets the location hash for a single line', () => {
+      testContext.subject(5);
+
+      expect(testContext.spies.__setLocationHash__).toHaveBeenCalledWith('#L5');
+    });
+
+    it('sets the location hash for a range', () => {
+      testContext.subject(5, 15);
+
+      expect(testContext.spies.__setLocationHash__).toHaveBeenCalledWith('#L5-15');
+    });
+  });
+});
diff --git a/spec/frontend/logs/components/environment_logs_spec.js b/spec/frontend/logs/components/environment_logs_spec.js
index 9046253bdc6..62f3e8a755d 100644
--- a/spec/frontend/logs/components/environment_logs_spec.js
+++ b/spec/frontend/logs/components/environment_logs_spec.js
@@ -301,11 +301,11 @@ describe('EnvironmentLogs', () => {
       });
 
       it('refresh button, trace is refreshed', () => {
-        expect(dispatch).not.toHaveBeenCalledWith(`${module}/fetchLogs`, undefined);
+        expect(dispatch).not.toHaveBeenCalledWith(`${module}/refreshPodLogs`, undefined);
 
         findLogControlButtons().vm.$emit('refresh');
 
-        expect(dispatch).toHaveBeenCalledWith(`${module}/fetchLogs`, undefined);
+        expect(dispatch).toHaveBeenCalledWith(`${module}/refreshPodLogs`, undefined);
       });
     });
   });
diff --git a/spec/frontend/logs/stores/actions_spec.js b/spec/frontend/logs/stores/actions_spec.js
index 6199c400e16..e2e3c3d23c6 100644
--- a/spec/frontend/logs/stores/actions_spec.js
+++ b/spec/frontend/logs/stores/actions_spec.js
@@ -1,6 +1,6 @@
 import MockAdapter from 'axios-mock-adapter';
-
 import testAction from 'helpers/vuex_action_helper';
+import Tracking from '~/tracking';
 import * as types from '~/logs/stores/mutation_types';
 import { convertToFixedRange } from '~/lib/utils/datetime_range';
 import logsPageState from '~/logs/stores/state';
@@ -104,7 +104,7 @@ describe('Logs Store actions', () => {
           { type: types.SET_CURRENT_POD_NAME, payload: null },
           { type: types.SET_SEARCH, payload: '' },
         ],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'used_search_bar' }],
       ));
 
     it('text search should filter with a search term', () =>
@@ -116,7 +116,7 @@ describe('Logs Store actions', () => {
           { type: types.SET_CURRENT_POD_NAME, payload: null },
           { type: types.SET_SEARCH, payload: mockSearch },
         ],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'used_search_bar' }],
       ));
 
     it('pod search should filter with a search term', () =>
@@ -128,7 +128,7 @@ describe('Logs Store actions', () => {
           { type: types.SET_CURRENT_POD_NAME, payload: mockPodName },
           { type: types.SET_SEARCH, payload: '' },
         ],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'used_search_bar' }],
       ));
 
     it('pod search should filter with a pod selection and a search term', () =>
@@ -140,7 +140,7 @@ describe('Logs Store actions', () => {
           { type: types.SET_CURRENT_POD_NAME, payload: mockPodName },
           { type: types.SET_SEARCH, payload: mockSearch },
         ],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'used_search_bar' }],
       ));
 
     it('pod search should filter with a pod selection and two search terms', () =>
@@ -152,7 +152,7 @@ describe('Logs Store actions', () => {
           { type: types.SET_CURRENT_POD_NAME, payload: null },
           { type: types.SET_SEARCH, payload: `term1 term2` },
         ],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'used_search_bar' }],
       ));
 
     it('pod search should filter with a pod selection and a search terms before and after', () =>
@@ -168,7 +168,7 @@ describe('Logs Store actions', () => {
           { type: types.SET_CURRENT_POD_NAME, payload: mockPodName },
           { type: types.SET_SEARCH, payload: `term1 term2` },
         ],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'used_search_bar' }],
       ));
   });
 
@@ -179,7 +179,7 @@ describe('Logs Store actions', () => {
         mockPodName,
         state,
         [{ type: types.SET_CURRENT_POD_NAME, payload: mockPodName }],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'pod_log_changed' }],
       ));
   });
 
@@ -198,7 +198,7 @@ describe('Logs Store actions', () => {
           { type: types.REQUEST_ENVIRONMENTS_DATA },
           { type: types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS, payload: mockEnvironments },
         ],
-        [{ type: 'fetchLogs' }],
+        [{ type: 'fetchLogs', payload: 'environment_selected' }],
       );
     });
 
@@ -471,3 +471,58 @@ describe('Logs Store actions', () => {
     });
   });
 });
+
+describe('Tracking user interaction', () => {
+  let commit;
+  let dispatch;
+  let state;
+  let mock;
+
+  beforeEach(() => {
+    jest.spyOn(Tracking, 'event');
+    commit = jest.fn();
+    dispatch = jest.fn();
+    state = logsPageState();
+    state.environments.options = mockEnvironments;
+    state.environments.current = mockEnvName;
+
+    mock = new MockAdapter(axios);
+  });
+
+  afterEach(() => {
+    mock.reset();
+  });
+
+  describe('Logs with data', () => {
+    beforeEach(() => {
+      mock.onGet(mockLogsEndpoint).reply(200, mockResponse);
+      mock.onGet(mockLogsEndpoint).replyOnce(202); // mock reactive cache
+    });
+
+    it('tracks fetched logs with data', () => {
+      return fetchLogs({ state, commit, dispatch }, 'environment_selected').then(() => {
+        expect(Tracking.event).toHaveBeenCalledWith(document.body.dataset.page, 'logs_view', {
+          label: 'environment_selected',
+          property: 'count',
+          value: 1,
+        });
+      });
+    });
+  });
+
+  describe('Logs without data', () => {
+    beforeEach(() => {
+      mock.onGet(mockLogsEndpoint).reply(200, {
+        ...mockResponse,
+        logs: [],
+      });
+      mock.onGet(mockLogsEndpoint).replyOnce(202); // mock reactive cache
+    });
+
+    it('does not track empty log responses', () => {
+      return fetchLogs({ state, commit, dispatch }).then(() => {
+        expect(Tracking.event).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/spec/frontend/matchers.js b/spec/frontend/matchers.js
index 35c362d0bf5..53c6a72eea0 100644
--- a/spec/frontend/matchers.js
+++ b/spec/frontend/matchers.js
@@ -35,4 +35,37 @@ export default {
       message: () => message,
     };
   },
+  toMatchInterpolatedText(received, match) {
+    let clearReceived;
+    let clearMatch;
+
+    try {
+      clearReceived = received
+        .replace(/\s\s+/gm, ' ')
+        .replace(/\s\./gm, '.')
+        .trim();
+    } catch (e) {
+      return { actual: received, message: 'The received value is not a string', pass: false };
+    }
+    try {
+      clearMatch = match.replace(/%{\w+}/gm, '').trim();
+    } catch (e) {
+      return { message: 'The comparator value is not a string', pass: false };
+    }
+    const pass = clearReceived === clearMatch;
+    const message = pass
+      ? () => `
+          \n\n
+          Expected: ${this.utils.printExpected(clearReceived)}
+          To not equal: ${this.utils.printReceived(clearMatch)}
+          `
+      : () =>
+          `
+        \n\n
+        Expected: ${this.utils.printExpected(clearReceived)}
+        To equal: ${this.utils.printReceived(clearMatch)}
+        `;
+
+    return { actual: received, message, pass };
+  },
 };
diff --git a/spec/frontend/matchers_spec.js b/spec/frontend/matchers_spec.js
new file mode 100644
index 00000000000..0a2478f978a
--- /dev/null
+++ b/spec/frontend/matchers_spec.js
@@ -0,0 +1,48 @@
+describe('Custom jest matchers', () => {
+  describe('toMatchInterpolatedText', () => {
+    describe('malformed input', () => {
+      it.each([null, 1, Symbol, Array, Object])(
+        'fails graciously if the expected value is %s',
+        expected => {
+          expect(expected).not.toMatchInterpolatedText('null');
+        },
+      );
+    });
+    describe('malformed matcher', () => {
+      it.each([null, 1, Symbol, Array, Object])(
+        'fails graciously if the matcher is %s',
+        matcher => {
+          expect('null').not.toMatchInterpolatedText(matcher);
+        },
+      );
+    });
+
+    describe('positive assertion', () => {
+      it.each`
+        htmlString         | templateString
+        ${'foo'}           | ${'foo'}
+        ${'foo'}           | ${'foo%{foo}'}
+        ${'foo  '}         | ${'foo'}
+        ${'foo  '}         | ${'foo%{foo}'}
+        ${'foo   . '}      | ${'foo%{foo}.'}
+        ${'foo   bar . '}  | ${'foo%{foo} bar.'}
+        ${'foo\n\nbar . '} | ${'foo%{foo} bar.'}
+        ${'foo bar . .'}   | ${'foo%{fooStart} bar.%{fooEnd}.'}
+      `('$htmlString equals $templateString', ({ htmlString, templateString }) => {
+        expect(htmlString).toMatchInterpolatedText(templateString);
+      });
+    });
+
+    describe('negative assertion', () => {
+      it.each`
+        htmlString  | templateString
+        ${'foo'}    | ${'bar'}
+        ${'foo'}    | ${'bar%{foo}'}
+        ${'foo'}    | ${'@{lol}foo%{foo}'}
+        ${' fo o '} | ${'foo'}
+      `('$htmlString does not equal $templateString', ({ htmlString, templateString }) => {
+        expect(htmlString).not.toMatchInterpolatedText(templateString);
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/merge_request_spec.js b/spec/frontend/merge_request_spec.js
index b6173b9b171..f4f2a78f5f7 100644
--- a/spec/javascripts/merge_request_spec.js
+++ b/spec/frontend/merge_request_spec.js
@@ -4,24 +4,26 @@ import axios from '~/lib/utils/axios_utils';
 import MergeRequest from '~/merge_request';
 import CloseReopenReportToggle from '~/close_reopen_report_toggle';
 import IssuablesHelper from '~/helpers/issuables_helper';
+import { TEST_HOST } from 'spec/test_constants';
 
-describe('MergeRequest', function() {
-  describe('task lists', function() {
+describe('MergeRequest', () => {
+  const test = {};
+  describe('task lists', () => {
     let mock;
 
     preloadFixtures('merge_requests/merge_request_with_task_list.html');
-    beforeEach(function() {
+    beforeEach(() => {
       loadFixtures('merge_requests/merge_request_with_task_list.html');
 
-      spyOn(axios, 'patch').and.callThrough();
+      jest.spyOn(axios, 'patch');
       mock = new MockAdapter(axios);
 
       mock
-        .onPatch(`${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`)
+        .onPatch(`${TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`)
         .reply(200, {});
 
-      this.merge = new MergeRequest();
-      return this.merge;
+      test.merge = new MergeRequest();
+      return test.merge;
     });
 
     afterEach(() => {
@@ -29,14 +31,14 @@ describe('MergeRequest', function() {
     });
 
     it('modifies the Markdown field', done => {
-      spyOn($, 'ajax').and.stub();
+      jest.spyOn($, 'ajax').mockImplementation();
       const changeEvent = document.createEvent('HTMLEvents');
       changeEvent.initEvent('change', true, true);
       $('input[type=checkbox]')
         .first()
         .attr('checked', true)[0]
         .dispatchEvent(changeEvent);
-      setTimeout(() => {
+      setImmediate(() => {
         expect($('.js-task-list-field').val()).toBe(
           '- [x] Task List Item\n- [ ]   \n- [ ] Task List Item 2\n',
         );
@@ -46,14 +48,14 @@ describe('MergeRequest', function() {
 
     it('ensure that task with only spaces does not get checked incorrectly', done => {
       // fixed in 'deckar01-task_list', '2.2.1' gem
-      spyOn($, 'ajax').and.stub();
+      jest.spyOn($, 'ajax').mockImplementation();
       const changeEvent = document.createEvent('HTMLEvents');
       changeEvent.initEvent('change', true, true);
       $('input[type=checkbox]')
         .last()
         .attr('checked', true)[0]
         .dispatchEvent(changeEvent);
-      setTimeout(() => {
+      setImmediate(() => {
         expect($('.js-task-list-field').val()).toBe(
           '- [ ] Task List Item\n- [ ]   \n- [x] Task List Item 2\n',
         );
@@ -73,9 +75,9 @@ describe('MergeRequest', function() {
           detail: { lineNumber, lineSource, index, checked },
         });
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(axios.patch).toHaveBeenCalledWith(
-            `${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`,
+            `${TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`,
             {
               merge_request: {
                 description: '- [ ] Task List Item\n- [ ]   \n- [ ] Task List Item 2\n',
@@ -89,13 +91,9 @@ describe('MergeRequest', function() {
         });
       });
 
-      // https://gitlab.com/gitlab-org/gitlab/issues/34861
-      // eslint-disable-next-line jasmine/no-disabled-tests
-      xit('shows an error notification when tasklist update failed', done => {
+      it('shows an error notification when tasklist update failed', done => {
         mock
-          .onPatch(
-            `${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`,
-          )
+          .onPatch(`${TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`)
           .reply(409, {});
 
         $('.js-task-list-field').trigger({
@@ -103,7 +101,7 @@ describe('MergeRequest', function() {
           detail: { lineNumber, lineSource, index, checked },
         });
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(document.querySelector('.flash-container .flash-text').innerText.trim()).toBe(
             'Someone edited this merge request at the same time you did. Please refresh the page to see changes.',
           );
@@ -116,11 +114,11 @@ describe('MergeRequest', function() {
 
   describe('class constructor', () => {
     beforeEach(() => {
-      spyOn($, 'ajax').and.stub();
+      jest.spyOn($, 'ajax').mockImplementation();
     });
 
     it('calls .initCloseReopenReport', () => {
-      spyOn(IssuablesHelper, 'initCloseReopenReport');
+      jest.spyOn(IssuablesHelper, 'initCloseReopenReport').mockImplementation(() => {});
 
       new MergeRequest(); // eslint-disable-line no-new
 
@@ -128,14 +126,20 @@ describe('MergeRequest', function() {
     });
 
     it('calls .initDroplab', () => {
-      const container = jasmine.createSpyObj('container', ['querySelector']);
+      const container = {
+        querySelector: jest.fn().mockName('container.querySelector'),
+      };
       const dropdownTrigger = {};
       const dropdownList = {};
       const button = {};
 
-      spyOn(CloseReopenReportToggle.prototype, 'initDroplab');
-      spyOn(document, 'querySelector').and.returnValue(container);
-      container.querySelector.and.returnValues(dropdownTrigger, dropdownList, button);
+      jest.spyOn(CloseReopenReportToggle.prototype, 'initDroplab').mockImplementation(() => {});
+      jest.spyOn(document, 'querySelector').mockReturnValue(container);
+
+      container.querySelector
+        .mockReturnValueOnce(dropdownTrigger)
+        .mockReturnValueOnce(dropdownList)
+        .mockReturnValueOnce(button);
 
       new MergeRequest(); // eslint-disable-line no-new
 
@@ -151,15 +155,15 @@ describe('MergeRequest', function() {
     describe('merge request of another user', () => {
       beforeEach(() => {
         loadFixtures('merge_requests/merge_request_with_task_list.html');
-        this.el = document.querySelector('.js-issuable-actions');
+        test.el = document.querySelector('.js-issuable-actions');
         new MergeRequest(); // eslint-disable-line no-new
         MergeRequest.hideCloseButton();
       });
 
       it('hides the dropdown close item and selects the next item', () => {
-        const closeItem = this.el.querySelector('li.close-item');
-        const smallCloseItem = this.el.querySelector('.js-close-item');
-        const reportItem = this.el.querySelector('li.report-item');
+        const closeItem = test.el.querySelector('li.close-item');
+        const smallCloseItem = test.el.querySelector('.js-close-item');
+        const reportItem = test.el.querySelector('li.report-item');
 
         expect(closeItem).toHaveClass('hidden');
         expect(smallCloseItem).toHaveClass('hidden');
@@ -171,13 +175,13 @@ describe('MergeRequest', function() {
     describe('merge request of current_user', () => {
       beforeEach(() => {
         loadFixtures('merge_requests/merge_request_of_current_user.html');
-        this.el = document.querySelector('.js-issuable-actions');
+        test.el = document.querySelector('.js-issuable-actions');
         MergeRequest.hideCloseButton();
       });
 
       it('hides the close button', () => {
-        const closeButton = this.el.querySelector('.btn-close');
-        const smallCloseItem = this.el.querySelector('.js-close-item');
+        const closeButton = test.el.querySelector('.btn-close');
+        const smallCloseItem = test.el.querySelector('.js-close-item');
 
         expect(closeButton).toHaveClass('hidden');
         expect(smallCloseItem).toHaveClass('hidden');
diff --git a/spec/frontend/merge_request_tabs_spec.js b/spec/frontend/merge_request_tabs_spec.js
new file mode 100644
index 00000000000..3d3be647d12
--- /dev/null
+++ b/spec/frontend/merge_request_tabs_spec.js
@@ -0,0 +1,293 @@
+import $ from 'jquery';
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
+import MergeRequestTabs from '~/merge_request_tabs';
+import '~/commit/pipelines/pipelines_bundle';
+import '~/lib/utils/common_utils';
+import 'vendor/jquery.scrollTo';
+import initMrPage from '../javascripts/helpers/init_vue_mr_page_helper';
+
+jest.mock('~/lib/utils/webpack', () => ({
+  resetServiceWorkersPublicPath: jest.fn(),
+}));
+
+describe('MergeRequestTabs', () => {
+  const testContext = {};
+  const stubLocation = {};
+  const setLocation = stubs => {
+    const defaults = {
+      pathname: '',
+      search: '',
+      hash: '',
+    };
+    $.extend(stubLocation, defaults, stubs || {});
+  };
+
+  preloadFixtures(
+    'merge_requests/merge_request_with_task_list.html',
+    'merge_requests/diff_comment.html',
+  );
+
+  beforeEach(() => {
+    initMrPage();
+
+    testContext.class = new MergeRequestTabs({ stubLocation });
+    setLocation();
+
+    testContext.spies = {
+      history: jest.spyOn(window.history, 'pushState').mockImplementation(() => {}),
+    };
+
+    gl.mrWidget = {};
+  });
+
+  describe('opensInNewTab', () => {
+    const windowTarget = '_blank';
+    let clickTabParams;
+    let tabUrl;
+
+    beforeEach(() => {
+      loadFixtures('merge_requests/merge_request_with_task_list.html');
+
+      tabUrl = $('.commits-tab a').attr('href');
+
+      clickTabParams = {
+        metaKey: false,
+        ctrlKey: false,
+        which: 1,
+        stopImmediatePropagation() {},
+        preventDefault() {},
+        currentTarget: {
+          getAttribute(attr) {
+            return attr === 'href' ? tabUrl : null;
+          },
+        },
+      };
+    });
+
+    describe('meta click', () => {
+      let metakeyEvent;
+
+      beforeEach(() => {
+        metakeyEvent = $.Event('click', { keyCode: 91, ctrlKey: true });
+      });
+
+      it('opens page when commits link is clicked', () => {
+        jest.spyOn(window, 'open').mockImplementation((url, name) => {
+          expect(url).toEqual(tabUrl);
+          expect(name).toEqual(windowTarget);
+        });
+
+        testContext.class.bindEvents();
+        $('.merge-request-tabs .commits-tab a').trigger(metakeyEvent);
+
+        expect(window.open).toHaveBeenCalled();
+      });
+
+      it('opens page when commits badge is clicked', () => {
+        jest.spyOn(window, 'open').mockImplementation((url, name) => {
+          expect(url).toEqual(tabUrl);
+          expect(name).toEqual(windowTarget);
+        });
+
+        testContext.class.bindEvents();
+        $('.merge-request-tabs .commits-tab a .badge').trigger(metakeyEvent);
+
+        expect(window.open).toHaveBeenCalled();
+      });
+    });
+
+    it('opens page tab in a new browser tab with Ctrl+Click - Windows/Linux', () => {
+      jest.spyOn(window, 'open').mockImplementation((url, name) => {
+        expect(url).toEqual(tabUrl);
+        expect(name).toEqual(windowTarget);
+      });
+
+      testContext.class.clickTab({ ...clickTabParams, metaKey: true });
+
+      expect(window.open).toHaveBeenCalled();
+    });
+
+    it('opens page tab in a new browser tab with Cmd+Click - Mac', () => {
+      jest.spyOn(window, 'open').mockImplementation((url, name) => {
+        expect(url).toEqual(tabUrl);
+        expect(name).toEqual(windowTarget);
+      });
+
+      testContext.class.clickTab({ ...clickTabParams, ctrlKey: true });
+
+      expect(window.open).toHaveBeenCalled();
+    });
+
+    it('opens page tab in a new browser tab with Middle-click - Mac/PC', () => {
+      jest.spyOn(window, 'open').mockImplementation((url, name) => {
+        expect(url).toEqual(tabUrl);
+        expect(name).toEqual(windowTarget);
+      });
+
+      testContext.class.clickTab({ ...clickTabParams, which: 2 });
+
+      expect(window.open).toHaveBeenCalled();
+    });
+  });
+
+  describe('setCurrentAction', () => {
+    let mock;
+
+    beforeEach(() => {
+      mock = new MockAdapter(axios);
+      mock.onAny().reply({ data: {} });
+      testContext.subject = testContext.class.setCurrentAction;
+    });
+
+    afterEach(() => {
+      mock.restore();
+      window.history.replaceState({}, '', '/');
+    });
+
+    it('changes from commits', () => {
+      setLocation({
+        pathname: '/foo/bar/-/merge_requests/1/commits',
+      });
+
+      expect(testContext.subject('show')).toBe('/foo/bar/-/merge_requests/1');
+      expect(testContext.subject('diffs')).toBe('/foo/bar/-/merge_requests/1/diffs');
+    });
+
+    it('changes from diffs', () => {
+      setLocation({
+        pathname: '/foo/bar/-/merge_requests/1/diffs',
+      });
+
+      expect(testContext.subject('show')).toBe('/foo/bar/-/merge_requests/1');
+      expect(testContext.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits');
+    });
+
+    it('changes from diffs.html', () => {
+      setLocation({
+        pathname: '/foo/bar/-/merge_requests/1/diffs.html',
+      });
+
+      expect(testContext.subject('show')).toBe('/foo/bar/-/merge_requests/1');
+      expect(testContext.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits');
+    });
+
+    it('changes from notes', () => {
+      setLocation({
+        pathname: '/foo/bar/-/merge_requests/1',
+      });
+
+      expect(testContext.subject('diffs')).toBe('/foo/bar/-/merge_requests/1/diffs');
+      expect(testContext.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits');
+    });
+
+    it('includes search parameters and hash string', () => {
+      setLocation({
+        pathname: '/foo/bar/-/merge_requests/1/diffs',
+        search: '?view=parallel',
+        hash: '#L15-35',
+      });
+
+      expect(testContext.subject('show')).toBe('/foo/bar/-/merge_requests/1?view=parallel#L15-35');
+    });
+
+    it('replaces the current history state', () => {
+      setLocation({
+        pathname: '/foo/bar/-/merge_requests/1',
+      });
+      window.history.replaceState(
+        {
+          url: window.location.href,
+          action: 'show',
+        },
+        document.title,
+        window.location.href,
+      );
+
+      const newState = testContext.subject('commits');
+
+      expect(testContext.spies.history).toHaveBeenCalledWith(
+        {
+          url: newState,
+          action: 'commits',
+        },
+        document.title,
+        newState,
+      );
+    });
+
+    it('treats "show" like "notes"', () => {
+      setLocation({
+        pathname: '/foo/bar/-/merge_requests/1/commits',
+      });
+
+      expect(testContext.subject('show')).toBe('/foo/bar/-/merge_requests/1');
+    });
+  });
+
+  describe('expandViewContainer', () => {
+    beforeEach(() => {
+      $('body').append(
+        '<div class="content-wrapper"><div class="container-fluid container-limited"></div></div>',
+      );
+    });
+
+    afterEach(() => {
+      $('.content-wrapper').remove();
+    });
+
+    it('removes container-limited from containers', () => {
+      testContext.class.expandViewContainer();
+
+      expect($('.content-wrapper .container-limited')).toHaveLength(0);
+    });
+
+    it('does not add container-limited when fluid layout is prefered', () => {
+      $('.content-wrapper .container-fluid').removeClass('container-limited');
+
+      testContext.class.expandViewContainer(false);
+
+      expect($('.content-wrapper .container-limited')).toHaveLength(0);
+    });
+
+    it('does remove container-limited from breadcrumbs', () => {
+      $('.container-limited').addClass('breadcrumbs');
+      testContext.class.expandViewContainer();
+
+      expect($('.content-wrapper .container-limited')).toHaveLength(1);
+    });
+  });
+
+  describe('tabShown', () => {
+    const mainContent = document.createElement('div');
+    const tabContent = document.createElement('div');
+
+    beforeEach(() => {
+      jest.spyOn(mainContent, 'getBoundingClientRect').mockReturnValue({ top: 10 });
+      jest.spyOn(tabContent, 'getBoundingClientRect').mockReturnValue({ top: 100 });
+      jest.spyOn(document, 'querySelector').mockImplementation(selector => {
+        return selector === '.content-wrapper' ? mainContent : tabContent;
+      });
+      testContext.class.currentAction = 'commits';
+    });
+
+    it('calls window scrollTo with options if document has scrollBehavior', () => {
+      document.documentElement.style.scrollBehavior = '';
+
+      jest.spyOn(window, 'scrollTo').mockImplementation(() => {});
+
+      testContext.class.tabShown('commits', 'foobar');
+
+      expect(window.scrollTo.mock.calls[0][0]).toEqual({ top: 39, behavior: 'smooth' });
+    });
+
+    it('calls window scrollTo with two args if document does not have scrollBehavior', () => {
+      jest.spyOn(document.documentElement, 'style', 'get').mockReturnValue({});
+      jest.spyOn(window, 'scrollTo').mockImplementation(() => {});
+
+      testContext.class.tabShown('commits', 'foobar');
+
+      expect(window.scrollTo.mock.calls[0]).toEqual([0, 39]);
+    });
+  });
+});
diff --git a/spec/javascripts/mini_pipeline_graph_dropdown_spec.js b/spec/frontend/mini_pipeline_graph_dropdown_spec.js
index aa4a376caf7..506290834c8 100644
--- a/spec/javascripts/mini_pipeline_graph_dropdown_spec.js
+++ b/spec/frontend/mini_pipeline_graph_dropdown_spec.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown';
-import timeoutPromise from './helpers/set_timeout_promise_helper';
+import waitForPromises from './helpers/wait_for_promises';
 
 describe('Mini Pipeline Graph Dropdown', () => {
   preloadFixtures('static/mini_dropdown_graph.html');
@@ -39,9 +39,9 @@ describe('Mini Pipeline Graph Dropdown', () => {
     });
 
     it('should call getBuildsList', () => {
-      const getBuildsListSpy = spyOn(MiniPipelineGraph.prototype, 'getBuildsList').and.callFake(
-        function() {},
-      );
+      const getBuildsListSpy = jest
+        .spyOn(MiniPipelineGraph.prototype, 'getBuildsList')
+        .mockImplementation(() => {});
 
       new MiniPipelineGraph({ container: '.js-builds-dropdown-tests' }).bindEvents();
 
@@ -51,7 +51,7 @@ describe('Mini Pipeline Graph Dropdown', () => {
     });
 
     it('should make a request to the endpoint provided in the html', () => {
-      const ajaxSpy = spyOn(axios, 'get').and.callThrough();
+      const ajaxSpy = jest.spyOn(axios, 'get');
 
       mock.onGet('foobar').reply(200, {
         html: '',
@@ -61,7 +61,7 @@ describe('Mini Pipeline Graph Dropdown', () => {
 
       document.querySelector('.js-builds-dropdown-button').click();
 
-      expect(ajaxSpy.calls.allArgs()[0][0]).toEqual('foobar');
+      expect(ajaxSpy.mock.calls[0][0]).toEqual('foobar');
     });
 
     it('should not close when user uses cmd/ctrl + click', done => {
@@ -78,11 +78,11 @@ describe('Mini Pipeline Graph Dropdown', () => {
 
       document.querySelector('.js-builds-dropdown-button').click();
 
-      timeoutPromise()
+      waitForPromises()
         .then(() => {
           document.querySelector('a.mini-pipeline-graph-dropdown-item').click();
         })
-        .then(timeoutPromise)
+        .then(waitForPromises)
         .then(() => {
           expect($('.js-builds-dropdown-list').is(':visible')).toEqual(true);
         })
@@ -97,7 +97,7 @@ describe('Mini Pipeline Graph Dropdown', () => {
 
       document.querySelector('.js-builds-dropdown-button').click();
 
-      setTimeout(() => {
+      setImmediate(() => {
         expect($('.js-builds-dropdown-tests .dropdown').hasClass('open')).toEqual(false);
         done();
       });
diff --git a/spec/frontend/monitoring/__snapshots__/alert_widget_spec.js.snap b/spec/frontend/monitoring/__snapshots__/alert_widget_spec.js.snap
index 2179e7b4ab5..59c17daacff 100644
--- a/spec/frontend/monitoring/__snapshots__/alert_widget_spec.js.snap
+++ b/spec/frontend/monitoring/__snapshots__/alert_widget_spec.js.snap
@@ -3,7 +3,7 @@
 exports[`AlertWidget Alert firing displays a warning icon and matches snapshot 1`] = `
 <gl-badge-stub
   class="d-flex-center text-truncate"
-  pill=""
+  size="md"
   variant="danger"
 >
   <gl-icon-stub
@@ -25,8 +25,8 @@ exports[`AlertWidget Alert firing displays a warning icon and matches snapshot 1
 exports[`AlertWidget Alert not firing displays a warning icon and matches snapshot 1`] = `
 <gl-badge-stub
   class="d-flex-center text-truncate"
-  pill=""
-  variant="secondary"
+  size="md"
+  variant="neutral"
 >
   <gl-icon-stub
     class="flex-shrink-0"
diff --git a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
index 9be5fa72110..4b08163f30a 100644
--- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
+++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
@@ -38,8 +38,8 @@ exports[`Dashboard template matches the default snapshot 1`] = `
             class="monitor-environment-dropdown-header text-center"
           >
             
-            Environment
-          
+          Environment
+        
           </gl-dropdown-header-stub>
            
           <gl-dropdown-divider-stub />
@@ -58,8 +58,8 @@ exports[`Dashboard template matches the default snapshot 1`] = `
             class="text-secondary no-matches-message"
           >
             
-            No matching results
-          
+          No matching results
+        
           </div>
         </div>
       </gl-dropdown-stub>
@@ -132,6 +132,8 @@ exports[`Dashboard template matches the default snapshot 1`] = `
    
   <!---->
    
+  <!---->
+   
   <empty-state-stub
     clusterspath="/path/to/clusters"
     documentationpath="/path/to/docs"
diff --git a/spec/frontend/monitoring/components/charts/anomaly_spec.js b/spec/frontend/monitoring/components/charts/anomaly_spec.js
index e2d001c3058..4178d3f0d2d 100644
--- a/spec/frontend/monitoring/components/charts/anomaly_spec.js
+++ b/spec/frontend/monitoring/components/charts/anomaly_spec.js
@@ -13,8 +13,6 @@ import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.v
 
 const mockProjectPath = `${TEST_HOST}${mockProjectDir}`;
 
-jest.mock('~/lib/utils/icon_utils'); // mock getSvgIconPathContent
-
 const makeAnomalyGraphData = (datasetName, template = anomalyMockGraphData) => {
   const metrics = anomalyMockResultValues[datasetName].map((values, index) => ({
     ...template.metrics[index],
diff --git a/spec/frontend/monitoring/components/charts/column_spec.js b/spec/frontend/monitoring/components/charts/column_spec.js
index f368cb7916c..89739a7485d 100644
--- a/spec/frontend/monitoring/components/charts/column_spec.js
+++ b/spec/frontend/monitoring/components/charts/column_spec.js
@@ -1,4 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
+import timezoneMock from 'timezone-mock';
 import { GlColumnChart } from '@gitlab/ui/dist/charts';
 import ColumnChart from '~/monitoring/components/charts/column.vue';
 
@@ -18,10 +19,7 @@ const dataValues = [
 describe('Column component', () => {
   let wrapper;
 
-  const findChart = () => wrapper.find(GlColumnChart);
-  const chartProps = prop => findChart().props(prop);
-
-  beforeEach(() => {
+  const createWrapper = (props = {}) => {
     wrapper = shallowMount(ColumnChart, {
       propsData: {
         graphData: {
@@ -41,14 +39,60 @@ describe('Column component', () => {
             },
           ],
         },
+        ...props,
       },
     });
+  };
+  const findChart = () => wrapper.find(GlColumnChart);
+  const chartProps = prop => findChart().props(prop);
+
+  beforeEach(() => {
+    createWrapper();
   });
 
   afterEach(() => {
     wrapper.destroy();
   });
 
+  describe('xAxisLabel', () => {
+    const mockDate = Date.UTC(2020, 4, 26, 20); // 8:00 PM in GMT
+
+    const useXAxisFormatter = date => {
+      const { xAxis } = chartProps('option');
+      const { formatter } = xAxis.axisLabel;
+      return formatter(date);
+    };
+
+    it('x-axis is formatted correctly in AM/PM format', () => {
+      expect(useXAxisFormatter(mockDate)).toEqual('8:00 PM');
+    });
+
+    describe('when in PT timezone', () => {
+      beforeAll(() => {
+        timezoneMock.register('US/Pacific');
+      });
+
+      afterAll(() => {
+        timezoneMock.unregister();
+      });
+
+      it('by default, values are formatted in PT', () => {
+        createWrapper();
+        expect(useXAxisFormatter(mockDate)).toEqual('1:00 PM');
+      });
+
+      it('when the chart uses local timezone, y-axis is formatted in PT', () => {
+        createWrapper({ timezone: 'LOCAL' });
+        expect(useXAxisFormatter(mockDate)).toEqual('1:00 PM');
+      });
+
+      it('when the chart uses UTC, y-axis is formatted in UTC', () => {
+        createWrapper({ timezone: 'UTC' });
+        expect(useXAxisFormatter(mockDate)).toEqual('8:00 PM');
+      });
+    });
+  });
+
   describe('wrapped components', () => {
     describe('GitLab UI column chart', () => {
       it('is a Vue instance', () => {
diff --git a/spec/frontend/monitoring/components/charts/heatmap_spec.js b/spec/frontend/monitoring/components/charts/heatmap_spec.js
index 5e2c1932e9e..2a1c78025ae 100644
--- a/spec/frontend/monitoring/components/charts/heatmap_spec.js
+++ b/spec/frontend/monitoring/components/charts/heatmap_spec.js
@@ -1,68 +1,101 @@
 import { shallowMount } from '@vue/test-utils';
 import { GlHeatmap } from '@gitlab/ui/dist/charts';
+import timezoneMock from 'timezone-mock';
 import Heatmap from '~/monitoring/components/charts/heatmap.vue';
 import { graphDataPrometheusQueryRangeMultiTrack } from '../../mock_data';
 
 describe('Heatmap component', () => {
-  let heatmapChart;
+  let wrapper;
   let store;
 
-  beforeEach(() => {
-    heatmapChart = shallowMount(Heatmap, {
+  const findChart = () => wrapper.find(GlHeatmap);
+
+  const createWrapper = (props = {}) => {
+    wrapper = shallowMount(Heatmap, {
       propsData: {
         graphData: graphDataPrometheusQueryRangeMultiTrack,
         containerWidth: 100,
+        ...props,
       },
       store,
     });
-  });
+  };
 
-  afterEach(() => {
-    heatmapChart.destroy();
-  });
+  describe('wrapped chart', () => {
+    let glHeatmapChart;
 
-  describe('wrapped components', () => {
-    describe('GitLab UI heatmap chart', () => {
-      let glHeatmapChart;
+    beforeEach(() => {
+      createWrapper();
+      glHeatmapChart = findChart();
+    });
 
-      beforeEach(() => {
-        glHeatmapChart = heatmapChart.find(GlHeatmap);
-      });
+    afterEach(() => {
+      wrapper.destroy();
+    });
 
-      it('is a Vue instance', () => {
-        expect(glHeatmapChart.isVueInstance()).toBe(true);
-      });
+    it('is a Vue instance', () => {
+      expect(glHeatmapChart.isVueInstance()).toBe(true);
+    });
 
-      it('should display a label on the x axis', () => {
-        expect(heatmapChart.vm.xAxisName).toBe(graphDataPrometheusQueryRangeMultiTrack.x_label);
-      });
+    it('should display a label on the x axis', () => {
+      expect(wrapper.vm.xAxisName).toBe(graphDataPrometheusQueryRangeMultiTrack.x_label);
+    });
 
-      it('should display a label on the y axis', () => {
-        expect(heatmapChart.vm.yAxisName).toBe(graphDataPrometheusQueryRangeMultiTrack.y_label);
-      });
+    it('should display a label on the y axis', () => {
+      expect(wrapper.vm.yAxisName).toBe(graphDataPrometheusQueryRangeMultiTrack.y_label);
+    });
 
-      // According to the echarts docs https://echarts.apache.org/en/option.html#series-heatmap.data
-      // each row of the heatmap chart is represented by an array inside another parent array
-      // e.g. [[0, 0, 10]], the format represents the column, the row and finally the value
-      // corresponding to the cell
+    // According to the echarts docs https://echarts.apache.org/en/option.html#series-heatmap.data
+    // each row of the heatmap chart is represented by an array inside another parent array
+    // e.g. [[0, 0, 10]], the format represents the column, the row and finally the value
+    // corresponding to the cell
 
-      it('should return chartData with a length of x by y, with a length of 3 per array', () => {
-        const row = heatmapChart.vm.chartData[0];
+    it('should return chartData with a length of x by y, with a length of 3 per array', () => {
+      const row = wrapper.vm.chartData[0];
 
-        expect(row.length).toBe(3);
-        expect(heatmapChart.vm.chartData.length).toBe(30);
-      });
+      expect(row.length).toBe(3);
+      expect(wrapper.vm.chartData.length).toBe(30);
+    });
+
+    it('returns a series of labels for the x axis', () => {
+      const { xAxisLabels } = wrapper.vm;
+
+      expect(xAxisLabels.length).toBe(5);
+    });
 
-      it('returns a series of labels for the x axis', () => {
-        const { xAxisLabels } = heatmapChart.vm;
+    describe('y axis labels', () => {
+      const gmtLabels = ['3:00 PM', '4:00 PM', '5:00 PM', '6:00 PM', '7:00 PM', '8:00 PM'];
 
-        expect(xAxisLabels.length).toBe(5);
+      it('y-axis labels are formatted in AM/PM format', () => {
+        expect(findChart().props('yAxisLabels')).toEqual(gmtLabels);
       });
 
-      it('returns a series of labels for the y axis', () => {
-        const { yAxisLabels } = heatmapChart.vm;
+      describe('when in PT timezone', () => {
+        const ptLabels = ['8:00 AM', '9:00 AM', '10:00 AM', '11:00 AM', '12:00 PM', '1:00 PM'];
+        const utcLabels = gmtLabels; // Identical in this case
+
+        beforeAll(() => {
+          timezoneMock.register('US/Pacific');
+        });
+
+        afterAll(() => {
+          timezoneMock.unregister();
+        });
+
+        it('by default, y-axis is formatted in PT', () => {
+          createWrapper();
+          expect(findChart().props('yAxisLabels')).toEqual(ptLabels);
+        });
+
+        it('when the chart uses local timezone, y-axis is formatted in PT', () => {
+          createWrapper({ timezone: 'LOCAL' });
+          expect(findChart().props('yAxisLabels')).toEqual(ptLabels);
+        });
 
-        expect(yAxisLabels.length).toBe(6);
+        it('when the chart uses UTC, y-axis is formatted in UTC', () => {
+          createWrapper({ timezone: 'UTC' });
+          expect(findChart().props('yAxisLabels')).toEqual(utcLabels);
+        });
       });
     });
   });
diff --git a/spec/frontend/monitoring/components/charts/stacked_column_spec.js b/spec/frontend/monitoring/components/charts/stacked_column_spec.js
index abb89ac15ef..bb2fbc68eaa 100644
--- a/spec/frontend/monitoring/components/charts/stacked_column_spec.js
+++ b/spec/frontend/monitoring/components/charts/stacked_column_spec.js
@@ -1,45 +1,192 @@
-import { shallowMount } from '@vue/test-utils';
-import { GlStackedColumnChart } from '@gitlab/ui/dist/charts';
+import { shallowMount, mount } from '@vue/test-utils';
+import timezoneMock from 'timezone-mock';
+import { cloneDeep } from 'lodash';
+import { GlStackedColumnChart, GlChartLegend } from '@gitlab/ui/dist/charts';
 import StackedColumnChart from '~/monitoring/components/charts/stacked_column.vue';
 import { stackedColumnMockedData } from '../../mock_data';
 
 jest.mock('~/lib/utils/icon_utils', () => ({
-  getSvgIconPathContent: jest.fn().mockResolvedValue('mockSvgPathContent'),
+  getSvgIconPathContent: jest.fn().mockImplementation(icon => Promise.resolve(`${icon}-content`)),
 }));
 
 describe('Stacked column chart component', () => {
   let wrapper;
-  const glStackedColumnChart = () => wrapper.find(GlStackedColumnChart);
 
-  beforeEach(() => {
-    wrapper = shallowMount(StackedColumnChart, {
+  const findChart = () => wrapper.find(GlStackedColumnChart);
+  const findLegend = () => wrapper.find(GlChartLegend);
+
+  const createWrapper = (props = {}, mountingMethod = shallowMount) =>
+    mountingMethod(StackedColumnChart, {
       propsData: {
         graphData: stackedColumnMockedData,
+        ...props,
+      },
+      stubs: {
+        GlPopover: true,
       },
+      attachToDocument: true,
+    });
+
+  beforeEach(() => {
+    wrapper = createWrapper({}, mount);
+  });
+
+  describe('when graphData is present', () => {
+    beforeEach(() => {
+      createWrapper();
+      return wrapper.vm.$nextTick();
+    });
+
+    it('chart is rendered', () => {
+      expect(findChart().exists()).toBe(true);
+    });
+
+    it('data should match the graphData y value for each series', () => {
+      const data = findChart().props('data');
+
+      data.forEach((series, index) => {
+        const { values } = stackedColumnMockedData.metrics[index].result[0];
+        expect(series).toEqual(values.map(value => value[1]));
+      });
+    });
+
+    it('series names should be the same as the graphData metrics labels', () => {
+      const seriesNames = findChart().props('seriesNames');
+
+      expect(seriesNames).toHaveLength(stackedColumnMockedData.metrics.length);
+      seriesNames.forEach((name, index) => {
+        expect(stackedColumnMockedData.metrics[index].label).toBe(name);
+      });
+    });
+
+    it('group by should be the same as the graphData first metric results', () => {
+      const groupBy = findChart().props('groupBy');
+
+      expect(groupBy).toEqual([
+        '2020-01-30T12:00:00.000Z',
+        '2020-01-30T12:01:00.000Z',
+        '2020-01-30T12:02:00.000Z',
+      ]);
+    });
+
+    it('chart options should configure data zoom and axis label ', () => {
+      const chartOptions = findChart().props('option');
+      const xAxisType = findChart().props('xAxisType');
+
+      expect(chartOptions).toMatchObject({
+        dataZoom: [{ handleIcon: 'path://scroll-handle-content' }],
+        xAxis: {
+          axisLabel: { formatter: expect.any(Function) },
+        },
+      });
+
+      expect(xAxisType).toBe('category');
+    });
+
+    it('chart options should configure category as x axis type', () => {
+      const chartOptions = findChart().props('option');
+      const xAxisType = findChart().props('xAxisType');
+
+      expect(chartOptions).toMatchObject({
+        xAxis: {
+          type: 'category',
+        },
+      });
+      expect(xAxisType).toBe('category');
+    });
+
+    it('format date is correct', () => {
+      const { xAxis } = findChart().props('option');
+      expect(xAxis.axisLabel.formatter('2020-01-30T12:01:00.000Z')).toBe('12:01 PM');
+    });
+
+    describe('when in PT timezone', () => {
+      beforeAll(() => {
+        timezoneMock.register('US/Pacific');
+      });
+
+      afterAll(() => {
+        timezoneMock.unregister();
+      });
+
+      it('date is shown in local time', () => {
+        const { xAxis } = findChart().props('option');
+        expect(xAxis.axisLabel.formatter('2020-01-30T12:01:00.000Z')).toBe('4:01 AM');
+      });
+
+      it('date is shown in UTC', () => {
+        wrapper.setProps({ timezone: 'UTC' });
+
+        return wrapper.vm.$nextTick().then(() => {
+          const { xAxis } = findChart().props('option');
+          expect(xAxis.axisLabel.formatter('2020-01-30T12:01:00.000Z')).toBe('12:01 PM');
+        });
+      });
     });
   });
 
-  afterEach(() => {
-    wrapper.destroy();
+  describe('when graphData has results missing', () => {
+    beforeEach(() => {
+      const graphData = cloneDeep(stackedColumnMockedData);
+
+      graphData.metrics[0].result = null;
+
+      createWrapper({ graphData });
+      return wrapper.vm.$nextTick();
+    });
+
+    it('chart is rendered', () => {
+      expect(findChart().exists()).toBe(true);
+    });
   });
 
-  describe('with graphData present', () => {
-    it('is a Vue instance', () => {
-      expect(glStackedColumnChart().exists()).toBe(true);
+  describe('legend', () => {
+    beforeEach(() => {
+      wrapper = createWrapper({}, mount);
+    });
+
+    it('allows user to override legend label texts using props', () => {
+      const legendRelatedProps = {
+        legendMinText: 'legendMinText',
+        legendMaxText: 'legendMaxText',
+        legendAverageText: 'legendAverageText',
+        legendCurrentText: 'legendCurrentText',
+      };
+      wrapper.setProps({
+        ...legendRelatedProps,
+      });
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findChart().props()).toMatchObject(legendRelatedProps);
+      });
     });
 
-    it('should contain the same number of elements in the seriesNames computed prop as the graphData metrics prop', () =>
-      wrapper.vm
-        .$nextTick()
-        .then(expect(wrapper.vm.seriesNames).toHaveLength(stackedColumnMockedData.metrics.length)));
+    it('should render a tabular legend layout by default', () => {
+      expect(findLegend().props('layout')).toBe('table');
+    });
+
+    describe('when inline legend layout prop is set', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          legendLayout: 'inline',
+        });
+      });
+
+      it('should render an inline legend layout', () => {
+        expect(findLegend().props('layout')).toBe('inline');
+      });
+    });
+
+    describe('when table legend layout prop is set', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          legendLayout: 'table',
+        });
+      });
 
-    it('should contain the same number of elements in the groupBy computed prop as the graphData result prop', () =>
-      wrapper.vm
-        .$nextTick()
-        .then(
-          expect(wrapper.vm.groupBy).toHaveLength(
-            stackedColumnMockedData.metrics[0].result[0].values.length,
-          ),
-        ));
+      it('should render a tabular legend layout', () => {
+        expect(findLegend().props('layout')).toBe('table');
+      });
+    });
   });
 });
diff --git a/spec/frontend/monitoring/components/charts/time_series_spec.js b/spec/frontend/monitoring/components/charts/time_series_spec.js
index 7d5a08bc4a1..50d2c9c80b2 100644
--- a/spec/frontend/monitoring/components/charts/time_series_spec.js
+++ b/spec/frontend/monitoring/components/charts/time_series_spec.js
@@ -1,5 +1,6 @@
 import { mount, shallowMount } from '@vue/test-utils';
 import { setTestTimeout } from 'helpers/timeout';
+import timezoneMock from 'timezone-mock';
 import { GlLink } from '@gitlab/ui';
 import { TEST_HOST } from 'jest/helpers/test_constants';
 import {
@@ -20,9 +21,6 @@ import {
   metricsDashboardViewModel,
   metricResultStatus,
 } from '../../fixture_data';
-import * as iconUtils from '~/lib/utils/icon_utils';
-
-const mockSvgPathContent = 'mockSvgPathContent';
 
 jest.mock('lodash/throttle', () =>
   // this throttle mock executes immediately
@@ -33,26 +31,33 @@ jest.mock('lodash/throttle', () =>
   }),
 );
 jest.mock('~/lib/utils/icon_utils', () => ({
-  getSvgIconPathContent: jest.fn().mockImplementation(() => Promise.resolve(mockSvgPathContent)),
+  getSvgIconPathContent: jest.fn().mockImplementation(icon => Promise.resolve(`${icon}-content`)),
 }));
 
 describe('Time series component', () => {
   let mockGraphData;
   let store;
+  let wrapper;
 
-  const createWrapper = (graphData = mockGraphData, mountingMethod = shallowMount) =>
-    mountingMethod(TimeSeries, {
+  const createWrapper = (
+    { graphData = mockGraphData, ...props } = {},
+    mountingMethod = shallowMount,
+  ) => {
+    wrapper = mountingMethod(TimeSeries, {
       propsData: {
         graphData,
         deploymentData: store.state.monitoringDashboard.deploymentData,
         annotations: store.state.monitoringDashboard.annotations,
         projectPath: `${TEST_HOST}${mockProjectDir}`,
+        ...props,
       },
       store,
       stubs: {
         GlPopover: true,
       },
+      attachToDocument: true,
     });
+  };
 
   describe('With a single time series', () => {
     beforeEach(() => {
@@ -76,39 +81,41 @@ describe('Time series component', () => {
     });
 
     describe('general functions', () => {
-      let timeSeriesChart;
-
-      const findChart = () => timeSeriesChart.find({ ref: 'chart' });
+      const findChart = () => wrapper.find({ ref: 'chart' });
 
       beforeEach(() => {
-        timeSeriesChart = createWrapper(mockGraphData, mount);
-        return timeSeriesChart.vm.$nextTick();
+        createWrapper({}, mount);
+        return wrapper.vm.$nextTick();
       });
 
-      it('allows user to override max value label text using prop', () => {
-        timeSeriesChart.setProps({ legendMaxText: 'legendMaxText' });
-
-        return timeSeriesChart.vm.$nextTick().then(() => {
-          expect(timeSeriesChart.props().legendMaxText).toBe('legendMaxText');
-        });
+      afterEach(() => {
+        wrapper.destroy();
       });
 
-      it('allows user to override average value label text using prop', () => {
-        timeSeriesChart.setProps({ legendAverageText: 'averageText' });
+      it('allows user to override legend label texts using props', () => {
+        const legendRelatedProps = {
+          legendMinText: 'legendMinText',
+          legendMaxText: 'legendMaxText',
+          legendAverageText: 'legendAverageText',
+          legendCurrentText: 'legendCurrentText',
+        };
+        wrapper.setProps({
+          ...legendRelatedProps,
+        });
 
-        return timeSeriesChart.vm.$nextTick().then(() => {
-          expect(timeSeriesChart.props().legendAverageText).toBe('averageText');
+        return wrapper.vm.$nextTick().then(() => {
+          expect(findChart().props()).toMatchObject(legendRelatedProps);
         });
       });
 
       it('chart sets a default height', () => {
-        const wrapper = createWrapper();
+        createWrapper();
         expect(wrapper.props('height')).toBe(chartHeight);
       });
 
       it('chart has a configurable height', () => {
         const mockHeight = 599;
-        const wrapper = createWrapper();
+        createWrapper();
 
         wrapper.setProps({ height: mockHeight });
         return wrapper.vm.$nextTick().then(() => {
@@ -122,7 +129,7 @@ describe('Time series component', () => {
           let startValue;
           let endValue;
 
-          beforeEach(done => {
+          beforeEach(() => {
             eChartMock = {
               handlers: {},
               getOption: () => ({
@@ -141,10 +148,9 @@ describe('Time series component', () => {
               }),
             };
 
-            timeSeriesChart = createWrapper(mockGraphData, mount);
-            timeSeriesChart.vm.$nextTick(() => {
+            createWrapper({}, mount);
+            return wrapper.vm.$nextTick(() => {
               findChart().vm.$emit('created', eChartMock);
-              done();
             });
           });
 
@@ -153,8 +159,8 @@ describe('Time series component', () => {
             endValue = 1577840400000; // 2020-01-01T01:00:00.000Z
             eChartMock.handlers.datazoom();
 
-            expect(timeSeriesChart.emitted('datazoom')).toHaveLength(1);
-            expect(timeSeriesChart.emitted('datazoom')[0]).toEqual([
+            expect(wrapper.emitted('datazoom')).toHaveLength(1);
+            expect(wrapper.emitted('datazoom')[0]).toEqual([
               {
                 start: new Date(startValue).toISOString(),
                 end: new Date(endValue).toISOString(),
@@ -172,7 +178,7 @@ describe('Time series component', () => {
           const mockLineSeriesData = () => ({
             seriesData: [
               {
-                seriesName: timeSeriesChart.vm.chartData[0].name,
+                seriesName: wrapper.vm.chartData[0].name,
                 componentSubType: 'line',
                 value: [mockDate, 5.55555],
                 dataIndex: 0,
@@ -210,86 +216,118 @@ describe('Time series component', () => {
                 value: undefined,
               })),
             };
-            expect(timeSeriesChart.vm.formatTooltipText(seriesDataWithoutValue)).toBeUndefined();
+            expect(wrapper.vm.formatTooltipText(seriesDataWithoutValue)).toBeUndefined();
           });
 
           describe('when series is of line type', () => {
-            beforeEach(done => {
-              timeSeriesChart.vm.formatTooltipText(mockLineSeriesData());
-              timeSeriesChart.vm.$nextTick(done);
+            beforeEach(() => {
+              createWrapper();
+              wrapper.vm.formatTooltipText(mockLineSeriesData());
+              return wrapper.vm.$nextTick();
             });
 
             it('formats tooltip title', () => {
-              expect(timeSeriesChart.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM');
+              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
             });
 
             it('formats tooltip content', () => {
               const name = 'Status Code';
               const value = '5.556';
               const dataIndex = 0;
-              const seriesLabel = timeSeriesChart.find(GlChartSeriesLabel);
+              const seriesLabel = wrapper.find(GlChartSeriesLabel);
 
               expect(seriesLabel.vm.color).toBe('');
               expect(shallowWrapperContainsSlotText(seriesLabel, 'default', name)).toBe(true);
-              expect(timeSeriesChart.vm.tooltip.content).toEqual([
+              expect(wrapper.vm.tooltip.content).toEqual([
                 { name, value, dataIndex, color: undefined },
               ]);
 
               expect(
-                shallowWrapperContainsSlotText(
-                  timeSeriesChart.find(GlAreaChart),
-                  'tooltipContent',
-                  value,
-                ),
+                shallowWrapperContainsSlotText(wrapper.find(GlAreaChart), 'tooltipContent', value),
               ).toBe(true);
             });
+
+            describe('when in PT timezone', () => {
+              beforeAll(() => {
+                // Note: node.js env renders (GMT-0700), in the browser we see (PDT)
+                timezoneMock.register('US/Pacific');
+              });
+
+              afterAll(() => {
+                timezoneMock.unregister();
+              });
+
+              it('formats tooltip title in local timezone by default', () => {
+                createWrapper();
+                wrapper.vm.formatTooltipText(mockLineSeriesData());
+                return wrapper.vm.$nextTick().then(() => {
+                  expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 3:14AM (GMT-0700)');
+                });
+              });
+
+              it('formats tooltip title in local timezone', () => {
+                createWrapper({ timezone: 'LOCAL' });
+                wrapper.vm.formatTooltipText(mockLineSeriesData());
+                return wrapper.vm.$nextTick().then(() => {
+                  expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 3:14AM (GMT-0700)');
+                });
+              });
+
+              it('formats tooltip title in UTC format', () => {
+                createWrapper({ timezone: 'UTC' });
+                wrapper.vm.formatTooltipText(mockLineSeriesData());
+                return wrapper.vm.$nextTick().then(() => {
+                  expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (UTC)');
+                });
+              });
+            });
           });
 
           describe('when series is of scatter type, for deployments', () => {
             beforeEach(() => {
-              timeSeriesChart.vm.formatTooltipText({
+              wrapper.vm.formatTooltipText({
                 ...mockAnnotationsSeriesData,
                 seriesData: mockAnnotationsSeriesData.seriesData.map(data => ({
                   ...data,
                   data: annotationsMetadata,
                 })),
               });
-              return timeSeriesChart.vm.$nextTick;
+              return wrapper.vm.$nextTick;
             });
 
             it('set tooltip type to deployments', () => {
-              expect(timeSeriesChart.vm.tooltip.type).toBe('deployments');
+              expect(wrapper.vm.tooltip.type).toBe('deployments');
             });
 
             it('formats tooltip title', () => {
-              expect(timeSeriesChart.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM');
+              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
             });
 
             it('formats tooltip sha', () => {
-              expect(timeSeriesChart.vm.tooltip.sha).toBe('f5bcd1d9');
+              expect(wrapper.vm.tooltip.sha).toBe('f5bcd1d9');
             });
 
             it('formats tooltip commit url', () => {
-              expect(timeSeriesChart.vm.tooltip.commitUrl).toBe(mockCommitUrl);
+              expect(wrapper.vm.tooltip.commitUrl).toBe(mockCommitUrl);
             });
           });
 
           describe('when series is of scatter type and deployments data is missing', () => {
             beforeEach(() => {
-              timeSeriesChart.vm.formatTooltipText(mockAnnotationsSeriesData);
-              return timeSeriesChart.vm.$nextTick;
+              wrapper.vm.formatTooltipText(mockAnnotationsSeriesData);
+              return wrapper.vm.$nextTick;
             });
 
             it('formats tooltip title', () => {
-              expect(timeSeriesChart.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM');
+              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
             });
 
             it('formats tooltip sha', () => {
-              expect(timeSeriesChart.vm.tooltip.sha).toBeUndefined();
+              expect(wrapper.vm.tooltip.sha).toBeUndefined();
             });
 
             it('formats tooltip commit url', () => {
-              expect(timeSeriesChart.vm.tooltip.commitUrl).toBeUndefined();
+              expect(wrapper.vm.tooltip.commitUrl).toBeUndefined();
             });
           });
         });
@@ -313,43 +351,12 @@ describe('Time series component', () => {
           };
 
           it('formats tooltip title and sets tooltip content', () => {
-            const formattedTooltipData = timeSeriesChart.vm.formatAnnotationsTooltipText(
-              mockMarkPoint,
-            );
-            expect(formattedTooltipData.title).toBe('19 Feb 2020, 10:01AM');
+            const formattedTooltipData = wrapper.vm.formatAnnotationsTooltipText(mockMarkPoint);
+            expect(formattedTooltipData.title).toBe('19 Feb 2020, 10:01AM (GMT+0000)');
             expect(formattedTooltipData.content).toBe(annotationsMetadata.tooltipData.content);
           });
         });
 
-        describe('setSvg', () => {
-          const mockSvgName = 'mockSvgName';
-
-          beforeEach(done => {
-            timeSeriesChart.vm.setSvg(mockSvgName);
-            timeSeriesChart.vm.$nextTick(done);
-          });
-
-          it('gets svg path content', () => {
-            expect(iconUtils.getSvgIconPathContent).toHaveBeenCalledWith(mockSvgName);
-          });
-
-          it('sets svg path content', () => {
-            timeSeriesChart.vm.$nextTick(() => {
-              expect(timeSeriesChart.vm.svgs[mockSvgName]).toBe(`path://${mockSvgPathContent}`);
-            });
-          });
-
-          it('contains an svg object within an array to properly render icon', () => {
-            timeSeriesChart.vm.$nextTick(() => {
-              expect(timeSeriesChart.vm.chartOptions.dataZoom).toEqual([
-                {
-                  handleIcon: `path://${mockSvgPathContent}`,
-                },
-              ]);
-            });
-          });
-        });
-
         describe('onResize', () => {
           const mockWidth = 233;
 
@@ -357,11 +364,11 @@ describe('Time series component', () => {
             jest.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(() => ({
               width: mockWidth,
             }));
-            timeSeriesChart.vm.onResize();
+            wrapper.vm.onResize();
           });
 
           it('sets area chart width', () => {
-            expect(timeSeriesChart.vm.width).toBe(mockWidth);
+            expect(wrapper.vm.width).toBe(mockWidth);
           });
         });
       });
@@ -374,7 +381,7 @@ describe('Time series component', () => {
           const seriesData = () => chartData[0];
 
           beforeEach(() => {
-            ({ chartData } = timeSeriesChart.vm);
+            ({ chartData } = wrapper.vm);
           });
 
           it('utilizes all data points', () => {
@@ -400,6 +407,21 @@ describe('Time series component', () => {
         });
 
         describe('chartOptions', () => {
+          describe('dataZoom', () => {
+            it('renders with scroll handle icons', () => {
+              expect(getChartOptions().dataZoom).toHaveLength(1);
+              expect(getChartOptions().dataZoom[0]).toMatchObject({
+                handleIcon: 'path://scroll-handle-content',
+              });
+            });
+          });
+
+          describe('xAxis pointer', () => {
+            it('snap is set to false by default', () => {
+              expect(getChartOptions().xAxis.axisPointer.snap).toBe(false);
+            });
+          });
+
           describe('are extended by `option`', () => {
             const mockSeriesName = 'Extra series 1';
             const mockOption = {
@@ -408,17 +430,17 @@ describe('Time series component', () => {
             };
 
             it('arbitrary options', () => {
-              timeSeriesChart.setProps({
+              wrapper.setProps({
                 option: mockOption,
               });
 
-              return timeSeriesChart.vm.$nextTick().then(() => {
+              return wrapper.vm.$nextTick().then(() => {
                 expect(getChartOptions()).toEqual(expect.objectContaining(mockOption));
               });
             });
 
             it('additional series', () => {
-              timeSeriesChart.setProps({
+              wrapper.setProps({
                 option: {
                   series: [
                     {
@@ -430,7 +452,7 @@ describe('Time series component', () => {
                 },
               });
 
-              return timeSeriesChart.vm.$nextTick().then(() => {
+              return wrapper.vm.$nextTick().then(() => {
                 const optionSeries = getChartOptions().series;
 
                 expect(optionSeries.length).toEqual(2);
@@ -446,13 +468,13 @@ describe('Time series component', () => {
                 },
               };
 
-              timeSeriesChart.setProps({
+              wrapper.setProps({
                 option: {
                   yAxis: mockCustomYAxisOption,
                 },
               });
 
-              return timeSeriesChart.vm.$nextTick().then(() => {
+              return wrapper.vm.$nextTick().then(() => {
                 const { yAxis } = getChartOptions();
 
                 expect(yAxis[0]).toMatchObject(mockCustomYAxisOption);
@@ -464,13 +486,13 @@ describe('Time series component', () => {
                 name: 'Custom x axis label',
               };
 
-              timeSeriesChart.setProps({
+              wrapper.setProps({
                 option: {
                   xAxis: mockCustomXAxisOption,
                 },
               });
 
-              return timeSeriesChart.vm.$nextTick().then(() => {
+              return wrapper.vm.$nextTick().then(() => {
                 const { xAxis } = getChartOptions();
 
                 expect(xAxis).toMatchObject(mockCustomXAxisOption);
@@ -499,25 +521,67 @@ describe('Time series component', () => {
 
         describe('annotationSeries', () => {
           it('utilizes deployment data', () => {
-            const annotationSeries = timeSeriesChart.vm.chartOptionSeries[0];
+            const annotationSeries = wrapper.vm.chartOptionSeries[0];
             expect(annotationSeries.yAxisIndex).toBe(1); // same as annotations y axis
             expect(annotationSeries.data).toEqual([
               expect.objectContaining({
                 symbolSize: 14,
+                symbol: 'path://rocket-content',
                 value: ['2019-07-16T10:14:25.589Z', expect.any(Number)],
               }),
               expect.objectContaining({
                 symbolSize: 14,
+                symbol: 'path://rocket-content',
                 value: ['2019-07-16T11:14:25.589Z', expect.any(Number)],
               }),
               expect.objectContaining({
                 symbolSize: 14,
+                symbol: 'path://rocket-content',
                 value: ['2019-07-16T12:14:25.589Z', expect.any(Number)],
               }),
             ]);
           });
         });
 
+        describe('xAxisLabel', () => {
+          const mockDate = Date.UTC(2020, 4, 26, 20); // 8:00 PM in GMT
+
+          const useXAxisFormatter = date => {
+            const { xAxis } = getChartOptions();
+            const { formatter } = xAxis.axisLabel;
+            return formatter(date);
+          };
+
+          it('x-axis is formatted correctly in AM/PM format', () => {
+            expect(useXAxisFormatter(mockDate)).toEqual('8:00 PM');
+          });
+
+          describe('when in PT timezone', () => {
+            beforeAll(() => {
+              timezoneMock.register('US/Pacific');
+            });
+
+            afterAll(() => {
+              timezoneMock.unregister();
+            });
+
+            it('by default, values are formatted in PT', () => {
+              createWrapper();
+              expect(useXAxisFormatter(mockDate)).toEqual('1:00 PM');
+            });
+
+            it('when the chart uses local timezone, y-axis is formatted in PT', () => {
+              createWrapper({ timezone: 'LOCAL' });
+              expect(useXAxisFormatter(mockDate)).toEqual('1:00 PM');
+            });
+
+            it('when the chart uses UTC, y-axis is formatted in UTC', () => {
+              createWrapper({ timezone: 'UTC' });
+              expect(useXAxisFormatter(mockDate)).toEqual('8:00 PM');
+            });
+          });
+        });
+
         describe('yAxisLabel', () => {
           it('y-axis is configured correctly', () => {
             const { yAxis } = getChartOptions();
@@ -544,7 +608,7 @@ describe('Time series component', () => {
       });
 
       afterEach(() => {
-        timeSeriesChart.destroy();
+        wrapper.destroy();
       });
     });
 
@@ -562,19 +626,14 @@ describe('Time series component', () => {
 
       glChartComponents.forEach(dynamicComponent => {
         describe(`GitLab UI: ${dynamicComponent.chartType}`, () => {
-          let timeSeriesAreaChart;
-          const findChartComponent = () => timeSeriesAreaChart.find(dynamicComponent.component);
+          const findChartComponent = () => wrapper.find(dynamicComponent.component);
 
-          beforeEach(done => {
-            timeSeriesAreaChart = createWrapper(
-              { ...mockGraphData, type: dynamicComponent.chartType },
+          beforeEach(() => {
+            createWrapper(
+              { graphData: { ...mockGraphData, type: dynamicComponent.chartType } },
               mount,
             );
-            timeSeriesAreaChart.vm.$nextTick(done);
-          });
-
-          afterEach(() => {
-            timeSeriesAreaChart.destroy();
+            return wrapper.vm.$nextTick();
           });
 
           it('is a Vue instance', () => {
@@ -585,21 +644,20 @@ describe('Time series component', () => {
           it('receives data properties needed for proper chart render', () => {
             const props = findChartComponent().props();
 
-            expect(props.data).toBe(timeSeriesAreaChart.vm.chartData);
-            expect(props.option).toBe(timeSeriesAreaChart.vm.chartOptions);
-            expect(props.formatTooltipText).toBe(timeSeriesAreaChart.vm.formatTooltipText);
-            expect(props.thresholds).toBe(timeSeriesAreaChart.vm.thresholds);
+            expect(props.data).toBe(wrapper.vm.chartData);
+            expect(props.option).toBe(wrapper.vm.chartOptions);
+            expect(props.formatTooltipText).toBe(wrapper.vm.formatTooltipText);
+            expect(props.thresholds).toBe(wrapper.vm.thresholds);
           });
 
-          it('recieves a tooltip title', done => {
+          it('receives a tooltip title', () => {
             const mockTitle = 'mockTitle';
-            timeSeriesAreaChart.vm.tooltip.title = mockTitle;
+            wrapper.vm.tooltip.title = mockTitle;
 
-            timeSeriesAreaChart.vm.$nextTick(() => {
+            return wrapper.vm.$nextTick(() => {
               expect(
                 shallowWrapperContainsSlotText(findChartComponent(), 'tooltipTitle', mockTitle),
               ).toBe(true);
-              done();
             });
           });
 
@@ -607,13 +665,13 @@ describe('Time series component', () => {
             const mockSha = 'mockSha';
             const commitUrl = `${mockProjectDir}/-/commit/${mockSha}`;
 
-            beforeEach(done => {
-              timeSeriesAreaChart.setData({
+            beforeEach(() => {
+              wrapper.setData({
                 tooltip: {
                   type: 'deployments',
                 },
               });
-              timeSeriesAreaChart.vm.$nextTick(done);
+              return wrapper.vm.$nextTick();
             });
 
             it('uses deployment title', () => {
@@ -622,16 +680,15 @@ describe('Time series component', () => {
               ).toBe(true);
             });
 
-            it('renders clickable commit sha in tooltip content', done => {
-              timeSeriesAreaChart.vm.tooltip.sha = mockSha;
-              timeSeriesAreaChart.vm.tooltip.commitUrl = commitUrl;
+            it('renders clickable commit sha in tooltip content', () => {
+              wrapper.vm.tooltip.sha = mockSha;
+              wrapper.vm.tooltip.commitUrl = commitUrl;
 
-              timeSeriesAreaChart.vm.$nextTick(() => {
-                const commitLink = timeSeriesAreaChart.find(GlLink);
+              return wrapper.vm.$nextTick(() => {
+                const commitLink = wrapper.find(GlLink);
 
                 expect(shallowWrapperContainsSlotText(commitLink, 'default', mockSha)).toBe(true);
                 expect(commitLink.attributes('href')).toEqual(commitUrl);
-                done();
               });
             });
           });
@@ -642,30 +699,26 @@ describe('Time series component', () => {
 
   describe('with multiple time series', () => {
     describe('General functions', () => {
-      let timeSeriesChart;
-
-      beforeEach(done => {
+      beforeEach(() => {
         store = createStore();
         const graphData = cloneDeep(metricsDashboardViewModel.panelGroups[0].panels[3]);
         graphData.metrics.forEach(metric =>
           Object.assign(metric, { result: metricResultStatus.result }),
         );
 
-        timeSeriesChart = createWrapper({ ...graphData, type: 'area-chart' }, mount);
-        timeSeriesChart.vm.$nextTick(done);
+        createWrapper({ graphData: { ...graphData, type: 'area-chart' } }, mount);
+        return wrapper.vm.$nextTick();
       });
 
       afterEach(() => {
-        timeSeriesChart.destroy();
+        wrapper.destroy();
       });
 
       describe('Color match', () => {
         let lineColors;
 
         beforeEach(() => {
-          lineColors = timeSeriesChart
-            .find(GlAreaChart)
-            .vm.series.map(item => item.lineStyle.color);
+          lineColors = wrapper.find(GlAreaChart).vm.series.map(item => item.lineStyle.color);
         });
 
         it('should contain different colors for contiguous time series', () => {
@@ -675,7 +728,7 @@ describe('Time series component', () => {
         });
 
         it('should match series color with tooltip label color', () => {
-          const labels = timeSeriesChart.findAll(GlChartSeriesLabel);
+          const labels = wrapper.findAll(GlChartSeriesLabel);
 
           lineColors.forEach((color, index) => {
             const labelColor = labels.at(index).props('color');
@@ -684,7 +737,7 @@ describe('Time series component', () => {
         });
 
         it('should match series color with legend color', () => {
-          const legendColors = timeSeriesChart
+          const legendColors = wrapper
             .find(GlChartLegend)
             .props('seriesInfo')
             .map(item => item.color);
@@ -696,4 +749,45 @@ describe('Time series component', () => {
       });
     });
   });
+
+  describe('legend layout', () => {
+    const findLegend = () => wrapper.find(GlChartLegend);
+
+    beforeEach(() => {
+      createWrapper(mockGraphData, mount);
+      return wrapper.vm.$nextTick();
+    });
+
+    afterEach(() => {
+      wrapper.destroy();
+    });
+
+    it('should render a tabular legend layout by default', () => {
+      expect(findLegend().props('layout')).toBe('table');
+    });
+
+    describe('when inline legend layout prop is set', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          legendLayout: 'inline',
+        });
+      });
+
+      it('should render an inline legend layout', () => {
+        expect(findLegend().props('layout')).toBe('inline');
+      });
+    });
+
+    describe('when table legend layout prop is set', () => {
+      beforeEach(() => {
+        wrapper.setProps({
+          legendLayout: 'table',
+        });
+      });
+
+      it('should render a tabular legend layout', () => {
+        expect(findLegend().props('layout')).toBe('table');
+      });
+    });
+  });
 });
diff --git a/spec/frontend/monitoring/components/dashboard_panel_spec.js b/spec/frontend/monitoring/components/dashboard_panel_spec.js
index f8c9bd56721..0ad6e04588f 100644
--- a/spec/frontend/monitoring/components/dashboard_panel_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_panel_spec.js
@@ -4,7 +4,7 @@ import AxiosMockAdapter from 'axios-mock-adapter';
 import { setTestTimeout } from 'helpers/timeout';
 import invalidUrl from '~/lib/utils/invalid_url';
 import axios from '~/lib/utils/axios_utils';
-import { GlDropdownItem } from '@gitlab/ui';
+import { GlNewDropdownItem as GlDropdownItem } from '@gitlab/ui';
 import AlertWidget from '~/monitoring/components/alert_widget.vue';
 
 import DashboardPanel from '~/monitoring/components/dashboard_panel.vue';
@@ -55,7 +55,9 @@ describe('Dashboard Panel', () => {
   const findCopyLink = () => wrapper.find({ ref: 'copyChartLink' });
   const findTimeChart = () => wrapper.find({ ref: 'timeSeriesChart' });
   const findTitle = () => wrapper.find({ ref: 'graphTitle' });
-  const findContextualMenu = () => wrapper.find({ ref: 'contextualMenu' });
+  const findCtxMenu = () => wrapper.find({ ref: 'contextualMenu' });
+  const findMenuItems = () => wrapper.findAll(GlDropdownItem);
+  const findMenuItemByText = text => findMenuItems().filter(i => i.text() === text);
 
   const createWrapper = (props, options) => {
     wrapper = shallowMount(DashboardPanel, {
@@ -70,6 +72,15 @@ describe('Dashboard Panel', () => {
     });
   };
 
+  const mockGetterReturnValue = (getter, value) => {
+    jest.spyOn(monitoringDashboard.getters, getter).mockReturnValue(value);
+    store = new Vuex.Store({
+      modules: {
+        monitoringDashboard,
+      },
+    });
+  };
+
   beforeEach(() => {
     setTestTimeout(1000);
 
@@ -119,13 +130,17 @@ describe('Dashboard Panel', () => {
     });
 
     it('does not contain graph widgets', () => {
-      expect(findContextualMenu().exists()).toBe(false);
+      expect(findCtxMenu().exists()).toBe(false);
     });
 
     it('The Empty Chart component is rendered and is a Vue instance', () => {
       expect(wrapper.find(MonitorEmptyChart).exists()).toBe(true);
       expect(wrapper.find(MonitorEmptyChart).isVueInstance()).toBe(true);
     });
+
+    it('does not contain a tabindex attribute', () => {
+      expect(wrapper.find(MonitorEmptyChart).contains('[tabindex]')).toBe(false);
+    });
   });
 
   describe('When graphData is null', () => {
@@ -148,7 +163,7 @@ describe('Dashboard Panel', () => {
     });
 
     it('does not contain graph widgets', () => {
-      expect(findContextualMenu().exists()).toBe(false);
+      expect(findCtxMenu().exists()).toBe(false);
     });
 
     it('The Empty Chart component is rendered and is a Vue instance', () => {
@@ -171,7 +186,7 @@ describe('Dashboard Panel', () => {
     });
 
     it('contains graph widgets', () => {
-      expect(findContextualMenu().exists()).toBe(true);
+      expect(findCtxMenu().exists()).toBe(true);
       expect(wrapper.find({ ref: 'downloadCsvLink' }).exists()).toBe(true);
     });
 
@@ -367,7 +382,7 @@ describe('Dashboard Panel', () => {
     });
   });
 
-  describe('when cliboard data is available', () => {
+  describe('when clipboard data is available', () => {
     const clipboardText = 'A value to copy.';
 
     beforeEach(() => {
@@ -392,7 +407,7 @@ describe('Dashboard Panel', () => {
     });
   });
 
-  describe('when cliboard data is not available', () => {
+  describe('when clipboard data is not available', () => {
     it('there is no "copy to clipboard" link for a null value', () => {
       createWrapper({ clipboardText: null });
       expect(findCopyLink().exists()).toBe(false);
@@ -498,6 +513,34 @@ describe('Dashboard Panel', () => {
     });
   });
 
+  describe('panel timezone', () => {
+    it('displays a time chart in local timezone', () => {
+      createWrapper();
+      expect(findTimeChart().props('timezone')).toBe('LOCAL');
+    });
+
+    it('displays a heatmap in local timezone', () => {
+      createWrapper({ graphData: graphDataPrometheusQueryRangeMultiTrack });
+      expect(wrapper.find(MonitorHeatmapChart).props('timezone')).toBe('LOCAL');
+    });
+
+    describe('when timezone is set to UTC', () => {
+      beforeEach(() => {
+        store = createStore({ dashboardTimezone: 'UTC' });
+      });
+
+      it('displays a time chart with UTC', () => {
+        createWrapper();
+        expect(findTimeChart().props('timezone')).toBe('UTC');
+      });
+
+      it('displays a heatmap with UTC', () => {
+        createWrapper({ graphData: graphDataPrometheusQueryRangeMultiTrack });
+        expect(wrapper.find(MonitorHeatmapChart).props('timezone')).toBe('UTC');
+      });
+    });
+  });
+
   describe('Expand to full screen', () => {
     const findExpandBtn = () => wrapper.find({ ref: 'expandBtn' });
 
@@ -530,17 +573,9 @@ describe('Dashboard Panel', () => {
     const setMetricsSavedToDb = val =>
       monitoringDashboard.getters.metricsSavedToDb.mockReturnValue(val);
     const findAlertsWidget = () => wrapper.find(AlertWidget);
-    const findMenuItemAlert = () =>
-      wrapper.findAll(GlDropdownItem).filter(i => i.text() === 'Alerts');
 
     beforeEach(() => {
-      jest.spyOn(monitoringDashboard.getters, 'metricsSavedToDb').mockReturnValue([]);
-
-      store = new Vuex.Store({
-        modules: {
-          monitoringDashboard,
-        },
-      });
+      mockGetterReturnValue('metricsSavedToDb', []);
 
       createWrapper();
     });
@@ -569,8 +604,99 @@ describe('Dashboard Panel', () => {
       });
 
       it(`${showsDesc} alert configuration`, () => {
-        expect(findMenuItemAlert().exists()).toBe(isShown);
+        expect(findMenuItemByText('Alerts').exists()).toBe(isShown);
       });
     });
   });
+
+  describe('When graphData contains links', () => {
+    const findManageLinksItem = () => wrapper.find({ ref: 'manageLinksItem' });
+    const mockLinks = [
+      {
+        url: 'https://example.com',
+        title: 'Example 1',
+      },
+      {
+        url: 'https://gitlab.com',
+        title: 'Example 2',
+      },
+    ];
+    const createWrapperWithLinks = (links = mockLinks) => {
+      createWrapper({
+        graphData: {
+          ...graphData,
+          links,
+        },
+      });
+    };
+
+    it('custom links are shown', () => {
+      createWrapperWithLinks();
+
+      mockLinks.forEach(({ url, title }) => {
+        const link = findMenuItemByText(title).at(0);
+
+        expect(link.exists()).toBe(true);
+        expect(link.attributes('href')).toBe(url);
+      });
+    });
+
+    it("custom links don't show unsecure content", () => {
+      createWrapperWithLinks([
+        {
+          title: '<script>alert("XSS")</script>',
+          url: 'http://example.com',
+        },
+      ]);
+
+      expect(findMenuItems().at(1).element.innerHTML).toBe(
+        '&lt;script&gt;alert("XSS")&lt;/script&gt;',
+      );
+    });
+
+    it("custom links don't show unsecure href attributes", () => {
+      const title = 'Owned!';
+
+      createWrapperWithLinks([
+        {
+          title,
+          // eslint-disable-next-line no-script-url
+          url: 'javascript:alert("Evil")',
+        },
+      ]);
+
+      const link = findMenuItemByText(title).at(0);
+      expect(link.attributes('href')).toBe('#');
+    });
+
+    it('when an editable dashboard is selected, shows `Manage chart links` link to the blob path', () => {
+      const editUrl = '/edit';
+      mockGetterReturnValue('selectedDashboard', {
+        can_edit: true,
+        project_blob_path: editUrl,
+      });
+      createWrapperWithLinks();
+
+      expect(findManageLinksItem().exists()).toBe(true);
+      expect(findManageLinksItem().attributes('href')).toBe(editUrl);
+    });
+
+    it('when no dashboard is selected, does not show `Manage chart links`', () => {
+      mockGetterReturnValue('selectedDashboard', null);
+      createWrapperWithLinks();
+
+      expect(findManageLinksItem().exists()).toBe(false);
+    });
+
+    it('when non-editable dashboard is selected, does not show `Manage chart links`', () => {
+      const editUrl = '/edit';
+      mockGetterReturnValue('selectedDashboard', {
+        can_edit: false,
+        project_blob_path: editUrl,
+      });
+      createWrapperWithLinks();
+
+      expect(findManageLinksItem().exists()).toBe(false);
+    });
+  });
 });
diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js
index b2c9fe93cde..7bb4c68b4cd 100644
--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -6,16 +6,17 @@ import { objectToQuery } from '~/lib/utils/url_utility';
 import VueDraggable from 'vuedraggable';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
-import statusCodes from '~/lib/utils/http_status';
 import { metricStates } from '~/monitoring/constants';
 import Dashboard from '~/monitoring/components/dashboard.vue';
 
+import DashboardHeader from '~/monitoring/components/dashboard_header.vue';
 import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue';
 import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue';
 import DashboardsDropdown from '~/monitoring/components/dashboards_dropdown.vue';
 import EmptyState from '~/monitoring/components/empty_state.vue';
 import GroupEmptyState from '~/monitoring/components/group_empty_state.vue';
 import DashboardPanel from '~/monitoring/components/dashboard_panel.vue';
+import LinksSection from '~/monitoring/components/links_section.vue';
 import { createStore } from '~/monitoring/stores';
 import * as types from '~/monitoring/stores/mutation_types';
 import {
@@ -24,6 +25,7 @@ import {
   setMetricResult,
   setupStoreWithData,
   setupStoreWithVariable,
+  setupStoreWithLinks,
 } from '../store_utils';
 import { environmentData, dashboardGitResponse, propsData } from '../mock_data';
 import { metricsDashboardViewModel, metricsDashboardPanelCount } from '../fixture_data';
@@ -36,7 +38,9 @@ describe('Dashboard', () => {
   let wrapper;
   let mock;
 
-  const findEnvironmentsDropdown = () => wrapper.find({ ref: 'monitorEnvironmentsDropdown' });
+  const findDashboardHeader = () => wrapper.find(DashboardHeader);
+  const findEnvironmentsDropdown = () =>
+    findDashboardHeader().find({ ref: 'monitorEnvironmentsDropdown' });
   const findAllEnvironmentsDropdownItems = () => findEnvironmentsDropdown().findAll(GlDropdownItem);
   const setSearchTerm = searchTerm => {
     store.commit(`monitoringDashboard/${types.SET_ENVIRONMENTS_FILTER}`, searchTerm);
@@ -46,6 +50,9 @@ describe('Dashboard', () => {
     wrapper = shallowMount(Dashboard, {
       propsData: { ...propsData, ...props },
       store,
+      stubs: {
+        DashboardHeader,
+      },
       ...options,
     });
   };
@@ -54,7 +61,11 @@ describe('Dashboard', () => {
     wrapper = mount(Dashboard, {
       propsData: { ...propsData, ...props },
       store,
-      stubs: ['graph-group', 'dashboard-panel'],
+      stubs: {
+        'graph-group': true,
+        'dashboard-panel': true,
+        'dashboard-header': DashboardHeader,
+      },
       ...options,
     });
   };
@@ -80,19 +91,6 @@ describe('Dashboard', () => {
     it('shows the environment selector', () => {
       expect(findEnvironmentsDropdown().exists()).toBe(true);
     });
-
-    it('sets initial state', () => {
-      expect(store.dispatch).toHaveBeenCalledWith('monitoringDashboard/setInitialState', {
-        currentDashboard: '',
-        currentEnvironmentName: 'production',
-        dashboardEndpoint: 'https://invalid',
-        dashboardsEndpoint: 'https://invalid',
-        deploymentsEndpoint: null,
-        logsPath: '/path/to/logs',
-        metricsEndpoint: 'http://test.host/monitoring/mock',
-        projectPath: '/path/to/project',
-      });
-    });
   });
 
   describe('no data found', () => {
@@ -288,7 +286,10 @@ describe('Dashboard', () => {
     it('URL is updated with panel parameters and custom dashboard', () => {
       const dashboard = 'dashboard.yml';
 
-      createMountedWrapper({ hasMetrics: true, currentDashboard: dashboard });
+      store.commit(`monitoringDashboard/${types.SET_INITIAL_STATE}`, {
+        currentDashboard: dashboard,
+      });
+      createMountedWrapper({ hasMetrics: true });
       expandPanel(group, panel);
 
       const expectedSearch = objectToQuery({
@@ -326,8 +327,10 @@ describe('Dashboard', () => {
 
   describe('when all requests have been commited by the store', () => {
     beforeEach(() => {
+      store.commit(`monitoringDashboard/${types.SET_INITIAL_STATE}`, {
+        currentEnvironmentName: 'production',
+      });
       createMountedWrapper({ hasMetrics: true });
-
       setupStoreWithData(store);
 
       return wrapper.vm.$nextTick();
@@ -345,7 +348,9 @@ describe('Dashboard', () => {
       });
     });
 
-    it('renders the environments dropdown with a single active element', () => {
+    // Note: This test is not working, .active does not show the active environment
+    // eslint-disable-next-line jest/no-disabled-tests
+    it.skip('renders the environments dropdown with a single active element', () => {
       const activeItem = findAllEnvironmentsDropdownItems().wrappers.filter(itemWrapper =>
         itemWrapper.find('.active').exists(),
       );
@@ -355,7 +360,7 @@ describe('Dashboard', () => {
   });
 
   describe('star dashboards', () => {
-    const findToggleStar = () => wrapper.find({ ref: 'toggleStarBtn' });
+    const findToggleStar = () => wrapper.find(DashboardHeader).find({ ref: 'toggleStarBtn' });
     const findToggleStarIcon = () => findToggleStar().find(GlIcon);
 
     beforeEach(() => {
@@ -459,7 +464,7 @@ describe('Dashboard', () => {
     setupStoreWithData(store);
 
     return wrapper.vm.$nextTick().then(() => {
-      const refreshBtn = wrapper.findAll({ ref: 'refreshDashboardBtn' });
+      const refreshBtn = wrapper.find(DashboardHeader).findAll({ ref: 'refreshDashboardBtn' });
 
       expect(refreshBtn).toHaveLength(1);
       expect(refreshBtn.is(GlDeprecatedButton)).toBe(true);
@@ -480,6 +485,21 @@ describe('Dashboard', () => {
     });
   });
 
+  describe('links section', () => {
+    beforeEach(() => {
+      createShallowWrapper({ hasMetrics: true });
+      setupStoreWithData(store);
+      setupStoreWithLinks(store);
+
+      return wrapper.vm.$nextTick();
+    });
+
+    it('shows the links section', () => {
+      expect(wrapper.vm.shouldShowLinksSection).toBe(true);
+      expect(wrapper.find(LinksSection)).toExist();
+    });
+  });
+
   describe('single panel expands to "full screen" mode', () => {
     const findExpandedPanel = () => wrapper.find({ ref: 'expandedPanel' });
 
@@ -630,7 +650,12 @@ describe('Dashboard', () => {
     });
 
     it('renders a search input', () => {
-      expect(wrapper.find({ ref: 'monitorEnvironmentsDropdownSearch' }).exists()).toBe(true);
+      expect(
+        wrapper
+          .find(DashboardHeader)
+          .find({ ref: 'monitorEnvironmentsDropdownSearch' })
+          .exists(),
+      ).toBe(true);
     });
 
     it('renders dropdown items', () => {
@@ -666,7 +691,12 @@ describe('Dashboard', () => {
       setSearchTerm(searchTerm);
 
       return wrapper.vm.$nextTick(() => {
-        expect(wrapper.find({ ref: 'monitorEnvironmentsDropdownMsg' }).isVisible()).toBe(true);
+        expect(
+          wrapper
+            .find(DashboardHeader)
+            .find({ ref: 'monitorEnvironmentsDropdownMsg' })
+            .isVisible(),
+        ).toBe(true);
       });
     });
 
@@ -676,7 +706,12 @@ describe('Dashboard', () => {
       return wrapper.vm
         .$nextTick()
         .then(() => {
-          expect(wrapper.find({ ref: 'monitorEnvironmentsDropdownLoading' }).exists()).toBe(true);
+          expect(
+            wrapper
+              .find(DashboardHeader)
+              .find({ ref: 'monitorEnvironmentsDropdownLoading' })
+              .exists(),
+          ).toBe(true);
         })
         .then(() => {
           store.commit(
@@ -685,7 +720,12 @@ describe('Dashboard', () => {
           );
         })
         .then(() => {
-          expect(wrapper.find({ ref: 'monitorEnvironmentsDropdownLoading' }).exists()).toBe(false);
+          expect(
+            wrapper
+              .find(DashboardHeader)
+              .find({ ref: 'monitorEnvironmentsDropdownLoading' })
+              .exists(),
+          ).toBe(false);
         });
     });
   });
@@ -783,9 +823,59 @@ describe('Dashboard', () => {
     });
   });
 
+  describe('dashboard timezone', () => {
+    const setupWithTimezone = value => {
+      store = createStore({ dashboardTimezone: value });
+      setupStoreWithData(store);
+      createShallowWrapper({ hasMetrics: true });
+      return wrapper.vm.$nextTick;
+    };
+
+    describe('local timezone is enabled by default', () => {
+      beforeEach(() => {
+        return setupWithTimezone();
+      });
+
+      it('shows the data time picker in local timezone', () => {
+        expect(
+          findDashboardHeader()
+            .find(DateTimePicker)
+            .props('utc'),
+        ).toBe(false);
+      });
+    });
+
+    describe('when LOCAL timezone is enabled', () => {
+      beforeEach(() => {
+        return setupWithTimezone('LOCAL');
+      });
+
+      it('shows the data time picker in local timezone', () => {
+        expect(
+          findDashboardHeader()
+            .find(DateTimePicker)
+            .props('utc'),
+        ).toBe(false);
+      });
+    });
+
+    describe('when UTC timezone is enabled', () => {
+      beforeEach(() => {
+        return setupWithTimezone('UTC');
+      });
+
+      it('shows the data time picker in UTC format', () => {
+        expect(
+          findDashboardHeader()
+            .find(DateTimePicker)
+            .props('utc'),
+        ).toBe(true);
+      });
+    });
+  });
+
   describe('cluster health', () => {
     beforeEach(() => {
-      mock.onGet(propsData.metricsEndpoint).reply(statusCodes.OK, JSON.stringify({}));
       createShallowWrapper({ hasMetrics: true, showHeader: false });
 
       // all_dashboards is not defined in health dashboards
@@ -830,6 +920,62 @@ describe('Dashboard', () => {
     });
   });
 
+  describe('document title', () => {
+    const originalTitle = 'Original Title';
+    const defaultDashboardName = dashboardGitResponse[0].display_name;
+
+    beforeEach(() => {
+      document.title = originalTitle;
+      createShallowWrapper({ hasMetrics: true });
+    });
+
+    afterAll(() => {
+      document.title = '';
+    });
+
+    it('is prepended with default dashboard name by default', () => {
+      setupAllDashboards(store);
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(document.title.startsWith(`${defaultDashboardName} · `)).toBe(true);
+      });
+    });
+
+    it('is prepended with dashboard name if path is known', () => {
+      const dashboard = dashboardGitResponse[1];
+      const currentDashboard = dashboard.path;
+
+      setupAllDashboards(store, currentDashboard);
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(document.title.startsWith(`${dashboard.display_name} · `)).toBe(true);
+      });
+    });
+
+    it('is prepended with default dashboard name is path is not known', () => {
+      setupAllDashboards(store, 'unknown/path');
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(document.title.startsWith(`${defaultDashboardName} · `)).toBe(true);
+      });
+    });
+
+    it('is not modified when dashboard name is not provided', () => {
+      const dashboard = { ...dashboardGitResponse[1], display_name: null };
+      const currentDashboard = dashboard.path;
+
+      store.commit(`monitoringDashboard/${types.SET_ALL_DASHBOARDS}`, [dashboard]);
+
+      store.commit(`monitoringDashboard/${types.SET_INITIAL_STATE}`, {
+        currentDashboard,
+      });
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(document.title).toBe(originalTitle);
+      });
+    });
+  });
+
   describe('Dashboard dropdown', () => {
     beforeEach(() => {
       createMountedWrapper({ hasMetrics: true });
@@ -877,7 +1023,10 @@ describe('Dashboard', () => {
 
     beforeEach(() => {
       setupStoreWithData(store);
-      createShallowWrapper({ hasMetrics: true, currentDashboard });
+      store.commit(`monitoringDashboard/${types.SET_INITIAL_STATE}`, {
+        currentDashboard,
+      });
+      createShallowWrapper({ hasMetrics: true });
 
       return wrapper.vm.$nextTick();
     });
@@ -893,7 +1042,8 @@ describe('Dashboard', () => {
   });
 
   describe('add custom metrics', () => {
-    const findAddMetricButton = () => wrapper.vm.$refs.addMetricBtn;
+    const findAddMetricButton = () => wrapper.find(DashboardHeader).find({ ref: 'addMetricBtn' });
+
     describe('when not available', () => {
       beforeEach(() => {
         createShallowWrapper({
@@ -902,7 +1052,7 @@ describe('Dashboard', () => {
         });
       });
       it('does not render add button on the dashboard', () => {
-        expect(findAddMetricButton()).toBeUndefined();
+        expect(findAddMetricButton().exists()).toBe(false);
       });
     });
 
@@ -935,10 +1085,9 @@ describe('Dashboard', () => {
         expect(wrapper.find(GlModal).attributes().modalid).toBe('add-metric');
       });
       it('adding new metric is tracked', done => {
-        const submitButton = wrapper.vm.$refs.submitCustomMetricsFormBtn;
-        wrapper.setData({
-          formIsValid: true,
-        });
+        const submitButton = wrapper
+          .find(DashboardHeader)
+          .find({ ref: 'submitCustomMetricsFormBtn' }).vm;
         wrapper.vm.$nextTick(() => {
           submitButton.$el.click();
           wrapper.vm.$nextTick(() => {
diff --git a/spec/frontend/monitoring/components/dashboard_template_spec.js b/spec/frontend/monitoring/components/dashboard_template_spec.js
index cc0ac348b11..a1a450d4abe 100644
--- a/spec/frontend/monitoring/components/dashboard_template_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_template_spec.js
@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import Dashboard from '~/monitoring/components/dashboard.vue';
+import DashboardHeader from '~/monitoring/components/dashboard_header.vue';
 import { createStore } from '~/monitoring/stores';
 import { setupAllDashboards } from '../store_utils';
 import { propsData } from '../mock_data';
@@ -14,7 +15,9 @@ describe('Dashboard template', () => {
   let mock;
 
   beforeEach(() => {
-    store = createStore();
+    store = createStore({
+      currentEnvironmentName: 'production',
+    });
     mock = new MockAdapter(axios);
 
     setupAllDashboards(store);
@@ -25,7 +28,13 @@ describe('Dashboard template', () => {
   });
 
   it('matches the default snapshot', () => {
-    wrapper = shallowMount(Dashboard, { propsData: { ...propsData }, store });
+    wrapper = shallowMount(Dashboard, {
+      propsData: { ...propsData },
+      store,
+      stubs: {
+        DashboardHeader,
+      },
+    });
 
     expect(wrapper.element).toMatchSnapshot();
   });
diff --git a/spec/frontend/monitoring/components/dashboard_url_time_spec.js b/spec/frontend/monitoring/components/dashboard_url_time_spec.js
index 9bba5280007..a74c621db9b 100644
--- a/spec/frontend/monitoring/components/dashboard_url_time_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_url_time_spec.js
@@ -12,6 +12,7 @@ import axios from '~/lib/utils/axios_utils';
 import { mockProjectDir, propsData } from '../mock_data';
 
 import Dashboard from '~/monitoring/components/dashboard.vue';
+import DashboardHeader from '~/monitoring/components/dashboard_header.vue';
 import { createStore } from '~/monitoring/stores';
 import { defaultTimeRange } from '~/vue_shared/constants';
 
@@ -27,12 +28,12 @@ describe('dashboard invalid url parameters', () => {
     wrapper = mount(Dashboard, {
       propsData: { ...propsData, ...props },
       store,
-      stubs: ['graph-group', 'dashboard-panel'],
+      stubs: { 'graph-group': true, 'dashboard-panel': true, 'dashboard-header': DashboardHeader },
       ...options,
     });
   };
 
-  const findDateTimePicker = () => wrapper.find({ ref: 'dateTimePicker' });
+  const findDateTimePicker = () => wrapper.find(DashboardHeader).find({ ref: 'dateTimePicker' });
 
   beforeEach(() => {
     store = createStore();
diff --git a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
index 8ab7c8b9e50..29e4c4514fe 100644
--- a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
+++ b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
@@ -10,6 +10,8 @@ const createMountedWrapper = (props = {}) => {
   wrapper = mount(DuplicateDashboardForm, {
     propsData: { ...props },
     sync: false,
+    // We need to attach to document, so that `document.activeElement` is properly set in jsdom
+    attachToDocument: true,
   });
 };
 
diff --git a/spec/frontend/monitoring/components/embeds/metric_embed_spec.js b/spec/frontend/monitoring/components/embeds/metric_embed_spec.js
index f23823ccad6..4e7fee81d66 100644
--- a/spec/frontend/monitoring/components/embeds/metric_embed_spec.js
+++ b/spec/frontend/monitoring/components/embeds/metric_embed_spec.js
@@ -4,6 +4,7 @@ import DashboardPanel from '~/monitoring/components/dashboard_panel.vue';
 import { TEST_HOST } from 'helpers/test_constants';
 import MetricEmbed from '~/monitoring/components/embeds/metric_embed.vue';
 import { groups, initialState, metricsData, metricsWithData } from './mock_data';
+import { setHTMLFixture } from 'helpers/fixtures';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -25,6 +26,8 @@ describe('MetricEmbed', () => {
   }
 
   beforeEach(() => {
+    setHTMLFixture('<div class="layout-page"></div>');
+
     actions = {
       setInitialState: jest.fn(),
       setShowErrorBanner: jest.fn(),
diff --git a/spec/frontend/monitoring/components/embeds/mock_data.js b/spec/frontend/monitoring/components/embeds/mock_data.js
index 9cf66e52d22..e32e1a08cdb 100644
--- a/spec/frontend/monitoring/components/embeds/mock_data.js
+++ b/spec/frontend/monitoring/components/embeds/mock_data.js
@@ -52,7 +52,6 @@ export const initialState = () => ({
   dashboard: {
     panel_groups: [],
   },
-  useDashboardEndpoint: true,
 });
 
 export const initialEmbedGroupState = () => ({
diff --git a/spec/frontend/monitoring/components/graph_group_spec.js b/spec/frontend/monitoring/components/graph_group_spec.js
index 28a6af64394..92829135c0f 100644
--- a/spec/frontend/monitoring/components/graph_group_spec.js
+++ b/spec/frontend/monitoring/components/graph_group_spec.js
@@ -8,6 +8,7 @@ describe('Graph group component', () => {
   const findGroup = () => wrapper.find({ ref: 'graph-group' });
   const findContent = () => wrapper.find({ ref: 'graph-group-content' });
   const findCaretIcon = () => wrapper.find(Icon);
+  const findToggleButton = () => wrapper.find('[data-testid="group-toggle-button"]');
 
   const createComponent = propsData => {
     wrapper = shallowMount(GraphGroup, {
@@ -41,6 +42,16 @@ describe('Graph group component', () => {
       });
     });
 
+    it('should contain a tabindex', () => {
+      expect(findGroup().contains('[tabindex]')).toBe(true);
+    });
+
+    it('should contain a tab index for the collapse button', () => {
+      const groupToggle = findToggleButton();
+
+      expect(groupToggle.contains('[tabindex]')).toBe(true);
+    });
+
     it('should show the open the group when collapseGroup is set to true', () => {
       wrapper.setProps({
         collapseGroup: true,
@@ -69,6 +80,15 @@ describe('Graph group component', () => {
 
         expect(wrapper.vm.caretIcon).toBe('angle-down');
       });
+
+      it('should call collapse the graph group content when enter is pressed on the caret icon', () => {
+        const graphGroupContent = findContent();
+        const button = findToggleButton();
+
+        button.trigger('keyup.enter');
+
+        expect(graphGroupContent.isVisible()).toBe(false);
+      });
     });
 
     describe('When groups can not be collapsed', () => {
diff --git a/spec/frontend/monitoring/components/links_section_spec.js b/spec/frontend/monitoring/components/links_section_spec.js
new file mode 100644
index 00000000000..3b5b72d84ee
--- /dev/null
+++ b/spec/frontend/monitoring/components/links_section_spec.js
@@ -0,0 +1,64 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlLink } from '@gitlab/ui';
+import { createStore } from '~/monitoring/stores';
+import LinksSection from '~/monitoring/components/links_section.vue';
+
+describe('Links Section component', () => {
+  let store;
+  let wrapper;
+
+  const createShallowWrapper = () => {
+    wrapper = shallowMount(LinksSection, {
+      store,
+    });
+  };
+  const setState = links => {
+    store.state.monitoringDashboard = {
+      ...store.state.monitoringDashboard,
+      showEmptyState: false,
+      links,
+    };
+  };
+  const findLinks = () => wrapper.findAll(GlLink);
+
+  beforeEach(() => {
+    store = createStore();
+    createShallowWrapper();
+  });
+
+  it('does not render a section if no links are present', () => {
+    setState();
+
+    return wrapper.vm.$nextTick(() => {
+      expect(findLinks()).not.toExist();
+    });
+  });
+
+  it('renders a link inside a section', () => {
+    setState([
+      {
+        title: 'GitLab Website',
+        url: 'https://gitlab.com',
+      },
+    ]);
+
+    return wrapper.vm.$nextTick(() => {
+      expect(findLinks()).toHaveLength(1);
+      const firstLink = findLinks().at(0);
+
+      expect(firstLink.attributes('href')).toBe('https://gitlab.com');
+      expect(firstLink.text()).toBe('GitLab Website');
+    });
+  });
+
+  it('renders multiple links inside a section', () => {
+    const links = new Array(10)
+      .fill(null)
+      .map((_, i) => ({ title: `Title ${i}`, url: `https://gitlab.com/projects/${i}` }));
+    setState(links);
+
+    return wrapper.vm.$nextTick(() => {
+      expect(findLinks()).toHaveLength(10);
+    });
+  });
+});
diff --git a/spec/frontend/monitoring/components/variables_section_spec.js b/spec/frontend/monitoring/components/variables_section_spec.js
index 095d89c9231..fd814e81c8f 100644
--- a/spec/frontend/monitoring/components/variables_section_spec.js
+++ b/spec/frontend/monitoring/components/variables_section_spec.js
@@ -57,8 +57,7 @@ describe('Metrics dashboard/variables section component', () => {
   });
 
   describe('when changing the variable inputs', () => {
-    const fetchDashboardData = jest.fn();
-    const updateVariableValues = jest.fn();
+    const updateVariablesAndFetchData = jest.fn();
 
     beforeEach(() => {
       store = new Vuex.Store({
@@ -67,11 +66,10 @@ describe('Metrics dashboard/variables section component', () => {
             namespaced: true,
             state: {
               showEmptyState: false,
-              promVariables: sampleVariables,
+              variables: sampleVariables,
             },
             actions: {
-              fetchDashboardData,
-              updateVariableValues,
+              updateVariablesAndFetchData,
             },
           },
         },
@@ -86,13 +84,12 @@ describe('Metrics dashboard/variables section component', () => {
       firstInput.vm.$emit('onUpdate', 'label1', 'test');
 
       return wrapper.vm.$nextTick(() => {
-        expect(updateVariableValues).toHaveBeenCalled();
+        expect(updateVariablesAndFetchData).toHaveBeenCalled();
         expect(mergeUrlParams).toHaveBeenCalledWith(
           convertVariablesForURL(sampleVariables),
           window.location.href,
         );
         expect(updateHistory).toHaveBeenCalled();
-        expect(fetchDashboardData).toHaveBeenCalled();
       });
     });
 
@@ -102,13 +99,12 @@ describe('Metrics dashboard/variables section component', () => {
       firstInput.vm.$emit('onUpdate', 'label1', 'test');
 
       return wrapper.vm.$nextTick(() => {
-        expect(updateVariableValues).toHaveBeenCalled();
+        expect(updateVariablesAndFetchData).toHaveBeenCalled();
         expect(mergeUrlParams).toHaveBeenCalledWith(
           convertVariablesForURL(sampleVariables),
           window.location.href,
         );
         expect(updateHistory).toHaveBeenCalled();
-        expect(fetchDashboardData).toHaveBeenCalled();
       });
     });
 
@@ -117,10 +113,9 @@ describe('Metrics dashboard/variables section component', () => {
 
       firstInput.vm.$emit('onUpdate', 'label1', 'Simple text');
 
-      expect(updateVariableValues).not.toHaveBeenCalled();
+      expect(updateVariablesAndFetchData).not.toHaveBeenCalled();
       expect(mergeUrlParams).not.toHaveBeenCalled();
       expect(updateHistory).not.toHaveBeenCalled();
-      expect(fetchDashboardData).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/spec/frontend/monitoring/mock_data.js b/spec/frontend/monitoring/mock_data.js
index 4611e6f1b18..05b29e78ecd 100644
--- a/spec/frontend/monitoring/mock_data.js
+++ b/spec/frontend/monitoring/mock_data.js
@@ -11,17 +11,12 @@ export const propsData = {
   settingsPath: '/path/to/settings',
   clustersPath: '/path/to/clusters',
   tagsPath: '/path/to/tags',
-  projectPath: '/path/to/project',
-  logsPath: '/path/to/logs',
   defaultBranch: 'master',
-  metricsEndpoint: mockApiEndpoint,
-  deploymentsEndpoint: null,
   emptyGettingStartedSvgPath: '/path/to/getting-started.svg',
   emptyLoadingSvgPath: '/path/to/loading.svg',
   emptyNoDataSvgPath: '/path/to/no-data.svg',
   emptyNoDataSmallSvgPath: '/path/to/no-data-small.svg',
   emptyUnableToConnectSvgPath: '/path/to/unable-to-connect.svg',
-  currentEnvironmentName: 'production',
   customMetricsAvailable: false,
   customMetricsPath: '',
   validateQueryPath: '',
@@ -472,9 +467,9 @@ export const stackedColumnMockedData = {
         {
           metric: {},
           values: [
-            ['2020-01-30 12:00:00', '5'],
-            ['2020-01-30 12:01:00', '10'],
-            ['2020-01-30 12:02:00', '15'],
+            ['2020-01-30T12:00:00.000Z', '5'],
+            ['2020-01-30T12:01:00.000Z', '10'],
+            ['2020-01-30T12:02:00.000Z', '15'],
           ],
         },
       ],
@@ -490,9 +485,9 @@ export const stackedColumnMockedData = {
         {
           metric: {},
           values: [
-            ['2020-01-30 12:00:00', '20'],
-            ['2020-01-30 12:01:00', '25'],
-            ['2020-01-30 12:02:00', '30'],
+            ['2020-01-30T12:00:00.000Z', '20'],
+            ['2020-01-30T12:01:00.000Z', '25'],
+            ['2020-01-30T12:02:00.000Z', '30'],
           ],
         },
       ],
@@ -563,6 +558,89 @@ export const mockLogsPath = '/mockLogsPath';
 
 export const mockLogsHref = `${mockLogsPath}?duration_seconds=${mockTimeRange.duration.seconds}`;
 
+export const mockLinks = [
+  {
+    title: 'Job',
+    url: 'http://intel.com/bibendum/felis/sed/interdum/venenatis.png',
+  },
+  {
+    title: 'Solarbreeze',
+    url: 'http://ebay.co.uk/primis/in/faucibus.jsp',
+  },
+  {
+    title: 'Bentosanzap',
+    url: 'http://cargocollective.com/sociis/natoque/penatibus/et/magnis/dis.js',
+  },
+  {
+    title: 'Wrapsafe',
+    url: 'https://bloomberg.com/tempus/vel/pede/morbi.aspx',
+  },
+  {
+    title: 'Stronghold',
+    url: 'https://networkadvertising.org/primis/in/faucibus/orci/luctus/et/ultrices.html',
+  },
+  {
+    title: 'Lotstring',
+    url:
+      'https://huffingtonpost.com/sapien/a/libero.aspx?et=lacus&ultrices=at&posuere=velit&cubilia=vivamus&curae=vel&duis=nulla&faucibus=eget&accumsan=eros&odio=elementum&curabitur=pellentesque&convallis=quisque&duis=porta&consequat=volutpat&dui=erat&nec=quisque&nisi=erat&volutpat=eros&eleifend=viverra&donec=eget&ut=congue&dolor=eget&morbi=semper&vel=rutrum&lectus=nulla&in=nunc&quam=purus&fringilla=phasellus&rhoncus=in&mauris=felis&enim=donec&leo=semper&rhoncus=sapien&sed=a&vestibulum=libero&sit=nam&amet=dui&cursus=proin&id=leo&turpis=odio&integer=porttitor&aliquet=id&massa=consequat&id=in&lobortis=consequat&convallis=ut&tortor=nulla&risus=sed&dapibus=accumsan&augue=felis&vel=ut&accumsan=at&tellus=dolor&nisi=quis&eu=odio',
+  },
+  {
+    title: 'Cardify',
+    url:
+      'http://nature.com/imperdiet/et/commodo/vulputate/justo/in/blandit.json?tempus=posuere&semper=felis&est=sed&quam=lacus&pharetra=morbi&magna=sem&ac=mauris&consequat=laoreet&metus=ut&sapien=rhoncus&ut=aliquet&nunc=pulvinar&vestibulum=sed&ante=nisl&ipsum=nunc&primis=rhoncus&in=dui&faucibus=vel&orci=sem&luctus=sed&et=sagittis&ultrices=nam&posuere=congue&cubilia=risus&curae=semper&mauris=porta&viverra=volutpat&diam=quam&vitae=pede&quam=lobortis&suspendisse=ligula&potenti=sit&nullam=amet&porttitor=eleifend&lacus=pede&at=libero&turpis=quis',
+  },
+  {
+    title: 'Ventosanzap',
+    url:
+      'http://stanford.edu/augue/vestibulum/ante/ipsum/primis/in/faucibus.xml?metus=morbi&sapien=quis&ut=tortor&nunc=id&vestibulum=nulla&ante=ultrices&ipsum=aliquet&primis=maecenas&in=leo&faucibus=odio&orci=condimentum&luctus=id&et=luctus&ultrices=nec&posuere=molestie&cubilia=sed&curae=justo&mauris=pellentesque&viverra=viverra&diam=pede&vitae=ac&quam=diam&suspendisse=cras&potenti=pellentesque&nullam=volutpat&porttitor=dui&lacus=maecenas&at=tristique&turpis=est&donec=et&posuere=tempus&metus=semper&vitae=est&ipsum=quam&aliquam=pharetra&non=magna&mauris=ac&morbi=consequat&non=metus',
+  },
+  {
+    title: 'Cardguard',
+    url:
+      'https://google.com.hk/lacinia/eget/tincidunt/eget/tempus/vel.js?at=eget&turpis=nunc&a=donec',
+  },
+  {
+    title: 'Namfix',
+    url:
+      'https://fotki.com/eget/rutrum/at/lorem.jsp?at=id&vulputate=nulla&vitae=ultrices&nisl=aliquet&aenean=maecenas&lectus=leo&pellentesque=odio&eget=condimentum&nunc=id&donec=luctus&quis=nec&orci=molestie&eget=sed&orci=justo&vehicula=pellentesque&condimentum=viverra&curabitur=pede&in=ac&libero=diam&ut=cras&massa=pellentesque&volutpat=volutpat&convallis=dui&morbi=maecenas&odio=tristique&odio=est&elementum=et&eu=tempus&interdum=semper&eu=est&tincidunt=quam&in=pharetra&leo=magna&maecenas=ac&pulvinar=consequat&lobortis=metus&est=sapien&phasellus=ut&sit=nunc&amet=vestibulum&erat=ante&nulla=ipsum&tempus=primis&vivamus=in&in=faucibus&felis=orci&eu=luctus&sapien=et&cursus=ultrices&vestibulum=posuere&proin=cubilia&eu=curae&mi=mauris&nulla=viverra&ac=diam&enim=vitae&in=quam&tempor=suspendisse&turpis=potenti&nec=nullam&euismod=porttitor&scelerisque=lacus&quam=at&turpis=turpis&adipiscing=donec&lorem=posuere&vitae=metus&mattis=vitae&nibh=ipsum&ligula=aliquam&nec=non&sem=mauris&duis=morbi&aliquam=non&convallis=lectus&nunc=aliquam&proin=sit&at=amet',
+  },
+  {
+    title: 'Alpha',
+    url:
+      'http://bravesites.com/tempus/vel.jpg?risus=est&auctor=phasellus&sed=sit&tristique=amet&in=erat&tempus=nulla&sit=tempus&amet=vivamus&sem=in&fusce=felis&consequat=eu&nulla=sapien&nisl=cursus&nunc=vestibulum&nisl=proin&duis=eu&bibendum=mi&felis=nulla&sed=ac&interdum=enim&venenatis=in&turpis=tempor&enim=turpis&blandit=nec&mi=euismod&in=scelerisque&porttitor=quam&pede=turpis&justo=adipiscing&eu=lorem&massa=vitae&donec=mattis&dapibus=nibh&duis=ligula',
+  },
+  {
+    title: 'Sonsing',
+    url:
+      'http://microsoft.com/blandit.js?quis=ante&lectus=vestibulum&suspendisse=ante&potenti=ipsum&in=primis&eleifend=in&quam=faucibus&a=orci&odio=luctus&in=et&hac=ultrices&habitasse=posuere&platea=cubilia&dictumst=curae&maecenas=duis&ut=faucibus&massa=accumsan&quis=odio&augue=curabitur&luctus=convallis&tincidunt=duis&nulla=consequat&mollis=dui&molestie=nec&lorem=nisi&quisque=volutpat&ut=eleifend&erat=donec&curabitur=ut&gravida=dolor&nisi=morbi&at=vel&nibh=lectus&in=in&hac=quam&habitasse=fringilla&platea=rhoncus&dictumst=mauris&aliquam=enim&augue=leo&quam=rhoncus&sollicitudin=sed&vitae=vestibulum&consectetuer=sit&eget=amet&rutrum=cursus&at=id&lorem=turpis&integer=integer&tincidunt=aliquet&ante=massa&vel=id&ipsum=lobortis&praesent=convallis&blandit=tortor&lacinia=risus&erat=dapibus&vestibulum=augue&sed=vel&magna=accumsan&at=tellus&nunc=nisi&commodo=eu&placerat=orci&praesent=mauris&blandit=lacinia&nam=sapien&nulla=quis&integer=libero',
+  },
+  {
+    title: 'Fintone',
+    url:
+      'https://linkedin.com/duis/bibendum/felis/sed/interdum/venenatis.json?ut=justo&suscipit=sollicitudin&a=ut&feugiat=suscipit&et=a&eros=feugiat&vestibulum=et&ac=eros&est=vestibulum&lacinia=ac&nisi=est&venenatis=lacinia&tristique=nisi&fusce=venenatis&congue=tristique&diam=fusce&id=congue&ornare=diam&imperdiet=id&sapien=ornare&urna=imperdiet&pretium=sapien&nisl=urna&ut=pretium&volutpat=nisl&sapien=ut&arcu=volutpat&sed=sapien&augue=arcu&aliquam=sed&erat=augue&volutpat=aliquam&in=erat&congue=volutpat&etiam=in&justo=congue&etiam=etiam&pretium=justo&iaculis=etiam&justo=pretium&in=iaculis&hac=justo&habitasse=in&platea=hac&dictumst=habitasse&etiam=platea&faucibus=dictumst&cursus=etiam&urna=faucibus&ut=cursus&tellus=urna&nulla=ut&ut=tellus&erat=nulla&id=ut&mauris=erat&vulputate=id&elementum=mauris&nullam=vulputate&varius=elementum&nulla=nullam&facilisi=varius&cras=nulla&non=facilisi&velit=cras&nec=non&nisi=velit&vulputate=nec&nonummy=nisi&maecenas=vulputate&tincidunt=nonummy&lacus=maecenas&at=tincidunt&velit=lacus&vivamus=at&vel=velit&nulla=vivamus&eget=vel&eros=nulla&elementum=eget',
+  },
+  {
+    title: 'Fix San',
+    url:
+      'http://pinterest.com/mi/in/porttitor/pede.png?varius=nibh&integer=quisque&ac=id&leo=justo&pellentesque=sit&ultrices=amet&mattis=sapien&odio=dignissim&donec=vestibulum&vitae=vestibulum&nisi=ante&nam=ipsum&ultrices=primis&libero=in&non=faucibus&mattis=orci&pulvinar=luctus&nulla=et&pede=ultrices&ullamcorper=posuere&augue=cubilia&a=curae&suscipit=nulla&nulla=dapibus&elit=dolor&ac=vel&nulla=est&sed=donec&vel=odio&enim=justo&sit=sollicitudin&amet=ut&nunc=suscipit&viverra=a&dapibus=feugiat&nulla=et&suscipit=eros&ligula=vestibulum&in=ac&lacus=est&curabitur=lacinia&at=nisi&ipsum=venenatis&ac=tristique&tellus=fusce&semper=congue&interdum=diam&mauris=id&ullamcorper=ornare&purus=imperdiet&sit=sapien&amet=urna&nulla=pretium&quisque=nisl&arcu=ut&libero=volutpat&rutrum=sapien&ac=arcu&lobortis=sed&vel=augue&dapibus=aliquam&at=erat&diam=volutpat&nam=in&tristique=congue&tortor=etiam',
+  },
+  {
+    title: 'Ronstring',
+    url:
+      'https://ebay.com/ut/erat.aspx?nulla=sed&eget=nisl&eros=nunc&elementum=rhoncus&pellentesque=dui&quisque=vel&porta=sem&volutpat=sed&erat=sagittis&quisque=nam&erat=congue&eros=risus&viverra=semper&eget=porta&congue=volutpat&eget=quam&semper=pede&rutrum=lobortis&nulla=ligula',
+  },
+  {
+    title: 'It',
+    url:
+      'http://symantec.com/tortor/sollicitudin/mi/sit/amet.json?in=nullam&libero=varius&ut=nulla&massa=facilisi&volutpat=cras&convallis=non&morbi=velit&odio=nec&odio=nisi&elementum=vulputate&eu=nonummy&interdum=maecenas&eu=tincidunt&tincidunt=lacus&in=at&leo=velit&maecenas=vivamus&pulvinar=vel&lobortis=nulla&est=eget&phasellus=eros&sit=elementum&amet=pellentesque&erat=quisque&nulla=porta&tempus=volutpat&vivamus=erat&in=quisque&felis=erat&eu=eros&sapien=viverra&cursus=eget&vestibulum=congue&proin=eget&eu=semper',
+  },
+  {
+    title: 'Andalax',
+    url:
+      'https://acquirethisname.com/tortor/eu.js?volutpat=mauris&dui=laoreet&maecenas=ut&tristique=rhoncus&est=aliquet&et=pulvinar&tempus=sed&semper=nisl&est=nunc&quam=rhoncus&pharetra=dui&magna=vel&ac=sem&consequat=sed&metus=sagittis&sapien=nam&ut=congue&nunc=risus&vestibulum=semper&ante=porta&ipsum=volutpat&primis=quam&in=pede&faucibus=lobortis&orci=ligula&luctus=sit&et=amet&ultrices=eleifend&posuere=pede&cubilia=libero&curae=quis&mauris=orci&viverra=nullam&diam=molestie&vitae=nibh&quam=in&suspendisse=lectus&potenti=pellentesque&nullam=at&porttitor=nulla&lacus=suspendisse&at=potenti&turpis=cras&donec=in&posuere=purus&metus=eu&vitae=magna&ipsum=vulputate&aliquam=luctus&non=cum&mauris=sociis&morbi=natoque&non=penatibus&lectus=et&aliquam=magnis&sit=dis&amet=parturient&diam=montes&in=nascetur&magna=ridiculus&bibendum=mus',
+  },
+];
+
 const templatingVariableTypes = {
   text: {
     simple: 'Simple text',
@@ -621,6 +699,19 @@ const templatingVariableTypes = {
           ],
         },
       },
+      withoutOptText: {
+        label: 'Options without text',
+        type: 'custom',
+        options: {
+          values: [
+            { value: 'value1' },
+            {
+              value: 'value2',
+              default: true,
+            },
+          ],
+        },
+      },
     },
   },
 };
@@ -709,6 +800,26 @@ const responseForAdvancedCustomVariableWithoutLabel = {
   },
 };
 
+const responseForAdvancedCustomVariableWithoutOptText = {
+  advCustomWithoutOptText: {
+    label: 'Options without text',
+    value: 'value2',
+    options: [
+      {
+        default: false,
+        text: 'value1',
+        value: 'value1',
+      },
+      {
+        default: true,
+        text: 'value2',
+        value: 'value2',
+      },
+    ],
+    type: 'custom',
+  },
+};
+
 const responseForAdvancedCustomVariable = {
   ...responseForSimpleCustomVariable,
   advCustomNormal: {
@@ -752,6 +863,9 @@ export const mockTemplatingData = {
   advCustomWithoutLabel: generateMockTemplatingData({
     advCustomWithoutLabel: templatingVariableTypes.custom.advanced.withoutLabel,
   }),
+  advCustomWithoutOptText: generateMockTemplatingData({
+    advCustomWithoutOptText: templatingVariableTypes.custom.advanced.withoutOptText,
+  }),
   simpleAndAdv: generateMockTemplatingData({
     simpleCustom: templatingVariableTypes.custom.simple,
     advCustomNormal: templatingVariableTypes.custom.advanced.normal,
@@ -773,6 +887,7 @@ export const mockTemplatingDataResponses = {
   advCustomWithoutOpts: responseForAdvancedCustomVariableWithoutOptions,
   advCustomWithoutType: {},
   advCustomWithoutLabel: responseForAdvancedCustomVariableWithoutLabel,
+  advCustomWithoutOptText: responseForAdvancedCustomVariableWithoutOptText,
   simpleAndAdv: responseForAdvancedCustomVariable,
   allVariableTypes: responsesForAllVariableTypes,
 };
diff --git a/spec/frontend/monitoring/pages/dashboard_page_spec.js b/spec/frontend/monitoring/pages/dashboard_page_spec.js
new file mode 100644
index 00000000000..e3c56ef4cbf
--- /dev/null
+++ b/spec/frontend/monitoring/pages/dashboard_page_spec.js
@@ -0,0 +1,36 @@
+import { shallowMount } from '@vue/test-utils';
+import DashboardPage from '~/monitoring/pages/dashboard_page.vue';
+import Dashboard from '~/monitoring/components/dashboard.vue';
+import { propsData } from '../mock_data';
+
+describe('monitoring/pages/dashboard_page', () => {
+  let wrapper;
+
+  const buildWrapper = (props = {}) => {
+    wrapper = shallowMount(DashboardPage, {
+      propsData: {
+        ...props,
+      },
+    });
+  };
+
+  const findDashboardComponent = () => wrapper.find(Dashboard);
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
+  });
+
+  it('throws errors if dashboard props are not passed', () => {
+    expect(() => buildWrapper()).toThrow('Missing required prop: "dashboardProps"');
+  });
+
+  it('renders the dashboard page with dashboard component', () => {
+    buildWrapper({ dashboardProps: propsData });
+
+    expect(findDashboardComponent().props()).toMatchObject(propsData);
+    expect(findDashboardComponent()).toExist();
+  });
+});
diff --git a/spec/frontend/monitoring/store/actions_spec.js b/spec/frontend/monitoring/store/actions_spec.js
index 8914f2e66ea..d0290386f12 100644
--- a/spec/frontend/monitoring/store/actions_spec.js
+++ b/spec/frontend/monitoring/store/actions_spec.js
@@ -8,7 +8,7 @@ import createFlash from '~/flash';
 import { defaultTimeRange } from '~/vue_shared/constants';
 import { ENVIRONMENT_AVAILABLE_STATE } from '~/monitoring/constants';
 
-import store from '~/monitoring/stores';
+import { createStore } from '~/monitoring/stores';
 import * as types from '~/monitoring/stores/mutation_types';
 import {
   fetchData,
@@ -26,7 +26,7 @@ import {
   clearExpandedPanel,
   setGettingStartedEmptyState,
   duplicateSystemDashboard,
-  updateVariableValues,
+  updateVariablesAndFetchData,
 } from '~/monitoring/stores/actions';
 import {
   gqClient,
@@ -52,20 +52,16 @@ import {
 
 jest.mock('~/flash');
 
-const resetStore = str => {
-  str.replaceState({
-    showEmptyState: true,
-    emptyState: 'loading',
-    groups: [],
-  });
-};
-
 describe('Monitoring store actions', () => {
   const { convertObjectPropsToCamelCase } = commonUtils;
 
   let mock;
+  let store;
+  let state;
 
   beforeEach(() => {
+    store = createStore();
+    state = store.state.monitoringDashboard;
     mock = new MockAdapter(axios);
 
     jest.spyOn(commonUtils, 'backOff').mockImplementation(callback => {
@@ -83,7 +79,6 @@ describe('Monitoring store actions', () => {
     });
   });
   afterEach(() => {
-    resetStore(store);
     mock.reset();
 
     commonUtils.backOff.mockReset();
@@ -92,8 +87,6 @@ describe('Monitoring store actions', () => {
 
   describe('fetchData', () => {
     it('dispatches fetchEnvironmentsData and fetchEnvironmentsData', () => {
-      const { state } = store;
-
       return testAction(
         fetchData,
         null,
@@ -111,8 +104,6 @@ describe('Monitoring store actions', () => {
       const origGon = window.gon;
       window.gon = { features: { metricsDashboardAnnotations: true } };
 
-      const { state } = store;
-
       return testAction(
         fetchData,
         null,
@@ -131,7 +122,6 @@ describe('Monitoring store actions', () => {
 
   describe('fetchDeploymentsData', () => {
     it('dispatches receiveDeploymentsDataSuccess on success', () => {
-      const { state } = store;
       state.deploymentsEndpoint = '/success';
       mock.onGet(state.deploymentsEndpoint).reply(200, {
         deployments: deploymentData,
@@ -146,7 +136,6 @@ describe('Monitoring store actions', () => {
       );
     });
     it('dispatches receiveDeploymentsDataFailure on error', () => {
-      const { state } = store;
       state.deploymentsEndpoint = '/error';
       mock.onGet(state.deploymentsEndpoint).reply(500);
 
@@ -164,11 +153,8 @@ describe('Monitoring store actions', () => {
   });
 
   describe('fetchEnvironmentsData', () => {
-    const { state } = store;
-    state.projectPath = 'gitlab-org/gitlab-test';
-
-    afterEach(() => {
-      resetStore(store);
+    beforeEach(() => {
+      state.projectPath = 'gitlab-org/gitlab-test';
     });
 
     it('setting SET_ENVIRONMENTS_FILTER should dispatch fetchEnvironmentsData', () => {
@@ -269,17 +255,14 @@ describe('Monitoring store actions', () => {
   });
 
   describe('fetchAnnotations', () => {
-    const { state } = store;
-    state.timeRange = {
-      start: '2020-04-15T12:54:32.137Z',
-      end: '2020-08-15T12:54:32.137Z',
-    };
-    state.projectPath = 'gitlab-org/gitlab-test';
-    state.currentEnvironmentName = 'production';
-    state.currentDashboard = '.gitlab/dashboards/custom_dashboard.yml';
-
-    afterEach(() => {
-      resetStore(store);
+    beforeEach(() => {
+      state.timeRange = {
+        start: '2020-04-15T12:54:32.137Z',
+        end: '2020-08-15T12:54:32.137Z',
+      };
+      state.projectPath = 'gitlab-org/gitlab-test';
+      state.currentEnvironmentName = 'production';
+      state.currentDashboard = '.gitlab/dashboards/custom_dashboard.yml';
     });
 
     it('fetches annotations data and dispatches receiveAnnotationsSuccess', () => {
@@ -353,7 +336,6 @@ describe('Monitoring store actions', () => {
   });
 
   describe('Toggles starred value of current dashboard', () => {
-    const { state } = store;
     let unstarredDashboard;
     let starredDashboard;
 
@@ -379,7 +361,13 @@ describe('Monitoring store actions', () => {
 
         return testAction(toggleStarredValue, null, state, [
           { type: types.REQUEST_DASHBOARD_STARRING },
-          { type: types.RECEIVE_DASHBOARD_STARRING_SUCCESS, payload: true },
+          {
+            type: types.RECEIVE_DASHBOARD_STARRING_SUCCESS,
+            payload: {
+              newStarredValue: true,
+              selectedDashboard: unstarredDashboard,
+            },
+          },
         ]);
       });
 
@@ -396,23 +384,19 @@ describe('Monitoring store actions', () => {
   });
 
   describe('Set initial state', () => {
-    let mockedState;
-    beforeEach(() => {
-      mockedState = storeState();
-    });
     it('should commit SET_INITIAL_STATE mutation', done => {
       testAction(
         setInitialState,
         {
-          metricsEndpoint: 'additional_metrics.json',
+          currentDashboard: '.gitlab/dashboards/dashboard.yml',
           deploymentsEndpoint: 'deployments.json',
         },
-        mockedState,
+        state,
         [
           {
             type: types.SET_INITIAL_STATE,
             payload: {
-              metricsEndpoint: 'additional_metrics.json',
+              currentDashboard: '.gitlab/dashboards/dashboard.yml',
               deploymentsEndpoint: 'deployments.json',
             },
           },
@@ -423,15 +407,11 @@ describe('Monitoring store actions', () => {
     });
   });
   describe('Set empty states', () => {
-    let mockedState;
-    beforeEach(() => {
-      mockedState = storeState();
-    });
     it('should commit SET_METRICS_ENDPOINT mutation', done => {
       testAction(
         setGettingStartedEmptyState,
         null,
-        mockedState,
+        state,
         [
           {
             type: types.SET_GETTING_STARTED_EMPTY_STATE,
@@ -443,23 +423,23 @@ describe('Monitoring store actions', () => {
     });
   });
 
-  describe('updateVariableValues', () => {
-    let mockedState;
-    beforeEach(() => {
-      mockedState = storeState();
-    });
-    it('should commit UPDATE_VARIABLE_VALUES mutation', done => {
+  describe('updateVariablesAndFetchData', () => {
+    it('should commit UPDATE_VARIABLES mutation and fetch data', done => {
       testAction(
-        updateVariableValues,
+        updateVariablesAndFetchData,
         { pod: 'POD' },
-        mockedState,
+        state,
         [
           {
-            type: types.UPDATE_VARIABLE_VALUES,
+            type: types.UPDATE_VARIABLES,
             payload: { pod: 'POD' },
           },
         ],
-        [],
+        [
+          {
+            type: 'fetchDashboardData',
+          },
+        ],
         done,
       );
     });
@@ -467,13 +447,11 @@ describe('Monitoring store actions', () => {
 
   describe('fetchDashboard', () => {
     let dispatch;
-    let state;
     let commit;
     const response = metricsDashboardResponse;
     beforeEach(() => {
       dispatch = jest.fn();
       commit = jest.fn();
-      state = storeState();
       state.dashboardEndpoint = '/dashboard';
     });
 
@@ -557,12 +535,10 @@ describe('Monitoring store actions', () => {
   describe('receiveMetricsDashboardSuccess', () => {
     let commit;
     let dispatch;
-    let state;
 
     beforeEach(() => {
       commit = jest.fn();
       dispatch = jest.fn();
-      state = storeState();
     });
 
     it('stores groups', () => {
@@ -623,13 +599,11 @@ describe('Monitoring store actions', () => {
   describe('fetchDashboardData', () => {
     let commit;
     let dispatch;
-    let state;
 
     beforeEach(() => {
       jest.spyOn(Tracking, 'event');
       commit = jest.fn();
       dispatch = jest.fn();
-      state = storeState();
 
       state.timeRange = defaultTimeRange;
     });
@@ -731,7 +705,6 @@ describe('Monitoring store actions', () => {
       step: 60,
     };
     let metric;
-    let state;
     let data;
     let prometheusEndpointPath;
 
@@ -929,10 +902,7 @@ describe('Monitoring store actions', () => {
   });
 
   describe('duplicateSystemDashboard', () => {
-    let state;
-
     beforeEach(() => {
-      state = storeState();
       state.dashboardsEndpoint = '/dashboards.json';
     });
 
@@ -1010,12 +980,6 @@ describe('Monitoring store actions', () => {
   });
 
   describe('setExpandedPanel', () => {
-    let state;
-
-    beforeEach(() => {
-      state = storeState();
-    });
-
     it('Sets a panel as expanded', () => {
       const group = 'group_1';
       const panel = { title: 'A Panel' };
@@ -1031,12 +995,6 @@ describe('Monitoring store actions', () => {
   });
 
   describe('clearExpandedPanel', () => {
-    let state;
-
-    beforeEach(() => {
-      state = storeState();
-    });
-
     it('Clears a panel as expanded', () => {
       return testAction(
         clearExpandedPanel,
diff --git a/spec/frontend/monitoring/store/getters_spec.js b/spec/frontend/monitoring/store/getters_spec.js
index 19ca001c281..933ccb1e46c 100644
--- a/spec/frontend/monitoring/store/getters_spec.js
+++ b/spec/frontend/monitoring/store/getters_spec.js
@@ -8,6 +8,7 @@ import {
   metricsResult,
   dashboardGitResponse,
   mockTemplatingDataResponses,
+  mockLinks,
 } from '../mock_data';
 import {
   metricsDashboardPayload,
@@ -334,11 +335,11 @@ describe('Monitoring store Getters', () => {
 
     beforeEach(() => {
       state = {
-        promVariables: {},
+        variables: {},
       };
     });
 
-    it('transforms the promVariables object to an array in the [variable, variable_value] format for all variable types', () => {
+    it('transforms the variables object to an array in the [variable, variable_value] format for all variable types', () => {
       mutations[types.SET_VARIABLES](state, mockTemplatingDataResponses.allVariableTypes);
       const variablesArray = getters.getCustomVariablesParams(state);
 
@@ -350,7 +351,7 @@ describe('Monitoring store Getters', () => {
       });
     });
 
-    it('transforms the promVariables object to an empty array when no keys are present', () => {
+    it('transforms the variables object to an empty array when no keys are present', () => {
       mutations[types.SET_VARIABLES](state, {});
       const variablesArray = getters.getCustomVariablesParams(state);
 
@@ -401,4 +402,37 @@ describe('Monitoring store Getters', () => {
       expect(selectedDashboard(state)).toEqual(null);
     });
   });
+
+  describe('linksWithMetadata', () => {
+    let state;
+    const setupState = (initState = {}) => {
+      state = {
+        ...state,
+        ...initState,
+      };
+    };
+
+    beforeAll(() => {
+      setupState({
+        links: mockLinks,
+      });
+    });
+
+    afterAll(() => {
+      state = null;
+    });
+
+    it.each`
+      timeRange                                                                 | output
+      ${{}}                                                                     | ${''}
+      ${{ start: '2020-01-01T00:00:00.000Z', end: '2020-01-31T23:59:00.000Z' }} | ${'start=2020-01-01T00%3A00%3A00.000Z&end=2020-01-31T23%3A59%3A00.000Z'}
+      ${{ duration: { seconds: 86400 } }}                                       | ${'duration_seconds=86400'}
+    `('linksWithMetadata returns URLs with time range', ({ timeRange, output }) => {
+      setupState({ timeRange });
+      const links = getters.linksWithMetadata(state);
+      links.forEach(({ url }) => {
+        expect(url).toMatch(output);
+      });
+    });
+  });
 });
diff --git a/spec/frontend/monitoring/store/index_spec.js b/spec/frontend/monitoring/store/index_spec.js
new file mode 100644
index 00000000000..4184687eec8
--- /dev/null
+++ b/spec/frontend/monitoring/store/index_spec.js
@@ -0,0 +1,23 @@
+import { createStore } from '~/monitoring/stores';
+
+describe('Monitoring Store Index', () => {
+  it('creates store with a `monitoringDashboard` namespace', () => {
+    expect(createStore().state).toEqual({
+      monitoringDashboard: expect.any(Object),
+    });
+  });
+
+  it('creates store with initial values', () => {
+    const defaults = {
+      deploymentsEndpoint: '/mock/deployments',
+      dashboardEndpoint: '/mock/dashboard',
+      dashboardsEndpoint: '/mock/dashboards',
+    };
+
+    const { state } = createStore(defaults);
+
+    expect(state).toEqual({
+      monitoringDashboard: expect.objectContaining(defaults),
+    });
+  });
+});
diff --git a/spec/frontend/monitoring/store/mutations_spec.js b/spec/frontend/monitoring/store/mutations_spec.js
index 4306243689a..0283f1a86a4 100644
--- a/spec/frontend/monitoring/store/mutations_spec.js
+++ b/spec/frontend/monitoring/store/mutations_spec.js
@@ -93,14 +93,20 @@ describe('Monitoring mutations', () => {
       });
 
       it('sets a dashboard as starred', () => {
-        mutations[types.RECEIVE_DASHBOARD_STARRING_SUCCESS](stateCopy, true);
+        mutations[types.RECEIVE_DASHBOARD_STARRING_SUCCESS](stateCopy, {
+          selectedDashboard: stateCopy.allDashboards[1],
+          newStarredValue: true,
+        });
 
         expect(stateCopy.isUpdatingStarredValue).toBe(false);
         expect(stateCopy.allDashboards[1].starred).toBe(true);
       });
 
       it('sets a dashboard as unstarred', () => {
-        mutations[types.RECEIVE_DASHBOARD_STARRING_SUCCESS](stateCopy, false);
+        mutations[types.RECEIVE_DASHBOARD_STARRING_SUCCESS](stateCopy, {
+          selectedDashboard: stateCopy.allDashboards[1],
+          newStarredValue: false,
+        });
 
         expect(stateCopy.isUpdatingStarredValue).toBe(false);
         expect(stateCopy.allDashboards[1].starred).toBe(false);
@@ -128,13 +134,11 @@ describe('Monitoring mutations', () => {
   describe('SET_INITIAL_STATE', () => {
     it('should set all the endpoints', () => {
       mutations[types.SET_INITIAL_STATE](stateCopy, {
-        metricsEndpoint: 'additional_metrics.json',
         deploymentsEndpoint: 'deployments.json',
         dashboardEndpoint: 'dashboard.json',
         projectPath: '/gitlab-org/gitlab-foss',
         currentEnvironmentName: 'production',
       });
-      expect(stateCopy.metricsEndpoint).toEqual('additional_metrics.json');
       expect(stateCopy.deploymentsEndpoint).toEqual('deployments.json');
       expect(stateCopy.dashboardEndpoint).toEqual('dashboard.json');
       expect(stateCopy.projectPath).toEqual('/gitlab-org/gitlab-foss');
@@ -179,12 +183,10 @@ describe('Monitoring mutations', () => {
   describe('SET_ENDPOINTS', () => {
     it('should set all the endpoints', () => {
       mutations[types.SET_ENDPOINTS](stateCopy, {
-        metricsEndpoint: 'additional_metrics.json',
         deploymentsEndpoint: 'deployments.json',
         dashboardEndpoint: 'dashboard.json',
         projectPath: '/gitlab-org/gitlab-foss',
       });
-      expect(stateCopy.metricsEndpoint).toEqual('additional_metrics.json');
       expect(stateCopy.deploymentsEndpoint).toEqual('deployments.json');
       expect(stateCopy.dashboardEndpoint).toEqual('dashboard.json');
       expect(stateCopy.projectPath).toEqual('/gitlab-org/gitlab-foss');
@@ -412,26 +414,26 @@ describe('Monitoring mutations', () => {
     it('stores an empty variables array when no custom variables are given', () => {
       mutations[types.SET_VARIABLES](stateCopy, {});
 
-      expect(stateCopy.promVariables).toEqual({});
+      expect(stateCopy.variables).toEqual({});
     });
 
     it('stores variables in the key key_value format in the array', () => {
       mutations[types.SET_VARIABLES](stateCopy, { pod: 'POD', stage: 'main ops' });
 
-      expect(stateCopy.promVariables).toEqual({ pod: 'POD', stage: 'main ops' });
+      expect(stateCopy.variables).toEqual({ pod: 'POD', stage: 'main ops' });
     });
   });
 
-  describe('UPDATE_VARIABLE_VALUES', () => {
+  describe('UPDATE_VARIABLES', () => {
     afterEach(() => {
       mutations[types.SET_VARIABLES](stateCopy, {});
     });
 
-    it('updates only the value of the variable in promVariables', () => {
+    it('updates only the value of the variable in variables', () => {
       mutations[types.SET_VARIABLES](stateCopy, { environment: { value: 'prod', type: 'text' } });
-      mutations[types.UPDATE_VARIABLE_VALUES](stateCopy, { key: 'environment', value: 'new prod' });
+      mutations[types.UPDATE_VARIABLES](stateCopy, { key: 'environment', value: 'new prod' });
 
-      expect(stateCopy.promVariables).toEqual({ environment: { value: 'new prod', type: 'text' } });
+      expect(stateCopy.variables).toEqual({ environment: { value: 'new prod', type: 'text' } });
     });
   });
 });
diff --git a/spec/frontend/monitoring/store/utils_spec.js b/spec/frontend/monitoring/store/utils_spec.js
index fe5754e1216..3a70bda51da 100644
--- a/spec/frontend/monitoring/store/utils_spec.js
+++ b/spec/frontend/monitoring/store/utils_spec.js
@@ -5,6 +5,9 @@ import {
   parseAnnotationsResponse,
   removeLeadingSlash,
   mapToDashboardViewModel,
+  normalizeQueryResult,
+  convertToGrafanaTimeRange,
+  addDashboardMetaDataToLink,
 } from '~/monitoring/stores/utils';
 import { annotationsData } from '../mock_data';
 import { NOT_IN_DB_PREFIX } from '~/monitoring/constants';
@@ -16,6 +19,8 @@ describe('mapToDashboardViewModel', () => {
     expect(mapToDashboardViewModel({})).toEqual({
       dashboard: '',
       panelGroups: [],
+      links: [],
+      variables: {},
     });
   });
 
@@ -44,6 +49,8 @@ describe('mapToDashboardViewModel', () => {
 
     expect(mapToDashboardViewModel(response)).toEqual({
       dashboard: 'Dashboard Name',
+      links: [],
+      variables: {},
       panelGroups: [
         {
           group: 'Group 1',
@@ -63,6 +70,7 @@ describe('mapToDashboardViewModel', () => {
                 format: 'engineering',
                 precision: 2,
               },
+              links: [],
               metrics: [],
             },
           ],
@@ -75,6 +83,8 @@ describe('mapToDashboardViewModel', () => {
     it('key', () => {
       const response = {
         dashboard: 'Dashboard Name',
+        links: [],
+        variables: {},
         panel_groups: [
           {
             group: 'Group A',
@@ -147,6 +157,7 @@ describe('mapToDashboardViewModel', () => {
           format: SUPPORTED_FORMATS.engineering,
           precision: 2,
         },
+        links: [],
         metrics: [],
       });
     });
@@ -170,6 +181,7 @@ describe('mapToDashboardViewModel', () => {
           format: SUPPORTED_FORMATS.engineering,
           precision: 2,
         },
+        links: [],
         metrics: [],
       });
     });
@@ -238,6 +250,77 @@ describe('mapToDashboardViewModel', () => {
 
       expect(getMappedPanel().maxValue).toBe(100);
     });
+
+    describe('panel with links', () => {
+      const title = 'Example';
+      const url = 'https://example.com';
+
+      it('maps an empty link collection', () => {
+        setupWithPanel({
+          links: undefined,
+        });
+
+        expect(getMappedPanel().links).toEqual([]);
+      });
+
+      it('maps a link', () => {
+        setupWithPanel({ links: [{ title, url }] });
+
+        expect(getMappedPanel().links).toEqual([{ title, url }]);
+      });
+
+      it('maps a link without a title', () => {
+        setupWithPanel({
+          links: [{ url }],
+        });
+
+        expect(getMappedPanel().links).toEqual([{ title: url, url }]);
+      });
+
+      it('maps a link without a url', () => {
+        setupWithPanel({
+          links: [{ title }],
+        });
+
+        expect(getMappedPanel().links).toEqual([{ title, url: '#' }]);
+      });
+
+      it('maps a link without a url or title', () => {
+        setupWithPanel({
+          links: [{}],
+        });
+
+        expect(getMappedPanel().links).toEqual([{ title: 'null', url: '#' }]);
+      });
+
+      it('maps a link with an unsafe url safely', () => {
+        // eslint-disable-next-line no-script-url
+        const unsafeUrl = 'javascript:alert("XSS")';
+
+        setupWithPanel({
+          links: [
+            {
+              title,
+              url: unsafeUrl,
+            },
+          ],
+        });
+
+        expect(getMappedPanel().links).toEqual([{ title, url: '#' }]);
+      });
+
+      it('maps multple links', () => {
+        setupWithPanel({
+          links: [{ title, url }, { url }, { title }],
+        });
+
+        expect(getMappedPanel().links).toEqual([
+          { title, url },
+          { title: url, url },
+          { title, url: '#' },
+        ]);
+      });
+    });
   });
 
   describe('metrics mapping', () => {
@@ -317,6 +400,28 @@ describe('mapToDashboardViewModel', () => {
   });
 });
 
+describe('normalizeQueryResult', () => {
+  const testData = {
+    metric: {
+      __name__: 'up',
+      job: 'prometheus',
+      instance: 'localhost:9090',
+    },
+    values: [[1435781430.781, '1'], [1435781445.781, '1'], [1435781460.781, '1']],
+  };
+
+  it('processes a simple matrix result', () => {
+    expect(normalizeQueryResult(testData)).toEqual({
+      metric: { __name__: 'up', job: 'prometheus', instance: 'localhost:9090' },
+      values: [
+        ['2015-07-01T20:10:30.781Z', 1],
+        ['2015-07-01T20:10:45.781Z', 1],
+        ['2015-07-01T20:11:00.781Z', 1],
+      ],
+    });
+  });
+});
+
 describe('uniqMetricsId', () => {
   [
     { input: { id: 1 }, expected: `${NOT_IN_DB_PREFIX}_1` },
@@ -419,3 +524,86 @@ describe('removeLeadingSlash', () => {
     });
   });
 });
+
+describe('user-defined links utils', () => {
+  const mockRelativeTimeRange = {
+    metricsDashboard: {
+      duration: {
+        seconds: 86400,
+      },
+    },
+    grafana: {
+      from: 'now-86400s',
+      to: 'now',
+    },
+  };
+  const mockAbsoluteTimeRange = {
+    metricsDashboard: {
+      start: '2020-06-08T16:13:01.995Z',
+      end: '2020-06-08T21:12:32.243Z',
+    },
+    grafana: {
+      from: 1591632781995,
+      to: 1591650752243,
+    },
+  };
+  describe('convertToGrafanaTimeRange', () => {
+    it('converts relative timezone to grafana timezone', () => {
+      expect(convertToGrafanaTimeRange(mockRelativeTimeRange.metricsDashboard)).toEqual(
+        mockRelativeTimeRange.grafana,
+      );
+    });
+
+    it('converts absolute timezone to grafana timezone', () => {
+      expect(convertToGrafanaTimeRange(mockAbsoluteTimeRange.metricsDashboard)).toEqual(
+        mockAbsoluteTimeRange.grafana,
+      );
+    });
+  });
+
+  describe('addDashboardMetaDataToLink', () => {
+    const link = { title: 'title', url: 'https://gitlab.com' };
+    const grafanaLink = { ...link, type: 'grafana' };
+
+    it('adds relative time range to link w/o type for metrics dashboards', () => {
+      const adder = addDashboardMetaDataToLink({
+        timeRange: mockRelativeTimeRange.metricsDashboard,
+      });
+      expect(adder(link)).toMatchObject({
+        title: 'title',
+        url: 'https://gitlab.com?duration_seconds=86400',
+      });
+    });
+
+    it('adds relative time range to Grafana type links', () => {
+      const adder = addDashboardMetaDataToLink({
+        timeRange: mockRelativeTimeRange.metricsDashboard,
+      });
+      expect(adder(grafanaLink)).toMatchObject({
+        title: 'title',
+        url: 'https://gitlab.com?from=now-86400s&to=now',
+      });
+    });
+
+    it('adds absolute time range to link w/o type for metrics dashboard', () => {
+      const adder = addDashboardMetaDataToLink({
+        timeRange: mockAbsoluteTimeRange.metricsDashboard,
+      });
+      expect(adder(link)).toMatchObject({
+        title: 'title',
+        url:
+          'https://gitlab.com?start=2020-06-08T16%3A13%3A01.995Z&end=2020-06-08T21%3A12%3A32.243Z',
+      });
+    });
+
+    it('adds absolute time range to Grafana type links', () => {
+      const adder = addDashboardMetaDataToLink({
+        timeRange: mockAbsoluteTimeRange.metricsDashboard,
+      });
+      expect(adder(grafanaLink)).toMatchObject({
+        title: 'title',
+        url: 'https://gitlab.com?from=1591632781995&to=1591650752243',
+      });
+    });
+  });
+});
diff --git a/spec/frontend/monitoring/store/variable_mapping_spec.js b/spec/frontend/monitoring/store/variable_mapping_spec.js
index 47681ac7c65..c44bb957166 100644
--- a/spec/frontend/monitoring/store/variable_mapping_spec.js
+++ b/spec/frontend/monitoring/store/variable_mapping_spec.js
@@ -3,19 +3,20 @@ import { mockTemplatingData, mockTemplatingDataResponses } from '../mock_data';
 
 describe('parseTemplatingVariables', () => {
   it.each`
-    case                                                                    | input                                       | expected
-    ${'Returns empty object for no dashboard input'}                        | ${{}}                                       | ${{}}
-    ${'Returns empty object for empty dashboard input'}                     | ${{ dashboard: {} }}                        | ${{}}
-    ${'Returns empty object for empty templating prop'}                     | ${mockTemplatingData.emptyTemplatingProp}   | ${{}}
-    ${'Returns empty object for empty variables prop'}                      | ${mockTemplatingData.emptyVariablesProp}    | ${{}}
-    ${'Returns parsed object for simple text variable'}                     | ${mockTemplatingData.simpleText}            | ${mockTemplatingDataResponses.simpleText}
-    ${'Returns parsed object for advanced text variable'}                   | ${mockTemplatingData.advText}               | ${mockTemplatingDataResponses.advText}
-    ${'Returns parsed object for simple custom variable'}                   | ${mockTemplatingData.simpleCustom}          | ${mockTemplatingDataResponses.simpleCustom}
-    ${'Returns parsed object for advanced custom variable without options'} | ${mockTemplatingData.advCustomWithoutOpts}  | ${mockTemplatingDataResponses.advCustomWithoutOpts}
-    ${'Returns parsed object for advanced custom variable without type'}    | ${mockTemplatingData.advCustomWithoutType}  | ${{}}
-    ${'Returns parsed object for advanced custom variable without label'}   | ${mockTemplatingData.advCustomWithoutLabel} | ${mockTemplatingDataResponses.advCustomWithoutLabel}
-    ${'Returns parsed object for simple and advanced custom variables'}     | ${mockTemplatingData.simpleAndAdv}          | ${mockTemplatingDataResponses.simpleAndAdv}
-    ${'Returns parsed object for all variable types'}                       | ${mockTemplatingData.allVariableTypes}      | ${mockTemplatingDataResponses.allVariableTypes}
+    case                                                                            | input                                         | expected
+    ${'Returns empty object for no dashboard input'}                                | ${{}}                                         | ${{}}
+    ${'Returns empty object for empty dashboard input'}                             | ${{ dashboard: {} }}                          | ${{}}
+    ${'Returns empty object for empty templating prop'}                             | ${mockTemplatingData.emptyTemplatingProp}     | ${{}}
+    ${'Returns empty object for empty variables prop'}                              | ${mockTemplatingData.emptyVariablesProp}      | ${{}}
+    ${'Returns parsed object for simple text variable'}                             | ${mockTemplatingData.simpleText}              | ${mockTemplatingDataResponses.simpleText}
+    ${'Returns parsed object for advanced text variable'}                           | ${mockTemplatingData.advText}                 | ${mockTemplatingDataResponses.advText}
+    ${'Returns parsed object for simple custom variable'}                           | ${mockTemplatingData.simpleCustom}            | ${mockTemplatingDataResponses.simpleCustom}
+    ${'Returns parsed object for advanced custom variable without options'}         | ${mockTemplatingData.advCustomWithoutOpts}    | ${mockTemplatingDataResponses.advCustomWithoutOpts}
+    ${'Returns parsed object for advanced custom variable for option without text'} | ${mockTemplatingData.advCustomWithoutOptText} | ${mockTemplatingDataResponses.advCustomWithoutOptText}
+    ${'Returns parsed object for advanced custom variable without type'}            | ${mockTemplatingData.advCustomWithoutType}    | ${{}}
+    ${'Returns parsed object for advanced custom variable without label'}           | ${mockTemplatingData.advCustomWithoutLabel}   | ${mockTemplatingDataResponses.advCustomWithoutLabel}
+    ${'Returns parsed object for simple and advanced custom variables'}             | ${mockTemplatingData.simpleAndAdv}            | ${mockTemplatingDataResponses.simpleAndAdv}
+    ${'Returns parsed object for all variable types'}                               | ${mockTemplatingData.allVariableTypes}        | ${mockTemplatingDataResponses.allVariableTypes}
   `('$case', ({ input, expected }) => {
     expect(parseTemplatingVariables(input?.dashboard?.templating)).toEqual(expected);
   });
diff --git a/spec/frontend/monitoring/store_utils.js b/spec/frontend/monitoring/store_utils.js
index 338af79dbbe..eb2578aa9db 100644
--- a/spec/frontend/monitoring/store_utils.js
+++ b/spec/frontend/monitoring/store_utils.js
@@ -16,8 +16,13 @@ const setEnvironmentData = store => {
   store.commit(`monitoringDashboard/${types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS}`, environmentData);
 };
 
-export const setupAllDashboards = store => {
+export const setupAllDashboards = (store, path) => {
   store.commit(`monitoringDashboard/${types.SET_ALL_DASHBOARDS}`, dashboardGitResponse);
+  if (path) {
+    store.commit(`monitoringDashboard/${types.SET_INITIAL_STATE}`, {
+      currentDashboard: path,
+    });
+  }
 };
 
 export const setupStoreWithDashboard = store => {
@@ -25,10 +30,6 @@ export const setupStoreWithDashboard = store => {
     `monitoringDashboard/${types.RECEIVE_METRICS_DASHBOARD_SUCCESS}`,
     metricsDashboardPayload,
   );
-  store.commit(
-    `monitoringDashboard/${types.RECEIVE_METRICS_DASHBOARD_SUCCESS}`,
-    metricsDashboardPayload,
-  );
 };
 
 export const setupStoreWithVariable = store => {
@@ -37,6 +38,18 @@ export const setupStoreWithVariable = store => {
   });
 };
 
+export const setupStoreWithLinks = store => {
+  store.commit(`monitoringDashboard/${types.RECEIVE_METRICS_DASHBOARD_SUCCESS}`, {
+    ...metricsDashboardPayload,
+    links: [
+      {
+        title: 'GitLab Website',
+        url: `https://gitlab.com/website`,
+      },
+    ],
+  });
+};
+
 export const setupStoreWithData = store => {
   setupAllDashboards(store);
   setupStoreWithDashboard(store);
diff --git a/spec/frontend/namespace_storage_limit_alert_spec.js b/spec/frontend/namespace_storage_limit_alert_spec.js
new file mode 100644
index 00000000000..ef398b12e1f
--- /dev/null
+++ b/spec/frontend/namespace_storage_limit_alert_spec.js
@@ -0,0 +1,36 @@
+import Cookies from 'js-cookie';
+import initNamespaceStorageLimitAlert from '~/namespace_storage_limit_alert';
+
+describe('broadcast message on dismiss', () => {
+  const dismiss = () => {
+    const button = document.querySelector('.js-namespace-storage-alert-dismiss');
+    button.click();
+  };
+
+  beforeEach(() => {
+    setFixtures(`
+    <div class="js-namespace-storage-alert">
+      <button class="js-namespace-storage-alert-dismiss" data-id="1" data-level="info"></button>
+    </div>
+    `);
+
+    initNamespaceStorageLimitAlert();
+  });
+
+  it('removes alert', () => {
+    expect(document.querySelector('.js-namespace-storage-alert')).toBeTruthy();
+
+    dismiss();
+
+    expect(document.querySelector('.js-namespace-storage-alert')).toBeNull();
+  });
+
+  it('calls Cookies.set', () => {
+    jest.spyOn(Cookies, 'set');
+    dismiss();
+
+    expect(Cookies.set).toHaveBeenCalledWith('hide_storage_limit_alert_1_info', true, {
+      expires: 365,
+    });
+  });
+});
diff --git a/spec/frontend/notes/components/diff_with_note_spec.js b/spec/frontend/notes/components/diff_with_note_spec.js
index d6d42e1988d..6480af015db 100644
--- a/spec/frontend/notes/components/diff_with_note_spec.js
+++ b/spec/frontend/notes/components/diff_with_note_spec.js
@@ -1,4 +1,4 @@
-import { mount } from '@vue/test-utils';
+import { shallowMount } from '@vue/test-utils';
 import DiffWithNote from '~/notes/components/diff_with_note.vue';
 import { createStore } from '~/mr_notes/stores';
 
@@ -37,7 +37,7 @@ describe('diff_with_note', () => {
     beforeEach(() => {
       const diffDiscussion = getJSONFixture(discussionFixture)[0];
 
-      wrapper = mount(DiffWithNote, {
+      wrapper = shallowMount(DiffWithNote, {
         propsData: {
           discussion: diffDiscussion,
         },
@@ -76,7 +76,10 @@ describe('diff_with_note', () => {
   describe('image diff', () => {
     beforeEach(() => {
       const imageDiscussion = getJSONFixture(imageDiscussionFixture)[0];
-      wrapper = mount(DiffWithNote, { propsData: { discussion: imageDiscussion }, store });
+      wrapper = shallowMount(DiffWithNote, {
+        propsData: { discussion: imageDiscussion, diffFile: {} },
+        store,
+      });
     });
 
     it('shows image diff', () => {
diff --git a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
index a881e44a007..b7b7ec08867 100644
--- a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
+++ b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
@@ -20,7 +20,7 @@ describe('ReplyPlaceholder', () => {
     wrapper.destroy();
   });
 
-  it('emits onClick even on button click', () => {
+  it('emits onClick event on button click', () => {
     findButton().trigger('click');
 
     return wrapper.vm.$nextTick().then(() => {
diff --git a/spec/frontend/notes/components/multiline_comment_utils_spec.js b/spec/frontend/notes/components/multiline_comment_utils_spec.js
new file mode 100644
index 00000000000..261bfb106e7
--- /dev/null
+++ b/spec/frontend/notes/components/multiline_comment_utils_spec.js
@@ -0,0 +1,49 @@
+import {
+  getSymbol,
+  getStartLineNumber,
+  getEndLineNumber,
+} from '~/notes/components/multiline_comment_utils';
+
+describe('Multiline comment utilities', () => {
+  describe('getStartLineNumber', () => {
+    it.each`
+      lineCode        | type     | result
+      ${'abcdef_1_1'} | ${'old'} | ${'-1'}
+      ${'abcdef_1_1'} | ${'new'} | ${'+1'}
+      ${'abcdef_1_1'} | ${null}  | ${'1'}
+      ${'abcdef'}     | ${'new'} | ${''}
+      ${'abcdef'}     | ${'old'} | ${''}
+      ${'abcdef'}     | ${null}  | ${''}
+    `('returns line number', ({ lineCode, type, result }) => {
+      expect(getStartLineNumber({ start_line_code: lineCode, start_line_type: type })).toEqual(
+        result,
+      );
+    });
+  });
+  describe('getEndLineNumber', () => {
+    it.each`
+      lineCode        | type     | result
+      ${'abcdef_1_1'} | ${'old'} | ${'-1'}
+      ${'abcdef_1_1'} | ${'new'} | ${'+1'}
+      ${'abcdef_1_1'} | ${null}  | ${'1'}
+      ${'abcdef'}     | ${'new'} | ${''}
+      ${'abcdef'}     | ${'old'} | ${''}
+      ${'abcdef'}     | ${null}  | ${''}
+    `('returns line number', ({ lineCode, type, result }) => {
+      expect(getEndLineNumber({ end_line_code: lineCode, end_line_type: type })).toEqual(result);
+    });
+  });
+  describe('getSymbol', () => {
+    it.each`
+      type         | result
+      ${'new'}     | ${'+'}
+      ${'old'}     | ${'-'}
+      ${'unused'}  | ${''}
+      ${''}        | ${''}
+      ${null}      | ${''}
+      ${undefined} | ${''}
+    `('`$type` returns `$result`', ({ type, result }) => {
+      expect(getSymbol(type)).toEqual(result);
+    });
+  });
+});
diff --git a/spec/frontend/notes/components/note_actions_spec.js b/spec/frontend/notes/components/note_actions_spec.js
index 5d13f587ca7..220ac22d8eb 100644
--- a/spec/frontend/notes/components/note_actions_spec.js
+++ b/spec/frontend/notes/components/note_actions_spec.js
@@ -4,26 +4,33 @@ import { TEST_HOST } from 'spec/test_constants';
 import createStore from '~/notes/stores';
 import noteActions from '~/notes/components/note_actions.vue';
 import { userDataMock } from '../mock_data';
+import AxiosMockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 
 describe('noteActions', () => {
   let wrapper;
   let store;
   let props;
+  let actions;
+  let axiosMock;
 
-  const shallowMountNoteActions = propsData => {
+  const shallowMountNoteActions = (propsData, computed) => {
     const localVue = createLocalVue();
     return shallowMount(localVue.extend(noteActions), {
       store,
       propsData,
       localVue,
+      computed,
     });
   };
 
   beforeEach(() => {
     store = createStore();
+
     props = {
       accessLevel: 'Maintainer',
-      authorId: 26,
+      authorId: 1,
+      author: userDataMock,
       canDelete: true,
       canEdit: true,
       canAwardEmoji: true,
@@ -33,10 +40,17 @@ describe('noteActions', () => {
       reportAbusePath: `${TEST_HOST}/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F7%23note_539&user_id=26`,
       showReply: false,
     };
+
+    actions = {
+      updateAssignees: jest.fn(),
+    };
+
+    axiosMock = new AxiosMockAdapter(axios);
   });
 
   afterEach(() => {
     wrapper.destroy();
+    axiosMock.restore();
   });
 
   describe('user is logged in', () => {
@@ -76,6 +90,14 @@ describe('noteActions', () => {
       it('should not show copy link action when `noteUrl` prop is empty', done => {
         wrapper.setProps({
           ...props,
+          author: {
+            avatar_url: 'mock_path',
+            id: 26,
+            name: 'Example Maintainer',
+            path: '/ExampleMaintainer',
+            state: 'active',
+            username: 'ExampleMaintainer',
+          },
           noteUrl: '',
         });
 
@@ -104,6 +126,25 @@ describe('noteActions', () => {
           })
           .catch(done.fail);
       });
+
+      it('should be possible to assign or unassign the comment author', () => {
+        wrapper = shallowMountNoteActions(props, {
+          targetType: () => 'issue',
+        });
+
+        const assignUserButton = wrapper.find('[data-testid="assign-user"]');
+        expect(assignUserButton.exists()).toBe(true);
+
+        assignUserButton.trigger('click');
+        axiosMock.onPut(`${TEST_HOST}/api/v4/projects/group/project/issues/1`).reply(() => {
+          expect(actions.updateAssignees).toHaveBeenCalled();
+        });
+      });
+
+      it('should not be possible to assign or unassign the comment author in a merge request', () => {
+        const assignUserButton = wrapper.find('[data-testid="assign-user"]');
+        expect(assignUserButton.exists()).toBe(false);
+      });
     });
   });
 
@@ -157,4 +198,19 @@ describe('noteActions', () => {
       expect(replyButton.exists()).toBe(false);
     });
   });
+
+  describe('Draft notes', () => {
+    beforeEach(() => {
+      store.dispatch('setUserData', userDataMock);
+
+      wrapper = shallowMountNoteActions({ ...props, canResolve: true, isDraft: true });
+    });
+
+    it('should render the right resolve button title', () => {
+      const resolveButton = wrapper.find({ ref: 'resolveButton' });
+
+      expect(resolveButton.exists()).toBe(true);
+      expect(resolveButton.attributes('title')).toBe('Thread stays unresolved');
+    });
+  });
 });
diff --git a/spec/frontend/notes/components/note_form_spec.js b/spec/frontend/notes/components/note_form_spec.js
index 8270c148fb5..15802841c57 100644
--- a/spec/frontend/notes/components/note_form_spec.js
+++ b/spec/frontend/notes/components/note_form_spec.js
@@ -1,8 +1,9 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import createStore from '~/notes/stores';
 import NoteForm from '~/notes/components/note_form.vue';
+import batchComments from '~/batch_comments/stores/modules/batch_comments';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
-import { noteableDataMock, notesDataMock } from '../mock_data';
+import { noteableDataMock, notesDataMock, discussionMock } from '../mock_data';
 
 import { getDraft, updateDraft } from '~/lib/utils/autosave';
 
@@ -245,4 +246,55 @@ describe('issue_note_form component', () => {
       expect(updateDraft).toHaveBeenCalledWith(dummyAutosaveKey, dummyContent);
     });
   });
+
+  describe('with batch comments', () => {
+    beforeEach(() => {
+      store.registerModule('batchComments', batchComments());
+
+      wrapper = createComponentWrapper();
+      wrapper.setProps({
+        ...props,
+        noteId: '',
+        discussion: { ...discussionMock, for_commit: false },
+      });
+    });
+
+    it('should be possible to cancel', () => {
+      jest.spyOn(wrapper.vm, 'cancelHandler');
+
+      return wrapper.vm.$nextTick().then(() => {
+        const cancelButton = wrapper.find('[data-testid="cancelBatchCommentsEnabled"]');
+        cancelButton.trigger('click');
+
+        expect(wrapper.vm.cancelHandler).toHaveBeenCalledWith(true);
+      });
+    });
+
+    it('shows resolve checkbox', () => {
+      expect(wrapper.find('.js-resolve-checkbox').exists()).toBe(true);
+    });
+
+    it('hides actions for commits', () => {
+      wrapper.setProps({ discussion: { for_commit: true } });
+
+      return wrapper.vm.$nextTick(() => {
+        expect(wrapper.find('.note-form-actions').text()).not.toContain('Start a review');
+      });
+    });
+
+    describe('on enter', () => {
+      it('should start review or add to review when cmd+enter is pressed', () => {
+        const textarea = wrapper.find('textarea');
+
+        jest.spyOn(wrapper.vm, 'handleAddToReview');
+
+        textarea.setValue('Foo');
+        textarea.trigger('keydown.enter', { metaKey: true });
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.handleAddToReview).toHaveBeenCalled();
+        });
+      });
+    });
+  });
 });
diff --git a/spec/frontend/notes/components/noteable_note_spec.js b/spec/frontend/notes/components/noteable_note_spec.js
index 0d67b1d87a9..aa3eaa97e20 100644
--- a/spec/frontend/notes/components/noteable_note_spec.js
+++ b/spec/frontend/notes/components/noteable_note_spec.js
@@ -1,5 +1,5 @@
 import { escape } from 'lodash';
-import { shallowMount, createLocalVue } from '@vue/test-utils';
+import { mount, createLocalVue } from '@vue/test-utils';
 import createStore from '~/notes/stores';
 import issueNote from '~/notes/components/noteable_note.vue';
 import NoteHeader from '~/notes/components/note_header.vue';
@@ -8,9 +8,19 @@ import NoteActions from '~/notes/components/note_actions.vue';
 import NoteBody from '~/notes/components/note_body.vue';
 import { noteableDataMock, notesDataMock, note } from '../mock_data';
 
+jest.mock('~/vue_shared/mixins/gl_feature_flags_mixin', () => () => ({
+  inject: {
+    glFeatures: {
+      from: 'glFeatures',
+      default: () => ({ multilineComments: true }),
+    },
+  },
+}));
+
 describe('issue_note', () => {
   let store;
   let wrapper;
+  const findMultilineComment = () => wrapper.find('[data-testid="multiline-comment"]');
 
   beforeEach(() => {
     store = createStore();
@@ -18,12 +28,13 @@ describe('issue_note', () => {
     store.dispatch('setNotesData', notesDataMock);
 
     const localVue = createLocalVue();
-    wrapper = shallowMount(localVue.extend(issueNote), {
+    wrapper = mount(localVue.extend(issueNote), {
       store,
       propsData: {
         note,
       },
       localVue,
+      stubs: ['note-header', 'user-avatar-link', 'note-actions', 'note-body'],
     });
   });
 
@@ -31,6 +42,44 @@ describe('issue_note', () => {
     wrapper.destroy();
   });
 
+  describe('mutiline comments', () => {
+    it('should render if has multiline comment', () => {
+      const position = {
+        line_range: {
+          start_line_code: 'abc_1_1',
+          end_line_code: 'abc_2_2',
+        },
+      };
+      wrapper.setProps({
+        note: { ...note, position },
+      });
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findMultilineComment().text()).toEqual('Comment on lines 1 to 2');
+      });
+    });
+
+    it('should not render if has single line comment', () => {
+      const position = {
+        line_range: {
+          start_line_code: 'abc_1_1',
+          end_line_code: 'abc_1_1',
+        },
+      };
+      wrapper.setProps({
+        note: { ...note, position },
+      });
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findMultilineComment().exists()).toBe(false);
+      });
+    });
+
+    it('should not render if `line_range` is unavailable', () => {
+      expect(findMultilineComment().exists()).toBe(false);
+    });
+  });
+
   it('should render user information', () => {
     const { author } = note;
     const avatar = wrapper.find(UserAvatarLink);
diff --git a/spec/frontend/notes/mixins/discussion_navigation_spec.js b/spec/frontend/notes/mixins/discussion_navigation_spec.js
index 120de023099..ae30a36fc81 100644
--- a/spec/frontend/notes/mixins/discussion_navigation_spec.js
+++ b/spec/frontend/notes/mixins/discussion_navigation_spec.js
@@ -41,7 +41,7 @@ describe('Discussion navigation mixin', () => {
         .join(''),
     );
 
-    jest.spyOn(utils, 'scrollToElement');
+    jest.spyOn(utils, 'scrollToElementWithContext');
 
     expandDiscussion = jest.fn();
     const { actions, ...notesRest } = notesModule();
@@ -102,7 +102,7 @@ describe('Discussion navigation mixin', () => {
         });
 
         it('scrolls to element', () => {
-          expect(utils.scrollToElement).toHaveBeenCalledWith(
+          expect(utils.scrollToElementWithContext).toHaveBeenCalledWith(
             findDiscussion('div.discussion', expected),
           );
         });
@@ -123,11 +123,13 @@ describe('Discussion navigation mixin', () => {
         });
 
         it('scrolls when scrollToDiscussion is emitted', () => {
-          expect(utils.scrollToElement).not.toHaveBeenCalled();
+          expect(utils.scrollToElementWithContext).not.toHaveBeenCalled();
 
           eventHub.$emit('scrollToDiscussion');
 
-          expect(utils.scrollToElement).toHaveBeenCalledWith(findDiscussion('ul.notes', expected));
+          expect(utils.scrollToElementWithContext).toHaveBeenCalledWith(
+            findDiscussion('ul.notes', expected),
+          );
         });
       });
 
@@ -167,7 +169,7 @@ describe('Discussion navigation mixin', () => {
           });
 
           it('scrolls to discussion', () => {
-            expect(utils.scrollToElement).toHaveBeenCalledWith(
+            expect(utils.scrollToElementWithContext).toHaveBeenCalledWith(
               findDiscussion('div.discussion', expected),
             );
           });
diff --git a/spec/frontend/notes/mock_data.js b/spec/frontend/notes/mock_data.js
index 980faac2b04..4ff64abe4cc 100644
--- a/spec/frontend/notes/mock_data.js
+++ b/spec/frontend/notes/mock_data.js
@@ -1254,3 +1254,16 @@ export const discussionFiltersMock = [
     value: 2,
   },
 ];
+
+export const batchSuggestionsInfoMock = [
+  {
+    suggestionId: 'a123',
+    noteId: 'b456',
+    discussionId: 'c789',
+  },
+  {
+    suggestionId: 'a001',
+    noteId: 'b002',
+    discussionId: 'c003',
+  },
+];
diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js
index cbfb9597159..ef87cb3bee7 100644
--- a/spec/frontend/notes/stores/actions_spec.js
+++ b/spec/frontend/notes/stores/actions_spec.js
@@ -15,6 +15,7 @@ import {
   userDataMock,
   noteableDataMock,
   individualNote,
+  batchSuggestionsInfoMock,
 } from '../mock_data';
 import axios from '~/lib/utils/axios_utils';
 
@@ -890,7 +891,23 @@ describe('Actions Notes Store', () => {
       testSubmitSuggestion(done, () => {
         expect(commit).not.toHaveBeenCalled();
         expect(dispatch).not.toHaveBeenCalled();
-        expect(Flash).toHaveBeenCalledWith(`${TEST_ERROR_MESSAGE}.`, 'alert', flashContainer);
+        expect(Flash).toHaveBeenCalledWith(TEST_ERROR_MESSAGE, 'alert', flashContainer);
+      });
+    });
+
+    it('when service fails, and no error message available, uses default message', done => {
+      const response = { response: 'foo' };
+
+      Api.applySuggestion.mockReturnValue(Promise.reject(response));
+
+      testSubmitSuggestion(done, () => {
+        expect(commit).not.toHaveBeenCalled();
+        expect(dispatch).not.toHaveBeenCalled();
+        expect(Flash).toHaveBeenCalledWith(
+          'Something went wrong while applying the suggestion. Please try again.',
+          'alert',
+          flashContainer,
+        );
       });
     });
 
@@ -903,6 +920,130 @@ describe('Actions Notes Store', () => {
     });
   });
 
+  describe('submitSuggestionBatch', () => {
+    const discussionIds = batchSuggestionsInfoMock.map(({ discussionId }) => discussionId);
+    const batchSuggestionsInfo = batchSuggestionsInfoMock;
+
+    let flashContainer;
+
+    beforeEach(() => {
+      jest.spyOn(Api, 'applySuggestionBatch');
+      dispatch.mockReturnValue(Promise.resolve());
+      Api.applySuggestionBatch.mockReturnValue(Promise.resolve());
+      state = { batchSuggestionsInfo };
+      flashContainer = {};
+    });
+
+    const testSubmitSuggestionBatch = (done, expectFn) => {
+      actions
+        .submitSuggestionBatch({ commit, dispatch, state }, { flashContainer })
+        .then(expectFn)
+        .then(done)
+        .catch(done.fail);
+    };
+
+    it('when service succeeds, commits, resolves discussions, resets batch and applying batch state', done => {
+      testSubmitSuggestionBatch(done, () => {
+        expect(commit.mock.calls).toEqual([
+          [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[0]],
+          [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[1]],
+          [mutationTypes.CLEAR_SUGGESTION_BATCH],
+          [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+        ]);
+
+        expect(dispatch.mock.calls).toEqual([
+          ['resolveDiscussion', { discussionId: discussionIds[0] }],
+          ['resolveDiscussion', { discussionId: discussionIds[1] }],
+        ]);
+
+        expect(Flash).not.toHaveBeenCalled();
+      });
+    });
+
+    it('when service fails, flashes error message, resets applying batch state', done => {
+      const response = { response: { data: { message: TEST_ERROR_MESSAGE } } };
+
+      Api.applySuggestionBatch.mockReturnValue(Promise.reject(response));
+
+      testSubmitSuggestionBatch(done, () => {
+        expect(commit.mock.calls).toEqual([
+          [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+        ]);
+
+        expect(dispatch).not.toHaveBeenCalled();
+        expect(Flash).toHaveBeenCalledWith(TEST_ERROR_MESSAGE, 'alert', flashContainer);
+      });
+    });
+
+    it('when service fails, and no error message available, uses default message', done => {
+      const response = { response: 'foo' };
+
+      Api.applySuggestionBatch.mockReturnValue(Promise.reject(response));
+
+      testSubmitSuggestionBatch(done, () => {
+        expect(commit.mock.calls).toEqual([
+          [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+        ]);
+
+        expect(dispatch).not.toHaveBeenCalled();
+        expect(Flash).toHaveBeenCalledWith(
+          'Something went wrong while applying the batch of suggestions. Please try again.',
+          'alert',
+          flashContainer,
+        );
+      });
+    });
+
+    it('when resolve discussions fails, fails gracefully, resets batch and applying batch state', done => {
+      dispatch.mockReturnValue(Promise.reject());
+
+      testSubmitSuggestionBatch(done, () => {
+        expect(commit.mock.calls).toEqual([
+          [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[0]],
+          [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[1]],
+          [mutationTypes.CLEAR_SUGGESTION_BATCH],
+          [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+        ]);
+
+        expect(Flash).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('addSuggestionInfoToBatch', () => {
+    const suggestionInfo = batchSuggestionsInfoMock[0];
+
+    it("adds a suggestion's info to the current batch", done => {
+      testAction(
+        actions.addSuggestionInfoToBatch,
+        suggestionInfo,
+        { batchSuggestionsInfo: [] },
+        [{ type: 'ADD_SUGGESTION_TO_BATCH', payload: suggestionInfo }],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('removeSuggestionInfoFromBatch', () => {
+    const suggestionInfo = batchSuggestionsInfoMock[0];
+
+    it("removes a suggestion's info the current batch", done => {
+      testAction(
+        actions.removeSuggestionInfoFromBatch,
+        suggestionInfo.suggestionId,
+        { batchSuggestionsInfo: [suggestionInfo] },
+        [{ type: 'REMOVE_SUGGESTION_FROM_BATCH', payload: suggestionInfo.suggestionId }],
+        [],
+        done,
+      );
+    });
+  });
+
   describe('filterDiscussion', () => {
     const path = 'some-discussion-path';
     const filter = 0;
@@ -942,4 +1083,75 @@ describe('Actions Notes Store', () => {
       );
     });
   });
+
+  describe('softDeleteDescriptionVersion', () => {
+    const endpoint = '/path/to/diff/1';
+    const payload = {
+      endpoint,
+      startingVersion: undefined,
+      versionId: 1,
+    };
+
+    describe('if response contains no errors', () => {
+      it('dispatches requestDeleteDescriptionVersion', done => {
+        axiosMock.onDelete(endpoint).replyOnce(200);
+        testAction(
+          actions.softDeleteDescriptionVersion,
+          payload,
+          {},
+          [],
+          [
+            {
+              type: 'requestDeleteDescriptionVersion',
+            },
+            {
+              type: 'receiveDeleteDescriptionVersion',
+              payload: payload.versionId,
+            },
+          ],
+          done,
+        );
+      });
+    });
+
+    describe('if response contains errors', () => {
+      const errorMessage = 'Request failed with status code 503';
+      it('dispatches receiveDeleteDescriptionVersionError and throws an error', done => {
+        axiosMock.onDelete(endpoint).replyOnce(503);
+        testAction(
+          actions.softDeleteDescriptionVersion,
+          payload,
+          {},
+          [],
+          [
+            {
+              type: 'requestDeleteDescriptionVersion',
+            },
+            {
+              type: 'receiveDeleteDescriptionVersionError',
+              payload: new Error(errorMessage),
+            },
+          ],
+        )
+          .then(() => done.fail('Expected error to be thrown'))
+          .catch(() => {
+            expect(Flash).toHaveBeenCalled();
+            done();
+          });
+      });
+    });
+  });
+
+  describe('updateAssignees', () => {
+    it('update the assignees state', done => {
+      testAction(
+        actions.updateAssignees,
+        [userDataMock.id],
+        { state: noteableDataMock },
+        [{ type: mutationTypes.UPDATE_ASSIGNEES, payload: [userDataMock.id] }],
+        [],
+        done,
+      );
+    });
+  });
 });
diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js
index 27e3490d64b..75ef007b78d 100644
--- a/spec/frontend/notes/stores/mutation_spec.js
+++ b/spec/frontend/notes/stores/mutation_spec.js
@@ -9,6 +9,7 @@ import {
   noteableDataMock,
   individualNote,
   notesWithDescriptionChanges,
+  batchSuggestionsInfoMock,
 } from '../mock_data';
 
 const RESOLVED_NOTE = { resolvable: true, resolved: true };
@@ -700,4 +701,120 @@ describe('Notes Store mutations', () => {
       expect(state.isToggleBlockedIssueWarning).toEqual(false);
     });
   });
+
+  describe('SET_APPLYING_BATCH_STATE', () => {
+    const buildDiscussions = suggestionsInfo => {
+      const suggestions = suggestionsInfo.map(({ suggestionId }) => ({ id: suggestionId }));
+
+      const notes = suggestionsInfo.map(({ noteId }, index) => ({
+        id: noteId,
+        suggestions: [suggestions[index]],
+      }));
+
+      return suggestionsInfo.map(({ discussionId }, index) => ({
+        id: discussionId,
+        notes: [notes[index]],
+      }));
+    };
+
+    let state;
+    let batchedSuggestionInfo;
+    let discussions;
+    let suggestions;
+
+    beforeEach(() => {
+      [batchedSuggestionInfo] = batchSuggestionsInfoMock;
+      suggestions = batchSuggestionsInfoMock.map(({ suggestionId }) => ({ id: suggestionId }));
+      discussions = buildDiscussions(batchSuggestionsInfoMock);
+      state = {
+        batchSuggestionsInfo: [batchedSuggestionInfo],
+        discussions,
+      };
+    });
+
+    it('sets is_applying_batch to a boolean value for all batched suggestions', () => {
+      mutations.SET_APPLYING_BATCH_STATE(state, true);
+
+      const updatedSuggestion = {
+        ...suggestions[0],
+        is_applying_batch: true,
+      };
+
+      const expectedSuggestions = [updatedSuggestion, suggestions[1]];
+
+      const actualSuggestions = state.discussions
+        .map(discussion => discussion.notes.map(n => n.suggestions))
+        .flat(2);
+
+      expect(actualSuggestions).toEqual(expectedSuggestions);
+    });
+  });
+
+  describe('ADD_SUGGESTION_TO_BATCH', () => {
+    let state;
+
+    beforeEach(() => {
+      state = { batchSuggestionsInfo: [] };
+    });
+
+    it("adds a suggestion's info to a batch", () => {
+      const suggestionInfo = {
+        suggestionId: 'a123',
+        noteId: 'b456',
+        discussionId: 'c789',
+      };
+
+      mutations.ADD_SUGGESTION_TO_BATCH(state, suggestionInfo);
+
+      expect(state.batchSuggestionsInfo).toEqual([suggestionInfo]);
+    });
+  });
+
+  describe('REMOVE_SUGGESTION_FROM_BATCH', () => {
+    let state;
+    let suggestionInfo1;
+    let suggestionInfo2;
+
+    beforeEach(() => {
+      [suggestionInfo1, suggestionInfo2] = batchSuggestionsInfoMock;
+
+      state = {
+        batchSuggestionsInfo: [suggestionInfo1, suggestionInfo2],
+      };
+    });
+
+    it("removes a suggestion's info from a batch", () => {
+      mutations.REMOVE_SUGGESTION_FROM_BATCH(state, suggestionInfo1.suggestionId);
+
+      expect(state.batchSuggestionsInfo).toEqual([suggestionInfo2]);
+    });
+  });
+
+  describe('CLEAR_SUGGESTION_BATCH', () => {
+    let state;
+
+    beforeEach(() => {
+      state = {
+        batchSuggestionsInfo: batchSuggestionsInfoMock,
+      };
+    });
+
+    it('removes info for all suggestions from a batch', () => {
+      mutations.CLEAR_SUGGESTION_BATCH(state);
+
+      expect(state.batchSuggestionsInfo.length).toEqual(0);
+    });
+  });
+
+  describe('UPDATE_ASSIGNEES', () => {
+    it('should update assignees', () => {
+      const state = {
+        noteableData: noteableDataMock,
+      };
+
+      mutations.UPDATE_ASSIGNEES(state, [userDataMock.id]);
+
+      expect(state.noteableData.assignees).toEqual([userDataMock.id]);
+    });
+  });
 });
diff --git a/spec/frontend/oauth_remember_me_spec.js b/spec/frontend/oauth_remember_me_spec.js
index 381be82697e..e12db05ac43 100644
--- a/spec/frontend/oauth_remember_me_spec.js
+++ b/spec/frontend/oauth_remember_me_spec.js
@@ -2,6 +2,12 @@ import $ from 'jquery';
 import OAuthRememberMe from '~/pages/sessions/new/oauth_remember_me';
 
 describe('OAuthRememberMe', () => {
+  const findFormAction = selector => {
+    return $(`#oauth-container .oauth-login${selector}`)
+      .parent('form')
+      .attr('action');
+  };
+
   preloadFixtures('static/oauth_remember_me.html');
 
   beforeEach(() => {
@@ -13,15 +19,9 @@ describe('OAuthRememberMe', () => {
   it('adds the "remember_me" query parameter to all OAuth login buttons', () => {
     $('#oauth-container #remember_me').click();
 
-    expect($('#oauth-container .oauth-login.twitter').attr('href')).toBe(
-      'http://example.com/?remember_me=1',
-    );
-
-    expect($('#oauth-container .oauth-login.github').attr('href')).toBe(
-      'http://example.com/?remember_me=1',
-    );
-
-    expect($('#oauth-container .oauth-login.facebook').attr('href')).toBe(
+    expect(findFormAction('.twitter')).toBe('http://example.com/?remember_me=1');
+    expect(findFormAction('.github')).toBe('http://example.com/?remember_me=1');
+    expect(findFormAction('.facebook')).toBe(
       'http://example.com/?redirect_fragment=L1&remember_me=1',
     );
   });
@@ -30,10 +30,8 @@ describe('OAuthRememberMe', () => {
     $('#oauth-container #remember_me').click();
     $('#oauth-container #remember_me').click();
 
-    expect($('#oauth-container .oauth-login.twitter').attr('href')).toBe('http://example.com/');
-    expect($('#oauth-container .oauth-login.github').attr('href')).toBe('http://example.com/');
-    expect($('#oauth-container .oauth-login.facebook').attr('href')).toBe(
-      'http://example.com/?redirect_fragment=L1',
-    );
+    expect(findFormAction('.twitter')).toBe('http://example.com/');
+    expect(findFormAction('.github')).toBe('http://example.com/');
+    expect(findFormAction('.facebook')).toBe('http://example.com/?redirect_fragment=L1');
   });
 });
diff --git a/spec/frontend/onboarding_issues/index_spec.js b/spec/frontend/onboarding_issues/index_spec.js
new file mode 100644
index 00000000000..b844caa07aa
--- /dev/null
+++ b/spec/frontend/onboarding_issues/index_spec.js
@@ -0,0 +1,137 @@
+import $ from 'jquery';
+import { showLearnGitLabIssuesPopover } from '~/onboarding_issues';
+import { getCookie, setCookie, removeCookie } from '~/lib/utils/common_utils';
+import setWindowLocation from 'helpers/set_window_location_helper';
+import Tracking from '~/tracking';
+
+describe('Onboarding Issues Popovers', () => {
+  const COOKIE_NAME = 'onboarding_issues_settings';
+  const getCookieValue = () => JSON.parse(getCookie(COOKIE_NAME));
+
+  beforeEach(() => {
+    jest.spyOn($.fn, 'popover');
+  });
+
+  afterEach(() => {
+    $.fn.popover.mockRestore();
+    document.getElementsByTagName('html')[0].innerHTML = '';
+    removeCookie(COOKIE_NAME);
+  });
+
+  const setupShowLearnGitLabIssuesPopoverTest = ({
+    currentPath = 'group/learn-gitlab',
+    isIssuesBoardsLinkShown = true,
+    isCookieSet = true,
+    cookieValue = true,
+  } = {}) => {
+    setWindowLocation(`http://example.com/${currentPath}`);
+
+    if (isIssuesBoardsLinkShown) {
+      const elem = document.createElement('a');
+      elem.setAttribute('data-qa-selector', 'issue_boards_link');
+      document.body.appendChild(elem);
+    }
+
+    if (isCookieSet) {
+      setCookie(COOKIE_NAME, { previous: true, 'issues#index': cookieValue });
+    }
+
+    showLearnGitLabIssuesPopover();
+  };
+
+  describe('showLearnGitLabIssuesPopover', () => {
+    describe('when on another project', () => {
+      beforeEach(() => {
+        setupShowLearnGitLabIssuesPopoverTest({
+          currentPath: 'group/another-project',
+        });
+      });
+
+      it('does not show a popover', () => {
+        expect($.fn.popover).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when the issues boards link is not shown', () => {
+      beforeEach(() => {
+        setupShowLearnGitLabIssuesPopoverTest({
+          isIssuesBoardsLinkShown: false,
+        });
+      });
+
+      it('does not show a popover', () => {
+        expect($.fn.popover).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when the cookie is not set', () => {
+      beforeEach(() => {
+        setupShowLearnGitLabIssuesPopoverTest({
+          isCookieSet: false,
+        });
+      });
+
+      it('does not show a popover', () => {
+        expect($.fn.popover).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when the cookie value is false', () => {
+      beforeEach(() => {
+        setupShowLearnGitLabIssuesPopoverTest({
+          cookieValue: false,
+        });
+      });
+
+      it('does not show a popover', () => {
+        expect($.fn.popover).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('with all the right conditions', () => {
+      beforeEach(() => {
+        setupShowLearnGitLabIssuesPopoverTest();
+      });
+
+      it('shows a popover', () => {
+        expect($.fn.popover).toHaveBeenCalled();
+      });
+
+      it('does not change the cookie value', () => {
+        expect(getCookieValue()['issues#index']).toBe(true);
+      });
+
+      it('disables the previous popover', () => {
+        expect(getCookieValue().previous).toBe(false);
+      });
+
+      describe('when clicking the issues boards link', () => {
+        beforeEach(() => {
+          document.querySelector('a[data-qa-selector="issue_boards_link"]').click();
+        });
+
+        it('deletes the cookie', () => {
+          expect(getCookie(COOKIE_NAME)).toBe(undefined);
+        });
+      });
+
+      describe('when dismissing the popover', () => {
+        beforeEach(() => {
+          jest.spyOn(Tracking, 'event');
+          document.querySelector('.learn-gitlab.popover .close').click();
+        });
+
+        it('deletes the cookie', () => {
+          expect(getCookie(COOKIE_NAME)).toBe(undefined);
+        });
+
+        it('sends a tracking event', () => {
+          expect(Tracking.event).toHaveBeenCalledWith(
+            'Growth::Conversion::Experiment::OnboardingIssues',
+            'dismiss_popover',
+          );
+        });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/operation_settings/components/external_dashboard_spec.js b/spec/frontend/operation_settings/components/metrics_settings_spec.js
index 19214d1d954..398b61ec693 100644
--- a/spec/frontend/operation_settings/components/external_dashboard_spec.js
+++ b/spec/frontend/operation_settings/components/metrics_settings_spec.js
@@ -1,7 +1,11 @@
 import { mount, shallowMount } from '@vue/test-utils';
-import { GlDeprecatedButton, GlLink, GlFormGroup, GlFormInput } from '@gitlab/ui';
+import { GlDeprecatedButton, GlLink, GlFormGroup, GlFormInput, GlFormSelect } from '@gitlab/ui';
 import { TEST_HOST } from 'helpers/test_constants';
-import ExternalDashboard from '~/operation_settings/components/external_dashboard.vue';
+import MetricsSettings from '~/operation_settings/components/metrics_settings.vue';
+
+import ExternalDashboard from '~/operation_settings/components/form_group/external_dashboard.vue';
+import DashboardTimezone from '~/operation_settings/components/form_group/dashboard_timezone.vue';
+import { timezones } from '~/monitoring/format_date';
 import store from '~/operation_settings/store';
 import axios from '~/lib/utils/axios_utils';
 import { refreshCurrentPage } from '~/lib/utils/url_utility';
@@ -12,18 +16,26 @@ jest.mock('~/flash');
 
 describe('operation settings external dashboard component', () => {
   let wrapper;
+
   const operationsSettingsEndpoint = `${TEST_HOST}/mock/ops/settings/endpoint`;
+  const helpPage = `${TEST_HOST}/help/metrics/page/path`;
   const externalDashboardUrl = `http://mock-external-domain.com/external/dashboard/url`;
-  const externalDashboardHelpPagePath = `${TEST_HOST}/help/page/path`;
+  const dashboardTimezoneSetting = timezones.LOCAL;
+
   const mountComponent = (shallow = true) => {
     const config = [
-      ExternalDashboard,
+      MetricsSettings,
       {
         store: store({
           operationsSettingsEndpoint,
+          helpPage,
           externalDashboardUrl,
-          externalDashboardHelpPagePath,
+          dashboardTimezoneSetting,
         }),
+        stubs: {
+          ExternalDashboard,
+          DashboardTimezone,
+        },
       },
     ];
     wrapper = shallow ? shallowMount(...config) : mount(...config);
@@ -44,7 +56,7 @@ describe('operation settings external dashboard component', () => {
 
   it('renders header text', () => {
     mountComponent();
-    expect(wrapper.find('.js-section-header').text()).toBe('External Dashboard');
+    expect(wrapper.find('.js-section-header').text()).toBe('Metrics Dashboard');
   });
 
   describe('expand/collapse button', () => {
@@ -64,53 +76,86 @@ describe('operation settings external dashboard component', () => {
     });
 
     it('renders descriptive text', () => {
-      expect(subHeader.text()).toContain(
-        'Add a button to the metrics dashboard linking directly to your existing external dashboards.',
-      );
+      expect(subHeader.text()).toContain('Manage Metrics Dashboard settings.');
     });
 
     it('renders help page link', () => {
       const link = subHeader.find(GlLink);
 
       expect(link.text()).toBe('Learn more');
-      expect(link.attributes().href).toBe(externalDashboardHelpPagePath);
+      expect(link.attributes().href).toBe(helpPage);
     });
   });
 
   describe('form', () => {
-    describe('input label', () => {
-      let formGroup;
-
-      beforeEach(() => {
-        mountComponent();
-        formGroup = wrapper.find(GlFormGroup);
+    describe('dashboard timezone', () => {
+      describe('field label', () => {
+        let formGroup;
+
+        beforeEach(() => {
+          mountComponent(false);
+          formGroup = wrapper.find(DashboardTimezone).find(GlFormGroup);
+        });
+
+        it('uses label text', () => {
+          expect(formGroup.find('label').text()).toBe('Dashboard timezone');
+        });
+
+        it('uses description text', () => {
+          const description = formGroup.find('small');
+          expect(description.text()).not.toBeFalsy();
+        });
       });
 
-      it('uses label text', () => {
-        expect(formGroup.attributes().label).toBe('Full dashboard URL');
-      });
+      describe('select field', () => {
+        let select;
 
-      it('uses description text', () => {
-        expect(formGroup.attributes().description).toBe(
-          'Enter the URL of the dashboard you want to link to',
-        );
+        beforeEach(() => {
+          mountComponent();
+          select = wrapper.find(DashboardTimezone).find(GlFormSelect);
+        });
+
+        it('defaults to externalDashboardUrl', () => {
+          expect(select.attributes('value')).toBe(dashboardTimezoneSetting);
+        });
       });
     });
 
-    describe('input field', () => {
-      let input;
+    describe('external dashboard', () => {
+      describe('input label', () => {
+        let formGroup;
 
-      beforeEach(() => {
-        mountComponent();
-        input = wrapper.find(GlFormInput);
-      });
+        beforeEach(() => {
+          mountComponent(false);
+          formGroup = wrapper.find(ExternalDashboard).find(GlFormGroup);
+        });
+
+        it('uses label text', () => {
+          expect(formGroup.find('label').text()).toBe('External dashboard URL');
+        });
 
-      it('defaults to externalDashboardUrl', () => {
-        expect(input.attributes().value).toBe(externalDashboardUrl);
+        it('uses description text', () => {
+          const description = formGroup.find('small');
+          expect(description.text()).not.toBeFalsy();
+        });
       });
 
-      it('uses a placeholder', () => {
-        expect(input.attributes().placeholder).toBe('https://my-org.gitlab.io/my-dashboards');
+      describe('input field', () => {
+        let input;
+
+        beforeEach(() => {
+          mountComponent();
+          input = wrapper.find(ExternalDashboard).find(GlFormInput);
+        });
+
+        it('defaults to externalDashboardUrl', () => {
+          expect(input.attributes().value).toBeTruthy();
+          expect(input.attributes().value).toBe(externalDashboardUrl);
+        });
+
+        it('uses a placeholder', () => {
+          expect(input.attributes().placeholder).toBe('https://my-org.gitlab.io/my-dashboards');
+        });
       });
     });
 
@@ -123,6 +168,7 @@ describe('operation settings external dashboard component', () => {
         {
           project: {
             metrics_setting_attributes: {
+              dashboard_timezone: dashboardTimezoneSetting,
               external_dashboard_url: externalDashboardUrl,
             },
           },
diff --git a/spec/frontend/operation_settings/store/mutations_spec.js b/spec/frontend/operation_settings/store/mutations_spec.js
index 1854142c89a..88eb66095ad 100644
--- a/spec/frontend/operation_settings/store/mutations_spec.js
+++ b/spec/frontend/operation_settings/store/mutations_spec.js
@@ -1,5 +1,6 @@
 import mutations from '~/operation_settings/store/mutations';
 import createState from '~/operation_settings/store/state';
+import { timezones } from '~/monitoring/format_date';
 
 describe('operation settings mutations', () => {
   let localState;
@@ -13,7 +14,16 @@ describe('operation settings mutations', () => {
       const mockUrl = 'mockUrl';
       mutations.SET_EXTERNAL_DASHBOARD_URL(localState, mockUrl);
 
-      expect(localState.externalDashboardUrl).toBe(mockUrl);
+      expect(localState.externalDashboard.url).toBe(mockUrl);
+    });
+  });
+
+  describe('SET_DASHBOARD_TIMEZONE', () => {
+    it('sets dashboardTimezoneSetting', () => {
+      mutations.SET_DASHBOARD_TIMEZONE(localState, timezones.LOCAL);
+
+      expect(localState.dashboardTimezone.selected).not.toBeUndefined();
+      expect(localState.dashboardTimezone.selected).toBe(timezones.LOCAL);
     });
   });
 });
diff --git a/spec/javascripts/pager_spec.js b/spec/frontend/pager_spec.js
index c95a8400c6c..d7177a32cde 100644
--- a/spec/javascripts/pager_spec.js
+++ b/spec/frontend/pager_spec.js
@@ -2,6 +2,11 @@ import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import Pager from '~/pager';
+import { removeParams } from '~/lib/utils/url_utility';
+
+jest.mock('~/lib/utils/url_utility', () => ({
+  removeParams: jest.fn().mockName('removeParams'),
+}));
 
 describe('pager', () => {
   let axiosMock;
@@ -19,7 +24,7 @@ describe('pager', () => {
 
     beforeEach(() => {
       setFixtures('<div class="content_list"></div><div class="loading"></div>');
-      spyOn($.fn, 'endlessScroll').and.stub();
+      jest.spyOn($.fn, 'endlessScroll').mockImplementation();
     });
 
     afterEach(() => {
@@ -36,7 +41,7 @@ describe('pager', () => {
 
     it('should use current url if data-href attribute not provided', () => {
       const href = `${gl.TEST_HOST}/some_list`;
-      spyOnDependency(Pager, 'removeParams').and.returnValue(href);
+      removeParams.mockReturnValue(href);
       Pager.init();
 
       expect(Pager.url).toBe(href);
@@ -52,7 +57,7 @@ describe('pager', () => {
     it('keeps extra query parameters from url', () => {
       window.history.replaceState({}, null, '?filter=test&offset=100');
       const href = `${gl.TEST_HOST}/some_list?filter=test`;
-      const removeParams = spyOnDependency(Pager, 'removeParams').and.returnValue(href);
+      removeParams.mockReturnValue(href);
       Pager.init();
 
       expect(removeParams).toHaveBeenCalledWith(['limit', 'offset']);
@@ -78,7 +83,7 @@ describe('pager', () => {
       setFixtures(
         '<div class="content_list" data-href="/some_list"></div><div class="loading"></div>',
       );
-      spyOn(axios, 'get').and.callThrough();
+      jest.spyOn(axios, 'get');
 
       Pager.init();
     });
@@ -86,10 +91,10 @@ describe('pager', () => {
     it('shows loader while loading next page', done => {
       mockSuccess();
 
-      spyOn(Pager.loading, 'show');
+      jest.spyOn(Pager.loading, 'show').mockImplementation(() => {});
       Pager.getOld();
 
-      setTimeout(() => {
+      setImmediate(() => {
         expect(Pager.loading.show).toHaveBeenCalled();
 
         done();
@@ -99,10 +104,10 @@ describe('pager', () => {
     it('hides loader on success', done => {
       mockSuccess();
 
-      spyOn(Pager.loading, 'hide');
+      jest.spyOn(Pager.loading, 'hide').mockImplementation(() => {});
       Pager.getOld();
 
-      setTimeout(() => {
+      setImmediate(() => {
         expect(Pager.loading.hide).toHaveBeenCalled();
 
         done();
@@ -112,10 +117,10 @@ describe('pager', () => {
     it('hides loader on error', done => {
       mockError();
 
-      spyOn(Pager.loading, 'hide');
+      jest.spyOn(Pager.loading, 'hide').mockImplementation(() => {});
       Pager.getOld();
 
-      setTimeout(() => {
+      setImmediate(() => {
         expect(Pager.loading.hide).toHaveBeenCalled();
 
         done();
@@ -127,8 +132,8 @@ describe('pager', () => {
       Pager.limit = 20;
       Pager.getOld();
 
-      setTimeout(() => {
-        const [url, params] = axios.get.calls.argsFor(0);
+      setImmediate(() => {
+        const [url, params] = axios.get.mock.calls[0];
 
         expect(params).toEqual({
           params: {
@@ -148,10 +153,10 @@ describe('pager', () => {
       Pager.limit = 20;
 
       mockSuccess(1);
-      spyOn(Pager.loading, 'hide');
+      jest.spyOn(Pager.loading, 'hide').mockImplementation(() => {});
       Pager.getOld();
 
-      setTimeout(() => {
+      setImmediate(() => {
         expect(Pager.loading.hide).toHaveBeenCalled();
         expect(Pager.disable).toBe(true);
 
diff --git a/spec/javascripts/todos_spec.js b/spec/frontend/pages/dashboard/todos/index/todos_spec.js
index dc3c547c632..204fe3d0a68 100644
--- a/spec/javascripts/todos_spec.js
+++ b/spec/frontend/pages/dashboard/todos/index/todos_spec.js
@@ -5,6 +5,11 @@ import '~/lib/utils/common_utils';
 import '~/gl_dropdown';
 import axios from '~/lib/utils/axios_utils';
 import { addDelimiter } from '~/lib/utils/text_utility';
+import { visitUrl } from '~/lib/utils/url_utility';
+
+jest.mock('~/lib/utils/url_utility', () => ({
+  visitUrl: jest.fn().mockName('visitUrl'),
+}));
 
 const TEST_COUNT_BIG = 2000;
 const TEST_DONE_COUNT_BIG = 7300;
@@ -30,7 +35,7 @@ describe('Todos', () => {
     it('opens the todo url', done => {
       const todoLink = todoItem.dataset.url;
 
-      spyOnDependency(Todos, 'visitUrl').and.callFake(url => {
+      visitUrl.mockImplementation(url => {
         expect(url).toEqual(todoLink);
         done();
       });
@@ -39,14 +44,12 @@ describe('Todos', () => {
     });
 
     describe('meta click', () => {
-      let visitUrlSpy;
       let windowOpenSpy;
       let metakeyEvent;
 
       beforeEach(() => {
         metakeyEvent = $.Event('click', { keyCode: 91, ctrlKey: true });
-        visitUrlSpy = spyOnDependency(Todos, 'visitUrl').and.callFake(() => {});
-        windowOpenSpy = spyOn(window, 'open').and.callFake(() => {});
+        windowOpenSpy = jest.spyOn(window, 'open').mockImplementation(() => {});
       });
 
       it('opens the todo url in another tab', () => {
@@ -54,7 +57,7 @@ describe('Todos', () => {
 
         $('.todos-list .todo').trigger(metakeyEvent);
 
-        expect(visitUrlSpy).not.toHaveBeenCalled();
+        expect(visitUrl).not.toHaveBeenCalled();
         expect(windowOpenSpy).toHaveBeenCalledWith(todoLink, '_blank');
       });
 
@@ -62,7 +65,7 @@ describe('Todos', () => {
         $('.todos-list a').on('click', e => e.preventDefault());
         $('.todos-list img').trigger(metakeyEvent);
 
-        expect(visitUrlSpy).not.toHaveBeenCalled();
+        expect(visitUrl).not.toHaveBeenCalled();
         expect(windowOpenSpy).not.toHaveBeenCalled();
       });
     });
@@ -78,7 +81,7 @@ describe('Todos', () => {
         mock
           .onDelete(path)
           .replyOnce(200, { count: TEST_COUNT_BIG, done_count: TEST_DONE_COUNT_BIG });
-        onToggleSpy = jasmine.createSpy('onToggle');
+        onToggleSpy = jest.fn();
         $(document).on('todo:toggle', onToggleSpy);
 
         // Act
@@ -89,7 +92,7 @@ describe('Todos', () => {
       });
 
       it('dispatches todo:toggle', () => {
-        expect(onToggleSpy).toHaveBeenCalledWith(jasmine.anything(), TEST_COUNT_BIG);
+        expect(onToggleSpy).toHaveBeenCalledWith(expect.anything(), TEST_COUNT_BIG);
       });
 
       it('updates pending text', () => {
diff --git a/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js
new file mode 100644
index 00000000000..0bb96ee33d4
--- /dev/null
+++ b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js
@@ -0,0 +1,47 @@
+import { shallowMount } from '@vue/test-utils';
+
+import { GlButton } from '@gitlab/ui';
+import BitbucketServerStatusTable from '~/pages/import/bitbucket_server/status/components/bitbucket_server_status_table.vue';
+import BitbucketStatusTable from '~/import_projects/components/bitbucket_status_table.vue';
+
+const BitbucketStatusTableStub = {
+  name: 'BitbucketStatusTable',
+  template: '<div><slot name="actions"></slot></div>',
+};
+
+describe('BitbucketServerStatusTable', () => {
+  let wrapper;
+
+  const findReconfigureButton = () =>
+    wrapper
+      .findAll(GlButton)
+      .filter(w => w.props().variant === 'info')
+      .at(0);
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
+  });
+
+  function createComponent(bitbucketStatusTableStub = true) {
+    wrapper = shallowMount(BitbucketServerStatusTable, {
+      propsData: { providerTitle: 'Test', reconfigurePath: '/reconfigure' },
+      stubs: {
+        BitbucketStatusTable: bitbucketStatusTableStub,
+      },
+    });
+  }
+
+  it('renders bitbucket status table component', () => {
+    createComponent();
+    expect(wrapper.contains(BitbucketStatusTable)).toBe(true);
+  });
+
+  it('renders Reconfigure button', async () => {
+    createComponent(BitbucketStatusTableStub);
+    expect(findReconfigureButton().attributes().href).toBe('/reconfigure');
+    expect(findReconfigureButton().text()).toBe('Reconfigure');
+  });
+});
diff --git a/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap b/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap
new file mode 100644
index 00000000000..94089ea922b
--- /dev/null
+++ b/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap
@@ -0,0 +1,88 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Code Coverage when fetching data is successful matches the snapshot 1`] = `
+<div>
+  <div
+    class="gl-mt-3 gl-mb-3"
+  >
+    <!---->
+     
+    <!---->
+     
+    <gl-dropdown-stub
+      text="rspec"
+    >
+      <gl-dropdown-item-stub
+        value="rspec"
+      >
+        <div
+          class="gl-display-flex"
+        >
+          <gl-icon-stub
+            class="gl-absolute"
+            name="mobile-issue-close"
+            size="16"
+          />
+           
+          <span
+            class="gl-display-flex align-items-center ml-4"
+          >
+            
+            rspec
+          
+          </span>
+        </div>
+      </gl-dropdown-item-stub>
+      <gl-dropdown-item-stub
+        value="cypress"
+      >
+        <div
+          class="gl-display-flex"
+        >
+          <!---->
+           
+          <span
+            class="gl-display-flex align-items-center ml-4"
+          >
+            
+            cypress
+          
+          </span>
+        </div>
+      </gl-dropdown-item-stub>
+      <gl-dropdown-item-stub
+        value="karma"
+      >
+        <div
+          class="gl-display-flex"
+        >
+          <!---->
+           
+          <span
+            class="gl-display-flex align-items-center ml-4"
+          >
+            
+            karma
+          
+          </span>
+        </div>
+      </gl-dropdown-item-stub>
+    </gl-dropdown-stub>
+  </div>
+   
+  <gl-area-chart-stub
+    annotations=""
+    data="[object Object]"
+    formattooltiptext="function () { [native code] }"
+    height="200"
+    includelegendavgmax="true"
+    legendaveragetext="Avg"
+    legendcurrenttext="Current"
+    legendlayout="inline"
+    legendmaxtext="Max"
+    legendmintext="Min"
+    option="[object Object]"
+    thresholds=""
+  />
+</div>
+`;
diff --git a/spec/frontend/pages/projects/graphs/code_coverage_spec.js b/spec/frontend/pages/projects/graphs/code_coverage_spec.js
new file mode 100644
index 00000000000..4990985b076
--- /dev/null
+++ b/spec/frontend/pages/projects/graphs/code_coverage_spec.js
@@ -0,0 +1,164 @@
+import MockAdapter from 'axios-mock-adapter';
+import { shallowMount } from '@vue/test-utils';
+import { GlAlert, GlIcon, GlDropdown, GlDropdownItem } from '@gitlab/ui';
+import { GlAreaChart } from '@gitlab/ui/dist/charts';
+
+import axios from '~/lib/utils/axios_utils';
+import CodeCoverage from '~/pages/projects/graphs/components/code_coverage.vue';
+import codeCoverageMockData from './mock_data';
+import waitForPromises from 'helpers/wait_for_promises';
+import httpStatusCodes from '~/lib/utils/http_status';
+
+describe('Code Coverage', () => {
+  let wrapper;
+  let mockAxios;
+
+  const graphEndpoint = '/graph';
+
+  const findAlert = () => wrapper.find(GlAlert);
+  const findAreaChart = () => wrapper.find(GlAreaChart);
+  const findAllDropdownItems = () => wrapper.findAll(GlDropdownItem);
+  const findFirstDropdownItem = () => findAllDropdownItems().at(0);
+  const findSecondDropdownItem = () => findAllDropdownItems().at(1);
+
+  const createComponent = () => {
+    wrapper = shallowMount(CodeCoverage, {
+      propsData: {
+        graphEndpoint,
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('when fetching data is successful', () => {
+    beforeEach(() => {
+      mockAxios = new MockAdapter(axios);
+      mockAxios.onGet().replyOnce(httpStatusCodes.OK, codeCoverageMockData);
+
+      createComponent();
+
+      return waitForPromises();
+    });
+
+    afterEach(() => {
+      mockAxios.restore();
+    });
+
+    it('renders the area chart', () => {
+      expect(findAreaChart().exists()).toBe(true);
+    });
+
+    it('matches the snapshot', () => {
+      expect(wrapper.element).toMatchSnapshot();
+    });
+
+    it('shows no error messages', () => {
+      expect(findAlert().exists()).toBe(false);
+    });
+  });
+
+  describe('when fetching data fails', () => {
+    beforeEach(() => {
+      mockAxios = new MockAdapter(axios);
+      mockAxios.onGet().replyOnce(httpStatusCodes.BAD_REQUEST);
+
+      createComponent();
+
+      return waitForPromises();
+    });
+
+    afterEach(() => {
+      mockAxios.restore();
+    });
+
+    it('renders an error message', () => {
+      expect(findAlert().exists()).toBe(true);
+      expect(findAlert().attributes().variant).toBe('danger');
+    });
+
+    it('still renders an empty graph', () => {
+      expect(findAreaChart().exists()).toBe(true);
+    });
+  });
+
+  describe('when fetching data succeed but returns an empty state', () => {
+    beforeEach(() => {
+      mockAxios = new MockAdapter(axios);
+      mockAxios.onGet().replyOnce(httpStatusCodes.OK, []);
+
+      createComponent();
+
+      return waitForPromises();
+    });
+
+    afterEach(() => {
+      mockAxios.restore();
+    });
+
+    it('renders an information message', () => {
+      expect(findAlert().exists()).toBe(true);
+      expect(findAlert().attributes().variant).toBe('info');
+    });
+
+    it('still renders an empty graph', () => {
+      expect(findAreaChart().exists()).toBe(true);
+    });
+  });
+
+  describe('dropdown options', () => {
+    beforeEach(() => {
+      mockAxios = new MockAdapter(axios);
+      mockAxios.onGet().replyOnce(httpStatusCodes.OK, codeCoverageMockData);
+
+      createComponent();
+
+      return waitForPromises();
+    });
+
+    it('renders the dropdown with all custom names as options', () => {
+      expect(wrapper.contains(GlDropdown)).toBeDefined();
+      expect(findAllDropdownItems()).toHaveLength(codeCoverageMockData.length);
+      expect(findFirstDropdownItem().text()).toBe(codeCoverageMockData[0].group_name);
+    });
+  });
+
+  describe('interactions', () => {
+    beforeEach(() => {
+      mockAxios = new MockAdapter(axios);
+      mockAxios.onGet().replyOnce(httpStatusCodes.OK, codeCoverageMockData);
+
+      createComponent();
+
+      return waitForPromises();
+    });
+
+    it('updates the selected dropdown option with an icon', async () => {
+      findSecondDropdownItem().vm.$emit('click');
+
+      await wrapper.vm.$nextTick();
+
+      expect(
+        findFirstDropdownItem()
+          .find(GlIcon)
+          .exists(),
+      ).toBe(false);
+      expect(findSecondDropdownItem().contains(GlIcon)).toBe(true);
+    });
+
+    it('updates the graph data when selecting a different option in dropdown', async () => {
+      const originalSelectedData = wrapper.vm.selectedDailyCoverage;
+      const expectedData = codeCoverageMockData[1];
+
+      findSecondDropdownItem().vm.$emit('click');
+
+      await wrapper.vm.$nextTick();
+
+      expect(wrapper.vm.selectedDailyCoverage).not.toBe(originalSelectedData);
+      expect(wrapper.vm.selectedDailyCoverage).toBe(expectedData);
+    });
+  });
+});
diff --git a/spec/frontend/pages/projects/graphs/mock_data.js b/spec/frontend/pages/projects/graphs/mock_data.js
new file mode 100644
index 00000000000..a15f861ee7a
--- /dev/null
+++ b/spec/frontend/pages/projects/graphs/mock_data.js
@@ -0,0 +1,60 @@
+export default [
+  {
+    group_name: 'rspec',
+    data: [
+      { date: '2020-04-30', coverage: 40.0 },
+      { date: '2020-05-01', coverage: 80.0 },
+      { date: '2020-05-02', coverage: 99.0 },
+      { date: '2020-05-10', coverage: 80.0 },
+      { date: '2020-05-15', coverage: 70.0 },
+      { date: '2020-05-20', coverage: 69.0 },
+    ],
+  },
+  {
+    group_name: 'cypress',
+    data: [
+      { date: '2022-07-30', coverage: 1.0 },
+      { date: '2022-08-01', coverage: 2.4 },
+      { date: '2022-08-02', coverage: 5.0 },
+      { date: '2022-08-10', coverage: 15.0 },
+      { date: '2022-08-15', coverage: 30.0 },
+      { date: '2022-08-20', coverage: 40.0 },
+    ],
+  },
+  {
+    group_name: 'karma',
+    data: [
+      { date: '2020-05-01', coverage: 94.0 },
+      { date: '2020-05-02', coverage: 94.0 },
+      { date: '2020-05-03', coverage: 94.0 },
+      { date: '2020-05-04', coverage: 94.0 },
+      { date: '2020-05-05', coverage: 92.0 },
+      { date: '2020-05-06', coverage: 91.0 },
+      { date: '2020-05-07', coverage: 78.0 },
+      { date: '2020-05-08', coverage: 94.0 },
+      { date: '2020-05-09', coverage: 94.0 },
+      { date: '2020-05-10', coverage: 94.0 },
+      { date: '2020-05-11', coverage: 94.0 },
+      { date: '2020-05-12', coverage: 94.0 },
+      { date: '2020-05-13', coverage: 92.0 },
+      { date: '2020-05-14', coverage: 91.0 },
+      { date: '2020-05-15', coverage: 78.0 },
+      { date: '2020-05-16', coverage: 94.0 },
+      { date: '2020-05-17', coverage: 94.0 },
+      { date: '2020-05-18', coverage: 93.0 },
+      { date: '2020-05-19', coverage: 92.0 },
+      { date: '2020-05-20', coverage: 91.0 },
+      { date: '2020-05-21', coverage: 90.0 },
+      { date: '2020-05-22', coverage: 91.0 },
+      { date: '2020-05-23', coverage: 92.0 },
+      { date: '2020-05-24', coverage: 75.0 },
+      { date: '2020-05-25', coverage: 74.0 },
+      { date: '2020-05-26', coverage: 74.0 },
+      { date: '2020-05-27', coverage: 74.0 },
+      { date: '2020-05-28', coverage: 80.0 },
+      { date: '2020-05-29', coverage: 85.0 },
+      { date: '2020-05-30', coverage: 92.0 },
+      { date: '2020-05-31', coverage: 91.0 },
+    ],
+  },
+];
diff --git a/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js b/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js
index 1809e92e1d9..0d9af0cb856 100644
--- a/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js
+++ b/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js
@@ -2,6 +2,12 @@ import $ from 'jquery';
 import preserveUrlFragment from '~/pages/sessions/new/preserve_url_fragment';
 
 describe('preserve_url_fragment', () => {
+  const findFormAction = selector => {
+    return $(`.omniauth-container ${selector}`)
+      .parent('form')
+      .attr('action');
+  };
+
   preloadFixtures('sessions/new.html');
 
   beforeEach(() => {
@@ -25,35 +31,36 @@ describe('preserve_url_fragment', () => {
   it('does not add an empty query parameter to OmniAuth login buttons', () => {
     preserveUrlFragment();
 
-    expect($('#oauth-login-cas3').attr('href')).toBe('http://test.host/users/auth/cas3');
+    expect(findFormAction('#oauth-login-cas3')).toBe('http://test.host/users/auth/cas3');
 
-    expect($('.omniauth-container #oauth-login-auth0').attr('href')).toBe(
-      'http://test.host/users/auth/auth0',
-    );
+    expect(findFormAction('#oauth-login-auth0')).toBe('http://test.host/users/auth/auth0');
   });
 
   describe('adds "redirect_fragment" query parameter to OmniAuth login buttons', () => {
     it('when "remember_me" is not present', () => {
       preserveUrlFragment('#L65');
 
-      expect($('#oauth-login-cas3').attr('href')).toBe(
+      expect(findFormAction('#oauth-login-cas3')).toBe(
         'http://test.host/users/auth/cas3?redirect_fragment=L65',
       );
 
-      expect($('.omniauth-container #oauth-login-auth0').attr('href')).toBe(
+      expect(findFormAction('#oauth-login-auth0')).toBe(
         'http://test.host/users/auth/auth0?redirect_fragment=L65',
       );
     });
 
     it('when "remember-me" is present', () => {
-      $('a.omniauth-btn').attr('href', (i, href) => `${href}?remember_me=1`);
+      $('.omniauth-btn')
+        .parent('form')
+        .attr('action', (i, href) => `${href}?remember_me=1`);
+
       preserveUrlFragment('#L65');
 
-      expect($('#oauth-login-cas3').attr('href')).toBe(
+      expect(findFormAction('#oauth-login-cas3')).toBe(
         'http://test.host/users/auth/cas3?remember_me=1&redirect_fragment=L65',
       );
 
-      expect($('#oauth-login-auth0').attr('href')).toBe(
+      expect(findFormAction('#oauth-login-auth0')).toBe(
         'http://test.host/users/auth/auth0?remember_me=1&redirect_fragment=L65',
       );
     });
diff --git a/spec/javascripts/signin_tabs_memoizer_spec.js b/spec/frontend/pages/sessions/new/signin_tabs_memoizer_spec.js
index 966ae55ce14..738498edbd3 100644
--- a/spec/javascripts/signin_tabs_memoizer_spec.js
+++ b/spec/frontend/pages/sessions/new/signin_tabs_memoizer_spec.js
@@ -2,6 +2,9 @@ import AccessorUtilities from '~/lib/utils/accessor';
 import SigninTabsMemoizer from '~/pages/sessions/new/signin_tabs_memoizer';
 import trackData from '~/pages/sessions/new/index';
 import Tracking from '~/tracking';
+import { useLocalStorageSpy } from 'helpers/local_storage_helper';
+
+useLocalStorageSpy();
 
 describe('SigninTabsMemoizer', () => {
   const fixtureTemplate = 'static/signin_tabs.html';
@@ -22,7 +25,7 @@ describe('SigninTabsMemoizer', () => {
   beforeEach(() => {
     loadFixtures(fixtureTemplate);
 
-    spyOn(AccessorUtilities, 'isLocalStorageAccessSafe').and.returnValue(true);
+    jest.spyOn(AccessorUtilities, 'isLocalStorageAccessSafe').mockReturnValue(true);
   });
 
   it('does nothing if no tab was previously selected', () => {
@@ -38,8 +41,8 @@ describe('SigninTabsMemoizer', () => {
     const fakeTab = {
       click: () => {},
     };
-    spyOn(document, 'querySelector').and.returnValue(fakeTab);
-    spyOn(fakeTab, 'click');
+    jest.spyOn(document, 'querySelector').mockReturnValue(fakeTab);
+    jest.spyOn(fakeTab, 'click').mockImplementation(() => {});
 
     memo.bootstrap();
 
@@ -51,17 +54,18 @@ describe('SigninTabsMemoizer', () => {
   it('clicks the first tab if value in local storage is bad', () => {
     createMemoizer().saveData('#bogus');
     const fakeTab = {
-      click: () => {},
+      click: jest.fn().mockName('fakeTab_click'),
     };
-    spyOn(document, 'querySelector').and.callFake(selector =>
-      selector === `${tabSelector} a[href="#bogus"]` ? null : fakeTab,
-    );
-    spyOn(fakeTab, 'click');
+    jest
+      .spyOn(document, 'querySelector')
+      .mockImplementation(selector =>
+        selector === `${tabSelector} a[href="#bogus"]` ? null : fakeTab,
+      );
 
     memo.bootstrap();
 
     // verify that triggers click on stored selector and fallback
-    expect(document.querySelector.calls.allArgs()).toEqual([
+    expect(document.querySelector.mock.calls).toEqual([
       ['ul.new-session-tabs a[href="#bogus"]'],
       ['ul.new-session-tabs a'],
     ]);
@@ -97,7 +101,7 @@ describe('SigninTabsMemoizer', () => {
 
   describe('trackData', () => {
     beforeEach(() => {
-      spyOn(Tracking, 'event');
+      jest.spyOn(Tracking, 'event').mockImplementation(() => {});
     });
 
     describe('with tracking data', () => {
@@ -144,12 +148,10 @@ describe('SigninTabsMemoizer', () => {
       memo = {
         currentTabKey,
       };
-
-      spyOn(localStorage, 'setItem');
     });
 
     describe('if .isLocalStorageAvailable is `false`', () => {
-      beforeEach(function() {
+      beforeEach(() => {
         memo.isLocalStorageAvailable = false;
 
         SigninTabsMemoizer.prototype.saveData.call(memo);
@@ -163,7 +165,7 @@ describe('SigninTabsMemoizer', () => {
     describe('if .isLocalStorageAvailable is `true`', () => {
       const value = 'value';
 
-      beforeEach(function() {
+      beforeEach(() => {
         memo.isLocalStorageAvailable = true;
 
         SigninTabsMemoizer.prototype.saveData.call(memo, value);
@@ -184,11 +186,11 @@ describe('SigninTabsMemoizer', () => {
         currentTabKey,
       };
 
-      spyOn(localStorage, 'getItem').and.returnValue(itemValue);
+      localStorage.getItem.mockReturnValue(itemValue);
     });
 
     describe('if .isLocalStorageAvailable is `false`', () => {
-      beforeEach(function() {
+      beforeEach(() => {
         memo.isLocalStorageAvailable = false;
 
         readData = SigninTabsMemoizer.prototype.readData.call(memo);
@@ -201,7 +203,7 @@ describe('SigninTabsMemoizer', () => {
     });
 
     describe('if .isLocalStorageAvailable is `true`', () => {
-      beforeEach(function() {
+      beforeEach(() => {
         memo.isLocalStorageAvailable = true;
 
         readData = SigninTabsMemoizer.prototype.readData.call(memo);
diff --git a/spec/javascripts/pdf/index_spec.js b/spec/frontend/pdf/index_spec.js
index 39cd4dacd70..0d8caa28fd1 100644
--- a/spec/javascripts/pdf/index_spec.js
+++ b/spec/frontend/pdf/index_spec.js
@@ -3,6 +3,10 @@ import Vue from 'vue';
 import { FIXTURES_PATH } from 'spec/test_constants';
 import PDFLab from '~/pdf/index.vue';
 
+jest.mock('pdfjs-dist/webpack', () => {
+  return { default: jest.requireActual('pdfjs-dist/build/pdf') };
+});
+
 const pdf = `${FIXTURES_PATH}/blob/pdf/test.pdf`;
 
 const Component = Vue.extend(PDFLab);
diff --git a/spec/javascripts/pdf/page_spec.js b/spec/frontend/pdf/page_spec.js
index cc2cc204ee3..4e24b0696ec 100644
--- a/spec/javascripts/pdf/page_spec.js
+++ b/spec/frontend/pdf/page_spec.js
@@ -1,27 +1,14 @@
 import Vue from 'vue';
-import pdfjsLib from 'pdfjs-dist/webpack';
-
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import { FIXTURES_PATH } from 'spec/test_constants';
 import PageComponent from '~/pdf/page/index.vue';
+import mountComponent from 'helpers/vue_mount_component_helper';
 
-const testPDF = `${FIXTURES_PATH}/blob/pdf/test.pdf`;
+jest.mock('pdfjs-dist/webpack', () => {
+  return { default: jest.requireActual('pdfjs-dist/build/pdf') };
+});
 
 describe('Page component', () => {
   const Component = Vue.extend(PageComponent);
   let vm;
-  let testPage;
-
-  beforeEach(done => {
-    pdfjsLib
-      .getDocument(testPDF)
-      .promise.then(pdf => pdf.getPage(1))
-      .then(page => {
-        testPage = page;
-      })
-      .then(done)
-      .catch(done.fail);
-  });
 
   afterEach(() => {
     vm.$destroy();
@@ -29,7 +16,10 @@ describe('Page component', () => {
 
   it('renders the page when mounting', done => {
     const promise = Promise.resolve();
-    spyOn(testPage, 'render').and.returnValue({ promise });
+    const testPage = {
+      render: jest.fn().mockReturnValue({ promise: Promise.resolve() }),
+      getViewport: jest.fn().mockReturnValue({}),
+    };
 
     vm = mountComponent(Component, {
       page: testPage,
diff --git a/spec/frontend/performance_bar/components/detailed_metric_spec.js b/spec/frontend/performance_bar/components/detailed_metric_spec.js
index 01b6b7b043c..f040dcfdea4 100644
--- a/spec/frontend/performance_bar/components/detailed_metric_spec.js
+++ b/spec/frontend/performance_bar/components/detailed_metric_spec.js
@@ -1,22 +1,32 @@
 import { shallowMount } from '@vue/test-utils';
 import DetailedMetric from '~/performance_bar/components/detailed_metric.vue';
 import RequestWarning from '~/performance_bar/components/request_warning.vue';
+import { trimText } from 'helpers/text_helper';
 
 describe('detailedMetric', () => {
-  const createComponent = props =>
-    shallowMount(DetailedMetric, {
+  let wrapper;
+
+  const createComponent = props => {
+    wrapper = shallowMount(DetailedMetric, {
       propsData: {
         ...props,
       },
     });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
 
   describe('when the current request has no details', () => {
-    const wrapper = createComponent({
-      currentRequest: {},
-      metric: 'gitaly',
-      header: 'Gitaly calls',
-      details: 'details',
-      keys: ['feature', 'request'],
+    beforeEach(() => {
+      createComponent({
+        currentRequest: {},
+        metric: 'gitaly',
+        header: 'Gitaly calls',
+        details: 'details',
+        keys: ['feature', 'request'],
+      });
     });
 
     it('does not render the element', () => {
@@ -31,20 +41,22 @@ describe('detailedMetric', () => {
     ];
 
     describe('with a default metric name', () => {
-      const wrapper = createComponent({
-        currentRequest: {
-          details: {
-            gitaly: {
-              duration: '123ms',
-              calls: '456',
-              details: requestDetails,
-              warnings: ['gitaly calls: 456 over 30'],
+      beforeEach(() => {
+        createComponent({
+          currentRequest: {
+            details: {
+              gitaly: {
+                duration: '123ms',
+                calls: '456',
+                details: requestDetails,
+                warnings: ['gitaly calls: 456 over 30'],
+              },
             },
           },
-        },
-        metric: 'gitaly',
-        header: 'Gitaly calls',
-        keys: ['feature', 'request'],
+          metric: 'gitaly',
+          header: 'Gitaly calls',
+          keys: ['feature', 'request'],
+        });
       });
 
       it('displays details', () => {
@@ -87,25 +99,49 @@ describe('detailedMetric', () => {
     });
 
     describe('when using a custom metric title', () => {
-      const wrapper = createComponent({
+      beforeEach(() => {
+        createComponent({
+          currentRequest: {
+            details: {
+              gitaly: {
+                duration: '123ms',
+                calls: '456',
+                details: requestDetails,
+              },
+            },
+          },
+          metric: 'gitaly',
+          title: 'custom',
+          header: 'Gitaly calls',
+          keys: ['feature', 'request'],
+        });
+      });
+
+      it('displays the custom title', () => {
+        expect(wrapper.text()).toContain('custom');
+      });
+    });
+  });
+
+  describe('when the details has no duration', () => {
+    beforeEach(() => {
+      createComponent({
         currentRequest: {
           details: {
-            gitaly: {
-              duration: '123ms',
+            bullet: {
               calls: '456',
-              details: requestDetails,
+              details: [{ notification: 'notification', backtrace: 'backtrace' }],
             },
           },
         },
-        metric: 'gitaly',
-        title: 'custom',
-        header: 'Gitaly calls',
-        keys: ['feature', 'request'],
+        metric: 'bullet',
+        header: 'Bullet notifications',
+        keys: ['notification'],
       });
+    });
 
-      it('displays the custom title', () => {
-        expect(wrapper.text()).toContain('custom');
-      });
+    it('renders only the number of calls', () => {
+      expect(trimText(wrapper.text())).toEqual('456 notification backtrace bullet');
     });
   });
 });
diff --git a/spec/javascripts/performance_bar/index_spec.js b/spec/frontend/performance_bar/index_spec.js
index 3957edce9e0..621c7d87a7e 100644
--- a/spec/javascripts/performance_bar/index_spec.js
+++ b/spec/frontend/performance_bar/index_spec.js
@@ -9,6 +9,11 @@ describe('performance bar wrapper', () => {
   let vm;
 
   beforeEach(() => {
+    URL.createObjectURL = jest.fn();
+    performance.getEntriesByType = jest.fn().mockReturnValue([]);
+
+    // clear html so that elements from previous tests don't mess with this test
+    document.body.innerHTML = '';
     const peekWrapper = document.createElement('div');
 
     peekWrapper.setAttribute('id', 'js-peek');
@@ -49,11 +54,11 @@ describe('performance bar wrapper', () => {
 
   describe('loadRequestDetails', () => {
     beforeEach(() => {
-      spyOn(vm.store, 'addRequest').and.callThrough();
+      jest.spyOn(vm.store, 'addRequest');
     });
 
     it('does nothing if the request cannot be tracked', () => {
-      spyOn(vm.store, 'canTrackRequest').and.callFake(() => false);
+      jest.spyOn(vm.store, 'canTrackRequest').mockImplementation(() => false);
 
       vm.loadRequestDetails('123', 'https://gitlab.com/');
 
@@ -67,7 +72,7 @@ describe('performance bar wrapper', () => {
     });
 
     it('makes an HTTP request for the request details', () => {
-      spyOn(PerformanceBarService, 'fetchRequestDetails').and.callThrough();
+      jest.spyOn(PerformanceBarService, 'fetchRequestDetails');
 
       vm.loadRequestDetails('456', 'https://gitlab.com/');
 
diff --git a/spec/javascripts/persistent_user_callout_spec.js b/spec/frontend/persistent_user_callout_spec.js
index d4cb92cacfd..db324990e71 100644
--- a/spec/javascripts/persistent_user_callout_spec.js
+++ b/spec/frontend/persistent_user_callout_spec.js
@@ -1,7 +1,10 @@
 import MockAdapter from 'axios-mock-adapter';
-import setTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import axios from '~/lib/utils/axios_utils';
 import PersistentUserCallout from '~/persistent_user_callout';
+import Flash from '~/flash';
+
+jest.mock('~/flash');
 
 describe('PersistentUserCallout', () => {
   const dismissEndpoint = '/dismiss';
@@ -51,44 +54,35 @@ describe('PersistentUserCallout', () => {
       button = fixture.querySelector('.js-close');
       mockAxios = new MockAdapter(axios);
       persistentUserCallout = new PersistentUserCallout(container);
-      spyOn(persistentUserCallout.container, 'remove');
+      jest.spyOn(persistentUserCallout.container, 'remove').mockImplementation(() => {});
     });
 
     afterEach(() => {
       mockAxios.restore();
     });
 
-    it('POSTs endpoint and removes container when clicking close', done => {
+    it('POSTs endpoint and removes container when clicking close', () => {
       mockAxios.onPost(dismissEndpoint).replyOnce(200);
 
       button.click();
 
-      setTimeoutPromise()
-        .then(() => {
-          expect(persistentUserCallout.container.remove).toHaveBeenCalled();
-          expect(mockAxios.history.post[0].data).toBe(
-            JSON.stringify({ feature_name: featureName }),
-          );
-        })
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises().then(() => {
+        expect(persistentUserCallout.container.remove).toHaveBeenCalled();
+        expect(mockAxios.history.post[0].data).toBe(JSON.stringify({ feature_name: featureName }));
+      });
     });
 
-    it('invokes Flash when the dismiss request fails', done => {
-      const Flash = spyOnDependency(PersistentUserCallout, 'Flash');
+    it('invokes Flash when the dismiss request fails', () => {
       mockAxios.onPost(dismissEndpoint).replyOnce(500);
 
       button.click();
 
-      setTimeoutPromise()
-        .then(() => {
-          expect(persistentUserCallout.container.remove).not.toHaveBeenCalled();
-          expect(Flash).toHaveBeenCalledWith(
-            'An error occurred while dismissing the alert. Refresh the page and try again.',
-          );
-        })
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises().then(() => {
+        expect(persistentUserCallout.container.remove).not.toHaveBeenCalled();
+        expect(Flash).toHaveBeenCalledWith(
+          'An error occurred while dismissing the alert. Refresh the page and try again.',
+        );
+      });
     });
   });
 
@@ -108,56 +102,45 @@ describe('PersistentUserCallout', () => {
       normalLink = fixture.querySelector('.normal-link');
       mockAxios = new MockAdapter(axios);
       persistentUserCallout = new PersistentUserCallout(container);
-      spyOn(persistentUserCallout.container, 'remove');
-      windowSpy = spyOn(window, 'open').and.callFake(() => {});
+      jest.spyOn(persistentUserCallout.container, 'remove').mockImplementation(() => {});
+      windowSpy = jest.spyOn(window, 'open').mockImplementation(() => {});
     });
 
     afterEach(() => {
       mockAxios.restore();
     });
 
-    it('defers loading of a link until callout is dismissed', done => {
+    it('defers loading of a link until callout is dismissed', () => {
       const { href, target } = deferredLink;
       mockAxios.onPost(dismissEndpoint).replyOnce(200);
 
       deferredLink.click();
 
-      setTimeoutPromise()
-        .then(() => {
-          expect(windowSpy).toHaveBeenCalledWith(href, target);
-          expect(persistentUserCallout.container.remove).toHaveBeenCalled();
-          expect(mockAxios.history.post[0].data).toBe(
-            JSON.stringify({ feature_name: featureName }),
-          );
-        })
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises().then(() => {
+        expect(windowSpy).toHaveBeenCalledWith(href, target);
+        expect(persistentUserCallout.container.remove).toHaveBeenCalled();
+        expect(mockAxios.history.post[0].data).toBe(JSON.stringify({ feature_name: featureName }));
+      });
     });
 
-    it('does not dismiss callout on non-deferred links', done => {
+    it('does not dismiss callout on non-deferred links', () => {
       normalLink.click();
 
-      setTimeoutPromise()
-        .then(() => {
-          expect(windowSpy).not.toHaveBeenCalled();
-          expect(persistentUserCallout.container.remove).not.toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises().then(() => {
+        expect(windowSpy).not.toHaveBeenCalled();
+        expect(persistentUserCallout.container.remove).not.toHaveBeenCalled();
+      });
     });
 
-    it('does not follow link when notification is closed', done => {
+    it('does not follow link when notification is closed', () => {
       mockAxios.onPost(dismissEndpoint).replyOnce(200);
 
       button.click();
 
-      setTimeoutPromise()
-        .then(() => {
-          expect(windowSpy).not.toHaveBeenCalled();
-          expect(persistentUserCallout.container.remove).toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises().then(() => {
+        expect(windowSpy).not.toHaveBeenCalled();
+        expect(persistentUserCallout.container.remove).toHaveBeenCalled();
+      });
     });
   });
 
diff --git a/spec/frontend/pipelines/components/dag/__snapshots__/dag_graph_spec.js.snap b/spec/frontend/pipelines/components/dag/__snapshots__/dag_graph_spec.js.snap
new file mode 100644
index 00000000000..629efc6d3fa
--- /dev/null
+++ b/spec/frontend/pipelines/components/dag/__snapshots__/dag_graph_spec.js.snap
@@ -0,0 +1,230 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`The DAG graph in the basic case renders the graph svg 1`] = `
+"<svg viewBox=\\"0,0,1000,540\\" width=\\"1000\\" height=\\"540\\">
+  <g fill=\\"none\\" stroke-opacity=\\"0.8\\">
+    <g id=\\"dag-link43\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad53\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"116\\" x2=\\"361.3333333333333\\">
+        <stop offset=\\"0%\\" stop-color=\\"#e17223\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#83ab4a\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip63\\">
+        <path d=\\"
+    M100, 129
+    V158
+    H377.3333333333333
+    V100
+    H100
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M108,129L190,129L190,129L369.3333333333333,129\\" stroke=\\"url(#dag-grad53)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip63)\\"></path>
+    </g>
+    <g id=\\"dag-link44\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad54\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"377.3333333333333\\" x2=\\"622.6666666666666\\">
+        <stop offset=\\"0%\\" stop-color=\\"#83ab4a\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#6f3500\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip64\\">
+        <path d=\\"
+    M361.3333333333333, 129.0000000000002
+    V158.0000000000002
+    H638.6666666666666
+    V100
+    H361.3333333333333
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M369.3333333333333,129L509.3333333333333,129L509.3333333333333,129.0000000000002L630.6666666666666,129.0000000000002\\" stroke=\\"url(#dag-grad54)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip64)\\"></path>
+    </g>
+    <g id=\\"dag-link45\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad55\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"116\\" x2=\\"622.6666666666666\\">
+        <stop offset=\\"0%\\" stop-color=\\"#5772ff\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#6f3500\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip65\\">
+        <path d=\\"
+    M100, 187.0000000000002
+    V241.00000000000003
+    H638.6666666666666
+    V158.0000000000002
+    H100
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M108,212.00000000000003L306,212.00000000000003L306,187.0000000000002L630.6666666666666,187.0000000000002\\" stroke=\\"url(#dag-grad55)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip65)\\"></path>
+    </g>
+    <g id=\\"dag-link46\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad56\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"116\\" x2=\\"361.3333333333333\\">
+        <stop offset=\\"0%\\" stop-color=\\"#b24800\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#006887\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip66\\">
+        <path d=\\"
+    M100, 269.9999999999998
+    V324
+    H377.3333333333333
+    V240.99999999999977
+    H100
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M108,295L338.93333333333334,295L338.93333333333334,269.9999999999998L369.3333333333333,269.9999999999998\\" stroke=\\"url(#dag-grad56)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip66)\\"></path>
+    </g>
+    <g id=\\"dag-link47\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad57\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"116\\" x2=\\"361.3333333333333\\">
+        <stop offset=\\"0%\\" stop-color=\\"#25d2d2\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#487900\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip67\\">
+        <path d=\\"
+    M100, 352.99999999999994
+    V407.00000000000006
+    H377.3333333333333
+    V323.99999999999994
+    H100
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M108,378.00000000000006L144.66666666666669,378.00000000000006L144.66666666666669,352.99999999999994L369.3333333333333,352.99999999999994\\" stroke=\\"url(#dag-grad57)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip67)\\"></path>
+    </g>
+    <g id=\\"dag-link48\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad58\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"377.3333333333333\\" x2=\\"622.6666666666666\\">
+        <stop offset=\\"0%\\" stop-color=\\"#006887\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#d84280\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip68\\">
+        <path d=\\"
+    M361.3333333333333, 270.0000000000001
+    V299.0000000000001
+    H638.6666666666666
+    V240.99999999999977
+    H361.3333333333333
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M369.3333333333333,269.9999999999998L464,269.9999999999998L464,270.0000000000001L630.6666666666666,270.0000000000001\\" stroke=\\"url(#dag-grad58)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip68)\\"></path>
+    </g>
+    <g id=\\"dag-link49\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad59\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"377.3333333333333\\" x2=\\"622.6666666666666\\">
+        <stop offset=\\"0%\\" stop-color=\\"#487900\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#d84280\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip69\\">
+        <path d=\\"
+    M361.3333333333333, 328.0000000000001
+    V381.99999999999994
+    H638.6666666666666
+    V299.0000000000001
+    H361.3333333333333
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M369.3333333333333,352.99999999999994L522,352.99999999999994L522,328.0000000000001L630.6666666666666,328.0000000000001\\" stroke=\\"url(#dag-grad59)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip69)\\"></path>
+    </g>
+    <g id=\\"dag-link50\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad60\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"377.3333333333333\\" x2=\\"622.6666666666666\\">
+        <stop offset=\\"0%\\" stop-color=\\"#487900\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#3547de\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip70\\">
+        <path d=\\"
+    M361.3333333333333, 411
+    V440
+    H638.6666666666666
+    V381.99999999999994
+    H361.3333333333333
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M369.3333333333333,410.99999999999994L580,410.99999999999994L580,411L630.6666666666666,411\\" stroke=\\"url(#dag-grad60)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip70)\\"></path>
+    </g>
+    <g id=\\"dag-link51\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad61\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"638.6666666666666\\" x2=\\"884\\">
+        <stop offset=\\"0%\\" stop-color=\\"#d84280\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#006887\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip71\\">
+        <path d=\\"
+    M622.6666666666666, 270.1890725105691
+    V299.1890725105691
+    H900
+    V241.0000000000001
+    H622.6666666666666
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M630.6666666666666,270.0000000000001L861.6,270.0000000000001L861.6,270.1890725105691L892,270.1890725105691\\" stroke=\\"url(#dag-grad61)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip71)\\"></path>
+    </g>
+    <g id=\\"dag-link52\\" class=\\"dag-link gl-cursor-pointer\\">
+      <linearGradient id=\\"dag-grad62\\" gradientUnits=\\"userSpaceOnUse\\" x1=\\"638.6666666666666\\" x2=\\"884\\">
+        <stop offset=\\"0%\\" stop-color=\\"#3547de\\"></stop>
+        <stop offset=\\"100%\\" stop-color=\\"#275600\\"></stop>
+      </linearGradient>
+      <clipPath id=\\"dag-clip72\\">
+        <path d=\\"
+    M622.6666666666666, 411
+    V440
+    H900
+    V382
+    H622.6666666666666
+    Z
+  \\"></path>
+      </clipPath>
+      <path d=\\"M630.6666666666666,411L679.9999999999999,411L679.9999999999999,411L892,411\\" stroke=\\"url(#dag-grad62)\\" style=\\"stroke-linejoin: round;\\" stroke-width=\\"56\\" clip-path=\\"url(#dag-clip72)\\"></path>
+    </g>
+  </g>
+  <g>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node73\\" stroke=\\"#e17223\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"108\\" x2=\\"108\\" y1=\\"104\\" y2=\\"154.00000000000003\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node74\\" stroke=\\"#83ab4a\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"369\\" x2=\\"369\\" y1=\\"104\\" y2=\\"154\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node75\\" stroke=\\"#5772ff\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"108\\" x2=\\"108\\" y1=\\"187.00000000000003\\" y2=\\"237.00000000000003\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node76\\" stroke=\\"#b24800\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"108\\" x2=\\"108\\" y1=\\"270\\" y2=\\"320.00000000000006\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node77\\" stroke=\\"#25d2d2\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"108\\" x2=\\"108\\" y1=\\"353.00000000000006\\" y2=\\"403.0000000000001\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node78\\" stroke=\\"#6f3500\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"630\\" x2=\\"630\\" y1=\\"104.0000000000002\\" y2=\\"212.00000000000009\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node79\\" stroke=\\"#006887\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"369\\" x2=\\"369\\" y1=\\"244.99999999999977\\" y2=\\"294.99999999999994\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node80\\" stroke=\\"#487900\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"369\\" x2=\\"369\\" y1=\\"327.99999999999994\\" y2=\\"436\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node81\\" stroke=\\"#d84280\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"630\\" x2=\\"630\\" y1=\\"245.00000000000009\\" y2=\\"353\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node82\\" stroke=\\"#3547de\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"630\\" x2=\\"630\\" y1=\\"386\\" y2=\\"436\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node83\\" stroke=\\"#006887\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"892\\" x2=\\"892\\" y1=\\"245.18907251056908\\" y2=\\"295.1890725105691\\"></line>
+    <line class=\\"dag-node gl-cursor-pointer\\" id=\\"dag-node84\\" stroke=\\"#275600\\" stroke-width=\\"16\\" stroke-linecap=\\"round\\" x1=\\"892\\" x2=\\"892\\" y1=\\"386\\" y2=\\"436\\"></line>
+  </g>
+  <g class=\\"gl-font-sm\\">
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"58.00000000000003px\\" width=\\"84\\" x=\\"8\\" y=\\"100\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 58.00000000000003px; text-align: right;\\">build_a</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"25px\\" width=\\"84\\" x=\\"369.3333333333333\\" y=\\"75\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 25px; text-align: left;\\">test_a</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"58px\\" width=\\"84\\" x=\\"8\\" y=\\"183.00000000000003\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 58px; text-align: right;\\">test_b</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"58.00000000000006px\\" width=\\"84\\" x=\\"8\\" y=\\"266\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 58.00000000000006px; text-align: right;\\">post_test_a</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"58.00000000000006px\\" width=\\"84\\" x=\\"8\\" y=\\"349.00000000000006\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 58.00000000000006px; text-align: right;\\">post_test_b</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"25px\\" width=\\"84\\" x=\\"630.6666666666666\\" y=\\"75.0000000000002\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 25px; text-align: right;\\">post_test_c</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"25px\\" width=\\"84\\" x=\\"369.3333333333333\\" y=\\"215.99999999999977\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 25px; text-align: left;\\">staging_a</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"25px\\" width=\\"84\\" x=\\"369.3333333333333\\" y=\\"298.99999999999994\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 25px; text-align: left;\\">staging_b</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"25px\\" width=\\"84\\" x=\\"630.6666666666666\\" y=\\"216.00000000000009\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 25px; text-align: right;\\">canary_a</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"25px\\" width=\\"84\\" x=\\"630.6666666666666\\" y=\\"357\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 25px; text-align: right;\\">canary_c</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"58px\\" width=\\"84\\" x=\\"908\\" y=\\"241.18907251056908\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 58px; text-align: left;\\">production_a</div>
+    </foreignObject>
+    <foreignObject requiredFeatures=\\"http://www.w3.org/TR/SVG11/feature#Extensibility\\" height=\\"58px\\" width=\\"84\\" x=\\"908\\" y=\\"382\\" class=\\"gl-overflow-visible\\">
+      <div class=\\"gl-display-flex gl-pointer-events-none gl-flex-direction-column gl-justify-content-center gl-overflow-wrap-break\\" style=\\"height: 58px; text-align: left;\\">production_d</div>
+    </foreignObject>
+  </g>
+</svg>"
+`;
diff --git a/spec/frontend/pipelines/components/dag/dag_graph_spec.js b/spec/frontend/pipelines/components/dag/dag_graph_spec.js
new file mode 100644
index 00000000000..017461dfb84
--- /dev/null
+++ b/spec/frontend/pipelines/components/dag/dag_graph_spec.js
@@ -0,0 +1,218 @@
+import { mount } from '@vue/test-utils';
+import DagGraph from '~/pipelines/components/dag/dag_graph.vue';
+import { IS_HIGHLIGHTED, LINK_SELECTOR, NODE_SELECTOR } from '~/pipelines/components/dag/constants';
+import { highlightIn, highlightOut } from '~/pipelines/components/dag/interactions';
+import { createSankey } from '~/pipelines/components/dag/drawing_utils';
+import { removeOrphanNodes } from '~/pipelines/components/dag/parsing_utils';
+import { parsedData } from './mock_data';
+
+describe('The DAG graph', () => {
+  let wrapper;
+
+  const getGraph = () => wrapper.find('.dag-graph-container > svg');
+  const getAllLinks = () => wrapper.findAll(`.${LINK_SELECTOR}`);
+  const getAllNodes = () => wrapper.findAll(`.${NODE_SELECTOR}`);
+  const getAllLabels = () => wrapper.findAll('foreignObject');
+
+  const createComponent = (propsData = {}) => {
+    if (wrapper?.destroy) {
+      wrapper.destroy();
+    }
+
+    wrapper = mount(DagGraph, {
+      attachToDocument: true,
+      propsData,
+      data() {
+        return {
+          color: () => {},
+          width: 0,
+          height: 0,
+        };
+      },
+    });
+  };
+
+  beforeEach(() => {
+    createComponent({ graphData: parsedData });
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('in the basic case', () => {
+    beforeEach(() => {
+      /*
+        The graph uses random to offset links. To keep the snapshot consistent,
+        we mock Math.random. Wheeeee!
+      */
+      const randomNumber = jest.spyOn(global.Math, 'random');
+      randomNumber.mockImplementation(() => 0.2);
+      createComponent({ graphData: parsedData });
+    });
+
+    it('renders the graph svg', () => {
+      expect(getGraph().exists()).toBe(true);
+      expect(getGraph().html()).toMatchSnapshot();
+    });
+  });
+
+  describe('links', () => {
+    it('renders the expected number of links', () => {
+      expect(getAllLinks()).toHaveLength(parsedData.links.length);
+    });
+
+    it('renders the expected number of gradients', () => {
+      expect(wrapper.findAll('linearGradient')).toHaveLength(parsedData.links.length);
+    });
+
+    it('renders the expected number of clip paths', () => {
+      expect(wrapper.findAll('clipPath')).toHaveLength(parsedData.links.length);
+    });
+  });
+
+  describe('nodes and labels', () => {
+    const sankeyNodes = createSankey()(parsedData).nodes;
+    const processedNodes = removeOrphanNodes(sankeyNodes);
+
+    describe('nodes', () => {
+      it('renders the expected number of nodes', () => {
+        expect(getAllNodes()).toHaveLength(processedNodes.length);
+      });
+    });
+
+    describe('labels', () => {
+      it('renders the expected number of labels as foreignObjects', () => {
+        expect(getAllLabels()).toHaveLength(processedNodes.length);
+      });
+
+      it('renders the title as text', () => {
+        expect(
+          getAllLabels()
+            .at(0)
+            .text(),
+        ).toBe(parsedData.nodes[0].name);
+      });
+    });
+  });
+
+  describe('interactions', () => {
+    const strokeOpacity = opacity => `stroke-opacity: ${opacity};`;
+    const baseOpacity = () => wrapper.vm.$options.viewOptions.baseOpacity;
+
+    describe('links', () => {
+      const liveLink = () => getAllLinks().at(4);
+      const otherLink = () => getAllLinks().at(1);
+
+      describe('on hover', () => {
+        it('sets the link opacity to baseOpacity and background links to 0.2', () => {
+          liveLink().trigger('mouseover');
+          expect(liveLink().attributes('style')).toBe(strokeOpacity(highlightIn));
+          expect(otherLink().attributes('style')).toBe(strokeOpacity(highlightOut));
+        });
+
+        it('reverts the styles on mouseout', () => {
+          liveLink().trigger('mouseover');
+          liveLink().trigger('mouseout');
+          expect(liveLink().attributes('style')).toBe(strokeOpacity(baseOpacity()));
+          expect(otherLink().attributes('style')).toBe(strokeOpacity(baseOpacity()));
+        });
+      });
+
+      describe('on click', () => {
+        describe('toggles link liveness', () => {
+          it('turns link on', () => {
+            liveLink().trigger('click');
+            expect(liveLink().attributes('style')).toBe(strokeOpacity(highlightIn));
+            expect(otherLink().attributes('style')).toBe(strokeOpacity(highlightOut));
+          });
+
+          it('turns link off on second click', () => {
+            liveLink().trigger('click');
+            liveLink().trigger('click');
+            expect(liveLink().attributes('style')).toBe(strokeOpacity(baseOpacity()));
+            expect(otherLink().attributes('style')).toBe(strokeOpacity(baseOpacity()));
+          });
+        });
+
+        it('the link remains live even after mouseout', () => {
+          liveLink().trigger('click');
+          liveLink().trigger('mouseout');
+          expect(liveLink().attributes('style')).toBe(strokeOpacity(highlightIn));
+          expect(otherLink().attributes('style')).toBe(strokeOpacity(highlightOut));
+        });
+
+        it('preserves state when multiple links are toggled on and off', () => {
+          const anotherLiveLink = () => getAllLinks().at(2);
+
+          liveLink().trigger('click');
+          anotherLiveLink().trigger('click');
+          expect(liveLink().attributes('style')).toBe(strokeOpacity(highlightIn));
+          expect(anotherLiveLink().attributes('style')).toBe(strokeOpacity(highlightIn));
+          expect(otherLink().attributes('style')).toBe(strokeOpacity(highlightOut));
+
+          anotherLiveLink().trigger('click');
+          expect(liveLink().attributes('style')).toBe(strokeOpacity(highlightIn));
+          expect(anotherLiveLink().attributes('style')).toBe(strokeOpacity(highlightOut));
+          expect(otherLink().attributes('style')).toBe(strokeOpacity(highlightOut));
+
+          liveLink().trigger('click');
+          expect(liveLink().attributes('style')).toBe(strokeOpacity(baseOpacity()));
+          expect(anotherLiveLink().attributes('style')).toBe(strokeOpacity(baseOpacity()));
+          expect(otherLink().attributes('style')).toBe(strokeOpacity(baseOpacity()));
+        });
+      });
+    });
+
+    describe('nodes', () => {
+      const liveNode = () => getAllNodes().at(10);
+      const anotherLiveNode = () => getAllNodes().at(5);
+      const nodesNotHighlighted = () => getAllNodes().filter(n => !n.classes(IS_HIGHLIGHTED));
+      const linksNotHighlighted = () => getAllLinks().filter(n => !n.classes(IS_HIGHLIGHTED));
+      const nodesHighlighted = () => getAllNodes().filter(n => n.classes(IS_HIGHLIGHTED));
+      const linksHighlighted = () => getAllLinks().filter(n => n.classes(IS_HIGHLIGHTED));
+
+      describe('on click', () => {
+        it('highlights the clicked node and predecessors', () => {
+          liveNode().trigger('click');
+
+          expect(nodesNotHighlighted().length < getAllNodes().length).toBe(true);
+          expect(linksNotHighlighted().length < getAllLinks().length).toBe(true);
+
+          linksHighlighted().wrappers.forEach(link => {
+            expect(link.attributes('style')).toBe(strokeOpacity(highlightIn));
+          });
+
+          nodesHighlighted().wrappers.forEach(node => {
+            expect(node.attributes('stroke')).not.toBe('#f2f2f2');
+          });
+
+          linksNotHighlighted().wrappers.forEach(link => {
+            expect(link.attributes('style')).toBe(strokeOpacity(highlightOut));
+          });
+
+          nodesNotHighlighted().wrappers.forEach(node => {
+            expect(node.attributes('stroke')).toBe('#f2f2f2');
+          });
+        });
+
+        it('toggles path off on second click', () => {
+          liveNode().trigger('click');
+          liveNode().trigger('click');
+
+          expect(nodesNotHighlighted().length).toBe(getAllNodes().length);
+          expect(linksNotHighlighted().length).toBe(getAllLinks().length);
+        });
+
+        it('preserves state when multiple nodes are toggled on and off', () => {
+          anotherLiveNode().trigger('click');
+          liveNode().trigger('click');
+          anotherLiveNode().trigger('click');
+          expect(nodesNotHighlighted().length < getAllNodes().length).toBe(true);
+          expect(linksNotHighlighted().length < getAllLinks().length).toBe(true);
+        });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/pipelines/components/dag/dag_spec.js b/spec/frontend/pipelines/components/dag/dag_spec.js
new file mode 100644
index 00000000000..666b4cfaa2f
--- /dev/null
+++ b/spec/frontend/pipelines/components/dag/dag_spec.js
@@ -0,0 +1,137 @@
+import { mount, shallowMount } from '@vue/test-utils';
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
+import waitForPromises from 'helpers/wait_for_promises';
+import { GlAlert } from '@gitlab/ui';
+import Dag from '~/pipelines/components/dag/dag.vue';
+import DagGraph from '~/pipelines/components/dag/dag_graph.vue';
+
+import {
+  DEFAULT,
+  PARSE_FAILURE,
+  LOAD_FAILURE,
+  UNSUPPORTED_DATA,
+} from '~/pipelines/components/dag//constants';
+import { mockBaseData, tooSmallGraph, unparseableGraph } from './mock_data';
+
+describe('Pipeline DAG graph wrapper', () => {
+  let wrapper;
+  let mock;
+  const getAlert = () => wrapper.find(GlAlert);
+  const getAllAlerts = () => wrapper.findAll(GlAlert);
+  const getGraph = () => wrapper.find(DagGraph);
+  const getErrorText = type => wrapper.vm.$options.errorTexts[type];
+
+  const dataPath = '/root/test/pipelines/90/dag.json';
+
+  const createComponent = (propsData = {}, method = shallowMount) => {
+    if (wrapper?.destroy) {
+      wrapper.destroy();
+    }
+
+    wrapper = method(Dag, {
+      propsData,
+      data() {
+        return {
+          showFailureAlert: false,
+        };
+      },
+    });
+  };
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+  });
+
+  afterEach(() => {
+    mock.restore();
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('when there is no dataUrl', () => {
+    beforeEach(() => {
+      createComponent({ graphUrl: undefined });
+    });
+
+    it('shows the DEFAULT alert and not the graph', () => {
+      expect(getAlert().exists()).toBe(true);
+      expect(getAlert().text()).toBe(getErrorText(DEFAULT));
+      expect(getGraph().exists()).toBe(false);
+    });
+  });
+
+  describe('when there is a dataUrl', () => {
+    describe('but the data fetch fails', () => {
+      beforeEach(() => {
+        mock.onGet(dataPath).replyOnce(500);
+        createComponent({ graphUrl: dataPath });
+      });
+
+      it('shows the LOAD_FAILURE alert and not the graph', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getAlert().exists()).toBe(true);
+            expect(getAlert().text()).toBe(getErrorText(LOAD_FAILURE));
+            expect(getGraph().exists()).toBe(false);
+          });
+      });
+    });
+
+    describe('the data fetch succeeds but the parse fails', () => {
+      beforeEach(() => {
+        mock.onGet(dataPath).replyOnce(200, unparseableGraph);
+        createComponent({ graphUrl: dataPath });
+      });
+
+      it('shows the PARSE_FAILURE alert and not the graph', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getAlert().exists()).toBe(true);
+            expect(getAlert().text()).toBe(getErrorText(PARSE_FAILURE));
+            expect(getGraph().exists()).toBe(false);
+          });
+      });
+    });
+
+    describe('and the data fetch and parse succeeds', () => {
+      beforeEach(() => {
+        mock.onGet(dataPath).replyOnce(200, mockBaseData);
+        createComponent({ graphUrl: dataPath }, mount);
+      });
+
+      it('shows the graph and not the beta alert', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getAllAlerts().length).toBe(1);
+            expect(getAlert().text()).toContain('This feature is currently in beta.');
+            expect(getGraph().exists()).toBe(true);
+          });
+      });
+    });
+
+    describe('the data fetch and parse succeeds, but the resulting graph is too small', () => {
+      beforeEach(() => {
+        mock.onGet(dataPath).replyOnce(200, tooSmallGraph);
+        createComponent({ graphUrl: dataPath });
+      });
+
+      it('shows the UNSUPPORTED_DATA alert and not the graph', () => {
+        return wrapper.vm
+          .$nextTick()
+          .then(waitForPromises)
+          .then(() => {
+            expect(getAlert().exists()).toBe(true);
+            expect(getAlert().text()).toBe(getErrorText(UNSUPPORTED_DATA));
+            expect(getGraph().exists()).toBe(false);
+          });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/pipelines/components/dag/drawing_utils_spec.js b/spec/frontend/pipelines/components/dag/drawing_utils_spec.js
new file mode 100644
index 00000000000..a50163411ed
--- /dev/null
+++ b/spec/frontend/pipelines/components/dag/drawing_utils_spec.js
@@ -0,0 +1,57 @@
+import { createSankey } from '~/pipelines/components/dag/drawing_utils';
+import { parseData } from '~/pipelines/components/dag/parsing_utils';
+import { mockBaseData } from './mock_data';
+
+describe('DAG visualization drawing utilities', () => {
+  const parsed = parseData(mockBaseData.stages);
+
+  const layoutSettings = {
+    width: 200,
+    height: 200,
+    nodeWidth: 10,
+    nodePadding: 20,
+    paddingForLabels: 100,
+  };
+
+  const sankeyLayout = createSankey(layoutSettings)(parsed);
+
+  describe('createSankey', () => {
+    it('returns a nodes data structure with expected d3-added properties', () => {
+      const exampleNode = sankeyLayout.nodes[0];
+      expect(exampleNode).toHaveProperty('sourceLinks');
+      expect(exampleNode).toHaveProperty('targetLinks');
+      expect(exampleNode).toHaveProperty('depth');
+      expect(exampleNode).toHaveProperty('layer');
+      expect(exampleNode).toHaveProperty('x0');
+      expect(exampleNode).toHaveProperty('x1');
+      expect(exampleNode).toHaveProperty('y0');
+      expect(exampleNode).toHaveProperty('y1');
+    });
+
+    it('returns a links data structure with expected d3-added properties', () => {
+      const exampleLink = sankeyLayout.links[0];
+      expect(exampleLink).toHaveProperty('source');
+      expect(exampleLink).toHaveProperty('target');
+      expect(exampleLink).toHaveProperty('width');
+      expect(exampleLink).toHaveProperty('y0');
+      expect(exampleLink).toHaveProperty('y1');
+    });
+
+    describe('data structure integrity', () => {
+      const newObject = { name: 'bad-actor' };
+
+      beforeEach(() => {
+        sankeyLayout.nodes.unshift(newObject);
+      });
+
+      it('sankey does not propagate changes back to the original', () => {
+        expect(sankeyLayout.nodes[0]).toBe(newObject);
+        expect(parsed.nodes[0]).not.toBe(newObject);
+      });
+
+      afterEach(() => {
+        sankeyLayout.nodes.shift();
+      });
+    });
+  });
+});
diff --git a/spec/frontend/pipelines/components/dag/mock_data.js b/spec/frontend/pipelines/components/dag/mock_data.js
new file mode 100644
index 00000000000..5de8697170a
--- /dev/null
+++ b/spec/frontend/pipelines/components/dag/mock_data.js
@@ -0,0 +1,390 @@
+/*
+  It is important that the simple base include parallel jobs
+  as well as non-parallel jobs with spaces in the name to prevent
+  us relying on spaces as an indicator.
+*/
+export const mockBaseData = {
+  stages: [
+    {
+      name: 'test',
+      groups: [
+        {
+          name: 'jest',
+          size: 2,
+          jobs: [{ name: 'jest 1/2', needs: ['frontend fixtures'] }, { name: 'jest 2/2' }],
+        },
+        {
+          name: 'rspec',
+          size: 1,
+          jobs: [{ name: 'rspec', needs: ['frontend fixtures'] }],
+        },
+      ],
+    },
+    {
+      name: 'fixtures',
+      groups: [
+        {
+          name: 'frontend fixtures',
+          size: 1,
+          jobs: [{ name: 'frontend fixtures' }],
+        },
+      ],
+    },
+    {
+      name: 'un-needed',
+      groups: [
+        {
+          name: 'un-needed',
+          size: 1,
+          jobs: [{ name: 'un-needed' }],
+        },
+      ],
+    },
+  ],
+};
+
+export const tooSmallGraph = {
+  stages: [
+    {
+      name: 'test',
+      groups: [
+        {
+          name: 'jest',
+          size: 2,
+          jobs: [{ name: 'jest 1/2' }, { name: 'jest 2/2' }],
+        },
+        {
+          name: 'rspec',
+          size: 1,
+          jobs: [{ name: 'rspec', needs: ['frontend fixtures'] }],
+        },
+      ],
+    },
+    {
+      name: 'fixtures',
+      groups: [
+        {
+          name: 'frontend fixtures',
+          size: 1,
+          jobs: [{ name: 'frontend fixtures' }],
+        },
+      ],
+    },
+    {
+      name: 'un-needed',
+      groups: [
+        {
+          name: 'un-needed',
+          size: 1,
+          jobs: [{ name: 'un-needed' }],
+        },
+      ],
+    },
+  ],
+};
+
+export const unparseableGraph = [
+  {
+    name: 'test',
+    groups: [
+      {
+        name: 'jest',
+        size: 2,
+        jobs: [{ name: 'jest 1/2', needs: ['frontend fixtures'] }, { name: 'jest 2/2' }],
+      },
+      {
+        name: 'rspec',
+        size: 1,
+        jobs: [{ name: 'rspec', needs: ['frontend fixtures'] }],
+      },
+    ],
+  },
+  {
+    name: 'un-needed',
+    groups: [
+      {
+        name: 'un-needed',
+        size: 1,
+        jobs: [{ name: 'un-needed' }],
+      },
+    ],
+  },
+];
+
+/*
+  This represents data that has been parsed by the wrapper
+*/
+export const parsedData = {
+  nodes: [
+    {
+      name: 'build_a',
+      size: 1,
+      jobs: [
+        {
+          name: 'build_a',
+        },
+      ],
+      category: 'build',
+    },
+    {
+      name: 'build_b',
+      size: 1,
+      jobs: [
+        {
+          name: 'build_b',
+        },
+      ],
+      category: 'build',
+    },
+    {
+      name: 'test_a',
+      size: 1,
+      jobs: [
+        {
+          name: 'test_a',
+          needs: ['build_a'],
+        },
+      ],
+      category: 'test',
+    },
+    {
+      name: 'test_b',
+      size: 1,
+      jobs: [
+        {
+          name: 'test_b',
+        },
+      ],
+      category: 'test',
+    },
+    {
+      name: 'test_c',
+      size: 1,
+      jobs: [
+        {
+          name: 'test_c',
+        },
+      ],
+      category: 'test',
+    },
+    {
+      name: 'test_d',
+      size: 1,
+      jobs: [
+        {
+          name: 'test_d',
+        },
+      ],
+      category: 'test',
+    },
+    {
+      name: 'post_test_a',
+      size: 1,
+      jobs: [
+        {
+          name: 'post_test_a',
+        },
+      ],
+      category: 'post-test',
+    },
+    {
+      name: 'post_test_b',
+      size: 1,
+      jobs: [
+        {
+          name: 'post_test_b',
+        },
+      ],
+      category: 'post-test',
+    },
+    {
+      name: 'post_test_c',
+      size: 1,
+      jobs: [
+        {
+          name: 'post_test_c',
+          needs: ['test_a', 'test_b'],
+        },
+      ],
+      category: 'post-test',
+    },
+    {
+      name: 'staging_a',
+      size: 1,
+      jobs: [
+        {
+          name: 'staging_a',
+          needs: ['post_test_a'],
+        },
+      ],
+      category: 'staging',
+    },
+    {
+      name: 'staging_b',
+      size: 1,
+      jobs: [
+        {
+          name: 'staging_b',
+          needs: ['post_test_b'],
+        },
+      ],
+      category: 'staging',
+    },
+    {
+      name: 'staging_c',
+      size: 1,
+      jobs: [
+        {
+          name: 'staging_c',
+        },
+      ],
+      category: 'staging',
+    },
+    {
+      name: 'staging_d',
+      size: 1,
+      jobs: [
+        {
+          name: 'staging_d',
+        },
+      ],
+      category: 'staging',
+    },
+    {
+      name: 'staging_e',
+      size: 1,
+      jobs: [
+        {
+          name: 'staging_e',
+        },
+      ],
+      category: 'staging',
+    },
+    {
+      name: 'canary_a',
+      size: 1,
+      jobs: [
+        {
+          name: 'canary_a',
+          needs: ['staging_a', 'staging_b'],
+        },
+      ],
+      category: 'canary',
+    },
+    {
+      name: 'canary_b',
+      size: 1,
+      jobs: [
+        {
+          name: 'canary_b',
+        },
+      ],
+      category: 'canary',
+    },
+    {
+      name: 'canary_c',
+      size: 1,
+      jobs: [
+        {
+          name: 'canary_c',
+          needs: ['staging_b'],
+        },
+      ],
+      category: 'canary',
+    },
+    {
+      name: 'production_a',
+      size: 1,
+      jobs: [
+        {
+          name: 'production_a',
+          needs: ['canary_a'],
+        },
+      ],
+      category: 'production',
+    },
+    {
+      name: 'production_b',
+      size: 1,
+      jobs: [
+        {
+          name: 'production_b',
+        },
+      ],
+      category: 'production',
+    },
+    {
+      name: 'production_c',
+      size: 1,
+      jobs: [
+        {
+          name: 'production_c',
+        },
+      ],
+      category: 'production',
+    },
+    {
+      name: 'production_d',
+      size: 1,
+      jobs: [
+        {
+          name: 'production_d',
+          needs: ['canary_c'],
+        },
+      ],
+      category: 'production',
+    },
+  ],
+  links: [
+    {
+      source: 'build_a',
+      target: 'test_a',
+      value: 10,
+    },
+    {
+      source: 'test_a',
+      target: 'post_test_c',
+      value: 10,
+    },
+    {
+      source: 'test_b',
+      target: 'post_test_c',
+      value: 10,
+    },
+    {
+      source: 'post_test_a',
+      target: 'staging_a',
+      value: 10,
+    },
+    {
+      source: 'post_test_b',
+      target: 'staging_b',
+      value: 10,
+    },
+    {
+      source: 'staging_a',
+      target: 'canary_a',
+      value: 10,
+    },
+    {
+      source: 'staging_b',
+      target: 'canary_a',
+      value: 10,
+    },
+    {
+      source: 'staging_b',
+      target: 'canary_c',
+      value: 10,
+    },
+    {
+      source: 'canary_a',
+      target: 'production_a',
+      value: 10,
+    },
+    {
+      source: 'canary_c',
+      target: 'production_d',
+      value: 10,
+    },
+  ],
+};
diff --git a/spec/frontend/pipelines/components/dag/parsing_utils_spec.js b/spec/frontend/pipelines/components/dag/parsing_utils_spec.js
new file mode 100644
index 00000000000..d9a1296e572
--- /dev/null
+++ b/spec/frontend/pipelines/components/dag/parsing_utils_spec.js
@@ -0,0 +1,133 @@
+import {
+  createNodesStructure,
+  makeLinksFromNodes,
+  filterByAncestors,
+  parseData,
+  removeOrphanNodes,
+  getMaxNodes,
+} from '~/pipelines/components/dag/parsing_utils';
+
+import { createSankey } from '~/pipelines/components/dag/drawing_utils';
+import { mockBaseData } from './mock_data';
+
+describe('DAG visualization parsing utilities', () => {
+  const { nodes, nodeDict } = createNodesStructure(mockBaseData.stages);
+  const unfilteredLinks = makeLinksFromNodes(nodes, nodeDict);
+  const parsed = parseData(mockBaseData.stages);
+
+  const layoutSettings = {
+    width: 200,
+    height: 200,
+    nodeWidth: 10,
+    nodePadding: 20,
+    paddingForLabels: 100,
+  };
+
+  const sankeyLayout = createSankey(layoutSettings)(parsed);
+
+  describe('createNodesStructure', () => {
+    const parallelGroupName = 'jest';
+    const parallelJobName = 'jest 1/2';
+    const singleJobName = 'frontend fixtures';
+
+    const { name, jobs, size } = mockBaseData.stages[0].groups[0];
+
+    it('returns the expected node structure', () => {
+      expect(nodes[0]).toHaveProperty('category', mockBaseData.stages[0].name);
+      expect(nodes[0]).toHaveProperty('name', name);
+      expect(nodes[0]).toHaveProperty('jobs', jobs);
+      expect(nodes[0]).toHaveProperty('size', size);
+    });
+
+    it('adds needs to top level of nodeDict entries', () => {
+      expect(nodeDict[parallelGroupName]).toHaveProperty('needs');
+      expect(nodeDict[parallelJobName]).toHaveProperty('needs');
+      expect(nodeDict[singleJobName]).toHaveProperty('needs');
+    });
+
+    it('makes entries in nodeDict for jobs and parallel jobs', () => {
+      const nodeNames = Object.keys(nodeDict);
+
+      expect(nodeNames.includes(parallelGroupName)).toBe(true);
+      expect(nodeNames.includes(parallelJobName)).toBe(true);
+      expect(nodeNames.includes(singleJobName)).toBe(true);
+    });
+  });
+
+  describe('makeLinksFromNodes', () => {
+    it('returns the expected link structure', () => {
+      expect(unfilteredLinks[0]).toHaveProperty('source', 'frontend fixtures');
+      expect(unfilteredLinks[0]).toHaveProperty('target', 'jest');
+      expect(unfilteredLinks[0]).toHaveProperty('value', 10);
+    });
+  });
+
+  describe('filterByAncestors', () => {
+    const allLinks = [
+      { source: 'job1', target: 'job4' },
+      { source: 'job1', target: 'job2' },
+      { source: 'job2', target: 'job4' },
+    ];
+
+    const dedupedLinks = [{ source: 'job1', target: 'job2' }, { source: 'job2', target: 'job4' }];
+
+    const nodeLookup = {
+      job1: {
+        name: 'job1',
+      },
+      job2: {
+        name: 'job2',
+        needs: ['job1'],
+      },
+      job4: {
+        name: 'job4',
+        needs: ['job1', 'job2'],
+        category: 'build',
+      },
+    };
+
+    it('dedupes links', () => {
+      expect(filterByAncestors(allLinks, nodeLookup)).toMatchObject(dedupedLinks);
+    });
+  });
+
+  describe('parseData parent function', () => {
+    it('returns an object containing a list of nodes and links', () => {
+      // an array of nodes exist and the values are defined
+      expect(parsed).toHaveProperty('nodes');
+      expect(Array.isArray(parsed.nodes)).toBe(true);
+      expect(parsed.nodes.filter(Boolean)).not.toHaveLength(0);
+
+      // an array of links exist and the values are defined
+      expect(parsed).toHaveProperty('links');
+      expect(Array.isArray(parsed.links)).toBe(true);
+      expect(parsed.links.filter(Boolean)).not.toHaveLength(0);
+    });
+  });
+
+  describe('removeOrphanNodes', () => {
+    it('removes sankey nodes that have no needs and are not needed', () => {
+      const cleanedNodes = removeOrphanNodes(sankeyLayout.nodes);
+      expect(cleanedNodes).toHaveLength(sankeyLayout.nodes.length - 1);
+    });
+  });
+
+  describe('getMaxNodes', () => {
+    it('returns the number of nodes in the most populous generation', () => {
+      const layerNodes = [
+        { layer: 0 },
+        { layer: 0 },
+        { layer: 1 },
+        { layer: 1 },
+        { layer: 0 },
+        { layer: 3 },
+        { layer: 2 },
+        { layer: 4 },
+        { layer: 1 },
+        { layer: 3 },
+        { layer: 4 },
+      ];
+      expect(getMaxNodes(layerNodes)).toBe(3);
+    });
+  });
+});
diff --git a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js
index 12c6fab9c41..bdc807fcbfe 100644
--- a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js
+++ b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js
@@ -3,13 +3,7 @@ import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import PipelinesFilteredSearch from '~/pipelines/components/pipelines_filtered_search.vue';
-import {
-  users,
-  mockSearch,
-  pipelineWithStages,
-  branches,
-  mockBranchesAfterMap,
-} from '../mock_data';
+import { users, mockSearch, branches, tags } from '../mock_data';
 import { GlFilteredSearch } from '@gitlab/ui';
 
 describe('Pipelines filtered search', () => {
@@ -21,12 +15,16 @@ describe('Pipelines filtered search', () => {
     findFilteredSearch()
       .props('availableTokens')
       .find(token => token.type === type);
+  const findBranchToken = () => getSearchToken('ref');
+  const findTagToken = () => getSearchToken('tag');
+  const findUserToken = () => getSearchToken('username');
+  const findStatusToken = () => getSearchToken('status');
 
-  const createComponent = () => {
+  const createComponent = (params = {}) => {
     wrapper = mount(PipelinesFilteredSearch, {
       propsData: {
-        pipelines: [pipelineWithStages],
         projectId: '21',
+        params,
       },
       attachToDocument: true,
     });
@@ -37,6 +35,7 @@ describe('Pipelines filtered search', () => {
 
     jest.spyOn(Api, 'projectUsers').mockResolvedValue(users);
     jest.spyOn(Api, 'branches').mockResolvedValue({ data: branches });
+    jest.spyOn(Api, 'tags').mockResolvedValue({ data: tags });
 
     createComponent();
   });
@@ -55,37 +54,39 @@ describe('Pipelines filtered search', () => {
   });
 
   it('displays search tokens', () => {
-    expect(getSearchToken('username')).toMatchObject({
+    expect(findUserToken()).toMatchObject({
       type: 'username',
       icon: 'user',
       title: 'Trigger author',
       unique: true,
-      triggerAuthors: users,
       projectId: '21',
       operators: [expect.objectContaining({ value: '=' })],
     });
 
-    expect(getSearchToken('ref')).toMatchObject({
+    expect(findBranchToken()).toMatchObject({
       type: 'ref',
       icon: 'branch',
       title: 'Branch name',
       unique: true,
-      branches: mockBranchesAfterMap,
       projectId: '21',
       operators: [expect.objectContaining({ value: '=' })],
     });
-  });
-
-  it('fetches and sets project users', () => {
-    expect(Api.projectUsers).toHaveBeenCalled();
-
-    expect(wrapper.vm.projectUsers).toEqual(users);
-  });
 
-  it('fetches and sets branches', () => {
-    expect(Api.branches).toHaveBeenCalled();
+    expect(findStatusToken()).toMatchObject({
+      type: 'status',
+      icon: 'status',
+      title: 'Status',
+      unique: true,
+      operators: [expect.objectContaining({ value: '=' })],
+    });
 
-    expect(wrapper.vm.projectBranches).toEqual(mockBranchesAfterMap);
+    expect(findTagToken()).toMatchObject({
+      type: 'tag',
+      icon: 'tag',
+      title: 'Tag name',
+      unique: true,
+      operators: [expect.objectContaining({ value: '=' })],
+    });
   });
 
   it('emits filterPipelines on submit with correct filter', () => {
@@ -94,4 +95,80 @@ describe('Pipelines filtered search', () => {
     expect(wrapper.emitted('filterPipelines')).toBeTruthy();
     expect(wrapper.emitted('filterPipelines')[0]).toEqual([mockSearch]);
   });
+
+  it('disables tag name token when branch name token is active', () => {
+    findFilteredSearch().vm.$emit('input', [
+      { type: 'ref', value: { data: 'branch-1', operator: '=' } },
+      { type: 'filtered-search-term', value: { data: '' } },
+    ]);
+
+    return wrapper.vm.$nextTick().then(() => {
+      expect(findBranchToken().disabled).toBe(false);
+      expect(findTagToken().disabled).toBe(true);
+    });
+  });
+
+  it('disables branch name token when tag name token is active', () => {
+    findFilteredSearch().vm.$emit('input', [
+      { type: 'tag', value: { data: 'tag-1', operator: '=' } },
+      { type: 'filtered-search-term', value: { data: '' } },
+    ]);
+
+    return wrapper.vm.$nextTick().then(() => {
+      expect(findBranchToken().disabled).toBe(true);
+      expect(findTagToken().disabled).toBe(false);
+    });
+  });
+
+  it('resets tokens disabled state on clear', () => {
+    findFilteredSearch().vm.$emit('clearInput');
+
+    return wrapper.vm.$nextTick().then(() => {
+      expect(findBranchToken().disabled).toBe(false);
+      expect(findTagToken().disabled).toBe(false);
+    });
+  });
+
+  it('resets tokens disabled state when clearing tokens by backspace', () => {
+    findFilteredSearch().vm.$emit('input', [{ type: 'filtered-search-term', value: { data: '' } }]);
+
+    return wrapper.vm.$nextTick().then(() => {
+      expect(findBranchToken().disabled).toBe(false);
+      expect(findTagToken().disabled).toBe(false);
+    });
+  });
+
+  describe('Url query params', () => {
+    const params = {
+      username: 'deja.green',
+      ref: 'master',
+    };
+
+    beforeEach(() => {
+      createComponent(params);
+    });
+
+    it('sets default value if url query params', () => {
+      const expectedValueProp = [
+        {
+          type: 'username',
+          value: {
+            data: params.username,
+            operator: '=',
+          },
+        },
+        {
+          type: 'ref',
+          value: {
+            data: params.ref,
+            operator: '=',
+          },
+        },
+        { type: 'filtered-search-term', value: { data: '' } },
+      ];
+
+      expect(findFilteredSearch().props('value')).toEqual(expectedValueProp);
+      expect(findFilteredSearch().props('value')).toHaveLength(expectedValueProp.length);
+    });
+  });
 });
diff --git a/spec/frontend/pipelines/graph/graph_component_spec.js b/spec/frontend/pipelines/graph/graph_component_spec.js
index a9b06eab3fa..9731ce3f8a6 100644
--- a/spec/frontend/pipelines/graph/graph_component_spec.js
+++ b/spec/frontend/pipelines/graph/graph_component_spec.js
@@ -7,6 +7,7 @@ import linkedPipelinesColumn from '~/pipelines/components/graph/linked_pipelines
 import graphJSON from './mock_data';
 import linkedPipelineJSON from './linked_pipelines_mock_data';
 import PipelinesMediator from '~/pipelines/pipeline_details_mediator';
+import { setHTMLFixture } from 'helpers/fixtures';
 
 describe('graph component', () => {
   const store = new PipelineStore();
@@ -15,6 +16,10 @@ describe('graph component', () => {
 
   let wrapper;
 
+  beforeEach(() => {
+    setHTMLFixture('<div class="layout-page"></div>');
+  });
+
   afterEach(() => {
     wrapper.destroy();
     wrapper = null;
diff --git a/spec/frontend/pipelines/mock_data.js b/spec/frontend/pipelines/mock_data.js
index 37c1e471415..e63efc543f1 100644
--- a/spec/frontend/pipelines/mock_data.js
+++ b/spec/frontend/pipelines/mock_data.js
@@ -560,9 +560,107 @@ export const branches = [
   },
 ];
 
+export const tags = [
+  {
+    name: 'tag-3',
+    message: '',
+    target: '66673b07efef254dab7d537f0433a40e61cf84fe',
+    commit: {
+      id: '66673b07efef254dab7d537f0433a40e61cf84fe',
+      short_id: '66673b07',
+      created_at: '2020-03-16T11:04:46.000-04:00',
+      parent_ids: ['def28bf679235071140180495f25b657e2203587'],
+      title: 'Update .gitlab-ci.yml',
+      message: 'Update .gitlab-ci.yml',
+      author_name: 'Administrator',
+      author_email: 'admin@example.com',
+      authored_date: '2020-03-16T11:04:46.000-04:00',
+      committer_name: 'Administrator',
+      committer_email: 'admin@example.com',
+      committed_date: '2020-03-16T11:04:46.000-04:00',
+      web_url:
+        'http://192.168.1.22:3000/root/dag-pipeline/-/commit/66673b07efef254dab7d537f0433a40e61cf84fe',
+    },
+    release: null,
+    protected: false,
+  },
+  {
+    name: 'tag-2',
+    message: '',
+    target: '66673b07efef254dab7d537f0433a40e61cf84fe',
+    commit: {
+      id: '66673b07efef254dab7d537f0433a40e61cf84fe',
+      short_id: '66673b07',
+      created_at: '2020-03-16T11:04:46.000-04:00',
+      parent_ids: ['def28bf679235071140180495f25b657e2203587'],
+      title: 'Update .gitlab-ci.yml',
+      message: 'Update .gitlab-ci.yml',
+      author_name: 'Administrator',
+      author_email: 'admin@example.com',
+      authored_date: '2020-03-16T11:04:46.000-04:00',
+      committer_name: 'Administrator',
+      committer_email: 'admin@example.com',
+      committed_date: '2020-03-16T11:04:46.000-04:00',
+      web_url:
+        'http://192.168.1.22:3000/root/dag-pipeline/-/commit/66673b07efef254dab7d537f0433a40e61cf84fe',
+    },
+    release: null,
+    protected: false,
+  },
+  {
+    name: 'tag-1',
+    message: '',
+    target: '66673b07efef254dab7d537f0433a40e61cf84fe',
+    commit: {
+      id: '66673b07efef254dab7d537f0433a40e61cf84fe',
+      short_id: '66673b07',
+      created_at: '2020-03-16T11:04:46.000-04:00',
+      parent_ids: ['def28bf679235071140180495f25b657e2203587'],
+      title: 'Update .gitlab-ci.yml',
+      message: 'Update .gitlab-ci.yml',
+      author_name: 'Administrator',
+      author_email: 'admin@example.com',
+      authored_date: '2020-03-16T11:04:46.000-04:00',
+      committer_name: 'Administrator',
+      committer_email: 'admin@example.com',
+      committed_date: '2020-03-16T11:04:46.000-04:00',
+      web_url:
+        'http://192.168.1.22:3000/root/dag-pipeline/-/commit/66673b07efef254dab7d537f0433a40e61cf84fe',
+    },
+    release: null,
+    protected: false,
+  },
+  {
+    name: 'master-tag',
+    message: '',
+    target: '66673b07efef254dab7d537f0433a40e61cf84fe',
+    commit: {
+      id: '66673b07efef254dab7d537f0433a40e61cf84fe',
+      short_id: '66673b07',
+      created_at: '2020-03-16T11:04:46.000-04:00',
+      parent_ids: ['def28bf679235071140180495f25b657e2203587'],
+      title: 'Update .gitlab-ci.yml',
+      message: 'Update .gitlab-ci.yml',
+      author_name: 'Administrator',
+      author_email: 'admin@example.com',
+      authored_date: '2020-03-16T11:04:46.000-04:00',
+      committer_name: 'Administrator',
+      committer_email: 'admin@example.com',
+      committed_date: '2020-03-16T11:04:46.000-04:00',
+      web_url:
+        'http://192.168.1.22:3000/root/dag-pipeline/-/commit/66673b07efef254dab7d537f0433a40e61cf84fe',
+    },
+    release: null,
+    protected: false,
+  },
+];
+
 export const mockSearch = [
   { type: 'username', value: { data: 'root', operator: '=' } },
   { type: 'ref', value: { data: 'master', operator: '=' } },
+  { type: 'status', value: { data: 'pending', operator: '=' } },
 ];
 
 export const mockBranchesAfterMap = ['branch-1', 'branch-10', 'branch-11'];
+
+export const mockTagsAfterMap = ['tag-3', 'tag-2', 'tag-1', 'master-tag'];
diff --git a/spec/frontend/pipelines/pipelines_spec.js b/spec/frontend/pipelines/pipelines_spec.js
index 2ddd2116e2c..0eeaef01a2d 100644
--- a/spec/frontend/pipelines/pipelines_spec.js
+++ b/spec/frontend/pipelines/pipelines_spec.js
@@ -56,6 +56,7 @@ describe('Pipelines', () => {
       propsData: {
         store: new Store(),
         projectId: '21',
+        params: {},
         ...props,
       },
       methods: {
@@ -683,7 +684,13 @@ describe('Pipelines', () => {
     });
 
     it('updates request data and query params on filter submit', () => {
-      const expectedQueryParams = { page: '1', scope: 'all', username: 'root', ref: 'master' };
+      const expectedQueryParams = {
+        page: '1',
+        scope: 'all',
+        username: 'root',
+        ref: 'master',
+        status: 'pending',
+      };
 
       findFilteredSearch().vm.$emit('submit', mockSearch);
 
diff --git a/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js
index a6753600792..1a85221581e 100644
--- a/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js
+++ b/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js
@@ -1,7 +1,8 @@
+import Api from '~/api';
 import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import PipelineBranchNameToken from '~/pipelines/components/tokens/pipeline_branch_name_token.vue';
-import { branches } from '../mock_data';
+import { branches, mockBranchesAfterMap } from '../mock_data';
 
 describe('Pipeline Branch Name Token', () => {
   let wrapper;
@@ -21,10 +22,9 @@ describe('Pipeline Branch Name Token', () => {
       type: 'ref',
       icon: 'branch',
       title: 'Branch name',
-      dataType: 'ref',
       unique: true,
-      branches,
       projectId: '21',
+      disabled: false,
     },
     value: {
       data: '',
@@ -46,6 +46,8 @@ describe('Pipeline Branch Name Token', () => {
   };
 
   beforeEach(() => {
+    jest.spyOn(Api, 'branches').mockResolvedValue({ data: branches });
+
     createComponent();
   });
 
@@ -58,6 +60,13 @@ describe('Pipeline Branch Name Token', () => {
     expect(findFilteredSearchToken().props('config')).toEqual(defaultProps.config);
   });
 
+  it('fetches and sets project branches', () => {
+    expect(Api.branches).toHaveBeenCalled();
+
+    expect(wrapper.vm.branches).toEqual(mockBranchesAfterMap);
+    expect(findLoadingIcon().exists()).toBe(false);
+  });
+
   describe('displays loading icon correctly', () => {
     it('shows loading icon', () => {
       createComponent({ stubs }, { loading: true });
@@ -73,7 +82,7 @@ describe('Pipeline Branch Name Token', () => {
   });
 
   describe('shows branches correctly', () => {
-    it('renders all trigger authors', () => {
+    it('renders all branches', () => {
       createComponent({ stubs }, { branches, loading: false });
 
       expect(findAllFilteredSearchSuggestions()).toHaveLength(branches.length);
diff --git a/spec/frontend/pipelines/tokens/pipeline_status_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_status_token_spec.js
new file mode 100644
index 00000000000..ee3694868a5
--- /dev/null
+++ b/spec/frontend/pipelines/tokens/pipeline_status_token_spec.js
@@ -0,0 +1,62 @@
+import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlIcon } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import PipelineStatusToken from '~/pipelines/components/tokens/pipeline_status_token.vue';
+
+describe('Pipeline Status Token', () => {
+  let wrapper;
+
+  const findFilteredSearchToken = () => wrapper.find(GlFilteredSearchToken);
+  const findAllFilteredSearchSuggestions = () => wrapper.findAll(GlFilteredSearchSuggestion);
+  const findAllGlIcons = () => wrapper.findAll(GlIcon);
+
+  const stubs = {
+    GlFilteredSearchToken: {
+      template: `<div><slot name="suggestions"></slot></div>`,
+    },
+  };
+
+  const defaultProps = {
+    config: {
+      type: 'status',
+      icon: 'status',
+      title: 'Status',
+      unique: true,
+    },
+    value: {
+      data: '',
+    },
+  };
+
+  const createComponent = options => {
+    wrapper = shallowMount(PipelineStatusToken, {
+      propsData: {
+        ...defaultProps,
+      },
+      ...options,
+    });
+  };
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it('passes config correctly', () => {
+    expect(findFilteredSearchToken().props('config')).toEqual(defaultProps.config);
+  });
+
+  describe('shows statuses correctly', () => {
+    beforeEach(() => {
+      createComponent({ stubs });
+    });
+
+    it('renders all pipeline statuses available', () => {
+      expect(findAllFilteredSearchSuggestions()).toHaveLength(wrapper.vm.statuses.length);
+      expect(findAllGlIcons()).toHaveLength(wrapper.vm.statuses.length);
+    });
+  });
+});
diff --git a/spec/frontend/pipelines/tokens/pipeline_tag_name_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_tag_name_token_spec.js
new file mode 100644
index 00000000000..9fecc9412b7
--- /dev/null
+++ b/spec/frontend/pipelines/tokens/pipeline_tag_name_token_spec.js
@@ -0,0 +1,98 @@
+import Api from '~/api';
+import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import PipelineTagNameToken from '~/pipelines/components/tokens/pipeline_tag_name_token.vue';
+import { tags, mockTagsAfterMap } from '../mock_data';
+
+describe('Pipeline Branch Name Token', () => {
+  let wrapper;
+
+  const findFilteredSearchToken = () => wrapper.find(GlFilteredSearchToken);
+  const findAllFilteredSearchSuggestions = () => wrapper.findAll(GlFilteredSearchSuggestion);
+  const findLoadingIcon = () => wrapper.find(GlLoadingIcon);
+
+  const stubs = {
+    GlFilteredSearchToken: {
+      template: `<div><slot name="suggestions"></slot></div>`,
+    },
+  };
+
+  const defaultProps = {
+    config: {
+      type: 'tag',
+      icon: 'tag',
+      title: 'Tag name',
+      unique: true,
+      projectId: '21',
+      disabled: false,
+    },
+    value: {
+      data: '',
+    },
+  };
+
+  const createComponent = (options, data) => {
+    wrapper = shallowMount(PipelineTagNameToken, {
+      propsData: {
+        ...defaultProps,
+      },
+      data() {
+        return {
+          ...data,
+        };
+      },
+      ...options,
+    });
+  };
+
+  beforeEach(() => {
+    jest.spyOn(Api, 'tags').mockResolvedValue({ data: tags });
+
+    createComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it('passes config correctly', () => {
+    expect(findFilteredSearchToken().props('config')).toEqual(defaultProps.config);
+  });
+
+  it('fetches and sets project tags', () => {
+    expect(Api.tags).toHaveBeenCalled();
+
+    expect(wrapper.vm.tags).toEqual(mockTagsAfterMap);
+    expect(findLoadingIcon().exists()).toBe(false);
+  });
+
+  describe('displays loading icon correctly', () => {
+    it('shows loading icon', () => {
+      createComponent({ stubs }, { loading: true });
+
+      expect(findLoadingIcon().exists()).toBe(true);
+    });
+
+    it('does not show loading icon', () => {
+      createComponent({ stubs }, { loading: false });
+
+      expect(findLoadingIcon().exists()).toBe(false);
+    });
+  });
+
+  describe('shows tags correctly', () => {
+    it('renders all tags', () => {
+      createComponent({ stubs }, { tags, loading: false });
+
+      expect(findAllFilteredSearchSuggestions()).toHaveLength(tags.length);
+    });
+
+    it('renders only the tag searched for', () => {
+      const mockTags = ['master-tag'];
+      createComponent({ stubs }, { tags: mockTags, loading: false });
+
+      expect(findAllFilteredSearchSuggestions()).toHaveLength(mockTags.length);
+    });
+  });
+});
diff --git a/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js
index 00a9ff04e75..98de4f40c51 100644
--- a/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js
+++ b/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js
@@ -1,3 +1,4 @@
+import Api from '~/api';
 import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import PipelineTriggerAuthorToken from '~/pipelines/components/tokens/pipeline_trigger_author_token.vue';
@@ -45,6 +46,8 @@ describe('Pipeline Trigger Author Token', () => {
   };
 
   beforeEach(() => {
+    jest.spyOn(Api, 'projectUsers').mockResolvedValue(users);
+
     createComponent();
   });
 
@@ -57,6 +60,13 @@ describe('Pipeline Trigger Author Token', () => {
     expect(findFilteredSearchToken().props('config')).toEqual(defaultProps.config);
   });
 
+  it('fetches and sets project users', () => {
+    expect(Api.projectUsers).toHaveBeenCalled();
+
+    expect(wrapper.vm.users).toEqual(users);
+    expect(findLoadingIcon().exists()).toBe(false);
+  });
+
   describe('displays loading icon correctly', () => {
     it('shows loading icon', () => {
       createComponent({ stubs }, { loading: true });
diff --git a/spec/frontend/projects/experiment_new_project_creation/components/app_spec.js b/spec/frontend/projects/experiment_new_project_creation/components/app_spec.js
new file mode 100644
index 00000000000..a1e1e4554e2
--- /dev/null
+++ b/spec/frontend/projects/experiment_new_project_creation/components/app_spec.js
@@ -0,0 +1,70 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlBreadcrumb } from '@gitlab/ui';
+import App from '~/projects/experiment_new_project_creation/components/app.vue';
+import WelcomePage from '~/projects/experiment_new_project_creation/components/welcome.vue';
+import LegacyContainer from '~/projects/experiment_new_project_creation/components/legacy_container.vue';
+
+describe('Experimental new project creation app', () => {
+  let wrapper;
+
+  const createComponent = propsData => {
+    wrapper = shallowMount(App, { propsData });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    window.location.hash = '';
+    wrapper = null;
+  });
+
+  describe('with empty hash', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('renders welcome page', () => {
+      expect(wrapper.find(WelcomePage).exists()).toBe(true);
+    });
+
+    it('does not render breadcrumbs', () => {
+      expect(wrapper.find(GlBreadcrumb).exists()).toBe(false);
+    });
+  });
+
+  it('renders blank project container if there are errors', () => {
+    createComponent({ hasErrors: true });
+    expect(wrapper.find(WelcomePage).exists()).toBe(false);
+    expect(wrapper.find(LegacyContainer).exists()).toBe(true);
+  });
+
+  describe('when hash is not empty on load', () => {
+    beforeEach(() => {
+      window.location.hash = '#blank_project';
+      createComponent();
+    });
+
+    it('renders relevant container', () => {
+      expect(wrapper.find(WelcomePage).exists()).toBe(false);
+      expect(wrapper.find(LegacyContainer).exists()).toBe(true);
+    });
+
+    it('renders breadcrumbs', () => {
+      expect(wrapper.find(GlBreadcrumb).exists()).toBe(true);
+    });
+  });
+
+  it('renders relevant container when hash changes', () => {
+    createComponent();
+    expect(wrapper.find(WelcomePage).exists()).toBe(true);
+
+    window.location.hash = '#blank_project';
+    const ev = document.createEvent('HTMLEvents');
+    ev.initEvent('hashchange', false, false);
+    window.dispatchEvent(ev);
+
+    return wrapper.vm.$nextTick().then(() => {
+      expect(wrapper.find(WelcomePage).exists()).toBe(false);
+      expect(wrapper.find(LegacyContainer).exists()).toBe(true);
+    });
+  });
+});
diff --git a/spec/frontend/projects/experiment_new_project_creation/components/legacy_container_spec.js b/spec/frontend/projects/experiment_new_project_creation/components/legacy_container_spec.js
new file mode 100644
index 00000000000..cd8b39f0426
--- /dev/null
+++ b/spec/frontend/projects/experiment_new_project_creation/components/legacy_container_spec.js
@@ -0,0 +1,63 @@
+import { shallowMount } from '@vue/test-utils';
+import LegacyContainer from '~/projects/experiment_new_project_creation/components/legacy_container.vue';
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
+
+describe('Legacy container component', () => {
+  let wrapper;
+  let dummy;
+
+  const createComponent = propsData => {
+    wrapper = shallowMount(LegacyContainer, { propsData });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    resetHTMLFixture();
+    wrapper = null;
+  });
+
+  describe('when selector targets real node', () => {
+    beforeEach(() => {
+      setHTMLFixture('<div class="dummy-target"></div>');
+      dummy = document.querySelector('.dummy-target');
+      createComponent({ selector: '.dummy-target' });
+    });
+
+    describe('when mounted', () => {
+      it('moves node inside component', () => {
+        expect(dummy.parentNode).toBe(wrapper.element);
+      });
+
+      it('sets active class', () => {
+        expect(dummy.classList.contains('active')).toBe(true);
+      });
+    });
+
+    describe('when unmounted', () => {
+      beforeEach(() => {
+        wrapper.destroy();
+      });
+
+      it('moves node back', () => {
+        expect(dummy.parentNode).toBe(document.body);
+      });
+
+      it('removes active class', () => {
+        expect(dummy.classList.contains('active')).toBe(false);
+      });
+    });
+  });
+
+  describe('when selector targets template node', () => {
+    beforeEach(() => {
+      setHTMLFixture('<template class="dummy-target">content</template>');
+      dummy = document.querySelector('.dummy-target');
+      createComponent({ selector: '.dummy-target' });
+    });
+
+    it('copies node content when mounted', () => {
+      expect(dummy.innerHTML).toEqual(wrapper.element.innerHTML);
+      expect(dummy.parentNode).toBe(document.body);
+    });
+  });
+});
diff --git a/spec/frontend/projects/experiment_new_project_creation/components/welcome_spec.js b/spec/frontend/projects/experiment_new_project_creation/components/welcome_spec.js
new file mode 100644
index 00000000000..acd142fa5ba
--- /dev/null
+++ b/spec/frontend/projects/experiment_new_project_creation/components/welcome_spec.js
@@ -0,0 +1,31 @@
+import { shallowMount } from '@vue/test-utils';
+import WelcomePage from '~/projects/experiment_new_project_creation/components/welcome.vue';
+import { mockTracking } from 'helpers/tracking_helper';
+
+describe('Welcome page', () => {
+  let wrapper;
+  let trackingSpy;
+
+  const createComponent = propsData => {
+    wrapper = shallowMount(WelcomePage, { propsData });
+  };
+
+  beforeEach(() => {
+    trackingSpy = mockTracking('_category_', document, jest.spyOn);
+    trackingSpy.mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    window.location.hash = '';
+    wrapper = null;
+  });
+
+  it('tracks link clicks', () => {
+    createComponent({ panels: [{ name: 'test', href: '#' }] });
+    wrapper.find('a').trigger('click');
+    return wrapper.vm.$nextTick().then(() => {
+      expect(trackingSpy).toHaveBeenCalledWith(undefined, 'click_tab', { label: 'test' });
+    });
+  });
+});
diff --git a/spec/frontend/projects/pipelines/charts/components/__snapshots__/pipelines_area_chart_spec.js.snap b/spec/frontend/projects/pipelines/charts/components/__snapshots__/pipelines_area_chart_spec.js.snap
index 3222b92d23f..f280ecaa0bc 100644
--- a/spec/frontend/projects/pipelines/charts/components/__snapshots__/pipelines_area_chart_spec.js.snap
+++ b/spec/frontend/projects/pipelines/charts/components/__snapshots__/pipelines_area_chart_spec.js.snap
@@ -14,7 +14,10 @@ exports[`PipelinesAreaChart matches the snapshot 1`] = `
       data="[object Object],[object Object]"
       height="300"
       legendaveragetext="Avg"
+      legendcurrenttext="Current"
+      legendlayout="inline"
       legendmaxtext="Max"
+      legendmintext="Min"
       option="[object Object]"
       thresholds=""
       width="0"
diff --git a/spec/javascripts/read_more_spec.js b/spec/frontend/read_more_spec.js
index d1d01272403..d1d01272403 100644
--- a/spec/javascripts/read_more_spec.js
+++ b/spec/frontend/read_more_spec.js
diff --git a/spec/frontend/registry/explorer/components/details_page/__snapshots__/tags_loader_spec.js.snap b/spec/frontend/registry/explorer/components/details_page/__snapshots__/tags_loader_spec.js.snap
new file mode 100644
index 00000000000..aeb49f88770
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/__snapshots__/tags_loader_spec.js.snap
@@ -0,0 +1,63 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TagsLoader component has the correct markup 1`] = `
+<div>
+  <div
+    preserve-aspect-ratio="xMinYMax meet"
+  >
+    <rect
+      height="15"
+      rx="4"
+      width="15"
+      x="0"
+      y="12.5"
+    />
+     
+    <rect
+      height="20"
+      rx="4"
+      width="250"
+      x="25"
+      y="10"
+    />
+     
+    <circle
+      cx="290"
+      cy="20"
+      r="10"
+    />
+     
+    <rect
+      height="20"
+      rx="4"
+      width="100"
+      x="315"
+      y="10"
+    />
+     
+    <rect
+      height="20"
+      rx="4"
+      width="100"
+      x="500"
+      y="10"
+    />
+     
+    <rect
+      height="20"
+      rx="4"
+      width="100"
+      x="630"
+      y="10"
+    />
+     
+    <rect
+      height="40"
+      rx="4"
+      width="40"
+      x="960"
+      y="0"
+    />
+  </div>
+</div>
+`;
diff --git a/spec/frontend/registry/explorer/components/details_page/delete_alert_spec.js b/spec/frontend/registry/explorer/components/details_page/delete_alert_spec.js
new file mode 100644
index 00000000000..5d54986978b
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/delete_alert_spec.js
@@ -0,0 +1,116 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
+import component from '~/registry/explorer/components/details_page/delete_alert.vue';
+import {
+  DELETE_TAG_SUCCESS_MESSAGE,
+  DELETE_TAG_ERROR_MESSAGE,
+  DELETE_TAGS_SUCCESS_MESSAGE,
+  DELETE_TAGS_ERROR_MESSAGE,
+  ADMIN_GARBAGE_COLLECTION_TIP,
+} from '~/registry/explorer/constants';
+
+describe('Delete alert', () => {
+  let wrapper;
+
+  const findAlert = () => wrapper.find(GlAlert);
+  const findLink = () => wrapper.find(GlLink);
+
+  const mountComponent = propsData => {
+    wrapper = shallowMount(component, { stubs: { GlSprintf }, propsData });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('when deleteAlertType is null', () => {
+    it('does not show the alert', () => {
+      mountComponent();
+      expect(findAlert().exists()).toBe(false);
+    });
+  });
+
+  describe('when deleteAlertType is not null', () => {
+    describe('success states', () => {
+      describe.each`
+        deleteAlertType   | message
+        ${'success_tag'}  | ${DELETE_TAG_SUCCESS_MESSAGE}
+        ${'success_tags'} | ${DELETE_TAGS_SUCCESS_MESSAGE}
+      `('when deleteAlertType is $deleteAlertType', ({ deleteAlertType, message }) => {
+        it('alert exists', () => {
+          mountComponent({ deleteAlertType });
+          expect(findAlert().exists()).toBe(true);
+        });
+
+        describe('when the user is an admin', () => {
+          beforeEach(() => {
+            mountComponent({
+              deleteAlertType,
+              isAdmin: true,
+              garbageCollectionHelpPagePath: 'foo',
+            });
+          });
+
+          it(`alert title is ${message}`, () => {
+            expect(findAlert().attributes('title')).toBe(message);
+          });
+
+          it('alert body contains admin tip', () => {
+            expect(findAlert().text()).toMatchInterpolatedText(ADMIN_GARBAGE_COLLECTION_TIP);
+          });
+
+          it('alert body contains link', () => {
+            const alertLink = findLink();
+            expect(alertLink.exists()).toBe(true);
+            expect(alertLink.attributes('href')).toBe('foo');
+          });
+        });
+
+        describe('when the user is not an admin', () => {
+          it('alert exist and text is appropriate', () => {
+            mountComponent({ deleteAlertType });
+            expect(findAlert().exists()).toBe(true);
+            expect(findAlert().text()).toBe(message);
+          });
+        });
+      });
+    });
+    describe('error states', () => {
+      describe.each`
+        deleteAlertType  | message
+        ${'danger_tag'}  | ${DELETE_TAG_ERROR_MESSAGE}
+        ${'danger_tags'} | ${DELETE_TAGS_ERROR_MESSAGE}
+      `('when deleteAlertType is $deleteAlertType', ({ deleteAlertType, message }) => {
+        it('alert exists', () => {
+          mountComponent({ deleteAlertType });
+          expect(findAlert().exists()).toBe(true);
+        });
+
+        describe('when the user is an admin', () => {
+          it('alert exist and text is appropriate', () => {
+            mountComponent({ deleteAlertType });
+            expect(findAlert().exists()).toBe(true);
+            expect(findAlert().text()).toBe(message);
+          });
+        });
+
+        describe('when the user is not an admin', () => {
+          it('alert exist and text is appropriate', () => {
+            mountComponent({ deleteAlertType });
+            expect(findAlert().exists()).toBe(true);
+            expect(findAlert().text()).toBe(message);
+          });
+        });
+      });
+    });
+
+    describe('dismissing alert', () => {
+      it('GlAlert dismiss event triggers a change event', () => {
+        mountComponent({ deleteAlertType: 'success_tags' });
+        findAlert().vm.$emit('dismiss');
+        expect(wrapper.emitted('change')).toEqual([[null]]);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/details_page/delete_modal_spec.js b/spec/frontend/registry/explorer/components/details_page/delete_modal_spec.js
new file mode 100644
index 00000000000..c77f7a54d34
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/delete_modal_spec.js
@@ -0,0 +1,79 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlSprintf } from '@gitlab/ui';
+import component from '~/registry/explorer/components/details_page/delete_modal.vue';
+import {
+  REMOVE_TAG_CONFIRMATION_TEXT,
+  REMOVE_TAGS_CONFIRMATION_TEXT,
+} from '~/registry/explorer/constants';
+import { GlModal } from '../../stubs';
+
+describe('Delete Modal', () => {
+  let wrapper;
+
+  const findModal = () => wrapper.find(GlModal);
+  const findDescription = () => wrapper.find('[data-testid="description"]');
+
+  const mountComponent = propsData => {
+    wrapper = shallowMount(component, {
+      propsData,
+      stubs: {
+        GlSprintf,
+        GlModal,
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it('contains a GlModal', () => {
+    mountComponent();
+    expect(findModal().exists()).toBe(true);
+  });
+
+  describe('events', () => {
+    it.each`
+      glEvent     | localEvent
+      ${'ok'}     | ${'confirmDelete'}
+      ${'cancel'} | ${'cancelDelete'}
+    `('GlModal $glEvent emits $localEvent', ({ glEvent, localEvent }) => {
+      mountComponent();
+      findModal().vm.$emit(glEvent);
+      expect(wrapper.emitted(localEvent)).toBeTruthy();
+    });
+  });
+
+  describe('methods', () => {
+    it('show calls gl-modal show', () => {
+      mountComponent();
+      wrapper.vm.show();
+      expect(GlModal.methods.show).toHaveBeenCalled();
+    });
+  });
+
+  describe('itemsToBeDeleted contains one element', () => {
+    beforeEach(() => {
+      mountComponent({ itemsToBeDeleted: [{ path: 'foo' }] });
+    });
+    it(`has the correct description`, () => {
+      expect(findDescription().text()).toBe(REMOVE_TAG_CONFIRMATION_TEXT.replace('%{item}', 'foo'));
+    });
+    it('has the correct action', () => {
+      expect(wrapper.text()).toContain('Remove tag');
+    });
+  });
+
+  describe('itemsToBeDeleted contains more than element', () => {
+    beforeEach(() => {
+      mountComponent({ itemsToBeDeleted: [{ path: 'foo' }, { path: 'bar' }] });
+    });
+    it(`has the correct description`, () => {
+      expect(findDescription().text()).toBe(REMOVE_TAGS_CONFIRMATION_TEXT.replace('%{item}', '2'));
+    });
+    it('has the correct action', () => {
+      expect(wrapper.text()).toContain('Remove tags');
+    });
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/details_page/details_header_spec.js b/spec/frontend/registry/explorer/components/details_page/details_header_spec.js
new file mode 100644
index 00000000000..cb31efa428f
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/details_header_spec.js
@@ -0,0 +1,32 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlSprintf } from '@gitlab/ui';
+import component from '~/registry/explorer/components/details_page/details_header.vue';
+import { DETAILS_PAGE_TITLE } from '~/registry/explorer/constants';
+
+describe('Details Header', () => {
+  let wrapper;
+
+  const mountComponent = propsData => {
+    wrapper = shallowMount(component, {
+      propsData,
+      stubs: {
+        GlSprintf,
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it('has the correct title ', () => {
+    mountComponent();
+    expect(wrapper.text()).toMatchInterpolatedText(DETAILS_PAGE_TITLE);
+  });
+
+  it('shows imageName in the title', () => {
+    mountComponent({ imageName: 'foo' });
+    expect(wrapper.text()).toContain('foo');
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/details_page/empty_tags_state.js b/spec/frontend/registry/explorer/components/details_page/empty_tags_state.js
new file mode 100644
index 00000000000..da80c75a26a
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/empty_tags_state.js
@@ -0,0 +1,43 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlEmptyState } from '@gitlab/ui';
+import component from '~/registry/explorer/components/details_page/empty_tags_state.vue';
+import {
+  EMPTY_IMAGE_REPOSITORY_TITLE,
+  EMPTY_IMAGE_REPOSITORY_MESSAGE,
+} from '~/registry/explorer/constants';
+
+describe('EmptyTagsState component', () => {
+  let wrapper;
+
+  const findEmptyState = () => wrapper.find(GlEmptyState);
+
+  const mountComponent = () => {
+    wrapper = shallowMount(component, {
+      stubs: {
+        GlEmptyState,
+      },
+      propsData: {
+        noContainersImage: 'foo',
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it('contains gl-empty-state', () => {
+    mountComponent();
+    expect(findEmptyState().exist()).toBe(true);
+  });
+
+  it('has the correct props', () => {
+    mountComponent();
+    expect(findEmptyState().props()).toMatchObject({
+      title: EMPTY_IMAGE_REPOSITORY_TITLE,
+      description: EMPTY_IMAGE_REPOSITORY_MESSAGE,
+      svgPath: 'foo',
+    });
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/details_page/tags_loader_spec.js b/spec/frontend/registry/explorer/components/details_page/tags_loader_spec.js
new file mode 100644
index 00000000000..b27d3e2c042
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/tags_loader_spec.js
@@ -0,0 +1,49 @@
+import { shallowMount } from '@vue/test-utils';
+import component from '~/registry/explorer/components/details_page/tags_loader.vue';
+import { GlSkeletonLoader } from '../../stubs';
+
+describe('TagsLoader component', () => {
+  let wrapper;
+
+  const findGlSkeletonLoaders = () => wrapper.findAll(GlSkeletonLoader);
+
+  const mountComponent = () => {
+    wrapper = shallowMount(component, {
+      stubs: {
+        GlSkeletonLoader,
+      },
+      // set the repeat to 1 to avoid a long and verbose snapshot
+      loader: {
+        ...component.loader,
+        repeat: 1,
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it('produces the correct amount of loaders ', () => {
+    mountComponent();
+    expect(findGlSkeletonLoaders().length).toBe(1);
+  });
+
+  it('has the correct props', () => {
+    mountComponent();
+    expect(
+      findGlSkeletonLoaders()
+        .at(0)
+        .props(),
+    ).toMatchObject({
+      width: component.loader.width,
+      height: component.loader.height,
+    });
+  });
+
+  it('has the correct markup', () => {
+    mountComponent();
+    expect(wrapper.element).toMatchSnapshot();
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/details_page/tags_table_spec.js b/spec/frontend/registry/explorer/components/details_page/tags_table_spec.js
new file mode 100644
index 00000000000..a60a362dcfe
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/details_page/tags_table_spec.js
@@ -0,0 +1,286 @@
+import { mount } from '@vue/test-utils';
+import stubChildren from 'helpers/stub_children';
+import component from '~/registry/explorer/components/details_page/tags_table.vue';
+import { tagsListResponse } from '../../mock_data';
+
+describe('tags_table', () => {
+  let wrapper;
+  const tags = [...tagsListResponse.data];
+
+  const findMainCheckbox = () => wrapper.find('[data-testid="mainCheckbox"]');
+  const findFirstRowItem = testid => wrapper.find(`[data-testid="${testid}"]`);
+  const findBulkDeleteButton = () => wrapper.find('[data-testid="bulkDeleteButton"]');
+  const findAllDeleteButtons = () => wrapper.findAll('[data-testid="singleDeleteButton"]');
+  const findAllCheckboxes = () => wrapper.findAll('[data-testid="rowCheckbox"]');
+  const findCheckedCheckboxes = () => findAllCheckboxes().filter(c => c.attributes('checked'));
+  const findFirsTagColumn = () => wrapper.find('.js-tag-column');
+  const findFirstTagNameText = () => wrapper.find('[data-testid="rowNameText"]');
+
+  const findLoaderSlot = () => wrapper.find('[data-testid="loaderSlot"]');
+  const findEmptySlot = () => wrapper.find('[data-testid="emptySlot"]');
+
+  const mountComponent = (propsData = { tags, isDesktop: true }) => {
+    wrapper = mount(component, {
+      stubs: {
+        ...stubChildren(component),
+        GlTable: false,
+      },
+      propsData,
+      slots: {
+        loader: '<div data-testid="loaderSlot"></div>',
+        empty: '<div data-testid="emptySlot"></div>',
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it.each([
+    'rowCheckbox',
+    'rowName',
+    'rowShortRevision',
+    'rowSize',
+    'rowTime',
+    'singleDeleteButton',
+  ])('%s exist in the table', element => {
+    mountComponent();
+
+    expect(findFirstRowItem(element).exists()).toBe(true);
+  });
+
+  describe('header checkbox', () => {
+    it('exists', () => {
+      mountComponent();
+      expect(findMainCheckbox().exists()).toBe(true);
+    });
+
+    it('if selected selects all the rows', () => {
+      mountComponent();
+      findMainCheckbox().vm.$emit('change');
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findMainCheckbox().attributes('checked')).toBeTruthy();
+        expect(findCheckedCheckboxes()).toHaveLength(tags.length);
+      });
+    });
+
+    it('if deselect deselects all the row', () => {
+      mountComponent();
+      findMainCheckbox().vm.$emit('change');
+      return wrapper.vm
+        .$nextTick()
+        .then(() => {
+          expect(findMainCheckbox().attributes('checked')).toBeTruthy();
+          findMainCheckbox().vm.$emit('change');
+          return wrapper.vm.$nextTick();
+        })
+        .then(() => {
+          expect(findMainCheckbox().attributes('checked')).toBe(undefined);
+          expect(findCheckedCheckboxes()).toHaveLength(0);
+        });
+    });
+  });
+
+  describe('row checkbox', () => {
+    beforeEach(() => {
+      mountComponent();
+    });
+
+    it('selecting and deselecting the checkbox works as intended', () => {
+      findFirstRowItem('rowCheckbox').vm.$emit('change');
+      return wrapper.vm
+        .$nextTick()
+        .then(() => {
+          expect(wrapper.vm.selectedItems).toEqual([tags[0].name]);
+          expect(findFirstRowItem('rowCheckbox').attributes('checked')).toBeTruthy();
+          findFirstRowItem('rowCheckbox').vm.$emit('change');
+          return wrapper.vm.$nextTick();
+        })
+        .then(() => {
+          expect(wrapper.vm.selectedItems.length).toBe(0);
+          expect(findFirstRowItem('rowCheckbox').attributes('checked')).toBe(undefined);
+        });
+    });
+  });
+
+  describe('header delete button', () => {
+    beforeEach(() => {
+      mountComponent();
+    });
+
+    it('exists', () => {
+      expect(findBulkDeleteButton().exists()).toBe(true);
+    });
+
+    it('is disabled if no item is selected', () => {
+      expect(findBulkDeleteButton().attributes('disabled')).toBe('true');
+    });
+
+    it('is enabled if at least one item is selected', () => {
+      expect(findBulkDeleteButton().attributes('disabled')).toBe('true');
+      findFirstRowItem('rowCheckbox').vm.$emit('change');
+      return wrapper.vm.$nextTick().then(() => {
+        expect(findBulkDeleteButton().attributes('disabled')).toBeFalsy();
+      });
+    });
+
+    describe('on click', () => {
+      it('when one item is selected', () => {
+        findFirstRowItem('rowCheckbox').vm.$emit('change');
+        findBulkDeleteButton().vm.$emit('click');
+        expect(wrapper.emitted('delete')).toEqual([[['centos6']]]);
+      });
+
+      it('when multiple items are selected', () => {
+        findMainCheckbox().vm.$emit('change');
+        findBulkDeleteButton().vm.$emit('click');
+
+        expect(wrapper.emitted('delete')).toEqual([[tags.map(t => t.name)]]);
+      });
+    });
+  });
+
+  describe('row delete button', () => {
+    beforeEach(() => {
+      mountComponent();
+    });
+
+    it('exists', () => {
+      expect(
+        findAllDeleteButtons()
+          .at(0)
+          .exists(),
+      ).toBe(true);
+    });
+
+    it('is disabled if the item has no destroy_path', () => {
+      expect(
+        findAllDeleteButtons()
+          .at(1)
+          .attributes('disabled'),
+      ).toBe('true');
+    });
+
+    it('on click', () => {
+      findAllDeleteButtons()
+        .at(0)
+        .vm.$emit('click');
+
+      expect(wrapper.emitted('delete')).toEqual([[['centos6']]]);
+    });
+  });
+
+  describe('name cell', () => {
+    it('tag column has a tooltip with the tag name', () => {
+      mountComponent();
+      expect(findFirstTagNameText().attributes('title')).toBe(tagsListResponse.data[0].name);
+    });
+
+    describe('on desktop viewport', () => {
+      beforeEach(() => {
+        mountComponent();
+      });
+
+      it('table header has class w-25', () => {
+        expect(findFirsTagColumn().classes()).toContain('w-25');
+      });
+
+      it('tag column has the mw-m class', () => {
+        expect(findFirstRowItem('rowName').classes()).toContain('mw-m');
+      });
+    });
+
+    describe('on mobile viewport', () => {
+      beforeEach(() => {
+        mountComponent({ tags, isDesktop: false });
+      });
+
+      it('table header does not have class w-25', () => {
+        expect(findFirsTagColumn().classes()).not.toContain('w-25');
+      });
+
+      it('tag column has the gl-justify-content-end class', () => {
+        expect(findFirstRowItem('rowName').classes()).toContain('gl-justify-content-end');
+      });
+    });
+  });
+
+  describe('last updated cell', () => {
+    let timeCell;
+
+    beforeEach(() => {
+      mountComponent();
+      timeCell = findFirstRowItem('rowTime');
+    });
+
+    it('displays the time in string format', () => {
+      expect(timeCell.text()).toBe('2 years ago');
+    });
+
+    it('has a tooltip timestamp', () => {
+      expect(timeCell.attributes('title')).toBe('Sep 19, 2017 1:45pm GMT+0000');
+    });
+  });
+
+  describe('empty state slot', () => {
+    describe('when the table is empty', () => {
+      beforeEach(() => {
+        mountComponent({ tags: [], isDesktop: true });
+      });
+
+      it('does not show table rows', () => {
+        expect(findFirstTagNameText().exists()).toBe(false);
+      });
+
+      it('has the empty state slot', () => {
+        expect(findEmptySlot().exists()).toBe(true);
+      });
+    });
+
+    describe('when the table is not empty', () => {
+      beforeEach(() => {
+        mountComponent({ tags, isDesktop: true });
+      });
+
+      it('does show table rows', () => {
+        expect(findFirstTagNameText().exists()).toBe(true);
+      });
+
+      it('does not show the empty state', () => {
+        expect(findEmptySlot().exists()).toBe(false);
+      });
+    });
+  });
+
+  describe('loader slot', () => {
+    describe('when the data is loading', () => {
+      beforeEach(() => {
+        mountComponent({ isLoading: true, tags });
+      });
+
+      it('show the loader', () => {
+        expect(findLoaderSlot().exists()).toBe(true);
+      });
+
+      it('does not show the table rows', () => {
+        expect(findFirstTagNameText().exists()).toBe(false);
+      });
+    });
+
+    describe('when the data is not loading', () => {
+      beforeEach(() => {
+        mountComponent({ isLoading: false, tags });
+      });
+
+      it('does not show the loader', () => {
+        expect(findLoaderSlot().exists()).toBe(false);
+      });
+
+      it('shows the table rows', () => {
+        expect(findFirstTagNameText().exists()).toBe(true);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/image_list_spec.js b/spec/frontend/registry/explorer/components/image_list_spec.js
deleted file mode 100644
index 12f0fbe0c87..00000000000
--- a/spec/frontend/registry/explorer/components/image_list_spec.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import { GlPagination } from '@gitlab/ui';
-import Component from '~/registry/explorer/components/image_list.vue';
-import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
-import { RouterLink } from '../stubs';
-import { imagesListResponse, imagePagination } from '../mock_data';
-
-describe('Image List', () => {
-  let wrapper;
-
-  const firstElement = imagesListResponse.data[0];
-
-  const findDeleteBtn = () => wrapper.find('[data-testid="deleteImageButton"]');
-  const findRowItems = () => wrapper.findAll('[data-testid="rowItem"]');
-  const findDetailsLink = () => wrapper.find('[data-testid="detailsLink"]');
-  const findClipboardButton = () => wrapper.find(ClipboardButton);
-  const findPagination = () => wrapper.find(GlPagination);
-
-  const mountComponent = () => {
-    wrapper = shallowMount(Component, {
-      stubs: {
-        RouterLink,
-      },
-      propsData: {
-        images: imagesListResponse.data,
-        pagination: imagePagination,
-      },
-    });
-  };
-
-  beforeEach(() => {
-    mountComponent();
-  });
-
-  it('contains one list element for each image', () => {
-    expect(findRowItems().length).toBe(imagesListResponse.data.length);
-  });
-
-  it('contains a link to the details page', () => {
-    const link = findDetailsLink();
-    expect(link.html()).toContain(firstElement.path);
-    expect(link.props('to').name).toBe('details');
-  });
-
-  it('contains a clipboard button', () => {
-    const button = findClipboardButton();
-    expect(button.exists()).toBe(true);
-    expect(button.props('text')).toBe(firstElement.location);
-    expect(button.props('title')).toBe(firstElement.location);
-  });
-
-  it('should be possible to delete a repo', () => {
-    const deleteBtn = findDeleteBtn();
-    expect(deleteBtn.exists()).toBe(true);
-  });
-
-  describe('pagination', () => {
-    it('exists', () => {
-      expect(findPagination().exists()).toBe(true);
-    });
-
-    it('is wired to the correct pagination props', () => {
-      const pagination = findPagination();
-      expect(pagination.props('perPage')).toBe(imagePagination.perPage);
-      expect(pagination.props('totalItems')).toBe(imagePagination.total);
-      expect(pagination.props('value')).toBe(imagePagination.page);
-    });
-
-    it('emits a pageChange event when the page change', () => {
-      wrapper.setData({ currentPage: 2 });
-      expect(wrapper.emitted('pageChange')).toEqual([[2]]);
-    });
-  });
-});
diff --git a/spec/frontend/registry/explorer/components/__snapshots__/group_empty_state_spec.js.snap b/spec/frontend/registry/explorer/components/list_page/__snapshots__/group_empty_state_spec.js.snap
index 3761369c944..3761369c944 100644
--- a/spec/frontend/registry/explorer/components/__snapshots__/group_empty_state_spec.js.snap
+++ b/spec/frontend/registry/explorer/components/list_page/__snapshots__/group_empty_state_spec.js.snap
diff --git a/spec/frontend/registry/explorer/components/__snapshots__/project_empty_state_spec.js.snap b/spec/frontend/registry/explorer/components/list_page/__snapshots__/project_empty_state_spec.js.snap
index 19767aefd1a..d8ec9c3ca4d 100644
--- a/spec/frontend/registry/explorer/components/__snapshots__/project_empty_state_spec.js.snap
+++ b/spec/frontend/registry/explorer/components/list_page/__snapshots__/project_empty_state_spec.js.snap
@@ -19,7 +19,7 @@ exports[`Registry Project Empty state to match the default snapshot 1`] = `
   </p>
    
   <h5>
-    Quick Start
+    CLI Commands
   </h5>
    
   <p
diff --git a/spec/frontend/registry/explorer/components/quickstart_dropdown_spec.js b/spec/frontend/registry/explorer/components/list_page/cli_commands_spec.js
index 0c3baefbc58..a556be12089 100644
--- a/spec/frontend/registry/explorer/components/quickstart_dropdown_spec.js
+++ b/spec/frontend/registry/explorer/components/list_page/cli_commands_spec.js
@@ -3,7 +3,7 @@ import { mount, createLocalVue } from '@vue/test-utils';
 import { GlDropdown, GlFormGroup, GlFormInputGroup } from '@gitlab/ui';
 import Tracking from '~/tracking';
 import * as getters from '~/registry/explorer/stores/getters';
-import QuickstartDropdown from '~/registry/explorer/components/quickstart_dropdown.vue';
+import QuickstartDropdown from '~/registry/explorer/components/list_page/cli_commands.vue';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 
 import {
@@ -19,7 +19,7 @@ import {
 const localVue = createLocalVue();
 localVue.use(Vuex);
 
-describe('quickstart_dropdown', () => {
+describe('cli_commands', () => {
   let wrapper;
   let store;
 
diff --git a/spec/frontend/registry/explorer/components/group_empty_state_spec.js b/spec/frontend/registry/explorer/components/list_page/group_empty_state_spec.js
index 1b4de534317..2f51e875672 100644
--- a/spec/frontend/registry/explorer/components/group_empty_state_spec.js
+++ b/spec/frontend/registry/explorer/components/list_page/group_empty_state_spec.js
@@ -1,8 +1,8 @@
 import Vuex from 'vuex';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { GlSprintf } from '@gitlab/ui';
-import { GlEmptyState } from '../stubs';
-import groupEmptyState from '~/registry/explorer/components/group_empty_state.vue';
+import { GlEmptyState } from '../../stubs';
+import groupEmptyState from '~/registry/explorer/components/list_page/group_empty_state.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
diff --git a/spec/frontend/registry/explorer/components/list_page/image_list_row_spec.js b/spec/frontend/registry/explorer/components/list_page/image_list_row_spec.js
new file mode 100644
index 00000000000..78de35ae1dc
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/list_page/image_list_row_spec.js
@@ -0,0 +1,140 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlIcon, GlSprintf } from '@gitlab/ui';
+import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
+import Component from '~/registry/explorer/components/list_page/image_list_row.vue';
+import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
+import {
+  ROW_SCHEDULED_FOR_DELETION,
+  LIST_DELETE_BUTTON_DISABLED,
+} from '~/registry/explorer/constants';
+import { RouterLink } from '../../stubs';
+import { imagesListResponse } from '../../mock_data';
+
+describe('Image List Row', () => {
+  let wrapper;
+  const item = imagesListResponse.data[0];
+  const findDeleteBtn = () => wrapper.find('[data-testid="deleteImageButton"]');
+  const findDetailsLink = () => wrapper.find('[data-testid="detailsLink"]');
+  const findTagsCount = () => wrapper.find('[data-testid="tagsCount"]');
+  const findDeleteButtonWrapper = () => wrapper.find('[data-testid="deleteButtonWrapper"]');
+  const findClipboardButton = () => wrapper.find(ClipboardButton);
+
+  const mountComponent = props => {
+    wrapper = shallowMount(Component, {
+      stubs: {
+        RouterLink,
+        GlSprintf,
+      },
+      propsData: {
+        item,
+        ...props,
+      },
+      directives: {
+        GlTooltip: createMockDirective(),
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('main tooltip', () => {
+    it(`the title is ${ROW_SCHEDULED_FOR_DELETION}`, () => {
+      mountComponent();
+      const tooltip = getBinding(wrapper.element, 'gl-tooltip');
+      expect(tooltip).toBeDefined();
+      expect(tooltip.value.title).toBe(ROW_SCHEDULED_FOR_DELETION);
+    });
+
+    it('is disabled when item is being deleted', () => {
+      mountComponent({ item: { ...item, deleting: true } });
+      const tooltip = getBinding(wrapper.element, 'gl-tooltip');
+      expect(tooltip.value.disabled).toBe(false);
+    });
+  });
+
+  describe('image title and path', () => {
+    it('contains a link to the details page', () => {
+      mountComponent();
+      const link = findDetailsLink();
+      expect(link.html()).toContain(item.path);
+      expect(link.props('to').name).toBe('details');
+    });
+
+    it('contains a clipboard button', () => {
+      mountComponent();
+      const button = findClipboardButton();
+      expect(button.exists()).toBe(true);
+      expect(button.props('text')).toBe(item.location);
+      expect(button.props('title')).toBe(item.location);
+    });
+  });
+
+  describe('delete button wrapper', () => {
+    it('has a tooltip', () => {
+      mountComponent();
+      const tooltip = getBinding(findDeleteButtonWrapper().element, 'gl-tooltip');
+      expect(tooltip).toBeDefined();
+      expect(tooltip.value.title).toBe(LIST_DELETE_BUTTON_DISABLED);
+    });
+    it('tooltip is enabled when destroy_path is falsy', () => {
+      mountComponent({ item: { ...item, destroy_path: null } });
+      const tooltip = getBinding(findDeleteButtonWrapper().element, 'gl-tooltip');
+      expect(tooltip.value.disabled).toBeFalsy();
+    });
+  });
+
+  describe('delete button', () => {
+    it('exists', () => {
+      mountComponent();
+      expect(findDeleteBtn().exists()).toBe(true);
+    });
+
+    it('emits a delete event', () => {
+      mountComponent();
+      findDeleteBtn().vm.$emit('click');
+      expect(wrapper.emitted('delete')).toEqual([[item]]);
+    });
+
+    it.each`
+      destroy_path | deleting | state
+      ${null}      | ${null}  | ${'true'}
+      ${null}      | ${true}  | ${'true'}
+      ${'foo'}     | ${true}  | ${'true'}
+      ${'foo'}     | ${false} | ${undefined}
+    `(
+      'disabled is $state when destroy_path is $destroy_path and deleting is $deleting',
+      ({ destroy_path, deleting, state }) => {
+        mountComponent({ item: { ...item, destroy_path, deleting } });
+        expect(findDeleteBtn().attributes('disabled')).toBe(state);
+      },
+    );
+  });
+
+  describe('tags count', () => {
+    it('exists', () => {
+      mountComponent();
+      expect(findTagsCount().exists()).toBe(true);
+    });
+
+    it('contains a tag icon', () => {
+      mountComponent();
+      const icon = findTagsCount().find(GlIcon);
+      expect(icon.exists()).toBe(true);
+      expect(icon.props('name')).toBe('tag');
+    });
+
+    describe('tags count text', () => {
+      it('with one tag in the image', () => {
+        mountComponent({ item: { ...item, tags_count: 1 } });
+        expect(findTagsCount().text()).toMatchInterpolatedText('1 Tag');
+      });
+      it('with more than one tag in the image', () => {
+        mountComponent({ item: { ...item, tags_count: 3 } });
+        expect(findTagsCount().text()).toMatchInterpolatedText('3 Tags');
+      });
+    });
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/list_page/image_list_spec.js b/spec/frontend/registry/explorer/components/list_page/image_list_spec.js
new file mode 100644
index 00000000000..03ba6ad7f80
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/list_page/image_list_spec.js
@@ -0,0 +1,62 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlPagination } from '@gitlab/ui';
+import Component from '~/registry/explorer/components/list_page/image_list.vue';
+import ImageListRow from '~/registry/explorer/components/list_page/image_list_row.vue';
+
+import { imagesListResponse, imagePagination } from '../../mock_data';
+
+describe('Image List', () => {
+  let wrapper;
+
+  const findRow = () => wrapper.findAll(ImageListRow);
+  const findPagination = () => wrapper.find(GlPagination);
+
+  const mountComponent = () => {
+    wrapper = shallowMount(Component, {
+      propsData: {
+        images: imagesListResponse.data,
+        pagination: imagePagination,
+      },
+    });
+  };
+
+  beforeEach(() => {
+    mountComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('list', () => {
+    it('contains one list element for each image', () => {
+      expect(findRow().length).toBe(imagesListResponse.data.length);
+    });
+
+    it('when delete event is emitted on the row it emits up a delete event', () => {
+      findRow()
+        .at(0)
+        .vm.$emit('delete', 'foo');
+      expect(wrapper.emitted('delete')).toEqual([['foo']]);
+    });
+  });
+
+  describe('pagination', () => {
+    it('exists', () => {
+      expect(findPagination().exists()).toBe(true);
+    });
+
+    it('is wired to the correct pagination props', () => {
+      const pagination = findPagination();
+      expect(pagination.props('perPage')).toBe(imagePagination.perPage);
+      expect(pagination.props('totalItems')).toBe(imagePagination.total);
+      expect(pagination.props('value')).toBe(imagePagination.page);
+    });
+
+    it('emits a pageChange event when the page change', () => {
+      findPagination().vm.$emit(GlPagination.model.event, 2);
+      expect(wrapper.emitted('pageChange')).toEqual([[2]]);
+    });
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/project_empty_state_spec.js b/spec/frontend/registry/explorer/components/list_page/project_empty_state_spec.js
index 4b209646da9..73746c545cb 100644
--- a/spec/frontend/registry/explorer/components/project_empty_state_spec.js
+++ b/spec/frontend/registry/explorer/components/list_page/project_empty_state_spec.js
@@ -1,8 +1,8 @@
 import Vuex from 'vuex';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { GlSprintf } from '@gitlab/ui';
-import { GlEmptyState } from '../stubs';
-import projectEmptyState from '~/registry/explorer/components/project_empty_state.vue';
+import { GlEmptyState } from '../../stubs';
+import projectEmptyState from '~/registry/explorer/components/list_page/project_empty_state.vue';
 import * as getters from '~/registry/explorer/stores/getters';
 
 const localVue = createLocalVue();
diff --git a/spec/frontend/registry/explorer/components/list_page/registry_header_spec.js b/spec/frontend/registry/explorer/components/list_page/registry_header_spec.js
new file mode 100644
index 00000000000..7484fccbea7
--- /dev/null
+++ b/spec/frontend/registry/explorer/components/list_page/registry_header_spec.js
@@ -0,0 +1,221 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlSprintf, GlLink } from '@gitlab/ui';
+import Component from '~/registry/explorer/components/list_page/registry_header.vue';
+import {
+  CONTAINER_REGISTRY_TITLE,
+  LIST_INTRO_TEXT,
+  EXPIRATION_POLICY_DISABLED_MESSAGE,
+  EXPIRATION_POLICY_DISABLED_TEXT,
+  EXPIRATION_POLICY_WILL_RUN_IN,
+} from '~/registry/explorer/constants';
+
+jest.mock('~/lib/utils/datetime_utility', () => ({
+  approximateDuration: jest.fn(),
+  calculateRemainingMilliseconds: jest.fn(),
+}));
+
+describe('registry_header', () => {
+  let wrapper;
+
+  const findHeader = () => wrapper.find('[data-testid="header"]');
+  const findTitle = () => wrapper.find('[data-testid="title"]');
+  const findCommandsSlot = () => wrapper.find('[data-testid="commands-slot"]');
+  const findInfoArea = () => wrapper.find('[data-testid="info-area"]');
+  const findIntroText = () => wrapper.find('[data-testid="default-intro"]');
+  const findSubHeader = () => wrapper.find('[data-testid="subheader"]');
+  const findImagesCountSubHeader = () => wrapper.find('[data-testid="images-count"]');
+  const findExpirationPolicySubHeader = () => wrapper.find('[data-testid="expiration-policy"]');
+  const findDisabledExpirationPolicyMessage = () =>
+    wrapper.find('[data-testid="expiration-disabled-message"]');
+
+  const mountComponent = (propsData, slots) => {
+    wrapper = shallowMount(Component, {
+      stubs: {
+        GlSprintf,
+      },
+      propsData,
+      slots,
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  describe('header', () => {
+    it('exists', () => {
+      mountComponent();
+      expect(findHeader().exists()).toBe(true);
+    });
+
+    it('contains the title of the page', () => {
+      mountComponent();
+      const title = findTitle();
+      expect(title.exists()).toBe(true);
+      expect(title.text()).toBe(CONTAINER_REGISTRY_TITLE);
+    });
+
+    it('has a commands slot', () => {
+      mountComponent(null, { commands: 'baz' });
+      expect(findCommandsSlot().text()).toBe('baz');
+    });
+  });
+
+  describe('subheader', () => {
+    describe('when there are no images', () => {
+      it('is hidden ', () => {
+        mountComponent();
+        expect(findSubHeader().exists()).toBe(false);
+      });
+    });
+
+    describe('when there are images', () => {
+      it('is visible', () => {
+        mountComponent({ imagesCount: 1 });
+        expect(findSubHeader().exists()).toBe(true);
+      });
+
+      describe('sub header parts', () => {
+        describe('images count', () => {
+          it('exists', () => {
+            mountComponent({ imagesCount: 1 });
+            expect(findImagesCountSubHeader().exists()).toBe(true);
+          });
+
+          it('when there is one image', () => {
+            mountComponent({ imagesCount: 1 });
+            expect(findImagesCountSubHeader().text()).toMatchInterpolatedText('1 Image repository');
+          });
+
+          it('when there is more than one image', () => {
+            mountComponent({ imagesCount: 3 });
+            expect(findImagesCountSubHeader().text()).toMatchInterpolatedText(
+              '3 Image repositories',
+            );
+          });
+        });
+
+        describe('expiration policy', () => {
+          it('when is disabled', () => {
+            mountComponent({
+              expirationPolicy: { enabled: false },
+              expirationPolicyHelpPagePath: 'foo',
+              imagesCount: 1,
+            });
+            const text = findExpirationPolicySubHeader();
+            expect(text.exists()).toBe(true);
+            expect(text.text()).toMatchInterpolatedText(EXPIRATION_POLICY_DISABLED_TEXT);
+          });
+
+          it('when is enabled', () => {
+            mountComponent({
+              expirationPolicy: { enabled: true },
+              expirationPolicyHelpPagePath: 'foo',
+              imagesCount: 1,
+            });
+            const text = findExpirationPolicySubHeader();
+            expect(text.exists()).toBe(true);
+            expect(text.text()).toMatchInterpolatedText(EXPIRATION_POLICY_WILL_RUN_IN);
+          });
+          it('when the expiration policy is completely disabled', () => {
+            mountComponent({
+              expirationPolicy: { enabled: true },
+              expirationPolicyHelpPagePath: 'foo',
+              imagesCount: 1,
+              hideExpirationPolicyData: true,
+            });
+            const text = findExpirationPolicySubHeader();
+            expect(text.exists()).toBe(false);
+          });
+        });
+      });
+    });
+  });
+
+  describe('info area', () => {
+    it('exists', () => {
+      mountComponent();
+      expect(findInfoArea().exists()).toBe(true);
+    });
+
+    describe('default message', () => {
+      beforeEach(() => {
+        mountComponent({ helpPagePath: 'bar' });
+      });
+
+      it('exists', () => {
+        expect(findIntroText().exists()).toBe(true);
+      });
+
+      it('has the correct copy', () => {
+        expect(findIntroText().text()).toMatchInterpolatedText(LIST_INTRO_TEXT);
+      });
+
+      it('has the correct link', () => {
+        expect(
+          findIntroText()
+            .find(GlLink)
+            .attributes('href'),
+        ).toBe('bar');
+      });
+    });
+
+    describe('expiration policy info message', () => {
+      describe('when there are no images', () => {
+        it('is hidden', () => {
+          mountComponent();
+          expect(findDisabledExpirationPolicyMessage().exists()).toBe(false);
+        });
+      });
+
+      describe('when there are images', () => {
+        describe('when expiration policy is disabled', () => {
+          beforeEach(() => {
+            mountComponent({
+              expirationPolicy: { enabled: false },
+              expirationPolicyHelpPagePath: 'foo',
+              imagesCount: 1,
+            });
+          });
+          it('message exist', () => {
+            expect(findDisabledExpirationPolicyMessage().exists()).toBe(true);
+          });
+          it('has the correct copy', () => {
+            expect(findDisabledExpirationPolicyMessage().text()).toMatchInterpolatedText(
+              EXPIRATION_POLICY_DISABLED_MESSAGE,
+            );
+          });
+
+          it('has the correct link', () => {
+            expect(
+              findDisabledExpirationPolicyMessage()
+                .find(GlLink)
+                .attributes('href'),
+            ).toBe('foo');
+          });
+        });
+
+        describe('when expiration policy is enabled', () => {
+          it('message does not exist', () => {
+            mountComponent({
+              expirationPolicy: { enabled: true },
+              imagesCount: 1,
+            });
+            expect(findDisabledExpirationPolicyMessage().exists()).toBe(false);
+          });
+        });
+        describe('when the expiration policy is completely disabled', () => {
+          it('message does not exist', () => {
+            mountComponent({
+              expirationPolicy: { enabled: true },
+              imagesCount: 1,
+              hideExpirationPolicyData: true,
+            });
+            expect(findDisabledExpirationPolicyMessage().exists()).toBe(false);
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/spec/frontend/registry/explorer/components/project_policy_alert_spec.js b/spec/frontend/registry/explorer/components/project_policy_alert_spec.js
deleted file mode 100644
index 89c37e55398..00000000000
--- a/spec/frontend/registry/explorer/components/project_policy_alert_spec.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import Vuex from 'vuex';
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-import { GlSprintf, GlAlert, GlLink } from '@gitlab/ui';
-import * as dateTimeUtils from '~/lib/utils/datetime_utility';
-import component from '~/registry/explorer/components/project_policy_alert.vue';
-import {
-  EXPIRATION_POLICY_ALERT_TITLE,
-  EXPIRATION_POLICY_ALERT_PRIMARY_BUTTON,
-} from '~/registry/explorer/constants';
-
-const localVue = createLocalVue();
-localVue.use(Vuex);
-
-describe('Project Policy Alert', () => {
-  let wrapper;
-  let store;
-
-  const defaultState = {
-    config: {
-      expirationPolicy: {
-        enabled: true,
-      },
-      settingsPath: 'foo',
-      expirationPolicyHelpPagePath: 'bar',
-    },
-    images: [],
-    isLoading: false,
-  };
-
-  const findAlert = () => wrapper.find(GlAlert);
-  const findLink = () => wrapper.find(GlLink);
-
-  const createComponent = (state = defaultState) => {
-    store = new Vuex.Store({
-      state,
-    });
-    wrapper = shallowMount(component, {
-      localVue,
-      store,
-      stubs: {
-        GlSprintf,
-      },
-    });
-  };
-
-  const documentationExpectation = () => {
-    it('contain a documentation link', () => {
-      createComponent();
-      expect(findLink().attributes('href')).toBe(defaultState.config.expirationPolicyHelpPagePath);
-      expect(findLink().text()).toBe('documentation');
-    });
-  };
-
-  beforeEach(() => {
-    jest.spyOn(dateTimeUtils, 'approximateDuration').mockReturnValue('1 day');
-  });
-
-  afterEach(() => {
-    wrapper.destroy();
-  });
-
-  describe('is hidden', () => {
-    it('when expiration policy does not exist', () => {
-      createComponent({ config: {} });
-      expect(findAlert().exists()).toBe(false);
-    });
-
-    it('when expiration policy exist but is disabled', () => {
-      createComponent({
-        ...defaultState,
-        config: {
-          expirationPolicy: {
-            enabled: false,
-          },
-        },
-      });
-      expect(findAlert().exists()).toBe(false);
-    });
-  });
-
-  describe('is visible', () => {
-    it('when expiration policy exists and is enabled', () => {
-      createComponent();
-      expect(findAlert().exists()).toBe(true);
-    });
-  });
-
-  describe('full info alert', () => {
-    beforeEach(() => {
-      createComponent({ ...defaultState, images: [1] });
-    });
-
-    it('has a primary button', () => {
-      const alert = findAlert();
-      expect(alert.props('primaryButtonText')).toBe(EXPIRATION_POLICY_ALERT_PRIMARY_BUTTON);
-      expect(alert.props('primaryButtonLink')).toBe(defaultState.config.settingsPath);
-    });
-
-    it('has a title', () => {
-      const alert = findAlert();
-      expect(alert.props('title')).toBe(EXPIRATION_POLICY_ALERT_TITLE);
-    });
-
-    it('has the full message', () => {
-      expect(findAlert().html()).toContain('<strong>1 day</strong>');
-    });
-
-    documentationExpectation();
-  });
-
-  describe('compact info alert', () => {
-    beforeEach(() => {
-      createComponent({ ...defaultState, images: [] });
-    });
-
-    it('does not have a button', () => {
-      const alert = findAlert();
-      expect(alert.props('primaryButtonText')).toBe(null);
-    });
-
-    it('does not have a title', () => {
-      const alert = findAlert();
-      expect(alert.props('title')).toBe(null);
-    });
-
-    it('has the short message', () => {
-      expect(findAlert().html()).not.toContain('<strong>1 day</strong>');
-    });
-
-    documentationExpectation();
-  });
-});
diff --git a/spec/frontend/registry/explorer/mock_data.js b/spec/frontend/registry/explorer/mock_data.js
index f6beccda9b1..e2b33826503 100644
--- a/spec/frontend/registry/explorer/mock_data.js
+++ b/spec/frontend/registry/explorer/mock_data.js
@@ -64,7 +64,7 @@ export const imagesListResponse = {
 export const tagsListResponse = {
   data: [
     {
-      tag: 'centos6',
+      name: 'centos6',
       revision: 'b118ab5b0e90b7cb5127db31d5321ac14961d097516a8e0e72084b6cdc783b43',
       short_revision: 'b118ab5b0',
       size: 19,
@@ -75,7 +75,7 @@ export const tagsListResponse = {
       destroy_path: 'path',
     },
     {
-      tag: 'test-image',
+      name: 'test-tag',
       revision: 'b969de599faea2b3d9b6605a8b0897261c571acaa36db1bdc7349b5775b4e0b4',
       short_revision: 'b969de599',
       size: 19,
diff --git a/spec/frontend/registry/explorer/pages/details_spec.js b/spec/frontend/registry/explorer/pages/details_spec.js
index 93098403a28..b7e01cad9bc 100644
--- a/spec/frontend/registry/explorer/pages/details_spec.js
+++ b/spec/frontend/registry/explorer/pages/details_spec.js
@@ -1,55 +1,43 @@
-import { mount } from '@vue/test-utils';
-import { GlTable, GlPagination, GlSkeletonLoader, GlAlert, GlLink } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import { GlPagination } from '@gitlab/ui';
 import Tracking from '~/tracking';
-import stubChildren from 'helpers/stub_children';
 import component from '~/registry/explorer/pages/details.vue';
+import DeleteAlert from '~/registry/explorer/components/details_page/delete_alert.vue';
+import DetailsHeader from '~/registry/explorer/components/details_page/details_header.vue';
+import TagsLoader from '~/registry/explorer/components/details_page/tags_loader.vue';
+import EmptyTagsState from '~/registry/explorer/components/details_page/empty_tags_state.vue';
 import { createStore } from '~/registry/explorer/stores/';
 import {
   SET_MAIN_LOADING,
-  SET_INITIAL_STATE,
   SET_TAGS_LIST_SUCCESS,
   SET_TAGS_PAGINATION,
+  SET_INITIAL_STATE,
 } from '~/registry/explorer/stores/mutation_types/';
-import {
-  DELETE_TAG_SUCCESS_MESSAGE,
-  DELETE_TAG_ERROR_MESSAGE,
-  DELETE_TAGS_SUCCESS_MESSAGE,
-  DELETE_TAGS_ERROR_MESSAGE,
-  ADMIN_GARBAGE_COLLECTION_TIP,
-} from '~/registry/explorer/constants';
+
 import { tagsListResponse } from '../mock_data';
-import { GlModal } from '../stubs';
-import { $toast } from '../../shared/mocks';
+import { TagsTable, DeleteModal } from '../stubs';
 
 describe('Details Page', () => {
   let wrapper;
   let dispatchSpy;
   let store;
 
-  const findDeleteModal = () => wrapper.find(GlModal);
+  const findDeleteModal = () => wrapper.find(DeleteModal);
   const findPagination = () => wrapper.find(GlPagination);
-  const findSkeletonLoader = () => wrapper.find(GlSkeletonLoader);
-  const findMainCheckbox = () => wrapper.find({ ref: 'mainCheckbox' });
-  const findFirstRowItem = ref => wrapper.find({ ref });
-  const findBulkDeleteButton = () => wrapper.find({ ref: 'bulkDeleteButton' });
-  // findAll and refs seems to no work falling back to class
-  const findAllDeleteButtons = () => wrapper.findAll('.js-delete-registry');
-  const findAllCheckboxes = () => wrapper.findAll('.js-row-checkbox');
-  const findCheckedCheckboxes = () => findAllCheckboxes().filter(c => c.attributes('checked'));
-  const findFirsTagColumn = () => wrapper.find('.js-tag-column');
-  const findFirstTagNameText = () => wrapper.find('[data-testid="rowNameText"]');
-  const findAlert = () => wrapper.find(GlAlert);
+  const findTagsLoader = () => wrapper.find(TagsLoader);
+  const findTagsTable = () => wrapper.find(TagsTable);
+  const findDeleteAlert = () => wrapper.find(DeleteAlert);
+  const findDetailsHeader = () => wrapper.find(DetailsHeader);
+  const findEmptyTagsState = () => wrapper.find(EmptyTagsState);
 
   const routeId = window.btoa(JSON.stringify({ name: 'foo', tags_path: 'bar' }));
 
   const mountComponent = options => {
-    wrapper = mount(component, {
+    wrapper = shallowMount(component, {
       store,
       stubs: {
-        ...stubChildren(component),
-        GlModal,
-        GlSprintf: false,
-        GlTable,
+        TagsTable,
+        DeleteModal,
       },
       mocks: {
         $route: {
@@ -57,7 +45,6 @@ describe('Details Page', () => {
             id: routeId,
           },
         },
-        $toast,
       },
       ...options,
     });
@@ -80,18 +67,14 @@ describe('Details Page', () => {
   describe('when isLoading is true', () => {
     beforeEach(() => {
       mountComponent();
-      store.dispatch('receiveTagsListSuccess', { ...tagsListResponse, data: [] });
       store.commit(SET_MAIN_LOADING, true);
+      return wrapper.vm.$nextTick();
     });
 
-    afterAll(() => store.commit(SET_MAIN_LOADING, false));
+    afterEach(() => store.commit(SET_MAIN_LOADING, false));
 
-    it('has a skeleton loader', () => {
-      expect(findSkeletonLoader().exists()).toBe(true);
-    });
-
-    it('does not have list items', () => {
-      expect(findFirstRowItem('rowCheckbox').exists()).toBe(false);
+    it('binds isLoading to tags-table', () => {
+      expect(findTagsTable().props('isLoading')).toBe(true);
     });
 
     it('does not show pagination', () => {
@@ -99,207 +82,76 @@ describe('Details Page', () => {
     });
   });
 
-  describe('table', () => {
+  describe('table slots', () => {
     beforeEach(() => {
       mountComponent();
     });
 
-    it.each([
-      'rowCheckbox',
-      'rowName',
-      'rowShortRevision',
-      'rowSize',
-      'rowTime',
-      'singleDeleteButton',
-    ])('%s exist in the table', element => {
-      expect(findFirstRowItem(element).exists()).toBe(true);
+    it('has the empty state', () => {
+      expect(findEmptyTagsState().exists()).toBe(true);
     });
 
-    describe('header checkbox', () => {
-      beforeEach(() => {
-        mountComponent();
-      });
-
-      it('exists', () => {
-        expect(findMainCheckbox().exists()).toBe(true);
-      });
-
-      it('if selected set selectedItem and allSelected', () => {
-        findMainCheckbox().vm.$emit('change');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findMainCheckbox().attributes('checked')).toBeTruthy();
-          expect(findCheckedCheckboxes()).toHaveLength(store.state.tags.length);
-        });
-      });
-
-      it('if deselect unset selectedItem and allSelected', () => {
-        wrapper.setData({ selectedItems: [1, 2], selectAllChecked: true });
-        findMainCheckbox().vm.$emit('change');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findMainCheckbox().attributes('checked')).toBe(undefined);
-          expect(findCheckedCheckboxes()).toHaveLength(0);
-        });
-      });
+    it('has a skeleton loader', () => {
+      expect(findTagsLoader().exists()).toBe(true);
     });
+  });
 
-    describe('row checkbox', () => {
-      it('if selected adds item to selectedItems', () => {
-        findFirstRowItem('rowCheckbox').vm.$emit('change');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(wrapper.vm.selectedItems).toEqual([1]);
-          expect(findFirstRowItem('rowCheckbox').attributes('checked')).toBeTruthy();
-        });
-      });
-
-      it('if deselect remove index from selectedItems', () => {
-        wrapper.setData({ selectedItems: [1] });
-        findFirstRowItem('rowCheckbox').vm.$emit('change');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(wrapper.vm.selectedItems.length).toBe(0);
-          expect(findFirstRowItem('rowCheckbox').attributes('checked')).toBe(undefined);
-        });
-      });
+  describe('table', () => {
+    beforeEach(() => {
+      mountComponent();
     });
 
-    describe('header delete button', () => {
-      beforeEach(() => {
-        mountComponent();
-      });
-
-      it('exists', () => {
-        expect(findBulkDeleteButton().exists()).toBe(true);
-      });
+    it('exists', () => {
+      expect(findTagsTable().exists()).toBe(true);
+    });
 
-      it('is disabled if no item is selected', () => {
-        expect(findBulkDeleteButton().attributes('disabled')).toBe('true');
+    it('has the correct props bound', () => {
+      expect(findTagsTable().props()).toMatchObject({
+        isDesktop: true,
+        isLoading: false,
+        tags: store.state.tags,
       });
+    });
 
-      it('is enabled if at least one item is selected', () => {
-        wrapper.setData({ selectedItems: [1] });
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findBulkDeleteButton().attributes('disabled')).toBeFalsy();
+    describe('deleteEvent', () => {
+      describe('single item', () => {
+        beforeEach(() => {
+          findTagsTable().vm.$emit('delete', [store.state.tags[0].name]);
         });
-      });
 
-      describe('on click', () => {
-        it('when one item is selected', () => {
-          wrapper.setData({ selectedItems: [1] });
-          findBulkDeleteButton().vm.$emit('click');
-          return wrapper.vm.$nextTick().then(() => {
-            expect(findDeleteModal().html()).toContain(
-              'You are about to remove <b>foo</b>. Are you sure?',
-            );
-            expect(GlModal.methods.show).toHaveBeenCalled();
-            expect(Tracking.event).toHaveBeenCalledWith(undefined, 'click_button', {
-              label: 'registry_tag_delete',
-            });
-          });
+        it('open the modal', () => {
+          expect(DeleteModal.methods.show).toHaveBeenCalled();
         });
 
-        it('when multiple items are selected', () => {
-          wrapper.setData({ selectedItems: [0, 1] });
-          findBulkDeleteButton().vm.$emit('click');
-          return wrapper.vm.$nextTick().then(() => {
-            expect(findDeleteModal().html()).toContain(
-              'You are about to remove <b>2</b> tags. Are you sure?',
-            );
-            expect(GlModal.methods.show).toHaveBeenCalled();
-            expect(Tracking.event).toHaveBeenCalledWith(undefined, 'click_button', {
-              label: 'bulk_registry_tag_delete',
-            });
-          });
+        it('maps the selection to itemToBeDeleted', () => {
+          expect(wrapper.vm.itemsToBeDeleted).toEqual([store.state.tags[0]]);
         });
-      });
-    });
 
-    describe('row delete button', () => {
-      beforeEach(() => {
-        mountComponent();
-      });
-
-      it('exists', () => {
-        expect(
-          findAllDeleteButtons()
-            .at(0)
-            .exists(),
-        ).toBe(true);
-      });
-
-      it('is disabled if the item has no destroy_path', () => {
-        expect(
-          findAllDeleteButtons()
-            .at(1)
-            .attributes('disabled'),
-        ).toBe('true');
-      });
-
-      it('on click', () => {
-        findAllDeleteButtons()
-          .at(0)
-          .vm.$emit('click');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findDeleteModal().html()).toContain(
-            'You are about to remove <b>bar</b>. Are you sure?',
-          );
-          expect(GlModal.methods.show).toHaveBeenCalled();
+        it('tracks a single delete event', () => {
           expect(Tracking.event).toHaveBeenCalledWith(undefined, 'click_button', {
             label: 'registry_tag_delete',
           });
         });
       });
-    });
-
-    describe('name cell', () => {
-      it('tag column has a tooltip with the tag name', () => {
-        mountComponent();
-        expect(findFirstTagNameText().attributes('title')).toBe(tagsListResponse.data[0].name);
-      });
 
-      describe('on desktop viewport', () => {
+      describe('multiple items', () => {
         beforeEach(() => {
-          mountComponent();
+          findTagsTable().vm.$emit('delete', store.state.tags.map(t => t.name));
         });
 
-        it('table header has class w-25', () => {
-          expect(findFirsTagColumn().classes()).toContain('w-25');
+        it('open the modal', () => {
+          expect(DeleteModal.methods.show).toHaveBeenCalled();
         });
 
-        it('tag column has the mw-m class', () => {
-          expect(findFirstRowItem('rowName').classes()).toContain('mw-m');
+        it('maps the selection to itemToBeDeleted', () => {
+          expect(wrapper.vm.itemsToBeDeleted).toEqual(store.state.tags);
         });
-      });
 
-      describe('on mobile viewport', () => {
-        beforeEach(() => {
-          mountComponent({
-            data() {
-              return { isDesktop: false };
-            },
+        it('tracks a single delete event', () => {
+          expect(Tracking.event).toHaveBeenCalledWith(undefined, 'click_button', {
+            label: 'bulk_registry_tag_delete',
           });
         });
-
-        it('table header does not have class w-25', () => {
-          expect(findFirsTagColumn().classes()).not.toContain('w-25');
-        });
-
-        it('tag column has the gl-justify-content-end class', () => {
-          expect(findFirstRowItem('rowName').classes()).toContain('gl-justify-content-end');
-        });
-      });
-    });
-
-    describe('last updated cell', () => {
-      let timeCell;
-
-      beforeEach(() => {
-        timeCell = findFirstRowItem('rowTime');
-      });
-
-      it('displays the time in string format', () => {
-        expect(timeCell.text()).toBe('2 years ago');
-      });
-      it('has a tooltip timestamp', () => {
-        expect(timeCell.attributes('title')).toBe('Sep 19, 2017 1:45pm GMT+0000');
       });
     });
   });
@@ -322,7 +174,7 @@ describe('Details Page', () => {
 
     it('fetch the data from the API when the v-model changes', () => {
       dispatchSpy.mockResolvedValue();
-      wrapper.setData({ currentPage: 2 });
+      findPagination().vm.$emit(GlPagination.model.event, 2);
       expect(store.dispatch).toHaveBeenCalledWith('requestTagsList', {
         params: wrapper.vm.$route.params.id,
         pagination: { page: 2 },
@@ -331,176 +183,86 @@ describe('Details Page', () => {
   });
 
   describe('modal', () => {
-    beforeEach(() => {
-      mountComponent();
-    });
-
     it('exists', () => {
+      mountComponent();
       expect(findDeleteModal().exists()).toBe(true);
     });
 
-    describe('when ok event is emitted', () => {
-      beforeEach(() => {
-        dispatchSpy.mockResolvedValue();
-      });
-
-      it('tracks confirm_delete', () => {
-        const deleteModal = findDeleteModal();
-        deleteModal.vm.$emit('ok');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(Tracking.event).toHaveBeenCalledWith(undefined, 'confirm_delete', {
-            label: 'registry_tag_delete',
-          });
+    describe('cancel event', () => {
+      it('tracks cancel_delete', () => {
+        mountComponent();
+        findDeleteModal().vm.$emit('cancel');
+        expect(Tracking.event).toHaveBeenCalledWith(undefined, 'cancel_delete', {
+          label: 'registry_tag_delete',
         });
       });
+    });
 
-      describe('when only one element is selected', () => {
-        it('execute the delete and remove selection', () => {
-          wrapper.setData({ itemsToBeDeleted: [0] });
-          findDeleteModal().vm.$emit('ok');
+    describe('confirmDelete event', () => {
+      describe('when one item is selected to be deleted', () => {
+        beforeEach(() => {
+          mountComponent();
+          findTagsTable().vm.$emit('delete', [store.state.tags[0].name]);
+        });
 
-          expect(store.dispatch).toHaveBeenCalledWith('requestDeleteTag', {
+        it('dispatch requestDeleteTag with the right parameters', () => {
+          findDeleteModal().vm.$emit('confirmDelete');
+          expect(dispatchSpy).toHaveBeenCalledWith('requestDeleteTag', {
             tag: store.state.tags[0],
-            params: wrapper.vm.$route.params.id,
+            params: routeId,
           });
-          // itemsToBeDeleted is not represented in the DOM, is used as parking variable between selected and deleted items
-          expect(wrapper.vm.itemsToBeDeleted).toEqual([]);
-          expect(wrapper.vm.selectedItems).toEqual([]);
-          expect(findCheckedCheckboxes()).toHaveLength(0);
         });
       });
 
-      describe('when multiple elements are selected', () => {
+      describe('when more than one item is selected to be deleted', () => {
         beforeEach(() => {
-          wrapper.setData({ itemsToBeDeleted: [0, 1] });
+          mountComponent();
+          findTagsTable().vm.$emit('delete', store.state.tags.map(t => t.name));
         });
 
-        it('execute the delete and remove selection', () => {
-          findDeleteModal().vm.$emit('ok');
-
-          expect(store.dispatch).toHaveBeenCalledWith('requestDeleteTags', {
+        it('dispatch requestDeleteTags with the right parameters', () => {
+          findDeleteModal().vm.$emit('confirmDelete');
+          expect(dispatchSpy).toHaveBeenCalledWith('requestDeleteTags', {
             ids: store.state.tags.map(t => t.name),
-            params: wrapper.vm.$route.params.id,
+            params: routeId,
           });
-          // itemsToBeDeleted is not represented in the DOM, is used as parking variable between selected and deleted items
-          expect(wrapper.vm.itemsToBeDeleted).toEqual([]);
-          expect(findCheckedCheckboxes()).toHaveLength(0);
         });
       });
     });
+  });
 
-    it('tracks cancel_delete when cancel event is emitted', () => {
-      const deleteModal = findDeleteModal();
-      deleteModal.vm.$emit('cancel');
-      return wrapper.vm.$nextTick().then(() => {
-        expect(Tracking.event).toHaveBeenCalledWith(undefined, 'cancel_delete', {
-          label: 'registry_tag_delete',
-        });
-      });
+  describe('Header', () => {
+    it('exists', () => {
+      mountComponent();
+      expect(findDetailsHeader().exists()).toBe(true);
+    });
+
+    it('has the correct props', () => {
+      mountComponent();
+      expect(findDetailsHeader().props()).toEqual({ imageName: 'foo' });
     });
   });
 
-  describe('Delete alert', () => {
+  describe('Delete Alert', () => {
     const config = {
-      garbageCollectionHelpPagePath: 'foo',
+      isAdmin: true,
+      garbageCollectionHelpPagePath: 'baz',
     };
+    const deleteAlertType = 'success_tag';
 
-    describe('when the user is an admin', () => {
-      beforeEach(() => {
-        store.commit(SET_INITIAL_STATE, { ...config, isAdmin: true });
-      });
-
-      afterEach(() => {
-        store.commit(SET_INITIAL_STATE, config);
-      });
-
-      describe.each`
-        deleteType                | successTitle                   | errorTitle
-        ${'handleSingleDelete'}   | ${DELETE_TAG_SUCCESS_MESSAGE}  | ${DELETE_TAG_ERROR_MESSAGE}
-        ${'handleMultipleDelete'} | ${DELETE_TAGS_SUCCESS_MESSAGE} | ${DELETE_TAGS_ERROR_MESSAGE}
-      `('behaves correctly on $deleteType', ({ deleteType, successTitle, errorTitle }) => {
-        describe('when delete is successful', () => {
-          beforeEach(() => {
-            dispatchSpy.mockResolvedValue();
-            mountComponent();
-            return wrapper.vm[deleteType]('foo');
-          });
-
-          it('alert exists', () => {
-            expect(findAlert().exists()).toBe(true);
-          });
-
-          it('alert body contains admin tip', () => {
-            expect(
-              findAlert()
-                .text()
-                .replace(/\s\s+/gm, ' '),
-            ).toBe(ADMIN_GARBAGE_COLLECTION_TIP.replace(/%{\w+}/gm, ''));
-          });
-
-          it('alert body contains link', () => {
-            const alertLink = findAlert().find(GlLink);
-            expect(alertLink.exists()).toBe(true);
-            expect(alertLink.attributes('href')).toBe(config.garbageCollectionHelpPagePath);
-          });
-
-          it('alert title is appropriate', () => {
-            expect(findAlert().attributes('title')).toBe(successTitle);
-          });
-        });
-
-        describe('when delete is not successful', () => {
-          beforeEach(() => {
-            mountComponent();
-            dispatchSpy.mockRejectedValue();
-            return wrapper.vm[deleteType]('foo');
-          });
+    it('exists', () => {
+      mountComponent();
+      expect(findDeleteAlert().exists()).toBe(true);
+    });
 
-          it('alert exist and text is appropriate', () => {
-            expect(findAlert().exists()).toBe(true);
-            expect(findAlert().text()).toBe(errorTitle);
-          });
-        });
+    it('has the correct props', () => {
+      store.commit(SET_INITIAL_STATE, { ...config });
+      mountComponent({
+        data: () => ({
+          deleteAlertType,
+        }),
       });
+      expect(findDeleteAlert().props()).toEqual({ ...config, deleteAlertType });
     });
-
-    describe.each`
-      deleteType                | successTitle                   | errorTitle
-      ${'handleSingleDelete'}   | ${DELETE_TAG_SUCCESS_MESSAGE}  | ${DELETE_TAG_ERROR_MESSAGE}
-      ${'handleMultipleDelete'} | ${DELETE_TAGS_SUCCESS_MESSAGE} | ${DELETE_TAGS_ERROR_MESSAGE}
-    `(
-      'when the user is not an admin alert behaves correctly on $deleteType',
-      ({ deleteType, successTitle, errorTitle }) => {
-        beforeEach(() => {
-          store.commit('SET_INITIAL_STATE', { ...config });
-        });
-
-        describe('when delete is successful', () => {
-          beforeEach(() => {
-            dispatchSpy.mockResolvedValue();
-            mountComponent();
-            return wrapper.vm[deleteType]('foo');
-          });
-
-          it('alert exist and text is appropriate', () => {
-            expect(findAlert().exists()).toBe(true);
-            expect(findAlert().text()).toBe(successTitle);
-          });
-        });
-
-        describe('when delete is not successful', () => {
-          beforeEach(() => {
-            mountComponent();
-            dispatchSpy.mockRejectedValue();
-            return wrapper.vm[deleteType]('foo');
-          });
-
-          it('alert exist and text is appropriate', () => {
-            expect(findAlert().exists()).toBe(true);
-            expect(findAlert().text()).toBe(errorTitle);
-          });
-        });
-      },
-    );
   });
 });
diff --git a/spec/frontend/registry/explorer/pages/index_spec.js b/spec/frontend/registry/explorer/pages/index_spec.js
index b558727ed5e..1dc5376cacf 100644
--- a/spec/frontend/registry/explorer/pages/index_spec.js
+++ b/spec/frontend/registry/explorer/pages/index_spec.js
@@ -1,9 +1,10 @@
 import { shallowMount } from '@vue/test-utils';
 import component from '~/registry/explorer/pages/index.vue';
-import store from '~/registry/explorer/stores/';
+import { createStore } from '~/registry/explorer/stores/';
 
 describe('List Page', () => {
   let wrapper;
+  let store;
 
   const findRouterView = () => wrapper.find({ ref: 'router-view' });
 
@@ -17,6 +18,7 @@ describe('List Page', () => {
   };
 
   beforeEach(() => {
+    store = createStore();
     mountComponent();
   });
 
diff --git a/spec/frontend/registry/explorer/pages/list_spec.js b/spec/frontend/registry/explorer/pages/list_spec.js
index 97742b9e9b3..2ece7593b41 100644
--- a/spec/frontend/registry/explorer/pages/list_spec.js
+++ b/spec/frontend/registry/explorer/pages/list_spec.js
@@ -3,11 +3,11 @@ import { GlSkeletonLoader, GlSprintf, GlAlert, GlSearchBoxByClick } from '@gitla
 import Tracking from '~/tracking';
 import waitForPromises from 'helpers/wait_for_promises';
 import component from '~/registry/explorer/pages/list.vue';
-import QuickstartDropdown from '~/registry/explorer/components/quickstart_dropdown.vue';
-import GroupEmptyState from '~/registry/explorer/components/group_empty_state.vue';
-import ProjectEmptyState from '~/registry/explorer/components/project_empty_state.vue';
-import ProjectPolicyAlert from '~/registry/explorer/components/project_policy_alert.vue';
-import ImageList from '~/registry/explorer/components/image_list.vue';
+import CliCommands from '~/registry/explorer/components/list_page/cli_commands.vue';
+import GroupEmptyState from '~/registry/explorer/components/list_page/group_empty_state.vue';
+import ProjectEmptyState from '~/registry/explorer/components/list_page/project_empty_state.vue';
+import RegistryHeader from '~/registry/explorer/components/list_page/registry_header.vue';
+import ImageList from '~/registry/explorer/components/list_page/image_list.vue';
 import { createStore } from '~/registry/explorer/stores/';
 import {
   SET_MAIN_LOADING,
@@ -32,14 +32,14 @@ describe('List Page', () => {
 
   const findDeleteModal = () => wrapper.find(GlModal);
   const findSkeletonLoader = () => wrapper.find(GlSkeletonLoader);
-  const findImagesList = () => wrapper.find({ ref: 'imagesList' });
 
   const findEmptyState = () => wrapper.find(GlEmptyState);
 
-  const findQuickStartDropdown = () => wrapper.find(QuickstartDropdown);
+  const findCliCommands = () => wrapper.find(CliCommands);
   const findProjectEmptyState = () => wrapper.find(ProjectEmptyState);
   const findGroupEmptyState = () => wrapper.find(GroupEmptyState);
-  const findProjectPolicyAlert = () => wrapper.find(ProjectPolicyAlert);
+  const findRegistryHeader = () => wrapper.find(RegistryHeader);
+
   const findDeleteAlert = () => wrapper.find(GlAlert);
   const findImageList = () => wrapper.find(ImageList);
   const findListHeader = () => wrapper.find('[data-testid="listHeader"]');
@@ -53,6 +53,7 @@ describe('List Page', () => {
         GlModal,
         GlEmptyState,
         GlSprintf,
+        RegistryHeader,
       },
       mocks: {
         $toast,
@@ -76,21 +77,6 @@ describe('List Page', () => {
     wrapper.destroy();
   });
 
-  describe('Expiration policy notification', () => {
-    beforeEach(() => {
-      mountComponent();
-    });
-    it('shows up on project page', () => {
-      expect(findProjectPolicyAlert().exists()).toBe(true);
-    });
-    it('does show up on group page', () => {
-      store.commit(SET_INITIAL_STATE, { isGroupPage: true });
-      return wrapper.vm.$nextTick().then(() => {
-        expect(findProjectPolicyAlert().exists()).toBe(false);
-      });
-    });
-  });
-
   describe('API calls', () => {
     it.each`
       imageList                  | name         | called
@@ -109,6 +95,11 @@ describe('List Page', () => {
     );
   });
 
+  it('contains registry header', () => {
+    mountComponent();
+    expect(findRegistryHeader().exists()).toBe(true);
+  });
+
   describe('connection error', () => {
     const config = {
       characterError: true,
@@ -139,7 +130,7 @@ describe('List Page', () => {
 
     it('should not show the loading or default state', () => {
       expect(findSkeletonLoader().exists()).toBe(false);
-      expect(findImagesList().exists()).toBe(false);
+      expect(findImageList().exists()).toBe(false);
     });
   });
 
@@ -156,11 +147,11 @@ describe('List Page', () => {
     });
 
     it('imagesList is not visible', () => {
-      expect(findImagesList().exists()).toBe(false);
+      expect(findImageList().exists()).toBe(false);
     });
 
-    it('quick start is not visible', () => {
-      expect(findQuickStartDropdown().exists()).toBe(false);
+    it('cli commands is not visible', () => {
+      expect(findCliCommands().exists()).toBe(false);
     });
   });
 
@@ -171,8 +162,8 @@ describe('List Page', () => {
       return waitForPromises();
     });
 
-    it('quick start is not visible', () => {
-      expect(findQuickStartDropdown().exists()).toBe(false);
+    it('cli commands is not visible', () => {
+      expect(findCliCommands().exists()).toBe(false);
     });
 
     it('project empty state is visible', () => {
@@ -193,8 +184,8 @@ describe('List Page', () => {
         expect(findGroupEmptyState().exists()).toBe(true);
       });
 
-      it('quick start is not visible', () => {
-        expect(findQuickStartDropdown().exists()).toBe(false);
+      it('cli commands is not visible', () => {
+        expect(findCliCommands().exists()).toBe(false);
       });
 
       it('list header is not visible', () => {
@@ -210,7 +201,7 @@ describe('List Page', () => {
       });
 
       it('quick start is visible', () => {
-        expect(findQuickStartDropdown().exists()).toBe(true);
+        expect(findCliCommands().exists()).toBe(true);
       });
 
       it('list component is visible', () => {
@@ -311,7 +302,7 @@ describe('List Page', () => {
     });
 
     it('contains a description with the path of the item to delete', () => {
-      wrapper.setData({ itemToDelete: { path: 'foo' } });
+      findImageList().vm.$emit('delete', { path: 'foo' });
       return wrapper.vm.$nextTick().then(() => {
         expect(findDeleteModal().html()).toContain('foo');
       });
diff --git a/spec/frontend/registry/explorer/stores/getters_spec.js b/spec/frontend/registry/explorer/stores/getters_spec.js
index cd053ea8edc..4cab65d2bb0 100644
--- a/spec/frontend/registry/explorer/stores/getters_spec.js
+++ b/spec/frontend/registry/explorer/stores/getters_spec.js
@@ -2,35 +2,6 @@ import * as getters from '~/registry/explorer/stores/getters';
 
 describe('Getters RegistryExplorer  store', () => {
   let state;
-  const tags = ['foo', 'bar'];
-
-  describe('tags', () => {
-    describe('when isLoading is false', () => {
-      beforeEach(() => {
-        state = {
-          tags,
-          isLoading: false,
-        };
-      });
-
-      it('returns tags', () => {
-        expect(getters.tags(state)).toEqual(state.tags);
-      });
-    });
-
-    describe('when isLoading is true', () => {
-      beforeEach(() => {
-        state = {
-          tags,
-          isLoading: true,
-        };
-      });
-
-      it('returns empty array', () => {
-        expect(getters.tags(state)).toEqual([]);
-      });
-    });
-  });
 
   describe.each`
     getter                  | prefix               | configParameter              | suffix
diff --git a/spec/frontend/registry/explorer/stores/mutations_spec.js b/spec/frontend/registry/explorer/stores/mutations_spec.js
index 43b2ba84218..4ca0211cdc3 100644
--- a/spec/frontend/registry/explorer/stores/mutations_spec.js
+++ b/spec/frontend/registry/explorer/stores/mutations_spec.js
@@ -12,11 +12,14 @@ describe('Mutations Registry Explorer Store', () => {
     it('should set the initial state', () => {
       const payload = {
         endpoint: 'foo',
-        isGroupPage: true,
+        isGroupPage: '',
         expirationPolicy: { foo: 'bar' },
-        isAdmin: true,
+        isAdmin: '',
+      };
+      const expectedState = {
+        ...mockState,
+        config: { ...payload, isGroupPage: false, isAdmin: false },
       };
-      const expectedState = { ...mockState, config: payload };
       mutations[types.SET_INITIAL_STATE](mockState, {
         ...payload,
         expirationPolicy: JSON.stringify(payload.expirationPolicy),
diff --git a/spec/frontend/registry/explorer/stubs.js b/spec/frontend/registry/explorer/stubs.js
index 0e178abfbed..d3518c36c82 100644
--- a/spec/frontend/registry/explorer/stubs.js
+++ b/spec/frontend/registry/explorer/stubs.js
@@ -1,3 +1,6 @@
+import RealTagsTable from '~/registry/explorer/components/details_page/tags_table.vue';
+import RealDeleteModal from '~/registry/explorer/components/details_page/delete_modal.vue';
+
 export const GlModal = {
   template: '<div><slot name="modal-title"></slot><slot></slot><slot name="modal-ok"></slot></div>',
   methods: {
@@ -14,3 +17,21 @@ export const RouterLink = {
   template: `<div><slot></slot></div>`,
   props: ['to'],
 };
+
+export const TagsTable = {
+  props: RealTagsTable.props,
+  template: `<div><slot name="empty"></slot><slot name="loader"></slot></div>`,
+};
+
+export const DeleteModal = {
+  template: '<div></div>',
+  methods: {
+    show: jest.fn(),
+  },
+  props: RealDeleteModal.props,
+};
+
+export const GlSkeletonLoader = {
+  template: `<div><slot></slot></div>`,
+  props: ['width', 'height'],
+};
diff --git a/spec/javascripts/releases/components/app_index_spec.js b/spec/frontend/releases/components/app_index_spec.js
index 020937d07e5..91beb5b1418 100644
--- a/spec/javascripts/releases/components/app_index_spec.js
+++ b/spec/frontend/releases/components/app_index_spec.js
@@ -1,6 +1,6 @@
 import { range as rge } from 'lodash';
 import Vue from 'vue';
-import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
+import { mountComponentWithStore } from 'helpers/vue_mount_component_helper';
 import app from '~/releases/components/app_index.vue';
 import createStore from '~/releases/stores';
 import listModule from '~/releases/stores/modules/list';
@@ -9,11 +9,11 @@ import { resetStore } from '../stores/modules/list/helpers';
 import {
   pageInfoHeadersWithoutPagination,
   pageInfoHeadersWithPagination,
-  release,
+  release2 as release,
   releases,
 } from '../mock_data';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-import waitForPromises from 'spec/helpers/wait_for_promises';
+import waitForPromises from 'helpers/wait_for_promises';
 
 describe('Releases App ', () => {
   const Component = Vue.extend(app);
@@ -42,83 +42,67 @@ describe('Releases App ', () => {
 
   describe('while loading', () => {
     beforeEach(() => {
-      spyOn(api, 'releases').and.returnValue(Promise.resolve({ data: [], headers: {} }));
+      jest
+        .spyOn(api, 'releases')
+        // Need to defer the return value here to the next stack,
+        // otherwise the loading state disappears before our test even starts.
+        .mockImplementation(() => waitForPromises().then(() => ({ data: [], headers: {} })));
       vm = mountComponentWithStore(Component, { props, store });
     });
 
-    it('renders loading icon', done => {
+    it('renders loading icon', () => {
       expect(vm.$el.querySelector('.js-loading')).not.toBeNull();
       expect(vm.$el.querySelector('.js-empty-state')).toBeNull();
       expect(vm.$el.querySelector('.js-success-state')).toBeNull();
       expect(vm.$el.querySelector('.gl-pagination')).toBeNull();
 
-      waitForPromises()
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises();
     });
   });
 
   describe('with successful request', () => {
     beforeEach(() => {
-      spyOn(api, 'releases').and.returnValue(
-        Promise.resolve({ data: releases, headers: pageInfoHeadersWithoutPagination }),
-      );
+      jest
+        .spyOn(api, 'releases')
+        .mockResolvedValue({ data: releases, headers: pageInfoHeadersWithoutPagination });
       vm = mountComponentWithStore(Component, { props, store });
     });
 
-    it('renders success state', done => {
-      waitForPromises()
-        .then(() => {
-          expect(vm.$el.querySelector('.js-loading')).toBeNull();
-          expect(vm.$el.querySelector('.js-empty-state')).toBeNull();
-          expect(vm.$el.querySelector('.js-success-state')).not.toBeNull();
-          expect(vm.$el.querySelector('.gl-pagination')).toBeNull();
-
-          done();
-        })
-        .catch(done.fail);
+    it('renders success state', () => {
+      expect(vm.$el.querySelector('.js-loading')).toBeNull();
+      expect(vm.$el.querySelector('.js-empty-state')).toBeNull();
+      expect(vm.$el.querySelector('.js-success-state')).not.toBeNull();
+      expect(vm.$el.querySelector('.gl-pagination')).toBeNull();
     });
   });
 
   describe('with successful request and pagination', () => {
     beforeEach(() => {
-      spyOn(api, 'releases').and.returnValue(
-        Promise.resolve({ data: releasesPagination, headers: pageInfoHeadersWithPagination }),
-      );
+      jest
+        .spyOn(api, 'releases')
+        .mockResolvedValue({ data: releasesPagination, headers: pageInfoHeadersWithPagination });
       vm = mountComponentWithStore(Component, { props, store });
     });
 
-    it('renders success state', done => {
-      waitForPromises()
-        .then(() => {
-          expect(vm.$el.querySelector('.js-loading')).toBeNull();
-          expect(vm.$el.querySelector('.js-empty-state')).toBeNull();
-          expect(vm.$el.querySelector('.js-success-state')).not.toBeNull();
-          expect(vm.$el.querySelector('.gl-pagination')).not.toBeNull();
-
-          done();
-        })
-        .catch(done.fail);
+    it('renders success state', () => {
+      expect(vm.$el.querySelector('.js-loading')).toBeNull();
+      expect(vm.$el.querySelector('.js-empty-state')).toBeNull();
+      expect(vm.$el.querySelector('.js-success-state')).not.toBeNull();
+      expect(vm.$el.querySelector('.gl-pagination')).not.toBeNull();
     });
   });
 
   describe('with empty request', () => {
     beforeEach(() => {
-      spyOn(api, 'releases').and.returnValue(Promise.resolve({ data: [], headers: {} }));
+      jest.spyOn(api, 'releases').mockResolvedValue({ data: [], headers: {} });
       vm = mountComponentWithStore(Component, { props, store });
     });
 
-    it('renders empty state', done => {
-      waitForPromises()
-        .then(() => {
-          expect(vm.$el.querySelector('.js-loading')).toBeNull();
-          expect(vm.$el.querySelector('.js-empty-state')).not.toBeNull();
-          expect(vm.$el.querySelector('.js-success-state')).toBeNull();
-          expect(vm.$el.querySelector('.gl-pagination')).toBeNull();
-
-          done();
-        })
-        .catch(done.fail);
+    it('renders empty state', () => {
+      expect(vm.$el.querySelector('.js-loading')).toBeNull();
+      expect(vm.$el.querySelector('.js-empty-state')).not.toBeNull();
+      expect(vm.$el.querySelector('.js-success-state')).toBeNull();
+      expect(vm.$el.querySelector('.gl-pagination')).toBeNull();
     });
   });
 
@@ -126,7 +110,7 @@ describe('Releases App ', () => {
     const findNewReleaseButton = () => vm.$el.querySelector('.js-new-release-btn');
 
     beforeEach(() => {
-      spyOn(api, 'releases').and.returnValue(Promise.resolve({ data: [], headers: {} }));
+      jest.spyOn(api, 'releases').mockResolvedValue({ data: [], headers: {} });
     });
 
     const factory = additionalProps => {
@@ -146,38 +130,20 @@ describe('Releases App ', () => {
         factory({ newReleasePath });
       });
 
-      it('renders the "New release" button', done => {
-        waitForPromises()
-          .then(() => {
-            expect(findNewReleaseButton()).not.toBeNull();
-
-            done();
-          })
-          .catch(done.fail);
+      it('renders the "New release" button', () => {
+        expect(findNewReleaseButton()).not.toBeNull();
       });
 
-      it('renders the "New release" button with the correct href', done => {
-        waitForPromises()
-          .then(() => {
-            expect(findNewReleaseButton().getAttribute('href')).toBe(newReleasePath);
-
-            done();
-          })
-          .catch(done.fail);
+      it('renders the "New release" button with the correct href', () => {
+        expect(findNewReleaseButton().getAttribute('href')).toBe(newReleasePath);
       });
     });
 
     describe('when the user is not allowed to create a new Release', () => {
       beforeEach(() => factory());
 
-      it('does not render the "New release" button', done => {
-        waitForPromises()
-          .then(() => {
-            expect(findNewReleaseButton()).toBeNull();
-
-            done();
-          })
-          .catch(done.fail);
+      it('does not render the "New release" button', () => {
+        expect(findNewReleaseButton()).toBeNull();
       });
     });
   });
diff --git a/spec/frontend/releases/components/asset_links_form_spec.js b/spec/frontend/releases/components/asset_links_form_spec.js
index 44542868cfe..e1f8592270e 100644
--- a/spec/frontend/releases/components/asset_links_form_spec.js
+++ b/spec/frontend/releases/components/asset_links_form_spec.js
@@ -3,6 +3,7 @@ import { mount, createLocalVue } from '@vue/test-utils';
 import AssetLinksForm from '~/releases/components/asset_links_form.vue';
 import { release as originalRelease } from '../mock_data';
 import * as commonUtils from '~/lib/utils/common_utils';
+import { ASSET_LINK_TYPE, DEFAULT_ASSET_LINK_TYPE } from '~/releases/constants';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -24,6 +25,7 @@ describe('Release edit component', () => {
       addEmptyAssetLink: jest.fn(),
       updateAssetLinkUrl: jest.fn(),
       updateAssetLinkName: jest.fn(),
+      updateAssetLinkType: jest.fn(),
       removeAssetLink: jest.fn().mockImplementation((_context, linkId) => {
         state.release.assets.links = state.release.assets.links.filter(l => l.id !== linkId);
       }),
@@ -51,6 +53,11 @@ describe('Release edit component', () => {
     wrapper = mount(AssetLinksForm, {
       localVue,
       store,
+      provide: {
+        glFeatures: {
+          releaseAssetLinkType: true,
+        },
+      },
     });
   };
 
@@ -103,7 +110,7 @@ describe('Release edit component', () => {
       );
     });
 
-    it('calls the "updateAssetLinName" store method when text is entered into the "Link title" input field', () => {
+    it('calls the "updateAssetLinkName" store method when text is entered into the "Link title" input field', () => {
       const linkIdToUpdate = release.assets.links[0].id;
       const newName = 'updated name';
 
@@ -121,6 +128,31 @@ describe('Release edit component', () => {
         undefined,
       );
     });
+
+    it('calls the "updateAssetLinkType" store method when an option is selected from the "Type" dropdown', () => {
+      const linkIdToUpdate = release.assets.links[0].id;
+      const newType = ASSET_LINK_TYPE.RUNBOOK;
+
+      expect(actions.updateAssetLinkType).not.toHaveBeenCalled();
+
+      wrapper.find({ ref: 'typeSelect' }).vm.$emit('change', newType);
+
+      expect(actions.updateAssetLinkType).toHaveBeenCalledTimes(1);
+      expect(actions.updateAssetLinkType).toHaveBeenCalledWith(
+        expect.anything(),
+        {
+          linkIdToUpdate,
+          newType,
+        },
+        undefined,
+      );
+    });
+
+    it('selects the default asset type if no type was provided by the backend', () => {
+      const selected = wrapper.find({ ref: 'typeSelect' }).element.value;
+
+      expect(selected).toBe(DEFAULT_ASSET_LINK_TYPE);
+    });
   });
 
   describe('validation', () => {
diff --git a/spec/frontend/releases/components/release_block_assets_spec.js b/spec/frontend/releases/components/release_block_assets_spec.js
new file mode 100644
index 00000000000..44b190b0d19
--- /dev/null
+++ b/spec/frontend/releases/components/release_block_assets_spec.js
@@ -0,0 +1,137 @@
+import { mount } from '@vue/test-utils';
+import { GlCollapse } from '@gitlab/ui';
+import ReleaseBlockAssets from '~/releases/components/release_block_assets.vue';
+import { ASSET_LINK_TYPE } from '~/releases/constants';
+import { trimText } from 'helpers/text_helper';
+import { assets } from '../mock_data';
+
+describe('Release block assets', () => {
+  let wrapper;
+  let defaultProps;
+
+  // A map of types to the expected section heading text
+  const sections = {
+    [ASSET_LINK_TYPE.IMAGE]: 'Images',
+    [ASSET_LINK_TYPE.PACKAGE]: 'Packages',
+    [ASSET_LINK_TYPE.RUNBOOK]: 'Runbooks',
+    [ASSET_LINK_TYPE.OTHER]: 'Other',
+  };
+
+  const createComponent = (propsData = defaultProps) => {
+    wrapper = mount(ReleaseBlockAssets, {
+      provide: {
+        glFeatures: { releaseAssetLinkType: true },
+      },
+      propsData,
+    });
+  };
+
+  const findSectionHeading = type =>
+    wrapper.findAll('h5').filter(h5 => h5.text() === sections[type]);
+
+  beforeEach(() => {
+    defaultProps = { assets };
+  });
+
+  describe('with default props', () => {
+    beforeEach(() => createComponent());
+
+    const findAccordionButton = () => wrapper.find('[data-testid="accordion-button"]');
+
+    it('renders an "Assets" accordion with the asset count', () => {
+      const accordionButton = findAccordionButton();
+
+      expect(accordionButton.exists()).toBe(true);
+      expect(trimText(accordionButton.text())).toBe('Assets 5');
+    });
+
+    it('renders the accordion as expanded by default', () => {
+      const accordion = wrapper.find(GlCollapse);
+
+      expect(accordion.exists()).toBe(true);
+      expect(accordion.isVisible()).toBe(true);
+    });
+
+    it('renders sources with the expected text and URL', () => {
+      defaultProps.assets.sources.forEach(s => {
+        const sourceLink = wrapper.find(`li>a[href="${s.url}"]`);
+
+        expect(sourceLink.exists()).toBe(true);
+        expect(sourceLink.text()).toBe(`Source code (${s.format})`);
+      });
+    });
+
+    it('renders a heading for each assets type (except sources)', () => {
+      Object.keys(sections).forEach(type => {
+        const sectionHeadings = findSectionHeading(type);
+
+        expect(sectionHeadings).toHaveLength(1);
+      });
+    });
+
+    it('renders asset links with the expected text and URL', () => {
+      defaultProps.assets.links.forEach(l => {
+        const sourceLink = wrapper.find(`li>a[href="${l.directAssetUrl}"]`);
+
+        expect(sourceLink.exists()).toBe(true);
+        expect(sourceLink.text()).toBe(l.name);
+      });
+    });
+  });
+
+  describe("when a release doesn't have a link with a certain asset type", () => {
+    const typeToExclude = ASSET_LINK_TYPE.IMAGE;
+
+    beforeEach(() => {
+      defaultProps.assets.links = defaultProps.assets.links.filter(
+        l => l.linkType !== typeToExclude,
+      );
+      createComponent(defaultProps);
+    });
+
+    it('does not render a section heading if there are no links of that type', () => {
+      const sectionHeadings = findSectionHeading(typeToExclude);
+
+      expect(sectionHeadings).toHaveLength(0);
+    });
+  });
+
+  describe('external vs internal links', () => {
+    const containsExternalSourceIndicator = () =>
+      wrapper.contains('[data-testid="external-link-indicator"]');
+
+    describe('when a link is external', () => {
+      beforeEach(() => {
+        defaultProps.assets.sources = [];
+        defaultProps.assets.links = [
+          {
+            ...defaultProps.assets.links[0],
+            external: true,
+          },
+        ];
+        createComponent(defaultProps);
+      });
+
+      it('renders the link with an "external source" indicator', () => {
+        expect(containsExternalSourceIndicator()).toBe(true);
+      });
+    });
+
+    describe('when a link is internal', () => {
+      beforeEach(() => {
+        defaultProps.assets.sources = [];
+        defaultProps.assets.links = [
+          {
+            ...defaultProps.assets.links[0],
+            external: false,
+          },
+        ];
+        createComponent(defaultProps);
+      });
+
+      it('renders the link without the "external source" indicator', () => {
+        expect(containsExternalSourceIndicator()).toBe(false);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/releases/mock_data.js b/spec/frontend/releases/mock_data.js
index bd5fc86275e..b97385154bd 100644
--- a/spec/frontend/releases/mock_data.js
+++ b/spec/frontend/releases/mock_data.js
@@ -1,3 +1,5 @@
+import { ASSET_LINK_TYPE } from '~/releases/constants';
+
 export const milestones = [
   {
     id: 50,
@@ -131,3 +133,92 @@ export const release = {
     edit_url: 'http://0.0.0.0:3001/root/release-test/-/releases/v0.3/edit',
   },
 };
+
+export const pageInfoHeadersWithoutPagination = {
+  'X-NEXT-PAGE': '',
+  'X-PAGE': '1',
+  'X-PER-PAGE': '20',
+  'X-PREV-PAGE': '',
+  'X-TOTAL': '19',
+  'X-TOTAL-PAGES': '1',
+};
+
+export const pageInfoHeadersWithPagination = {
+  'X-NEXT-PAGE': '2',
+  'X-PAGE': '1',
+  'X-PER-PAGE': '20',
+  'X-PREV-PAGE': '',
+  'X-TOTAL': '21',
+  'X-TOTAL-PAGES': '2',
+};
+
+export const assets = {
+  count: 5,
+  sources: [
+    {
+      format: 'zip',
+      url: 'https://example.gitlab.com/path/to/zip',
+    },
+  ],
+  links: [
+    {
+      linkType: ASSET_LINK_TYPE.IMAGE,
+      url: 'https://example.gitlab.com/path/to/image',
+      directAssetUrl: 'https://example.gitlab.com/path/to/image',
+      name: 'Example image link',
+    },
+    {
+      linkType: ASSET_LINK_TYPE.PACKAGE,
+      url: 'https://example.gitlab.com/path/to/package',
+      directAssetUrl: 'https://example.gitlab.com/path/to/package',
+      name: 'Example package link',
+    },
+    {
+      linkType: ASSET_LINK_TYPE.RUNBOOK,
+      url: 'https://example.gitlab.com/path/to/runbook',
+      directAssetUrl: 'https://example.gitlab.com/path/to/runbook',
+      name: 'Example runbook link',
+    },
+    {
+      linkType: ASSET_LINK_TYPE.OTHER,
+      url: 'https://example.gitlab.com/path/to/link',
+      directAssetUrl: 'https://example.gitlab.com/path/to/link',
+      name: 'Example link',
+    },
+  ],
+};
+
+export const release2 = {
+  name: 'Bionic Beaver',
+  tag_name: '18.04',
+  description: '## changelog\n\n* line 1\n* line2',
+  description_html: '<div><h2>changelog</h2><ul><li>line1</li<li>line 2</li></ul></div>',
+  author_name: 'Release bot',
+  author_email: 'release-bot@example.com',
+  created_at: '2012-05-28T05:00:00-07:00',
+  commit: {
+    id: '2695effb5807a22ff3d138d593fd856244e155e7',
+    short_id: '2695effb',
+    title: 'Initial commit',
+    created_at: '2017-07-26T11:08:53.000+02:00',
+    parent_ids: ['2a4b78934375d7f53875269ffd4f45fd83a84ebe'],
+    message: 'Initial commit',
+    author: {
+      avatar_url: 'uploads/-/system/user/avatar/johndoe/avatar.png',
+      id: 482476,
+      name: 'John Doe',
+      path: '/johndoe',
+      state: 'active',
+      status_tooltip_html: null,
+      username: 'johndoe',
+      web_url: 'https://gitlab.com/johndoe',
+    },
+    authored_date: '2012-05-28T04:42:42-07:00',
+    committer_name: 'Jack Smith',
+    committer_email: 'jack@example.com',
+    committed_date: '2012-05-28T04:42:42-07:00',
+  },
+  assets,
+};
+
+export const releases = [release, release2];
diff --git a/spec/frontend/releases/stores/modules/detail/actions_spec.js b/spec/frontend/releases/stores/modules/detail/actions_spec.js
index 854f06821be..345be2acc71 100644
--- a/spec/frontend/releases/stores/modules/detail/actions_spec.js
+++ b/spec/frontend/releases/stores/modules/detail/actions_spec.js
@@ -10,6 +10,7 @@ import createFlash from '~/flash';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { redirectTo } from '~/lib/utils/url_utility';
 import api from '~/api';
+import { ASSET_LINK_TYPE } from '~/releases/constants';
 
 jest.mock('~/flash', () => jest.fn());
 
@@ -130,6 +131,54 @@ describe('Release detail actions', () => {
     });
   });
 
+  describe('updateAssetLinkUrl', () => {
+    it(`commits ${types.UPDATE_ASSET_LINK_URL} with the updated link URL`, () => {
+      const params = {
+        linkIdToUpdate: 2,
+        newUrl: 'https://example.com/updated',
+      };
+
+      return testAction(actions.updateAssetLinkUrl, params, state, [
+        { type: types.UPDATE_ASSET_LINK_URL, payload: params },
+      ]);
+    });
+  });
+
+  describe('updateAssetLinkName', () => {
+    it(`commits ${types.UPDATE_ASSET_LINK_NAME} with the updated link name`, () => {
+      const params = {
+        linkIdToUpdate: 2,
+        newName: 'Updated link name',
+      };
+
+      return testAction(actions.updateAssetLinkName, params, state, [
+        { type: types.UPDATE_ASSET_LINK_NAME, payload: params },
+      ]);
+    });
+  });
+
+  describe('updateAssetLinkType', () => {
+    it(`commits ${types.UPDATE_ASSET_LINK_TYPE} with the updated link type`, () => {
+      const params = {
+        linkIdToUpdate: 2,
+        newType: ASSET_LINK_TYPE.RUNBOOK,
+      };
+
+      return testAction(actions.updateAssetLinkType, params, state, [
+        { type: types.UPDATE_ASSET_LINK_TYPE, payload: params },
+      ]);
+    });
+  });
+
+  describe('removeAssetLink', () => {
+    it(`commits ${types.REMOVE_ASSET_LINK} with the ID of the asset link to remove`, () => {
+      const idToRemove = 2;
+      return testAction(actions.removeAssetLink, idToRemove, state, [
+        { type: types.REMOVE_ASSET_LINK, payload: idToRemove },
+      ]);
+    });
+  });
+
   describe('updateReleaseMilestones', () => {
     it(`commits ${types.UPDATE_RELEASE_MILESTONES} with the updated release milestones`, () => {
       const newReleaseMilestones = ['v0.0', 'v0.1'];
diff --git a/spec/frontend/releases/stores/modules/detail/mutations_spec.js b/spec/frontend/releases/stores/modules/detail/mutations_spec.js
index f3f7ca797b4..a34c1be64d9 100644
--- a/spec/frontend/releases/stores/modules/detail/mutations_spec.js
+++ b/spec/frontend/releases/stores/modules/detail/mutations_spec.js
@@ -3,6 +3,7 @@ import mutations from '~/releases/stores/modules/detail/mutations';
 import * as types from '~/releases/stores/modules/detail/mutation_types';
 import { release as originalRelease } from '../../../mock_data';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import { ASSET_LINK_TYPE, DEFAULT_ASSET_LINK_TYPE } from '~/releases/constants';
 
 describe('Release detail mutations', () => {
   let state;
@@ -24,7 +25,7 @@ describe('Release detail mutations', () => {
     it('set state.isFetchingRelease to true', () => {
       mutations[types.REQUEST_RELEASE](state);
 
-      expect(state.isFetchingRelease).toEqual(true);
+      expect(state.isFetchingRelease).toBe(true);
     });
   });
 
@@ -32,9 +33,9 @@ describe('Release detail mutations', () => {
     it('handles a successful response from the server', () => {
       mutations[types.RECEIVE_RELEASE_SUCCESS](state, release);
 
-      expect(state.fetchError).toEqual(undefined);
+      expect(state.fetchError).toBeUndefined();
 
-      expect(state.isFetchingRelease).toEqual(false);
+      expect(state.isFetchingRelease).toBe(false);
 
       expect(state.release).toEqual(release);
 
@@ -47,7 +48,7 @@ describe('Release detail mutations', () => {
       const error = { message: 'An error occurred!' };
       mutations[types.RECEIVE_RELEASE_ERROR](state, error);
 
-      expect(state.isFetchingRelease).toEqual(false);
+      expect(state.isFetchingRelease).toBe(false);
 
       expect(state.release).toBeUndefined();
 
@@ -61,7 +62,7 @@ describe('Release detail mutations', () => {
       const newTitle = 'The new release title';
       mutations[types.UPDATE_RELEASE_TITLE](state, newTitle);
 
-      expect(state.release.name).toEqual(newTitle);
+      expect(state.release.name).toBe(newTitle);
     });
   });
 
@@ -71,7 +72,7 @@ describe('Release detail mutations', () => {
       const newNotes = 'The new release notes';
       mutations[types.UPDATE_RELEASE_NOTES](state, newNotes);
 
-      expect(state.release.description).toEqual(newNotes);
+      expect(state.release.description).toBe(newNotes);
     });
   });
 
@@ -79,7 +80,7 @@ describe('Release detail mutations', () => {
     it('set state.isUpdatingRelease to true', () => {
       mutations[types.REQUEST_UPDATE_RELEASE](state);
 
-      expect(state.isUpdatingRelease).toEqual(true);
+      expect(state.isUpdatingRelease).toBe(true);
     });
   });
 
@@ -87,9 +88,9 @@ describe('Release detail mutations', () => {
     it('handles a successful response from the server', () => {
       mutations[types.RECEIVE_UPDATE_RELEASE_SUCCESS](state, release);
 
-      expect(state.updateError).toEqual(undefined);
+      expect(state.updateError).toBeUndefined();
 
-      expect(state.isUpdatingRelease).toEqual(false);
+      expect(state.isUpdatingRelease).toBe(false);
     });
   });
 
@@ -98,7 +99,7 @@ describe('Release detail mutations', () => {
       const error = { message: 'An error occurred!' };
       mutations[types.RECEIVE_UPDATE_RELEASE_ERROR](state, error);
 
-      expect(state.isUpdatingRelease).toEqual(false);
+      expect(state.isUpdatingRelease).toBe(false);
 
       expect(state.updateError).toEqual(error);
     });
@@ -118,6 +119,7 @@ describe('Release detail mutations', () => {
           id: expect.stringMatching(/^new-link-/),
           url: '',
           name: '',
+          linkType: DEFAULT_ASSET_LINK_TYPE,
         },
       ]);
     });
@@ -134,7 +136,7 @@ describe('Release detail mutations', () => {
         newUrl,
       });
 
-      expect(state.release.assets.links[0].url).toEqual(newUrl);
+      expect(state.release.assets.links[0].url).toBe(newUrl);
     });
   });
 
@@ -149,7 +151,22 @@ describe('Release detail mutations', () => {
         newName,
       });
 
-      expect(state.release.assets.links[0].name).toEqual(newName);
+      expect(state.release.assets.links[0].name).toBe(newName);
+    });
+  });
+
+  describe(`${types.UPDATE_ASSET_LINK_TYPE}`, () => {
+    it('updates an asset link with a new type', () => {
+      state.release = release;
+
+      const newType = ASSET_LINK_TYPE.RUNBOOK;
+
+      mutations[types.UPDATE_ASSET_LINK_TYPE](state, {
+        linkIdToUpdate: state.release.assets.links[0].id,
+        newType,
+      });
+
+      expect(state.release.assets.links[0].linkType).toBe(newType);
     });
   });
 
diff --git a/spec/javascripts/releases/stores/modules/list/actions_spec.js b/spec/frontend/releases/stores/modules/list/actions_spec.js
index bf85e18997b..4c3af157684 100644
--- a/spec/javascripts/releases/stores/modules/list/actions_spec.js
+++ b/spec/frontend/releases/stores/modules/list/actions_spec.js
@@ -1,4 +1,4 @@
-import testAction from 'spec/helpers/vuex_action_helper';
+import testAction from 'helpers/vuex_action_helper';
 import {
   requestReleases,
   fetchReleases,
@@ -31,7 +31,7 @@ describe('Releases State actions', () => {
   describe('fetchReleases', () => {
     describe('success', () => {
       it('dispatches requestReleases and receiveReleasesSuccess', done => {
-        spyOn(api, 'releases').and.callFake((id, options) => {
+        jest.spyOn(api, 'releases').mockImplementation((id, options) => {
           expect(id).toEqual(1);
           expect(options.page).toEqual('1');
           return Promise.resolve({ data: releases, headers: pageInfoHeadersWithoutPagination });
@@ -56,7 +56,7 @@ describe('Releases State actions', () => {
       });
 
       it('dispatches requestReleases and receiveReleasesSuccess on page two', done => {
-        spyOn(api, 'releases').and.callFake((_, options) => {
+        jest.spyOn(api, 'releases').mockImplementation((_, options) => {
           expect(options.page).toEqual('2');
           return Promise.resolve({ data: releases, headers: pageInfoHeadersWithoutPagination });
         });
@@ -82,7 +82,7 @@ describe('Releases State actions', () => {
 
     describe('error', () => {
       it('dispatches requestReleases and receiveReleasesError', done => {
-        spyOn(api, 'releases').and.returnValue(Promise.reject());
+        jest.spyOn(api, 'releases').mockReturnValue(Promise.reject());
 
         testAction(
           fetchReleases,
diff --git a/spec/javascripts/releases/stores/modules/list/helpers.js b/spec/frontend/releases/stores/modules/list/helpers.js
index 435ca36047e..435ca36047e 100644
--- a/spec/javascripts/releases/stores/modules/list/helpers.js
+++ b/spec/frontend/releases/stores/modules/list/helpers.js
diff --git a/spec/javascripts/releases/stores/modules/list/mutations_spec.js b/spec/frontend/releases/stores/modules/list/mutations_spec.js
index 3035b916ff6..3035b916ff6 100644
--- a/spec/javascripts/releases/stores/modules/list/mutations_spec.js
+++ b/spec/frontend/releases/stores/modules/list/mutations_spec.js
diff --git a/spec/frontend/reports/components/grouped_test_reports_app_spec.js b/spec/frontend/reports/components/grouped_test_reports_app_spec.js
index 1a01db391da..6a402277f52 100644
--- a/spec/frontend/reports/components/grouped_test_reports_app_spec.js
+++ b/spec/frontend/reports/components/grouped_test_reports_app_spec.js
@@ -1,260 +1,214 @@
-import Vue from 'vue';
-import MockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
-import state from '~/reports/store/state';
-import component from '~/reports/components/grouped_test_reports_app.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
+import { mount, createLocalVue } from '@vue/test-utils';
+import Vuex from 'vuex';
+import GroupedTestReportsApp from '~/reports/components/grouped_test_reports_app.vue';
+import store from '~/reports/store';
+
 import { failedReport } from '../mock_data/mock_data';
+import successTestReports from '../mock_data/no_failures_report.json';
 import newFailedTestReports from '../mock_data/new_failures_report.json';
 import newErrorsTestReports from '../mock_data/new_errors_report.json';
-import successTestReports from '../mock_data/no_failures_report.json';
 import mixedResultsTestReports from '../mock_data/new_and_fixed_failures_report.json';
 import resolvedFailures from '../mock_data/resolved_failures.json';
 
-describe('Grouped Test Reports App', () => {
-  let vm;
-  let mock;
-  const Component = Vue.extend(component);
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+describe('Grouped test reports app', () => {
+  const endpoint = 'endpoint.json';
+  const Component = localVue.extend(GroupedTestReportsApp);
+  let wrapper;
+  let mockStore;
+
+  const mountComponent = () => {
+    wrapper = mount(Component, {
+      store: mockStore,
+      localVue,
+      propsData: {
+        endpoint,
+      },
+      methods: {
+        fetchReports: () => {},
+      },
+    });
+  };
+
+  const setReports = reports => {
+    mockStore.state.status = reports.status;
+    mockStore.state.summary = reports.summary;
+    mockStore.state.reports = reports.suites;
+  };
+
+  const findHeader = () => wrapper.find('[data-testid="report-section-code-text"]');
+  const findSummaryDescription = () => wrapper.find('[data-testid="test-summary-row-description"]');
+  const findIssueDescription = () => wrapper.find('[data-testid="test-issue-body-description"]');
+  const findAllIssueDescriptions = () =>
+    wrapper.findAll('[data-testid="test-issue-body-description"]');
 
   beforeEach(() => {
-    mock = new MockAdapter(axios);
+    mockStore = store();
+    mountComponent();
   });
 
   afterEach(() => {
-    vm.$store.replaceState(state());
-    vm.$destroy();
-    mock.restore();
+    wrapper.destroy();
+    wrapper = null;
   });
 
   describe('with success result', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(200, successTestReports, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      setReports(successTestReports);
+      mountComponent();
     });
 
-    it('renders success summary text', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
-        expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained no changed test results out of 11 total tests',
-        );
-
-        expect(vm.$el.textContent).toContain(
-          'rspec:pg found no changed test results out of 8 total tests',
-        );
-
-        expect(vm.$el.textContent).toContain(
-          'java ant found no changed test results out of 3 total tests',
-        );
-        done();
-      });
+    it('renders success summary text', () => {
+      expect(findHeader().text()).toBe(
+        'Test summary contained no changed test results out of 11 total tests',
+      );
     });
   });
 
-  describe('with 204 result', () => {
+  describe('with new failed result', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(204, {}, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      setReports(newFailedTestReports);
+      mountComponent();
     });
 
-    it('renders success summary text', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.gl-spinner')).not.toBeNull();
-        expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary results are being parsed',
-        );
-
-        done();
-      });
+    it('renders failed summary text', () => {
+      expect(findHeader().text()).toBe('Test summary contained 2 failed out of 11 total tests');
     });
-  });
 
-  describe('with new failed result', () => {
-    beforeEach(() => {
-      mock.onGet('test_results.json').reply(200, newFailedTestReports, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+    it('renders failed test suite', () => {
+      expect(findSummaryDescription().text()).toContain(
+        'rspec:pg found 2 failed out of 8 total tests',
+      );
     });
 
-    it('renders failed summary text + new badge', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
-        expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed out of 11 total tests',
-        );
-
-        expect(vm.$el.textContent).toContain('rspec:pg found 2 failed out of 8 total tests');
-
-        expect(vm.$el.textContent).toContain('New');
-        expect(vm.$el.textContent).toContain(
-          'java ant found no changed test results out of 3 total tests',
-        );
-        done();
-      });
+    it('renders failed issue in list', () => {
+      expect(findIssueDescription().text()).toContain('New');
+      expect(findIssueDescription().text()).toContain(
+        'Test#sum when a is 1 and b is 2 returns summary',
+      );
     });
   });
 
   describe('with new error result', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(200, newErrorsTestReports, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      setReports(newErrorsTestReports);
+      mountComponent();
+    });
+
+    it('renders error summary text', () => {
+      expect(findHeader().text()).toBe('Test summary contained 2 errors out of 11 total tests');
+    });
+
+    it('renders error test suite', () => {
+      expect(findSummaryDescription().text()).toContain(
+        'karma found 2 errors out of 3 total tests',
+      );
     });
 
-    it('renders error summary text + new badge', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
-        expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 errors out of 11 total tests',
-        );
-
-        expect(vm.$el.textContent).toContain('karma found 2 errors out of 3 total tests');
-
-        expect(vm.$el.textContent).toContain('New');
-        expect(vm.$el.textContent).toContain(
-          'rspec:pg found no changed test results out of 8 total tests',
-        );
-        done();
-      });
+    it('renders error issue in list', () => {
+      expect(findIssueDescription().text()).toContain('New');
+      expect(findIssueDescription().text()).toContain(
+        'Test#sum when a is 1 and b is 2 returns summary',
+      );
     });
   });
 
   describe('with mixed results', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(200, mixedResultsTestReports, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      setReports(mixedResultsTestReports);
+      mountComponent();
+    });
+
+    it('renders summary text', () => {
+      expect(findHeader().text()).toBe(
+        'Test summary contained 2 failed and 2 fixed test results out of 11 total tests',
+      );
     });
 
-    it('renders summary text', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
-        expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed and 2 fixed test results out of 11 total tests',
-        );
-
-        expect(vm.$el.textContent).toContain(
-          'rspec:pg found 1 failed and 2 fixed test results out of 8 total tests',
-        );
-
-        expect(vm.$el.textContent).toContain('New');
-        expect(vm.$el.textContent).toContain(' java ant found 1 failed out of 3 total tests');
-        done();
-      });
+    it('renders failed test suite', () => {
+      expect(findSummaryDescription().text()).toContain(
+        'rspec:pg found 1 failed and 2 fixed test results out of 8 total tests',
+      );
+    });
+
+    it('renders failed issue in list', () => {
+      expect(findIssueDescription().text()).toContain('New');
+      expect(findIssueDescription().text()).toContain(
+        'Test#subtract when a is 2 and b is 1 returns correct result',
+      );
     });
   });
 
   describe('with resolved failures and resolved errors', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(200, resolvedFailures, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      setReports(resolvedFailures);
+      mountComponent();
     });
 
-    it('renders summary text', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
-        expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 4 fixed test results out of 11 total tests',
-        );
-
-        expect(vm.$el.textContent).toContain(
-          'rspec:pg found 4 fixed test results out of 8 total tests',
-        );
-        done();
-      });
+    it('renders summary text', () => {
+      expect(findHeader().text()).toBe(
+        'Test summary contained 4 fixed test results out of 11 total tests',
+      );
+    });
+
+    it('renders resolved test suite', () => {
+      expect(findSummaryDescription().text()).toContain(
+        'rspec:pg found 4 fixed test results out of 8 total tests',
+      );
     });
 
-    it('renders resolved failures', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.report-block-container').textContent).toContain(
-          resolvedFailures.suites[0].resolved_failures[0].name,
-        );
-
-        expect(vm.$el.querySelector('.report-block-container').textContent).toContain(
-          resolvedFailures.suites[0].resolved_failures[1].name,
-        );
-        done();
-      });
+    it('renders resolved failures', () => {
+      expect(findIssueDescription().text()).toContain(
+        resolvedFailures.suites[0].resolved_failures[0].name,
+      );
     });
 
-    it('renders resolved errors', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.report-block-container').textContent).toContain(
-          resolvedFailures.suites[0].resolved_errors[0].name,
-        );
-
-        expect(vm.$el.querySelector('.report-block-container').textContent).toContain(
-          resolvedFailures.suites[0].resolved_errors[1].name,
-        );
-        done();
-      });
+    it('renders resolved errors', () => {
+      expect(
+        findAllIssueDescriptions()
+          .at(2)
+          .text(),
+      ).toContain(resolvedFailures.suites[0].resolved_errors[0].name);
     });
   });
 
   describe('with a report that failed to load', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(200, failedReport, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      setReports(failedReport);
+      mountComponent();
     });
 
-    it('renders an error status for the report', done => {
-      setImmediate(() => {
-        const { name } = failedReport.suites[0];
+    it('renders an error status for the report', () => {
+      const { name } = failedReport.suites[0];
 
-        expect(vm.$el.querySelector('.report-block-list-issue').textContent).toContain(
-          `An error occurred while loading ${name} results`,
-        );
-        done();
-      });
+      expect(findSummaryDescription().text()).toContain(
+        `An error occurred while loading ${name} result`,
+      );
     });
   });
 
   describe('with error', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(500, {}, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      mockStore.state.isLoading = false;
+      mockStore.state.hasError = true;
+      mountComponent();
     });
 
-    it('renders loading summary text with loading icon', done => {
-      setImmediate(() => {
-        expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary failed loading results',
-        );
-        done();
-      });
+    it('renders loading state', () => {
+      expect(findHeader().text()).toBe('Test summary failed loading results');
     });
   });
 
   describe('while loading', () => {
     beforeEach(() => {
-      mock.onGet('test_results.json').reply(200, {}, {});
-      vm = mountComponent(Component, {
-        endpoint: 'test_results.json',
-      });
+      mockStore.state.isLoading = true;
+      mountComponent();
     });
 
-    it('renders loading summary text with loading icon', done => {
-      expect(vm.$el.querySelector('.gl-spinner')).not.toBeNull();
-      expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-        'Test summary results are being parsed',
-      );
-
-      setImmediate(() => {
-        done();
-      });
+    it('renders loading state', () => {
+      expect(findHeader().text()).toBe('Test summary results are being parsed');
     });
   });
 });
diff --git a/spec/frontend/reports/mock_data/new_errors_report.json b/spec/frontend/reports/mock_data/new_errors_report.json
index cebf98fdb63..6573d23ee50 100644
--- a/spec/frontend/reports/mock_data/new_errors_report.json
+++ b/spec/frontend/reports/mock_data/new_errors_report.json
@@ -2,16 +2,6 @@
   "summary": { "total": 11, "resolved": 0, "errored": 2, "failed": 0 },
   "suites": [
     {
-      "name": "rspec:pg",
-      "summary": { "total": 8, "resolved": 0, "errored": 0, "failed": 0 },
-      "new_failures": [],
-      "resolved_failures": [],
-      "existing_failures": [],
-      "new_errors": [],
-      "resolved_errors": [],
-      "existing_errors": []
-    },
-    {
       "name": "karma",
       "summary": { "total": 3, "resolved": 0, "errored": 2, "failed": 0 },
       "new_failures": [],
@@ -33,6 +23,16 @@
       ],
       "resolved_errors": [],
       "existing_errors": []
+    },
+    {
+      "name": "rspec:pg",
+      "summary": { "total": 8, "resolved": 0, "errored": 0, "failed": 0 },
+      "new_failures": [],
+      "resolved_failures": [],
+      "existing_failures": [],
+      "new_errors": [],
+      "resolved_errors": [],
+      "existing_errors": []
     }
   ]
 }
diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/frontend/right_sidebar_spec.js
index 9565e3ce546..d80d80152a5 100644
--- a/spec/javascripts/right_sidebar_spec.js
+++ b/spec/frontend/right_sidebar_spec.js
@@ -10,7 +10,7 @@ let $icon = null;
 let $page = null;
 let $labelsIcon = null;
 
-const assertSidebarState = function(state) {
+const assertSidebarState = state => {
   const shouldBeExpanded = state === 'expanded';
   const shouldBeCollapsed = state === 'collapsed';
   expect($aside.hasClass('right-sidebar-expanded')).toBe(shouldBeExpanded);
@@ -21,14 +21,13 @@ const assertSidebarState = function(state) {
   expect($icon.hasClass('fa-angle-double-left')).toBe(shouldBeCollapsed);
 };
 
-describe('RightSidebar', function() {
+describe('RightSidebar', () => {
   describe('fixture tests', () => {
     const fixtureName = 'issues/open-issue.html';
     preloadFixtures(fixtureName);
-    loadJSONFixtures('todos/todos.json');
     let mock;
 
-    beforeEach(function() {
+    beforeEach(() => {
       loadFixtures(fixtureName);
       mock = new MockAdapter(axios);
       new Sidebar(); // eslint-disable-line no-new
@@ -43,7 +42,7 @@ describe('RightSidebar', function() {
       mock.restore();
     });
 
-    it('should expand/collapse the sidebar when arrow is clicked', function() {
+    it('should expand/collapse the sidebar when arrow is clicked', () => {
       assertSidebarState('expanded');
       $toggle.click();
       assertSidebarState('collapsed');
@@ -51,28 +50,29 @@ describe('RightSidebar', function() {
       assertSidebarState('expanded');
     });
 
-    it('should float over the page and when sidebar icons clicked', function() {
+    it('should float over the page and when sidebar icons clicked', () => {
       $labelsIcon.click();
       assertSidebarState('expanded');
     });
 
-    it('should collapse when the icon arrow clicked while it is floating on page', function() {
+    it('should collapse when the icon arrow clicked while it is floating on page', () => {
       $labelsIcon.click();
       assertSidebarState('expanded');
       $toggle.click();
       assertSidebarState('collapsed');
     });
 
-    it('should broadcast todo:toggle event when add todo clicked', function(done) {
+    it('should broadcast todo:toggle event when add todo clicked', done => {
       const todos = getJSONFixture('todos/todos.json');
       mock.onPost(/(.*)\/todos$/).reply(200, todos);
 
-      const todoToggleSpy = spyOnEvent(document, 'todo:toggle');
+      const todoToggleSpy = jest.fn();
+      $(document).on('todo:toggle', todoToggleSpy);
 
       $('.issuable-sidebar-header .js-issuable-todo').click();
 
-      setTimeout(() => {
-        expect(todoToggleSpy.calls.count()).toEqual(1);
+      setImmediate(() => {
+        expect(todoToggleSpy.mock.calls.length).toEqual(1);
 
         done();
       });
diff --git a/spec/frontend/shortcuts_spec.js b/spec/frontend/shortcuts_spec.js
new file mode 100644
index 00000000000..3d16074154c
--- /dev/null
+++ b/spec/frontend/shortcuts_spec.js
@@ -0,0 +1,46 @@
+import $ from 'jquery';
+import Shortcuts from '~/behaviors/shortcuts/shortcuts';
+
+describe('Shortcuts', () => {
+  const fixtureName = 'snippets/show.html';
+  const createEvent = (type, target) =>
+    $.Event(type, {
+      target,
+    });
+
+  preloadFixtures(fixtureName);
+
+  describe('toggleMarkdownPreview', () => {
+    beforeEach(() => {
+      loadFixtures(fixtureName);
+
+      jest.spyOn(document.querySelector('.js-new-note-form .js-md-preview-button'), 'focus');
+      jest.spyOn(document.querySelector('.edit-note .js-md-preview-button'), 'focus');
+
+      new Shortcuts(); // eslint-disable-line no-new
+    });
+
+    it('focuses preview button in form', () => {
+      Shortcuts.toggleMarkdownPreview(
+        createEvent('KeyboardEvent', document.querySelector('.js-new-note-form .js-note-text')),
+      );
+
+      expect(
+        document.querySelector('.js-new-note-form .js-md-preview-button').focus,
+      ).toHaveBeenCalled();
+    });
+
+    it('focues preview button inside edit comment form', () => {
+      document.querySelector('.js-note-edit').click();
+
+      Shortcuts.toggleMarkdownPreview(
+        createEvent('KeyboardEvent', document.querySelector('.edit-note .js-note-text')),
+      );
+
+      expect(
+        document.querySelector('.js-new-note-form .js-md-preview-button').focus,
+      ).not.toHaveBeenCalled();
+      expect(document.querySelector('.edit-note .js-md-preview-button').focus).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js
index e7a64ec5ed9..fe7c3aadeeb 100644
--- a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js
+++ b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js
@@ -6,11 +6,14 @@ import SidebarService from '~/sidebar/services/sidebar_service';
 import createFlash from '~/flash';
 import RecaptchaModal from '~/vue_shared/components/recaptcha_modal.vue';
 import createStore from '~/notes/stores';
+import { useMockLocationHelper } from 'helpers/mock_window_location_helper';
 
 jest.mock('~/flash');
 jest.mock('~/sidebar/services/sidebar_service');
 
 describe('Confidential Issue Sidebar Block', () => {
+  useMockLocationHelper();
+
   let wrapper;
 
   const findRecaptchaModal = () => wrapper.find(RecaptchaModal);
@@ -43,10 +46,6 @@ describe('Confidential Issue Sidebar Block', () => {
     });
   };
 
-  beforeEach(() => {
-    jest.spyOn(window.location, 'reload').mockImplementation();
-  });
-
   afterEach(() => {
     wrapper.destroy();
   });
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
index 301ec5652a9..959bc24eef6 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
@@ -12,7 +12,7 @@ exports[`Snippet Blob Edit component rendering matches the snapshot 1`] = `
     class="file-holder snippet"
   >
     <blob-header-edit-stub
-      data-qa-selector="snippet_file_name"
+      data-qa-selector="file_name_field"
       value="lorem.txt"
     />
      
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
index 9fd4cba5b87..297ad16b681 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
@@ -4,7 +4,9 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
 <div
   class="form-group js-description-input"
 >
-  <label>
+  <label
+    for="snippet-description"
+  >
     Description (optional)
   </label>
    
@@ -21,27 +23,67 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
       />
     </div>
      
-    <markdown-field-stub
-      addspacingclasses="true"
-      canattachfile="true"
-      class="js-expanded"
-      enableautocomplete="true"
-      helppagepath=""
-      markdowndocspath="help/"
-      markdownpreviewpath="foo/"
-      note="[object Object]"
-      quickactionsdocspath=""
-      textareavalue=""
+    <div
+      class="js-vue-markdown-field md-area position-relative js-expanded gfm-form"
     >
-      <textarea
-        aria-label="Description"
-        class="note-textarea js-gfm-input js-autosize markdown-area"
-        data-qa-selector="snippet_description_field"
-        data-supports-quick-actions="false"
-        dir="auto"
-        placeholder="Write a comment or drag your files here…"
+      <markdown-header-stub
+        linecontent=""
       />
-    </markdown-field-stub>
+       
+      <div
+        class="md-write-holder"
+      >
+        <div
+          class="zen-backdrop div-dropzone-wrapper"
+        >
+          <div
+            class="div-dropzone js-invalid-dropzone"
+          >
+            <textarea
+              aria-label="Description"
+              class="note-textarea js-gfm-input js-autosize markdown-area"
+              data-qa-selector="snippet_description_field"
+              data-supports-quick-actions="false"
+              dir="auto"
+              id="snippet-description"
+              placeholder="Write a comment or drag your files here…"
+              style="overflow-x: hidden; word-wrap: break-word; overflow-y: hidden;"
+            />
+            <div
+              class="div-dropzone-hover"
+            >
+              <i
+                class="fa fa-paperclip div-dropzone-icon"
+              />
+            </div>
+          </div>
+           
+          <a
+            aria-label="Leave zen mode"
+            class="zen-control zen-control-leave js-zen-leave gl-text-gray-700"
+            href="#"
+          >
+            <icon-stub
+              name="screen-normal"
+              size="16"
+            />
+          </a>
+           
+          <markdown-toolbar-stub
+            canattachfile="true"
+            markdowndocspath="help/"
+            quickactionsdocspath=""
+          />
+        </div>
+      </div>
+       
+      <div
+        class="js-vue-md-preview md md-preview-holder"
+        style="display: none;"
+      />
+       
+      <!---->
+    </div>
   </div>
 </div>
 `;
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap
index 9ebc4e81baf..9fb43815cbc 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap
@@ -3,7 +3,7 @@
 exports[`Snippet Description component matches the snapshot 1`] = `
 <markdown-field-view-stub
   class="snippet-description"
-  data-qa-selector="snippet_description_field"
+  data-qa-selector="snippet_description_content"
 >
   <div
     class="md js-snippet-description"
diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js
index ba62a0a92ca..83f46dd347f 100644
--- a/spec/frontend/snippets/components/edit_spec.js
+++ b/spec/frontend/snippets/components/edit_spec.js
@@ -1,5 +1,6 @@
 import { shallowMount } from '@vue/test-utils';
 import axios from '~/lib/utils/axios_utils';
+import Flash from '~/flash';
 
 import { GlLoadingIcon } from '@gitlab/ui';
 import { joinPaths, redirectTo } from '~/lib/utils/url_utility';
@@ -10,6 +11,7 @@ import SnippetVisibilityEdit from '~/snippets/components/snippet_visibility_edit
 import SnippetBlobEdit from '~/snippets/components/snippet_blob_edit.vue';
 import TitleField from '~/vue_shared/components/form/title.vue';
 import FormFooterActions from '~/vue_shared/components/form/form_footer_actions.vue';
+import { SNIPPET_CREATE_MUTATION_ERROR, SNIPPET_UPDATE_MUTATION_ERROR } from '~/snippets/constants';
 
 import UpdateSnippetMutation from '~/snippets/mutations/updateSnippet.mutation.graphql';
 import CreateSnippetMutation from '~/snippets/mutations/createSnippet.mutation.graphql';
@@ -27,6 +29,8 @@ jest.mock('~/lib/utils/url_utility', () => ({
     .mockReturnValue('contentApiURL'),
 }));
 
+jest.mock('~/flash');
+
 let flashSpy;
 
 const contentMock = 'Foo Bar';
@@ -34,6 +38,10 @@ const rawPathMock = '/foo/bar';
 const rawProjectPathMock = '/project/path';
 const newlyEditedSnippetUrl = 'http://foo.bar';
 const apiError = { message: 'Ufff' };
+const mutationError = 'Bummer';
+
+const attachedFilePath1 = 'foo/bar';
+const attachedFilePath2 = 'alpha/beta';
 
 const defaultProps = {
   snippetGid: 'gid://gitlab/PersonalSnippet/42',
@@ -56,10 +64,26 @@ describe('Snippet Edit app', () => {
     },
   });
 
+  const resolveMutateWithErrors = jest.fn().mockResolvedValue({
+    data: {
+      updateSnippet: {
+        errors: [mutationError],
+        snippet: {
+          webUrl: newlyEditedSnippetUrl,
+        },
+      },
+      createSnippet: {
+        errors: [mutationError],
+        snippet: null,
+      },
+    },
+  });
+
   const rejectMutation = jest.fn().mockRejectedValue(apiError);
 
   const mutationTypes = {
     RESOLVE: resolveMutate,
+    RESOLVE_WITH_ERRORS: resolveMutateWithErrors,
     REJECT: rejectMutation,
   };
 
@@ -99,8 +123,9 @@ describe('Snippet Edit app', () => {
     wrapper.destroy();
   });
 
-  const findSubmitButton = () => wrapper.find('[type=submit]');
+  const findSubmitButton = () => wrapper.find('[data-testid="snippet-submit-btn"]');
   const findCancellButton = () => wrapper.find('[data-testid="snippet-cancel-btn"]');
+  const clickSubmitBtn = () => wrapper.find('[data-testid="snippet-edit-form"]').trigger('submit');
 
   describe('rendering', () => {
     it('renders loader while the query is in flight', () => {
@@ -268,28 +293,131 @@ describe('Snippet Edit app', () => {
           },
         };
 
-        wrapper.vm.handleFormSubmit();
+        clickSubmitBtn();
+
         expect(resolveMutate).toHaveBeenCalledWith(mutationPayload);
       });
 
       it('redirects to snippet view on successful mutation', () => {
         createComponent();
-        wrapper.vm.handleFormSubmit();
+        clickSubmitBtn();
+
         return waitForPromises().then(() => {
           expect(redirectTo).toHaveBeenCalledWith(newlyEditedSnippetUrl);
         });
       });
 
+      it.each`
+        newSnippet | projectPath           | mutationName
+        ${true}    | ${rawProjectPathMock} | ${'CreateSnippetMutation with projectPath'}
+        ${true}    | ${''}                 | ${'CreateSnippetMutation without projectPath'}
+        ${false}   | ${rawProjectPathMock} | ${'UpdateSnippetMutation with projectPath'}
+        ${false}   | ${''}                 | ${'UpdateSnippetMutation without projectPath'}
+      `(
+        'does not redirect to snippet view if the seemingly successful' +
+          ' $mutationName response contains errors',
+        ({ newSnippet, projectPath }) => {
+          createComponent({
+            data: {
+              newSnippet,
+            },
+            props: {
+              ...defaultProps,
+              projectPath,
+            },
+            mutationRes: mutationTypes.RESOLVE_WITH_ERRORS,
+          });
+
+          clickSubmitBtn();
+
+          return waitForPromises().then(() => {
+            expect(redirectTo).not.toHaveBeenCalled();
+            expect(flashSpy).toHaveBeenCalledWith(mutationError);
+          });
+        },
+      );
+
       it('flashes an error if mutation failed', () => {
         createComponent({
           mutationRes: mutationTypes.REJECT,
         });
-        wrapper.vm.handleFormSubmit();
+
+        clickSubmitBtn();
+
         return waitForPromises().then(() => {
           expect(redirectTo).not.toHaveBeenCalled();
           expect(flashSpy).toHaveBeenCalledWith(apiError);
         });
       });
+
+      it.each`
+        isNew    | status        | expectation
+        ${true}  | ${`new`}      | ${SNIPPET_CREATE_MUTATION_ERROR.replace('%{err}', '')}
+        ${false} | ${`existing`} | ${SNIPPET_UPDATE_MUTATION_ERROR.replace('%{err}', '')}
+      `(
+        `renders the correct error message if mutation fails for $status snippet`,
+        ({ isNew, expectation }) => {
+          createComponent({
+            data: {
+              newSnippet: isNew,
+            },
+            mutationRes: mutationTypes.REJECT,
+          });
+
+          clickSubmitBtn();
+
+          return waitForPromises().then(() => {
+            expect(Flash).toHaveBeenCalledWith(expect.stringContaining(expectation));
+          });
+        },
+      );
+    });
+
+    describe('correctly includes attached files into the mutation', () => {
+      const createMutationPayload = expectation => {
+        return expect.objectContaining({
+          variables: {
+            input: expect.objectContaining({ uploadedFiles: expectation }),
+          },
+        });
+      };
+
+      const updateMutationPayload = () => {
+        return expect.objectContaining({
+          variables: {
+            input: expect.not.objectContaining({ uploadedFiles: expect.anything() }),
+          },
+        });
+      };
+
+      it.each`
+        paths                                     | expectation
+        ${[attachedFilePath1]}                    | ${[attachedFilePath1]}
+        ${[attachedFilePath1, attachedFilePath2]} | ${[attachedFilePath1, attachedFilePath2]}
+        ${[]}                                     | ${[]}
+      `(`correctly sends paths for $paths.length files`, ({ paths, expectation }) => {
+        createComponent({
+          data: {
+            newSnippet: true,
+          },
+        });
+
+        const fixtures = paths.map(path => {
+          return path ? `<input name="files[]" value="${path}">` : undefined;
+        });
+        wrapper.vm.$el.innerHTML += fixtures.join('');
+
+        clickSubmitBtn();
+
+        expect(resolveMutate).toHaveBeenCalledWith(createMutationPayload(expectation));
+      });
+
+      it(`neither fails nor sends 'uploadedFiles' to update mutation`, () => {
+        createComponent();
+
+        clickSubmitBtn();
+        expect(resolveMutate).toHaveBeenCalledWith(updateMutationPayload());
+      });
     });
   });
 });
diff --git a/spec/frontend/snippets/components/snippet_blob_view_spec.js b/spec/frontend/snippets/components/snippet_blob_view_spec.js
index d06489cffa9..e4d8ee9b7df 100644
--- a/spec/frontend/snippets/components/snippet_blob_view_spec.js
+++ b/spec/frontend/snippets/components/snippet_blob_view_spec.js
@@ -3,7 +3,11 @@ import SnippetBlobView from '~/snippets/components/snippet_blob_view.vue';
 import BlobHeader from '~/blob/components/blob_header.vue';
 import BlobEmbeddable from '~/blob/components/blob_embeddable.vue';
 import BlobContent from '~/blob/components/blob_content.vue';
-import { BLOB_RENDER_EVENT_LOAD, BLOB_RENDER_EVENT_SHOW_SOURCE } from '~/blob/components/constants';
+import {
+  BLOB_RENDER_EVENT_LOAD,
+  BLOB_RENDER_EVENT_SHOW_SOURCE,
+  BLOB_RENDER_ERRORS,
+} from '~/blob/components/constants';
 import { RichViewer, SimpleViewer } from '~/vue_shared/components/blob_viewers';
 import {
   SNIPPET_VISIBILITY_PRIVATE,
@@ -109,6 +113,20 @@ describe('Blob Embeddable', () => {
         });
     });
 
+    it('passes information about render error down to blob header', () => {
+      createComponent({
+        blob: {
+          ...BlobMock,
+          simpleViewer: {
+            ...SimpleViewerMock,
+            renderError: BLOB_RENDER_ERRORS.REASONS.COLLAPSED.id,
+          },
+        },
+      });
+
+      expect(wrapper.find(BlobHeader).props('hasRenderError')).toBe(true);
+    });
+
     describe('URLS with hash', () => {
       beforeEach(() => {
         window.location.hash = '#LC2';
diff --git a/spec/frontend/snippets/components/snippet_description_edit_spec.js b/spec/frontend/snippets/components/snippet_description_edit_spec.js
index c5e667747c6..816ab4e48de 100644
--- a/spec/frontend/snippets/components/snippet_description_edit_spec.js
+++ b/spec/frontend/snippets/components/snippet_description_edit_spec.js
@@ -1,4 +1,5 @@
 import SnippetDescriptionEdit from '~/snippets/components/snippet_description_edit.vue';
+import MarkdownField from '~/vue_shared/components/markdown/field.vue';
 import { shallowMount } from '@vue/test-utils';
 
 describe('Snippet Description Edit component', () => {
@@ -15,6 +16,9 @@ describe('Snippet Description Edit component', () => {
         markdownPreviewPath,
         markdownDocsPath,
       },
+      stubs: {
+        MarkdownField,
+      },
     });
   }
 
diff --git a/spec/frontend/static_site_editor/components/edit_area_spec.js b/spec/frontend/static_site_editor/components/edit_area_spec.js
index bfe41f65d6e..d7c798e6620 100644
--- a/spec/frontend/static_site_editor/components/edit_area_spec.js
+++ b/spec/frontend/static_site_editor/components/edit_area_spec.js
@@ -5,13 +5,19 @@ import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_
 import EditArea from '~/static_site_editor/components/edit_area.vue';
 import PublishToolbar from '~/static_site_editor/components/publish_toolbar.vue';
 import EditHeader from '~/static_site_editor/components/edit_header.vue';
+import UnsavedChangesConfirmDialog from '~/static_site_editor/components/unsaved_changes_confirm_dialog.vue';
 
-import { sourceContentTitle as title, sourceContent as content, returnUrl } from '../mock_data';
+import {
+  sourceContentTitle as title,
+  sourceContent as content,
+  sourceContentBody as body,
+  returnUrl,
+} from '../mock_data';
 
 describe('~/static_site_editor/components/edit_area.vue', () => {
   let wrapper;
   const savingChanges = true;
-  const newContent = `new ${content}`;
+  const newBody = `new ${body}`;
 
   const buildWrapper = (propsData = {}) => {
     wrapper = shallowMount(EditArea, {
@@ -28,6 +34,7 @@ describe('~/static_site_editor/components/edit_area.vue', () => {
   const findEditHeader = () => wrapper.find(EditHeader);
   const findRichContentEditor = () => wrapper.find(RichContentEditor);
   const findPublishToolbar = () => wrapper.find(PublishToolbar);
+  const findUnsavedChangesConfirmDialog = () => wrapper.find(UnsavedChangesConfirmDialog);
 
   beforeEach(() => {
     buildWrapper();
@@ -44,29 +51,40 @@ describe('~/static_site_editor/components/edit_area.vue', () => {
 
   it('renders rich content editor', () => {
     expect(findRichContentEditor().exists()).toBe(true);
-    expect(findRichContentEditor().props('value')).toBe(content);
+    expect(findRichContentEditor().props('value')).toBe(body);
   });
 
   it('renders publish toolbar', () => {
     expect(findPublishToolbar().exists()).toBe(true);
-    expect(findPublishToolbar().props('returnUrl')).toBe(returnUrl);
-    expect(findPublishToolbar().props('savingChanges')).toBe(savingChanges);
-    expect(findPublishToolbar().props('saveable')).toBe(false);
+    expect(findPublishToolbar().props()).toMatchObject({
+      returnUrl,
+      savingChanges,
+      saveable: false,
+    });
+  });
+
+  it('renders unsaved changes confirm dialog', () => {
+    expect(findUnsavedChangesConfirmDialog().exists()).toBe(true);
+    expect(findUnsavedChangesConfirmDialog().props('modified')).toBe(false);
   });
 
   describe('when content changes', () => {
     beforeEach(() => {
-      findRichContentEditor().vm.$emit('input', newContent);
+      findRichContentEditor().vm.$emit('input', newBody);
 
       return wrapper.vm.$nextTick();
     });
 
-    it('sets publish toolbar as saveable when content changes', () => {
+    it('sets publish toolbar as saveable', () => {
       expect(findPublishToolbar().props('saveable')).toBe(true);
     });
 
+    it('sets unsaved changes confirm dialog as modified', () => {
+      expect(findUnsavedChangesConfirmDialog().props('modified')).toBe(true);
+    });
+
     it('sets publish toolbar as not saveable when content changes are rollback', () => {
-      findRichContentEditor().vm.$emit('input', content);
+      findRichContentEditor().vm.$emit('input', body);
 
       return wrapper.vm.$nextTick().then(() => {
         expect(findPublishToolbar().props('saveable')).toBe(false);
diff --git a/spec/frontend/static_site_editor/components/unsaved_changes_confirm_dialog_spec.js b/spec/frontend/static_site_editor/components/unsaved_changes_confirm_dialog_spec.js
new file mode 100644
index 00000000000..9b8b22da693
--- /dev/null
+++ b/spec/frontend/static_site_editor/components/unsaved_changes_confirm_dialog_spec.js
@@ -0,0 +1,44 @@
+import { shallowMount } from '@vue/test-utils';
+
+import UnsavedChangesConfirmDialog from '~/static_site_editor/components/unsaved_changes_confirm_dialog.vue';
+
+describe('static_site_editor/components/unsaved_changes_confirm_dialog', () => {
+  let wrapper;
+  let event;
+  let returnValueSetter;
+
+  const buildWrapper = (propsData = {}) => {
+    wrapper = shallowMount(UnsavedChangesConfirmDialog, {
+      propsData,
+    });
+  };
+
+  beforeEach(() => {
+    event = new Event('beforeunload');
+
+    jest.spyOn(event, 'preventDefault');
+    returnValueSetter = jest.spyOn(event, 'returnValue', 'set');
+  });
+
+  afterEach(() => {
+    event.preventDefault.mockRestore();
+    returnValueSetter.mockRestore();
+    wrapper.destroy();
+  });
+
+  it('displays confirmation dialog when modified = true', () => {
+    buildWrapper({ modified: true });
+    window.dispatchEvent(event);
+
+    expect(event.preventDefault).toHaveBeenCalled();
+    expect(returnValueSetter).toHaveBeenCalledWith('');
+  });
+
+  it('does not display confirmation dialog when modified = false', () => {
+    buildWrapper();
+    window.dispatchEvent(event);
+
+    expect(event.preventDefault).not.toHaveBeenCalled();
+    expect(returnValueSetter).not.toHaveBeenCalled();
+  });
+});
diff --git a/spec/frontend/static_site_editor/mock_data.js b/spec/frontend/static_site_editor/mock_data.js
index 371695e913e..422048a5f69 100644
--- a/spec/frontend/static_site_editor/mock_data.js
+++ b/spec/frontend/static_site_editor/mock_data.js
@@ -1,16 +1,17 @@
-export const sourceContent = `
----
+export const sourceContentHeader = `---
 layout: handbook-page-toc
 title: Handbook
 twitter_image: '/images/tweets/handbook-gitlab.png'
----
-
-## On this page
+---`;
+export const sourceContentSpacing = `
+`;
+export const sourceContentBody = `## On this page
 {:.no_toc .hidden-md .hidden-lg}
 
 - TOC
 {:toc .hidden-md .hidden-lg}
 `;
+export const sourceContent = `${sourceContentHeader}${sourceContentSpacing}${sourceContentBody}`;
 export const sourceContentTitle = 'Handbook';
 
 export const username = 'gitlabuser';
diff --git a/spec/frontend/static_site_editor/pages/home_spec.js b/spec/frontend/static_site_editor/pages/home_spec.js
index 8c9c54f593e..d3ee70785d1 100644
--- a/spec/frontend/static_site_editor/pages/home_spec.js
+++ b/spec/frontend/static_site_editor/pages/home_spec.js
@@ -7,6 +7,8 @@ import InvalidContentMessage from '~/static_site_editor/components/invalid_conte
 import SubmitChangesError from '~/static_site_editor/components/submit_changes_error.vue';
 import submitContentChangesMutation from '~/static_site_editor/graphql/mutations/submit_content_changes.mutation.graphql';
 import { SUCCESS_ROUTE } from '~/static_site_editor/router/constants';
+import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
+import { TRACKING_ACTION_INITIALIZE_EDITOR } from '~/static_site_editor/constants';
 
 import {
   projectId as project,
@@ -17,6 +19,7 @@ import {
   username,
   savedContentMeta,
   submitChangesError,
+  trackingCategory,
 } from '../mock_data';
 
 const localVue = createLocalVue();
@@ -29,6 +32,7 @@ describe('static_site_editor/pages/home', () => {
   let $apollo;
   let $router;
   let mutateMock;
+  let trackingSpy;
 
   const buildApollo = (queries = {}) => {
     mutateMock = jest.fn();
@@ -76,10 +80,14 @@ describe('static_site_editor/pages/home', () => {
   beforeEach(() => {
     buildApollo();
     buildRouter();
+
+    document.body.dataset.page = trackingCategory;
+    trackingSpy = mockTracking(document.body.dataset.page, undefined, jest.spyOn);
   });
 
   afterEach(() => {
     wrapper.destroy();
+    unmockTracking();
     wrapper = null;
     $apollo = null;
   });
@@ -208,4 +216,12 @@ describe('static_site_editor/pages/home', () => {
       expect($router.push).toHaveBeenCalledWith(SUCCESS_ROUTE);
     });
   });
+
+  it('tracks when editor is initialized on the mounted lifecycle hook', () => {
+    buildWrapper();
+    expect(trackingSpy).toHaveBeenCalledWith(
+      document.body.dataset.page,
+      TRACKING_ACTION_INITIALIZE_EDITOR,
+    );
+  });
 });
diff --git a/spec/frontend/static_site_editor/services/parse_source_file_spec.js b/spec/frontend/static_site_editor/services/parse_source_file_spec.js
new file mode 100644
index 00000000000..fe99c4f5334
--- /dev/null
+++ b/spec/frontend/static_site_editor/services/parse_source_file_spec.js
@@ -0,0 +1,64 @@
+import {
+  sourceContent as content,
+  sourceContentHeader as header,
+  sourceContentSpacing as spacing,
+  sourceContentBody as body,
+} from '../mock_data';
+
+import parseSourceFile from '~/static_site_editor/services/parse_source_file';
+
+describe('parseSourceFile', () => {
+  const contentSimple = content;
+  const contentComplex = [content, content, content].join('');
+
+  describe('the editable shape and its expected values', () => {
+    it.each`
+      sourceContent     | sourceHeader | sourceSpacing | sourceBody                           | desc
+      ${contentSimple}  | ${header}    | ${spacing}    | ${body}                              | ${'extracts header'}
+      ${contentComplex} | ${header}    | ${spacing}    | ${[body, content, content].join('')} | ${'extracts body'}
+    `('$desc', ({ sourceContent, sourceHeader, sourceSpacing, sourceBody }) => {
+      const { editable } = parseSourceFile(sourceContent);
+
+      expect(editable).toMatchObject({
+        raw: sourceContent,
+        header: sourceHeader,
+        spacing: sourceSpacing,
+        body: sourceBody,
+      });
+    });
+
+    it('returns the same front matter regardless of front matter duplication', () => {
+      const parsedSourceSimple = parseSourceFile(contentSimple);
+      const parsedSourceComplex = parseSourceFile(contentComplex);
+
+      expect(parsedSourceSimple.editable.header).toBe(parsedSourceComplex.editable.header);
+    });
+  });
+
+  describe('editable body to raw content default and changes', () => {
+    it.each`
+      sourceContent     | desc
+      ${contentSimple}  | ${'returns false by default for both raw and body'}
+      ${contentComplex} | ${'returns false by default for both raw and body'}
+    `('$desc', ({ sourceContent }) => {
+      const parsedSource = parseSourceFile(sourceContent);
+
+      expect(parsedSource.isModifiedRaw()).toBe(false);
+      expect(parsedSource.isModifiedBody()).toBe(false);
+    });
+
+    it.each`
+      sourceContent     | editableKey | syncKey       | isModifiedKey       | desc
+      ${contentSimple}  | ${'body'}   | ${'syncRaw'}  | ${'isModifiedRaw'}  | ${'returns true after modification and sync'}
+      ${contentSimple}  | ${'raw'}    | ${'syncBody'} | ${'isModifiedBody'} | ${'returns true after modification and sync'}
+      ${contentComplex} | ${'body'}   | ${'syncRaw'}  | ${'isModifiedRaw'}  | ${'returns true after modification and sync'}
+      ${contentComplex} | ${'raw'}    | ${'syncBody'} | ${'isModifiedBody'} | ${'returns true after modification and sync'}
+    `('$desc', ({ sourceContent, editableKey, syncKey, isModifiedKey }) => {
+      const parsedSource = parseSourceFile(sourceContent);
+      parsedSource.editable[editableKey] += 'Added content';
+      parsedSource[syncKey]();
+
+      expect(parsedSource[isModifiedKey]()).toBe(true);
+    });
+  });
+});
diff --git a/spec/frontend/static_site_editor/services/submit_content_changes_spec.js b/spec/frontend/static_site_editor/services/submit_content_changes_spec.js
index a1e9ff4ec4c..3636de3fe70 100644
--- a/spec/frontend/static_site_editor/services/submit_content_changes_spec.js
+++ b/spec/frontend/static_site_editor/services/submit_content_changes_spec.js
@@ -8,6 +8,7 @@ import {
   SUBMIT_CHANGES_COMMIT_ERROR,
   SUBMIT_CHANGES_MERGE_REQUEST_ERROR,
   TRACKING_ACTION_CREATE_COMMIT,
+  TRACKING_ACTION_CREATE_MERGE_REQUEST,
 } from '~/static_site_editor/constants';
 import generateBranchName from '~/static_site_editor/services/generate_branch_name';
 import submitContentChanges from '~/static_site_editor/services/submit_content_changes';
@@ -83,15 +84,6 @@ describe('submitContentChanges', () => {
     });
   });
 
-  it('sends the correct tracking event when committing content changes', () => {
-    return submitContentChanges({ username, projectId, sourcePath, content }).then(() => {
-      expect(trackingSpy).toHaveBeenCalledWith(
-        document.body.dataset.page,
-        TRACKING_ACTION_CREATE_COMMIT,
-      );
-    });
-  });
-
   it('notifies error when content could not be committed', () => {
     Api.commitMultiple.mockRejectedValueOnce();
 
@@ -152,4 +144,24 @@ describe('submitContentChanges', () => {
       });
     });
   });
+
+  describe('sends the correct tracking event', () => {
+    beforeEach(() => {
+      return submitContentChanges({ username, projectId, sourcePath, content });
+    });
+
+    it('for committing changes', () => {
+      expect(trackingSpy).toHaveBeenCalledWith(
+        document.body.dataset.page,
+        TRACKING_ACTION_CREATE_COMMIT,
+      );
+    });
+
+    it('for creating a merge request', () => {
+      expect(trackingSpy).toHaveBeenCalledWith(
+        document.body.dataset.page,
+        TRACKING_ACTION_CREATE_MERGE_REQUEST,
+      );
+    });
+  });
 });
diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js
index e216f49630f..49eae715a45 100644
--- a/spec/frontend/test_setup.js
+++ b/spec/frontend/test_setup.js
@@ -43,15 +43,6 @@ Object.assign(global, {
   preloadFixtures() {},
 });
 
-Object.assign(global, {
-  MutationObserver() {
-    return {
-      disconnect() {},
-      observe() {},
-    };
-  },
-});
-
 // custom-jquery-matchers was written for an old Jest version, we need to make it compatible
 Object.entries(jqueryMatchers).forEach(([matcherName, matcherFactory]) => {
   // Don't override existing Jest matcher
@@ -69,12 +60,6 @@ expect.extend(customMatchers);
 // Tech debt issue TBD
 testUtilsConfig.logModifiedComponents = false;
 
-// Basic stub for MutationObserver
-global.MutationObserver = () => ({
-  disconnect: () => {},
-  observe: () => {},
-});
-
 Object.assign(global, {
   requestIdleCallback(cb) {
     const start = Date.now();
diff --git a/spec/javascripts/toggle_buttons_spec.js b/spec/frontend/toggle_buttons_spec.js
index 09756ff76ec..09a4bd53c09 100644
--- a/spec/javascripts/toggle_buttons_spec.js
+++ b/spec/frontend/toggle_buttons_spec.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import setupToggleButtons from '~/toggle_buttons';
-import getSetTimeoutPromise from './helpers/set_timeout_promise_helper';
+import waitForPromises from './helpers/wait_for_promises';
 
 function generateMarkup(isChecked = true) {
   return `
@@ -31,19 +31,16 @@ describe('ToggleButtons', () => {
       expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('true');
     });
 
-    it('should toggle to unchecked when clicked', done => {
+    it('should toggle to unchecked when clicked', () => {
       const wrapper = setupFixture(true);
       const toggleButton = wrapper.querySelector('.js-project-feature-toggle');
 
       toggleButton.click();
 
-      getSetTimeoutPromise()
-        .then(() => {
-          expect(toggleButton.classList.contains('is-checked')).toEqual(false);
-          expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('false');
-        })
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises().then(() => {
+        expect(toggleButton.classList.contains('is-checked')).toEqual(false);
+        expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('false');
+      });
     });
   });
 
@@ -58,24 +55,21 @@ describe('ToggleButtons', () => {
       expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('false');
     });
 
-    it('should toggle to checked when clicked', done => {
+    it('should toggle to checked when clicked', () => {
       const wrapper = setupFixture(false);
       const toggleButton = wrapper.querySelector('.js-project-feature-toggle');
 
       toggleButton.click();
 
-      getSetTimeoutPromise()
-        .then(() => {
-          expect(toggleButton.classList.contains('is-checked')).toEqual(true);
-          expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('true');
-        })
-        .then(done)
-        .catch(done.fail);
+      return waitForPromises().then(() => {
+        expect(toggleButton.classList.contains('is-checked')).toEqual(true);
+        expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('true');
+      });
     });
   });
 
-  it('should emit `trigger-change` event', done => {
-    const changeSpy = jasmine.createSpy('changeEventHandler');
+  it('should emit `trigger-change` event', () => {
+    const changeSpy = jest.fn();
     const wrapper = setupFixture(false);
     const toggleButton = wrapper.querySelector('.js-project-feature-toggle');
     const input = wrapper.querySelector('.js-project-feature-toggle-input');
@@ -84,16 +78,13 @@ describe('ToggleButtons', () => {
 
     toggleButton.click();
 
-    getSetTimeoutPromise()
-      .then(() => {
-        expect(changeSpy).toHaveBeenCalled();
-      })
-      .then(done)
-      .catch(done.fail);
+    return waitForPromises().then(() => {
+      expect(changeSpy).toHaveBeenCalled();
+    });
   });
 
   describe('clickCallback', () => {
-    it('should show loading indicator while waiting', done => {
+    it('should show loading indicator while waiting', () => {
       const isChecked = true;
       const clickCallback = (newValue, toggleButton) => {
         const input = toggleButton.querySelector('.js-project-feature-toggle-input');
@@ -107,15 +98,12 @@ describe('ToggleButtons', () => {
         expect(input.value).toEqual('true');
 
         // After the callback finishes, check that the loading state is gone
-        getSetTimeoutPromise()
-          .then(() => {
-            expect(toggleButton.classList.contains('is-checked')).toEqual(false);
-            expect(toggleButton.classList.contains('is-loading')).toEqual(false);
-            expect(toggleButton.disabled).toEqual(false);
-            expect(input.value).toEqual('false');
-          })
-          .then(done)
-          .catch(done.fail);
+        return waitForPromises().then(() => {
+          expect(toggleButton.classList.contains('is-checked')).toEqual(false);
+          expect(toggleButton.classList.contains('is-loading')).toEqual(false);
+          expect(toggleButton.disabled).toEqual(false);
+          expect(input.value).toEqual('false');
+        });
       };
 
       const wrapper = setupFixture(isChecked, clickCallback);
diff --git a/spec/frontend/tracking_spec.js b/spec/frontend/tracking_spec.js
index 08a26d46618..8acfa655c2c 100644
--- a/spec/frontend/tracking_spec.js
+++ b/spec/frontend/tracking_spec.js
@@ -121,11 +121,6 @@ describe('Tracking', () => {
   describe('tracking interface events', () => {
     let eventSpy;
 
-    const trigger = (selector, eventName = 'click') => {
-      const event = new Event(eventName, { bubbles: true });
-      document.querySelector(selector).dispatchEvent(event);
-    };
-
     beforeEach(() => {
       eventSpy = jest.spyOn(Tracking, 'event');
       Tracking.bindDocument('_category_'); // only happens once
@@ -140,7 +135,7 @@ describe('Tracking', () => {
     });
 
     it('binds to clicks on elements matching [data-track-event]', () => {
-      trigger('[data-track-event="click_input1"]');
+      document.querySelector('[data-track-event="click_input1"]').click();
 
       expect(eventSpy).toHaveBeenCalledWith('_category_', 'click_input1', {
         label: '_label_',
@@ -149,13 +144,13 @@ describe('Tracking', () => {
     });
 
     it('does not bind to clicks on elements without [data-track-event]', () => {
-      trigger('[data-track-eventbogus="click_bogusinput"]');
+      document.querySelector('[data-track-eventbogus="click_bogusinput"]').click();
 
       expect(eventSpy).not.toHaveBeenCalled();
     });
 
     it('allows value override with the data-track-value attribute', () => {
-      trigger('[data-track-event="click_input2"]');
+      document.querySelector('[data-track-event="click_input2"]').click();
 
       expect(eventSpy).toHaveBeenCalledWith('_category_', 'click_input2', {
         value: '_value_override_',
@@ -163,13 +158,15 @@ describe('Tracking', () => {
     });
 
     it('handles checkbox values correctly', () => {
-      trigger('[data-track-event="toggle_checkbox"]'); // checking
+      const checkbox = document.querySelector('[data-track-event="toggle_checkbox"]');
+
+      checkbox.click(); // unchecking
 
       expect(eventSpy).toHaveBeenCalledWith('_category_', 'toggle_checkbox', {
         value: false,
       });
 
-      trigger('[data-track-event="toggle_checkbox"]'); // unchecking
+      checkbox.click(); // checking
 
       expect(eventSpy).toHaveBeenCalledWith('_category_', 'toggle_checkbox', {
         value: '_value_',
@@ -177,17 +174,19 @@ describe('Tracking', () => {
     });
 
     it('handles bootstrap dropdowns', () => {
-      trigger('[data-track-event="toggle_dropdown"]', 'show.bs.dropdown'); // showing
+      const dropdown = document.querySelector('[data-track-event="toggle_dropdown"]');
+
+      dropdown.dispatchEvent(new Event('show.bs.dropdown', { bubbles: true }));
 
       expect(eventSpy).toHaveBeenCalledWith('_category_', 'toggle_dropdown_show', {});
 
-      trigger('[data-track-event="toggle_dropdown"]', 'hide.bs.dropdown'); // hiding
+      dropdown.dispatchEvent(new Event('hide.bs.dropdown', { bubbles: true }));
 
       expect(eventSpy).toHaveBeenCalledWith('_category_', 'toggle_dropdown_hide', {});
     });
 
     it('handles nested elements inside an element with tracking', () => {
-      trigger('span.nested', 'click');
+      document.querySelector('span.nested').click();
 
       expect(eventSpy).toHaveBeenCalledWith('_category_', 'nested_event', {});
     });
diff --git a/spec/javascripts/user_popovers_spec.js b/spec/frontend/user_popovers_spec.js
index 6ac22fca2d3..0367b9cc924 100644
--- a/spec/javascripts/user_popovers_spec.js
+++ b/spec/frontend/user_popovers_spec.js
@@ -26,10 +26,12 @@ describe('User Popovers', () => {
     loadFixtures(fixtureTemplate);
 
     const usersCacheSpy = () => Promise.resolve(dummyUser);
-    spyOn(UsersCache, 'retrieveById').and.callFake(userId => usersCacheSpy(userId));
+    jest.spyOn(UsersCache, 'retrieveById').mockImplementation(userId => usersCacheSpy(userId));
 
     const userStatusCacheSpy = () => Promise.resolve(dummyUserStatus);
-    spyOn(UsersCache, 'retrieveStatusById').and.callFake(userId => userStatusCacheSpy(userId));
+    jest
+      .spyOn(UsersCache, 'retrieveStatusById')
+      .mockImplementation(userId => userStatusCacheSpy(userId));
 
     popovers = initUserPopovers(document.querySelectorAll(selector));
   });
@@ -53,6 +55,8 @@ describe('User Popovers', () => {
     let userLink;
 
     beforeEach(() => {
+      UsersCache.retrieveById.mockReset();
+
       userLink = document.querySelector(selector);
 
       triggerEvent('mouseenter', userLink);
@@ -68,7 +72,7 @@ describe('User Popovers', () => {
       const [firstPopover] = popovers;
 
       expect(firstPopover.$props.user).toEqual(
-        jasmine.objectContaining({
+        expect.objectContaining({
           name,
           userId,
           username,
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_alert_message_spec.js
index f78fcfb52b4..f78fcfb52b4 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_alert_message_spec.js
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_author_spec.js
index a942a9dec87..05690aa1248 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_author_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import MrWidgetAuthor from '~/vue_merge_request_widget/components/mr_widget_author.vue';
 
 describe('MrWidgetAuthor', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_author_time_spec.js
index 55af2baa924..58ed92298bf 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_author_time_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_author_time_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import MrWidgetAuthorTime from '~/vue_merge_request_widget/components/mr_widget_author_time.vue';
 
 describe('MrWidgetAuthorTime', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_header_spec.js
index 3cbaa47c832..b492a69fb3d 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_header_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import headerComponent from '~/vue_merge_request_widget/components/mr_widget_header.vue';
 
 describe('MRWidgetHeader', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js
index d15c3552b4a..7a932feb3a7 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js
@@ -1,4 +1,6 @@
 import Vue from 'vue';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import MemoryUsage from '~/vue_merge_request_widget/components/deployment/memory_usage.vue';
 import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 
@@ -59,12 +61,20 @@ const messages = {
 describe('MemoryUsage', () => {
   let vm;
   let el;
+  let mock;
 
   beforeEach(() => {
+    mock = new MockAdapter(axios);
+    mock.onGet(`${url}.json`).reply(200);
+
     vm = createComponent();
     el = vm.$el;
   });
 
+  afterEach(() => {
+    mock.restore();
+  });
+
   describe('data', () => {
     it('should have default data', () => {
       const data = MemoryUsage.data();
@@ -127,6 +137,9 @@ describe('MemoryUsage', () => {
 
     describe('computeGraphData', () => {
       it('should populate sparkline graph', () => {
+        // ignore BoostrapVue warnings
+        jest.spyOn(console, 'warn').mockImplementation();
+
         vm.computeGraphData(metrics, deployment_time);
         const { hasMetrics, memoryMetrics, deploymentTime, memoryFrom, memoryTo } = vm;
 
@@ -147,15 +160,15 @@ describe('MemoryUsage', () => {
         });
 
       it('should load metrics data using MRWidgetService', done => {
-        spyOn(MRWidgetService, 'fetchMetrics').and.returnValue(returnServicePromise(true));
-        spyOn(vm, 'computeGraphData');
+        jest.spyOn(MRWidgetService, 'fetchMetrics').mockReturnValue(returnServicePromise(true));
+        jest.spyOn(vm, 'computeGraphData').mockImplementation(() => {});
 
         vm.loadMetrics();
-        setTimeout(() => {
+        setImmediate(() => {
           expect(MRWidgetService.fetchMetrics).toHaveBeenCalledWith(url);
           expect(vm.computeGraphData).toHaveBeenCalledWith(metrics, deployment_time);
           done();
-        }, 333);
+        });
       });
     });
   });
@@ -182,6 +195,9 @@ describe('MemoryUsage', () => {
     });
 
     it('should show deployment memory usage when metrics are loaded', done => {
+      // ignore BoostrapVue warnings
+      jest.spyOn(console, 'warn').mockImplementation();
+
       vm.loadingMetrics = false;
       vm.hasMetrics = true;
       vm.loadFailed = false;
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_merge_help_spec.js
index b566876fe1d..00e79a22485 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_merge_help_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_merge_help_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import mergeHelpComponent from '~/vue_merge_request_widget/components/mr_widget_merge_help.vue';
 
 describe('MRWidgetMergeHelp', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_spec.js
index 883c41085fa..309aec179d9 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import { trimText } from 'spec/helpers/text_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
+import { trimText } from 'helpers/text_helper';
 import pipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue';
 import mockData from '../mock_data';
 
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
index 5b293862b16..6ec30493f8b 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import eventHub from '~/vue_merge_request_widget/event_hub';
 import component from '~/vue_merge_request_widget/components/states/mr_widget_rebase.vue';
 
@@ -45,10 +45,8 @@ describe('Merge request widget rebase component', () => {
 
       expect(text).toContain('Fast-forward merge is not possible.');
       expect(text.replace(/\s\s+/g, ' ')).toContain(
-        'Rebase the source branch onto the target branch or merge target',
+        'Rebase the source branch onto the target branch.',
       );
-
-      expect(text).toContain('branch into source branch to allow this merge request to be merged.');
     });
 
     it('it should render error message when it fails', done => {
@@ -105,7 +103,7 @@ describe('Merge request widget rebase component', () => {
 
   describe('methods', () => {
     it('checkRebaseStatus', done => {
-      spyOn(eventHub, '$emit');
+      jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
       vm = mountComponent(Component, {
         mr: {},
         service: {
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_related_links_spec.js
index a152bd01916..0c4ec7ed99b 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_related_links_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import relatedLinksComponent from '~/vue_merge_request_widget/components/mr_widget_related_links.vue';
 
 describe('MRWidgetRelatedLinks', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_status_icon_spec.js
index 20bda024d89..6c3b4a01659 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_status_icon_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import mrStatusIcon from '~/vue_merge_request_widget/components/mr_widget_status_icon.vue';
 
 describe('MR widget status icon component', () => {
diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_terraform_plan_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_terraform_plan_spec.js
index 91e95b2bdb1..62c5c8e8531 100644
--- a/spec/frontend/vue_mr_widget/components/mr_widget_terraform_plan_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_terraform_plan_spec.js
@@ -1,4 +1,4 @@
-import { GlLoadingIcon, GlSprintf } from '@gitlab/ui';
+import { GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import axios from '~/lib/utils/axios_utils';
 import MockAdapter from 'axios-mock-adapter';
@@ -38,7 +38,7 @@ describe('MrWidgetTerraformPlan', () => {
 
   describe('loading poll', () => {
     beforeEach(() => {
-      mockPollingApi(200, { 'tfplan.json': plan }, {});
+      mockPollingApi(200, { '123': plan }, {});
 
       return mountWrapper().then(() => {
         wrapper.setData({ loading: true });
@@ -65,7 +65,7 @@ describe('MrWidgetTerraformPlan', () => {
       pollRequest = jest.spyOn(Poll.prototype, 'makeRequest');
       pollStop = jest.spyOn(Poll.prototype, 'stop');
 
-      mockPollingApi(200, { 'tfplan.json': plan }, {});
+      mockPollingApi(200, { '123': plan }, {});
 
       return mountWrapper();
     });
@@ -80,7 +80,7 @@ describe('MrWidgetTerraformPlan', () => {
     });
 
     it('renders button when url is found', () => {
-      expect(wrapper.find('a').text()).toContain('View full log');
+      expect(wrapper.find(GlLink).exists()).toBe(true);
     });
 
     it('does not make additional requests after poll is successful', () => {
@@ -101,7 +101,7 @@ describe('MrWidgetTerraformPlan', () => {
       );
 
       expect(wrapper.find('.js-terraform-report-link').exists()).toBe(false);
-      expect(wrapper.text()).not.toContain('View full log');
+      expect(wrapper.find(GlLink).exists()).toBe(false);
     });
   });
 });
diff --git a/spec/javascripts/vue_mr_widget/components/review_app_link_spec.js b/spec/frontend/vue_mr_widget/components/review_app_link_spec.js
index 242193c7b3d..7b063653a93 100644
--- a/spec/javascripts/vue_mr_widget/components/review_app_link_spec.js
+++ b/spec/frontend/vue_mr_widget/components/review_app_link_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { mockTracking, triggerEvent } from 'spec/helpers/tracking_helper';
+import { mockTracking, triggerEvent } from 'helpers/tracking_helper';
 import component from '~/vue_merge_request_widget/components/review_app_link.vue';
 import mountComponent from '../../helpers/vue_mount_component_helper';
 
@@ -42,7 +42,7 @@ describe('review app link', () => {
   });
 
   it('tracks an event when clicked', () => {
-    const spy = mockTracking('_category_', el, spyOn);
+    const spy = mockTracking('_category_', el, jest.spyOn);
     triggerEvent(el);
 
     expect(spy).toHaveBeenCalledWith('_category_', 'open_review_app', {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_archived_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_archived_spec.js
index 29a257b0e24..4bdc6c95f22 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_archived_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_archived_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import archivedComponent from '~/vue_merge_request_widget/components/states/mr_widget_archived.vue';
 
 describe('MRWidgetArchived', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
index 73b65178ecf..e2caa6e8092 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import { trimText } from 'spec/helpers/text_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
+import { trimText } from 'helpers/text_helper';
 import autoMergeEnabledComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue';
 import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 import eventHub from '~/vue_merge_request_widget/event_hub';
@@ -14,7 +14,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
 
   beforeEach(() => {
     const Component = Vue.extend(autoMergeEnabledComponent);
-    spyOn(eventHub, '$emit');
+    jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
 
     vm = mountComponent(Component, {
       mr: {
@@ -103,7 +103,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
         const mrObj = {
           is_new_mr_data: true,
         };
-        spyOn(vm.service, 'cancelAutomaticMerge').and.returnValue(
+        jest.spyOn(vm.service, 'cancelAutomaticMerge').mockReturnValue(
           new Promise(resolve => {
             resolve({
               data: mrObj,
@@ -112,17 +112,17 @@ describe('MRWidgetAutoMergeEnabled', () => {
         );
 
         vm.cancelAutomaticMerge();
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.isCancellingAutoMerge).toBeTruthy();
           expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
           done();
-        }, 333);
+        });
       });
     });
 
     describe('removeSourceBranch', () => {
       it('should set flag and call service then request main component to update the widget', done => {
-        spyOn(vm.service, 'merge').and.returnValue(
+        jest.spyOn(vm.service, 'merge').mockReturnValue(
           Promise.resolve({
             data: {
               status: MWPS_MERGE_STRATEGY,
@@ -131,7 +131,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
         );
 
         vm.removeSourceBranch();
-        setTimeout(() => {
+        setImmediate(() => {
           expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
           expect(vm.service.merge).toHaveBeenCalledWith({
             sha,
@@ -139,7 +139,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
             should_remove_source_branch: true,
           });
           done();
-        }, 333);
+        });
       });
     });
   });
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_checking_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_checking_spec.js
index efccd507fe2..56d55c9afac 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_checking_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_checking_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import checkingComponent from '~/vue_merge_request_widget/components/states/mr_widget_checking.vue';
 
 describe('MRWidgetChecking', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_closed_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_closed_spec.js
index bbbaed0d2f5..322f440763c 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_closed_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_closed_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import closedComponent from '~/vue_merge_request_widget/components/states/mr_widget_closed.vue';
 
 describe('MRWidgetClosed', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
index 9035bc6f65d..d3482b457ad 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
@@ -1,7 +1,8 @@
 import $ from 'jquery';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
-import { removeBreakLine } from 'spec/helpers/text_helper';
+import { removeBreakLine } from 'helpers/text_helper';
 import ConflictsComponent from '~/vue_merge_request_widget/components/states/mr_widget_conflicts.vue';
+import { TEST_HOST } from 'helpers/test_constants';
 
 describe('MRWidgetConflicts', () => {
   let vm;
@@ -16,7 +17,7 @@ describe('MRWidgetConflicts', () => {
   }
 
   beforeEach(() => {
-    spyOn($.fn, 'popover').and.callThrough();
+    jest.spyOn($.fn, 'popover');
   });
 
   afterEach(() => {
@@ -185,7 +186,7 @@ describe('MRWidgetConflicts', () => {
         mr: {
           canMerge: true,
           canPushToSourceBranch: true,
-          conflictResolutionPath: gl.TEST_HOST,
+          conflictResolutionPath: TEST_HOST,
           sourceBranchProtected: true,
           conflictsDocsPath: '',
         },
@@ -207,7 +208,7 @@ describe('MRWidgetConflicts', () => {
         mr: {
           canMerge: true,
           canPushToSourceBranch: true,
-          conflictResolutionPath: gl.TEST_HOST,
+          conflictResolutionPath: TEST_HOST,
           sourceBranchProtected: false,
           conflictsDocsPath: '',
         },
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
index ef76e617c07..f591393d721 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_failed_to_merge_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import failedToMergeComponent from '~/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue';
 import eventHub from '~/vue_merge_request_widget/event_hub';
 
@@ -11,9 +11,9 @@ describe('MRWidgetFailedToMerge', () => {
 
   beforeEach(() => {
     Component = Vue.extend(failedToMergeComponent);
-    spyOn(eventHub, '$emit');
-    spyOn(window, 'setInterval').and.returnValue(dummyIntervalId);
-    spyOn(window, 'clearInterval').and.stub();
+    jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+    jest.spyOn(window, 'setInterval').mockReturnValue(dummyIntervalId);
+    jest.spyOn(window, 'clearInterval').mockImplementation();
     mr = {
       mergeError: 'Merge error happened',
     };
@@ -83,7 +83,7 @@ describe('MRWidgetFailedToMerge', () => {
 
     describe('updateTimer', () => {
       it('should update timer and emit event when timer end', () => {
-        spyOn(vm, 'refresh');
+        jest.spyOn(vm, 'refresh').mockImplementation(() => {});
 
         expect(vm.timer).toEqual(10);
 
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js
index 423c800bfbc..1921599ae95 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import mergedComponent from '~/vue_merge_request_widget/components/states/mr_widget_merged.vue';
 import eventHub from '~/vue_merge_request_widget/event_hub';
 
@@ -52,7 +52,7 @@ describe('MRWidgetMerged', () => {
       removeSourceBranch() {},
     };
 
-    spyOn(eventHub, '$emit');
+    jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
 
     vm = mountComponent(Component, { mr, service });
   });
@@ -124,7 +124,7 @@ describe('MRWidgetMerged', () => {
   describe('methods', () => {
     describe('removeSourceBranch', () => {
       it('should set flag and call service then request main component to update the widget', done => {
-        spyOn(vm.service, 'removeSourceBranch').and.returnValue(
+        jest.spyOn(vm.service, 'removeSourceBranch').mockReturnValue(
           new Promise(resolve => {
             resolve({
               data: {
@@ -135,14 +135,14 @@ describe('MRWidgetMerged', () => {
         );
 
         vm.removeSourceBranch();
-        setTimeout(() => {
-          const args = eventHub.$emit.calls.argsFor(0);
+        setImmediate(() => {
+          const args = eventHub.$emit.mock.calls[0];
 
           expect(vm.isMakingRequest).toEqual(true);
           expect(args[0]).toEqual('MRWidgetUpdateRequested');
           expect(args[1]).not.toThrow();
           done();
-        }, 333);
+        });
       });
     });
   });
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
index 06d236064dd..222cb74cc66 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import mergingComponent from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue';
 
 describe('MRWidgetMerging', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
index 47b989e2022..3f03ebdb047 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import missingBranchComponent from '~/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue';
 
 describe('MRWidgetMissingBranch', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js
index b1cb91663c9..63e93074857 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_not_allowed_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import notAllowedComponent from '~/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue';
 
 describe('MRWidgetNotAllowed', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
index bd0bd36ebc2..bd0bd36ebc2 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
index 0bca86b12b2..8847e4e6bdd 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import { removeBreakLine } from 'spec/helpers/text_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
+import { removeBreakLine } from 'helpers/text_helper';
 import pipelineBlockedComponent from '~/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue';
 
 describe('MRWidgetPipelineBlocked', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js
index 85f65d024a8..179adef12d9 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { removeBreakLine } from 'spec/helpers/text_helper';
+import { removeBreakLine } from 'helpers/text_helper';
 import PipelineFailed from '~/vue_merge_request_widget/components/states/pipeline_failed.vue';
 
 describe('PipelineFailed', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
index 9ba429c3d20..1f0d6a7378c 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -7,6 +7,15 @@ import CommitEdit from '~/vue_merge_request_widget/components/states/commit_edit
 import CommitMessageDropdown from '~/vue_merge_request_widget/components/states/commit_message_dropdown.vue';
 import eventHub from '~/vue_merge_request_widget/event_hub';
 import { MWPS_MERGE_STRATEGY, MTWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
+import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests';
+import simplePoll from '~/lib/utils/simple_poll';
+
+jest.mock('~/lib/utils/simple_poll', () =>
+  jest.fn().mockImplementation(jest.requireActual('~/lib/utils/simple_poll').default),
+);
+jest.mock('~/commons/nav/user_merge_requests', () => ({
+  refreshUserMergeRequestCounts: jest.fn(),
+}));
 
 const commitMessage = 'This is the commit message';
 const squashCommitMessage = 'This is the squash commit message';
@@ -33,6 +42,7 @@ const createTestMr = customConfig => {
     targetBranch: 'master',
     preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY,
     availableAutoMergeStrategies: [MWPS_MERGE_STRATEGY],
+    mergeImmediatelyDocsPath: 'path/to/merge/immediately/docs',
   };
 
   Object.assign(mr, customConfig.mr);
@@ -41,8 +51,8 @@ const createTestMr = customConfig => {
 };
 
 const createTestService = () => ({
-  merge() {},
-  poll() {},
+  merge: jest.fn(),
+  poll: jest.fn().mockResolvedValue(),
 });
 
 const createComponent = (customConfig = {}) => {
@@ -59,11 +69,9 @@ const createComponent = (customConfig = {}) => {
 
 describe('ReadyToMerge', () => {
   let vm;
-  let updateMrCountSpy;
 
   beforeEach(() => {
     vm = createComponent();
-    updateMrCountSpy = spyOnDependency(ReadyToMerge, 'refreshUserMergeRequestCounts');
   });
 
   afterEach(() => {
@@ -347,19 +355,21 @@ describe('ReadyToMerge', () => {
         });
 
       it('should handle merge when pipeline succeeds', done => {
-        spyOn(eventHub, '$emit');
-        spyOn(vm.service, 'merge').and.returnValue(returnPromise('merge_when_pipeline_succeeds'));
+        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+        jest
+          .spyOn(vm.service, 'merge')
+          .mockReturnValue(returnPromise('merge_when_pipeline_succeeds'));
         vm.removeSourceBranch = false;
         vm.handleMergeButtonClick(true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.isMakingRequest).toBeTruthy();
           expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
 
-          const params = vm.service.merge.calls.argsFor(0)[0];
+          const params = vm.service.merge.mock.calls[0][0];
 
           expect(params).toEqual(
-            jasmine.objectContaining({
+            expect.objectContaining({
               sha: vm.mr.sha,
               commit_message: vm.mr.commitMessage,
               should_remove_source_branch: false,
@@ -367,67 +377,56 @@ describe('ReadyToMerge', () => {
             }),
           );
           done();
-        }, 333);
+        });
       });
 
       it('should handle merge failed', done => {
-        spyOn(eventHub, '$emit');
-        spyOn(vm.service, 'merge').and.returnValue(returnPromise('failed'));
+        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+        jest.spyOn(vm.service, 'merge').mockReturnValue(returnPromise('failed'));
         vm.handleMergeButtonClick(false, true);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.isMakingRequest).toBeTruthy();
           expect(eventHub.$emit).toHaveBeenCalledWith('FailedToMerge', undefined);
 
-          const params = vm.service.merge.calls.argsFor(0)[0];
+          const params = vm.service.merge.mock.calls[0][0];
 
           expect(params.should_remove_source_branch).toBeTruthy();
           expect(params.auto_merge_strategy).toBeUndefined();
           done();
-        }, 333);
+        });
       });
 
       it('should handle merge action accepted case', done => {
-        spyOn(vm.service, 'merge').and.returnValue(returnPromise('success'));
-        spyOn(vm, 'initiateMergePolling');
+        jest.spyOn(vm.service, 'merge').mockReturnValue(returnPromise('success'));
+        jest.spyOn(vm, 'initiateMergePolling').mockImplementation(() => {});
         vm.handleMergeButtonClick();
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.isMakingRequest).toBeTruthy();
           expect(vm.initiateMergePolling).toHaveBeenCalled();
 
-          const params = vm.service.merge.calls.argsFor(0)[0];
+          const params = vm.service.merge.mock.calls[0][0];
 
           expect(params.should_remove_source_branch).toBeTruthy();
           expect(params.auto_merge_strategy).toBeUndefined();
           done();
-        }, 333);
+        });
       });
     });
 
     describe('initiateMergePolling', () => {
-      beforeEach(() => {
-        jasmine.clock().install();
-      });
-
-      afterEach(() => {
-        jasmine.clock().uninstall();
-      });
-
       it('should call simplePoll', () => {
-        const simplePoll = spyOnDependency(ReadyToMerge, 'simplePoll');
         vm.initiateMergePolling();
 
-        expect(simplePoll).toHaveBeenCalledWith(jasmine.any(Function), { timeout: 0 });
+        expect(simplePoll).toHaveBeenCalledWith(expect.any(Function), { timeout: 0 });
       });
 
       it('should call handleMergePolling', () => {
-        spyOn(vm, 'handleMergePolling');
+        jest.spyOn(vm, 'handleMergePolling').mockImplementation(() => {});
 
         vm.initiateMergePolling();
 
-        jasmine.clock().tick(2000);
-
         expect(vm.handleMergePolling).toHaveBeenCalled();
       });
     });
@@ -448,9 +447,9 @@ describe('ReadyToMerge', () => {
       });
 
       it('should call start and stop polling when MR merged', done => {
-        spyOn(eventHub, '$emit');
-        spyOn(vm.service, 'poll').and.returnValue(returnPromise('merged'));
-        spyOn(vm, 'initiateRemoveSourceBranchPolling');
+        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+        jest.spyOn(vm.service, 'poll').mockReturnValue(returnPromise('merged'));
+        jest.spyOn(vm, 'initiateRemoveSourceBranchPolling').mockImplementation(() => {});
 
         let cpc = false; // continuePollingCalled
         let spc = false; // stopPollingCalled
@@ -463,26 +462,26 @@ describe('ReadyToMerge', () => {
             spc = true;
           },
         );
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.service.poll).toHaveBeenCalled();
           expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
           expect(eventHub.$emit).toHaveBeenCalledWith('FetchActionsContent');
           expect(vm.initiateRemoveSourceBranchPolling).toHaveBeenCalled();
-          expect(updateMrCountSpy).toHaveBeenCalled();
+          expect(refreshUserMergeRequestCounts).toHaveBeenCalled();
           expect(cpc).toBeFalsy();
           expect(spc).toBeTruthy();
 
           done();
-        }, 333);
+        });
       });
 
       it('updates status box', done => {
-        spyOn(vm.service, 'poll').and.returnValue(returnPromise('merged'));
-        spyOn(vm, 'initiateRemoveSourceBranchPolling');
+        jest.spyOn(vm.service, 'poll').mockReturnValue(returnPromise('merged'));
+        jest.spyOn(vm, 'initiateRemoveSourceBranchPolling').mockImplementation(() => {});
 
         vm.handleMergePolling(() => {}, () => {});
 
-        setTimeout(() => {
+        setImmediate(() => {
           const statusBox = document.querySelector('.status-box');
 
           expect(statusBox.classList.contains('status-box-mr-merged')).toBeTruthy();
@@ -493,12 +492,12 @@ describe('ReadyToMerge', () => {
       });
 
       it('hides close button', done => {
-        spyOn(vm.service, 'poll').and.returnValue(returnPromise('merged'));
-        spyOn(vm, 'initiateRemoveSourceBranchPolling');
+        jest.spyOn(vm.service, 'poll').mockReturnValue(returnPromise('merged'));
+        jest.spyOn(vm, 'initiateRemoveSourceBranchPolling').mockImplementation(() => {});
 
         vm.handleMergePolling(() => {}, () => {});
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(document.querySelector('.btn-close').classList.contains('hidden')).toBeTruthy();
 
           done();
@@ -506,12 +505,12 @@ describe('ReadyToMerge', () => {
       });
 
       it('updates merge request count badge', done => {
-        spyOn(vm.service, 'poll').and.returnValue(returnPromise('merged'));
-        spyOn(vm, 'initiateRemoveSourceBranchPolling');
+        jest.spyOn(vm.service, 'poll').mockReturnValue(returnPromise('merged'));
+        jest.spyOn(vm, 'initiateRemoveSourceBranchPolling').mockImplementation(() => {});
 
         vm.handleMergePolling(() => {}, () => {});
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(document.querySelector('.js-merge-counter').textContent).toBe('0');
 
           done();
@@ -519,8 +518,8 @@ describe('ReadyToMerge', () => {
       });
 
       it('should continue polling until MR is merged', done => {
-        spyOn(vm.service, 'poll').and.returnValue(returnPromise('some_other_state'));
-        spyOn(vm, 'initiateRemoveSourceBranchPolling');
+        jest.spyOn(vm.service, 'poll').mockReturnValue(returnPromise('some_other_state'));
+        jest.spyOn(vm, 'initiateRemoveSourceBranchPolling').mockImplementation(() => {});
 
         let cpc = false; // continuePollingCalled
         let spc = false; // stopPollingCalled
@@ -533,19 +532,18 @@ describe('ReadyToMerge', () => {
             spc = true;
           },
         );
-        setTimeout(() => {
+        setImmediate(() => {
           expect(cpc).toBeTruthy();
           expect(spc).toBeFalsy();
 
           done();
-        }, 333);
+        });
       });
     });
 
     describe('initiateRemoveSourceBranchPolling', () => {
       it('should emit event and call simplePoll', () => {
-        spyOn(eventHub, '$emit');
-        const simplePoll = spyOnDependency(ReadyToMerge, 'simplePoll');
+        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
 
         vm.initiateRemoveSourceBranchPolling();
 
@@ -565,8 +563,8 @@ describe('ReadyToMerge', () => {
         });
 
       it('should call start and stop polling when MR merged', done => {
-        spyOn(eventHub, '$emit');
-        spyOn(vm.service, 'poll').and.returnValue(returnPromise(false));
+        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+        jest.spyOn(vm.service, 'poll').mockReturnValue(returnPromise(false));
 
         let cpc = false; // continuePollingCalled
         let spc = false; // stopPollingCalled
@@ -579,10 +577,10 @@ describe('ReadyToMerge', () => {
             spc = true;
           },
         );
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.service.poll).toHaveBeenCalled();
 
-          const args = eventHub.$emit.calls.argsFor(0);
+          const args = eventHub.$emit.mock.calls[0];
 
           expect(args[0]).toEqual('MRWidgetUpdateRequested');
           expect(args[1]).toBeDefined();
@@ -594,11 +592,11 @@ describe('ReadyToMerge', () => {
           expect(spc).toBeTruthy();
 
           done();
-        }, 333);
+        });
       });
 
       it('should continue polling until MR is merged', done => {
-        spyOn(vm.service, 'poll').and.returnValue(returnPromise(true));
+        jest.spyOn(vm.service, 'poll').mockReturnValue(returnPromise(true));
 
         let cpc = false; // continuePollingCalled
         let spc = false; // stopPollingCalled
@@ -611,12 +609,12 @@ describe('ReadyToMerge', () => {
             spc = true;
           },
         );
-        setTimeout(() => {
+        setImmediate(() => {
           expect(cpc).toBeTruthy();
           expect(spc).toBeFalsy();
 
           done();
-        }, 333);
+        });
       });
     });
   });
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
index 11eb0fef9b2..38920846a50 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import { removeBreakLine } from 'spec/helpers/text_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
+import { removeBreakLine } from 'helpers/text_helper';
 import ShaMismatch from '~/vue_merge_request_widget/components/states/sha_mismatch.vue';
 
 describe('ShaMismatch', () => {
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
index b70d580ed04..b70d580ed04 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
index e8367caa438..33e52f4fd36 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
@@ -1,6 +1,7 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import UnresolvedDiscussions from '~/vue_merge_request_widget/components/states/unresolved_discussions.vue';
+import { TEST_HOST } from 'helpers/test_constants';
 
 describe('UnresolvedDiscussions', () => {
   const Component = Vue.extend(UnresolvedDiscussions);
@@ -14,7 +15,7 @@ describe('UnresolvedDiscussions', () => {
     beforeEach(() => {
       vm = mountComponent(Component, {
         mr: {
-          createIssueToResolveDiscussionsPath: gl.TEST_HOST,
+          createIssueToResolveDiscussionsPath: TEST_HOST,
         },
       });
     });
@@ -25,7 +26,7 @@ describe('UnresolvedDiscussions', () => {
       );
 
       expect(vm.$el.innerText).toContain('Create an issue to resolve them later');
-      expect(vm.$el.querySelector('.js-create-issue').getAttribute('href')).toEqual(gl.TEST_HOST);
+      expect(vm.$el.querySelector('.js-create-issue').getAttribute('href')).toEqual(TEST_HOST);
     });
   });
 
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js
index 9153231b974..6fa555b4fc4 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js
@@ -1,6 +1,9 @@
 import Vue from 'vue';
 import WorkInProgress from '~/vue_merge_request_widget/components/states/work_in_progress.vue';
 import eventHub from '~/vue_merge_request_widget/event_hub';
+import createFlash from '~/flash';
+
+jest.mock('~/flash');
 
 const createComponent = () => {
   const Component = Vue.extend(WorkInProgress);
@@ -47,9 +50,8 @@ describe('Wip', () => {
       it('should make a request to service and handle response', done => {
         const vm = createComponent();
 
-        const flashSpy = spyOnDependency(WorkInProgress, 'createFlash').and.returnValue(true);
-        spyOn(eventHub, '$emit');
-        spyOn(vm.service, 'removeWIP').and.returnValue(
+        jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
+        jest.spyOn(vm.service, 'removeWIP').mockReturnValue(
           new Promise(resolve => {
             resolve({
               data: mrObj,
@@ -58,12 +60,15 @@ describe('Wip', () => {
         );
 
         vm.handleRemoveWIP();
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.isMakingRequest).toBeTruthy();
           expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
-          expect(flashSpy).toHaveBeenCalledWith('The merge request can now be merged.', 'notice');
+          expect(createFlash).toHaveBeenCalledWith(
+            'The merge request can now be merged.',
+            'notice',
+          );
           done();
-        }, 333);
+        });
       });
     });
   });
diff --git a/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_lib_spec.js b/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_lib_spec.js
index 98962918b49..e46c63a1a32 100644
--- a/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_lib_spec.js
+++ b/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_lib_spec.js
@@ -1,7 +1,13 @@
-import * as dateTimePickerLib from '~/vue_shared/components/date_time_picker/date_time_picker_lib';
+import timezoneMock from 'timezone-mock';
+
+import {
+  isValidInputString,
+  inputStringToIsoDate,
+  isoDateToInputString,
+} from '~/vue_shared/components/date_time_picker/date_time_picker_lib';
 
 describe('date time picker lib', () => {
-  describe('isValidDate', () => {
+  describe('isValidInputString', () => {
     [
       {
         input: '2019-09-09T00:00:00.000Z',
@@ -48,121 +54,137 @@ describe('date time picker lib', () => {
         output: false,
       },
     ].forEach(({ input, output }) => {
-      it(`isValidDate return ${output} for ${input}`, () => {
-        expect(dateTimePickerLib.isValidDate(input)).toBe(output);
+      it(`isValidInputString return ${output} for ${input}`, () => {
+        expect(isValidInputString(input)).toBe(output);
       });
     });
   });
 
-  describe('stringToISODate', () => {
-    ['', 'null', undefined, 'abc'].forEach(input => {
+  describe('inputStringToIsoDate', () => {
+    [
+      '',
+      'null',
+      undefined,
+      'abc',
+      'xxxx-xx-xx',
+      '9999-99-19',
+      '2019-19-23',
+      '2019-09-23 x',
+      '2019-09-29 24:24:24',
+    ].forEach(input => {
       it(`throws error for invalid input like ${input}`, () => {
-        expect(() => dateTimePickerLib.stringToISODate(input)).toThrow();
+        expect(() => inputStringToIsoDate(input)).toThrow();
       });
     });
+
     [
       {
-        input: '2019-09-09 01:01:01',
-        output: '2019-09-09T01:01:01Z',
+        input: '2019-09-08 01:01:01',
+        output: '2019-09-08T01:01:01Z',
       },
       {
-        input: '2019-09-09 00:00:00',
-        output: '2019-09-09T00:00:00Z',
+        input: '2019-09-08 00:00:00',
+        output: '2019-09-08T00:00:00Z',
       },
       {
-        input: '2019-09-09 23:59:59',
-        output: '2019-09-09T23:59:59Z',
+        input: '2019-09-08 23:59:59',
+        output: '2019-09-08T23:59:59Z',
       },
       {
-        input: '2019-09-09',
-        output: '2019-09-09T00:00:00Z',
+        input: '2019-09-08',
+        output: '2019-09-08T00:00:00Z',
       },
-    ].forEach(({ input, output }) => {
-      it(`returns ${output} from ${input}`, () => {
-        expect(dateTimePickerLib.stringToISODate(input)).toBe(output);
-      });
-    });
-  });
-
-  describe('truncateZerosInDateTime', () => {
-    [
       {
-        input: '',
-        output: '',
+        input: '2019-09-08',
+        output: '2019-09-08T00:00:00Z',
       },
       {
-        input: '2019-10-10',
-        output: '2019-10-10',
+        input: '2019-09-08 00:00:00',
+        output: '2019-09-08T00:00:00Z',
       },
       {
-        input: '2019-10-10 00:00:01',
-        output: '2019-10-10 00:00:01',
+        input: '2019-09-08 23:24:24',
+        output: '2019-09-08T23:24:24Z',
       },
       {
-        input: '2019-10-10 00:00:00',
-        output: '2019-10-10',
+        input: '2019-09-08 0:0:0',
+        output: '2019-09-08T00:00:00Z',
       },
     ].forEach(({ input, output }) => {
-      it(`truncateZerosInDateTime return ${output} for ${input}`, () => {
-        expect(dateTimePickerLib.truncateZerosInDateTime(input)).toBe(output);
+      it(`returns ${output} from ${input}`, () => {
+        expect(inputStringToIsoDate(input)).toBe(output);
       });
     });
+
+    describe('timezone formatting', () => {
+      const value = '2019-09-08 01:01:01';
+      const utcResult = '2019-09-08T01:01:01Z';
+      const localResult = '2019-09-08T08:01:01Z';
+
+      test.each`
+        val      | locatTimezone   | utc          | result
+        ${value} | ${'UTC'}        | ${undefined} | ${utcResult}
+        ${value} | ${'UTC'}        | ${false}     | ${utcResult}
+        ${value} | ${'UTC'}        | ${true}      | ${utcResult}
+        ${value} | ${'US/Pacific'} | ${undefined} | ${localResult}
+        ${value} | ${'US/Pacific'} | ${false}     | ${localResult}
+        ${value} | ${'US/Pacific'} | ${true}      | ${utcResult}
+      `(
+        'when timezone is $locatTimezone, formats $result for utc = $utc',
+        ({ val, locatTimezone, utc, result }) => {
+          timezoneMock.register(locatTimezone);
+
+          expect(inputStringToIsoDate(val, utc)).toBe(result);
+
+          timezoneMock.unregister();
+        },
+      );
+    });
   });
 
-  describe('isDateTimePickerInputValid', () => {
+  describe('isoDateToInputString', () => {
     [
       {
-        input: null,
-        output: false,
-      },
-      {
-        input: '',
-        output: false,
+        input: '2019-09-08T01:01:01Z',
+        output: '2019-09-08 01:01:01',
       },
       {
-        input: 'xxxx-xx-xx',
-        output: false,
+        input: '2019-09-08T01:01:01.999Z',
+        output: '2019-09-08 01:01:01',
       },
       {
-        input: '9999-99-19',
-        output: false,
-      },
-      {
-        input: '2019-19-23',
-        output: false,
-      },
-      {
-        input: '2019-09-23',
-        output: true,
-      },
-      {
-        input: '2019-09-23 x',
-        output: false,
-      },
-      {
-        input: '2019-09-29 0:0:0',
-        output: false,
-      },
-      {
-        input: '2019-09-29 00:00:00',
-        output: true,
-      },
-      {
-        input: '2019-09-29 24:24:24',
-        output: false,
-      },
-      {
-        input: '2019-09-29 23:24:24',
-        output: true,
-      },
-      {
-        input: '2019-09-29 23:24:24 ',
-        output: false,
+        input: '2019-09-08T00:00:00Z',
+        output: '2019-09-08 00:00:00',
       },
     ].forEach(({ input, output }) => {
       it(`returns ${output} for ${input}`, () => {
-        expect(dateTimePickerLib.isDateTimePickerInputValid(input)).toBe(output);
+        expect(isoDateToInputString(input)).toBe(output);
       });
     });
+
+    describe('timezone formatting', () => {
+      const value = '2019-09-08T08:01:01Z';
+      const utcResult = '2019-09-08 08:01:01';
+      const localResult = '2019-09-08 01:01:01';
+
+      test.each`
+        val      | locatTimezone   | utc          | result
+        ${value} | ${'UTC'}        | ${undefined} | ${utcResult}
+        ${value} | ${'UTC'}        | ${false}     | ${utcResult}
+        ${value} | ${'UTC'}        | ${true}      | ${utcResult}
+        ${value} | ${'US/Pacific'} | ${undefined} | ${localResult}
+        ${value} | ${'US/Pacific'} | ${false}     | ${localResult}
+        ${value} | ${'US/Pacific'} | ${true}      | ${utcResult}
+      `(
+        'when timezone is $locatTimezone, formats $result for utc = $utc',
+        ({ val, locatTimezone, utc, result }) => {
+          timezoneMock.register(locatTimezone);
+
+          expect(isoDateToInputString(val, utc)).toBe(result);
+
+          timezoneMock.unregister();
+        },
+      );
+    });
   });
 });
diff --git a/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_spec.js b/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_spec.js
index 90130917d8f..ceea8d2fa92 100644
--- a/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_spec.js
+++ b/spec/frontend/vue_shared/components/date_time_picker/date_time_picker_spec.js
@@ -1,4 +1,5 @@
 import { mount } from '@vue/test-utils';
+import timezoneMock from 'timezone-mock';
 import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue';
 import {
   defaultTimeRanges,
@@ -8,16 +9,16 @@ import {
 const optionsCount = defaultTimeRanges.length;
 
 describe('DateTimePicker', () => {
-  let dateTimePicker;
+  let wrapper;
 
-  const dropdownToggle = () => dateTimePicker.find('.dropdown-toggle');
-  const dropdownMenu = () => dateTimePicker.find('.dropdown-menu');
-  const applyButtonElement = () => dateTimePicker.find('button.btn-success').element;
-  const findQuickRangeItems = () => dateTimePicker.findAll('.dropdown-item');
-  const cancelButtonElement = () => dateTimePicker.find('button.btn-secondary').element;
+  const dropdownToggle = () => wrapper.find('.dropdown-toggle');
+  const dropdownMenu = () => wrapper.find('.dropdown-menu');
+  const applyButtonElement = () => wrapper.find('button.btn-success').element;
+  const findQuickRangeItems = () => wrapper.findAll('.dropdown-item');
+  const cancelButtonElement = () => wrapper.find('button.btn-secondary').element;
 
   const createComponent = props => {
-    dateTimePicker = mount(DateTimePicker, {
+    wrapper = mount(DateTimePicker, {
       propsData: {
         ...props,
       },
@@ -25,54 +26,86 @@ describe('DateTimePicker', () => {
   };
 
   afterEach(() => {
-    dateTimePicker.destroy();
+    wrapper.destroy();
   });
 
-  it('renders dropdown toggle button with selected text', done => {
+  it('renders dropdown toggle button with selected text', () => {
     createComponent();
-    dateTimePicker.vm.$nextTick(() => {
+    return wrapper.vm.$nextTick(() => {
       expect(dropdownToggle().text()).toBe(defaultTimeRange.label);
-      done();
+    });
+  });
+
+  it('renders dropdown toggle button with selected text and utc label', () => {
+    createComponent({ utc: true });
+    return wrapper.vm.$nextTick(() => {
+      expect(dropdownToggle().text()).toContain(defaultTimeRange.label);
+      expect(dropdownToggle().text()).toContain('UTC');
     });
   });
 
   it('renders dropdown with 2 custom time range inputs', () => {
     createComponent();
-    dateTimePicker.vm.$nextTick(() => {
-      expect(dateTimePicker.findAll('input').length).toBe(2);
+    return wrapper.vm.$nextTick(() => {
+      expect(wrapper.findAll('input').length).toBe(2);
     });
   });
 
-  it('renders inputs with h/m/s truncated if its all 0s', done => {
-    createComponent({
-      value: {
+  describe('renders label with h/m/s truncated if possible', () => {
+    [
+      {
+        start: '2019-10-10T00:00:00.000Z',
+        end: '2019-10-10T00:00:00.000Z',
+        label: '2019-10-10 to 2019-10-10',
+      },
+      {
         start: '2019-10-10T00:00:00.000Z',
         end: '2019-10-14T00:10:00.000Z',
+        label: '2019-10-10 to 2019-10-14 00:10:00',
       },
-    });
-    dateTimePicker.vm.$nextTick(() => {
-      expect(dateTimePicker.find('#custom-time-from').element.value).toBe('2019-10-10');
-      expect(dateTimePicker.find('#custom-time-to').element.value).toBe('2019-10-14 00:10:00');
-      done();
+      {
+        start: '2019-10-10T00:00:00.000Z',
+        end: '2019-10-10T00:00:01.000Z',
+        label: '2019-10-10 to 2019-10-10 00:00:01',
+      },
+      {
+        start: '2019-10-10T00:00:01.000Z',
+        end: '2019-10-10T00:00:01.000Z',
+        label: '2019-10-10 00:00:01 to 2019-10-10 00:00:01',
+      },
+      {
+        start: '2019-10-10T00:00:01.000Z',
+        end: '2019-10-10T00:00:01.000Z',
+        utc: true,
+        label: '2019-10-10 00:00:01 to 2019-10-10 00:00:01 UTC',
+      },
+    ].forEach(({ start, end, utc, label }) => {
+      it(`for start ${start}, end ${end}, and utc ${utc}, label is ${label}`, () => {
+        createComponent({
+          value: { start, end },
+          utc,
+        });
+        return wrapper.vm.$nextTick(() => {
+          expect(dropdownToggle().text()).toBe(label);
+        });
+      });
     });
   });
 
-  it(`renders dropdown with ${optionsCount} (default) items in quick range`, done => {
+  it(`renders dropdown with ${optionsCount} (default) items in quick range`, () => {
     createComponent();
     dropdownToggle().trigger('click');
-    dateTimePicker.vm.$nextTick(() => {
+    return wrapper.vm.$nextTick(() => {
       expect(findQuickRangeItems().length).toBe(optionsCount);
-      done();
     });
   });
 
-  it('renders dropdown with a default quick range item selected', done => {
+  it('renders dropdown with a default quick range item selected', () => {
     createComponent();
     dropdownToggle().trigger('click');
-    dateTimePicker.vm.$nextTick(() => {
-      expect(dateTimePicker.find('.dropdown-item.active').exists()).toBe(true);
-      expect(dateTimePicker.find('.dropdown-item.active').text()).toBe(defaultTimeRange.label);
-      done();
+    return wrapper.vm.$nextTick(() => {
+      expect(wrapper.find('.dropdown-item.active').exists()).toBe(true);
+      expect(wrapper.find('.dropdown-item.active').text()).toBe(defaultTimeRange.label);
     });
   });
 
@@ -86,78 +119,128 @@ describe('DateTimePicker', () => {
 
   describe('user input', () => {
     const fillInputAndBlur = (input, val) => {
-      dateTimePicker.find(input).setValue(val);
-      return dateTimePicker.vm.$nextTick().then(() => {
-        dateTimePicker.find(input).trigger('blur');
-        return dateTimePicker.vm.$nextTick();
+      wrapper.find(input).setValue(val);
+      return wrapper.vm.$nextTick().then(() => {
+        wrapper.find(input).trigger('blur');
+        return wrapper.vm.$nextTick();
       });
     };
 
-    beforeEach(done => {
+    beforeEach(() => {
       createComponent();
-      dateTimePicker.vm.$nextTick(done);
+      return wrapper.vm.$nextTick();
     });
 
-    it('displays inline error message if custom time range inputs are invalid', done => {
-      fillInputAndBlur('#custom-time-from', '2019-10-01abc')
+    it('displays inline error message if custom time range inputs are invalid', () => {
+      return fillInputAndBlur('#custom-time-from', '2019-10-01abc')
         .then(() => fillInputAndBlur('#custom-time-to', '2019-10-10abc'))
         .then(() => {
-          expect(dateTimePicker.findAll('.invalid-feedback').length).toBe(2);
-          done();
-        })
-        .catch(done);
+          expect(wrapper.findAll('.invalid-feedback').length).toBe(2);
+        });
     });
 
-    it('keeps apply button disabled with invalid custom time range inputs', done => {
-      fillInputAndBlur('#custom-time-from', '2019-10-01abc')
+    it('keeps apply button disabled with invalid custom time range inputs', () => {
+      return fillInputAndBlur('#custom-time-from', '2019-10-01abc')
         .then(() => fillInputAndBlur('#custom-time-to', '2019-09-19'))
         .then(() => {
           expect(applyButtonElement().getAttribute('disabled')).toBe('disabled');
-          done();
-        })
-        .catch(done);
+        });
     });
 
-    it('enables apply button with valid custom time range inputs', done => {
-      fillInputAndBlur('#custom-time-from', '2019-10-01')
+    it('enables apply button with valid custom time range inputs', () => {
+      return fillInputAndBlur('#custom-time-from', '2019-10-01')
         .then(() => fillInputAndBlur('#custom-time-to', '2019-10-19'))
         .then(() => {
           expect(applyButtonElement().getAttribute('disabled')).toBeNull();
-          done();
-        })
-        .catch(done.fail);
+        });
     });
 
-    it('emits dates in an object when apply is clicked', done => {
-      fillInputAndBlur('#custom-time-from', '2019-10-01')
-        .then(() => fillInputAndBlur('#custom-time-to', '2019-10-19'))
-        .then(() => {
-          applyButtonElement().click();
-
-          expect(dateTimePicker.emitted().input).toHaveLength(1);
-          expect(dateTimePicker.emitted().input[0]).toEqual([
-            {
-              end: '2019-10-19T00:00:00Z',
-              start: '2019-10-01T00:00:00Z',
-            },
-          ]);
-          done();
-        })
-        .catch(done.fail);
+    describe('when "apply" is clicked', () => {
+      it('emits iso dates', () => {
+        return fillInputAndBlur('#custom-time-from', '2019-10-01 00:00:00')
+          .then(() => fillInputAndBlur('#custom-time-to', '2019-10-19 00:00:00'))
+          .then(() => {
+            applyButtonElement().click();
+
+            expect(wrapper.emitted().input).toHaveLength(1);
+            expect(wrapper.emitted().input[0]).toEqual([
+              {
+                end: '2019-10-19T00:00:00Z',
+                start: '2019-10-01T00:00:00Z',
+              },
+            ]);
+          });
+      });
+
+      it('emits iso dates, for dates without time of day', () => {
+        return fillInputAndBlur('#custom-time-from', '2019-10-01')
+          .then(() => fillInputAndBlur('#custom-time-to', '2019-10-19'))
+          .then(() => {
+            applyButtonElement().click();
+
+            expect(wrapper.emitted().input).toHaveLength(1);
+            expect(wrapper.emitted().input[0]).toEqual([
+              {
+                end: '2019-10-19T00:00:00Z',
+                start: '2019-10-01T00:00:00Z',
+              },
+            ]);
+          });
+      });
+
+      describe('when timezone is different', () => {
+        beforeAll(() => {
+          timezoneMock.register('US/Pacific');
+        });
+        afterAll(() => {
+          timezoneMock.unregister();
+        });
+
+        it('emits iso dates', () => {
+          return fillInputAndBlur('#custom-time-from', '2019-10-01 00:00:00')
+            .then(() => fillInputAndBlur('#custom-time-to', '2019-10-19 12:00:00'))
+            .then(() => {
+              applyButtonElement().click();
+
+              expect(wrapper.emitted().input).toHaveLength(1);
+              expect(wrapper.emitted().input[0]).toEqual([
+                {
+                  start: '2019-10-01T07:00:00Z',
+                  end: '2019-10-19T19:00:00Z',
+                },
+              ]);
+            });
+        });
+
+        it('emits iso dates with utc format', () => {
+          wrapper.setProps({ utc: true });
+          return wrapper.vm
+            .$nextTick()
+            .then(() => fillInputAndBlur('#custom-time-from', '2019-10-01 00:00:00'))
+            .then(() => fillInputAndBlur('#custom-time-to', '2019-10-19 12:00:00'))
+            .then(() => {
+              applyButtonElement().click();
+
+              expect(wrapper.emitted().input).toHaveLength(1);
+              expect(wrapper.emitted().input[0]).toEqual([
+                {
+                  start: '2019-10-01T00:00:00Z',
+                  end: '2019-10-19T12:00:00Z',
+                },
+              ]);
+            });
+        });
+      });
     });
 
-    it('unchecks quick range when text is input is clicked', done => {
+    it('unchecks quick range when text is input is clicked', () => {
       const findActiveItems = () => findQuickRangeItems().filter(w => w.is('.active'));
 
       expect(findActiveItems().length).toBe(1);
 
-      fillInputAndBlur('#custom-time-from', '2019-10-01')
-        .then(() => {
-          expect(findActiveItems().length).toBe(0);
-
-          done();
-        })
-        .catch(done.fail);
+      return fillInputAndBlur('#custom-time-from', '2019-10-01').then(() => {
+        expect(findActiveItems().length).toBe(0);
+      });
     });
 
     it('emits dates in an object when a  is clicked', () => {
@@ -165,23 +248,22 @@ describe('DateTimePicker', () => {
         .at(3) // any item
         .trigger('click');
 
-      expect(dateTimePicker.emitted().input).toHaveLength(1);
-      expect(dateTimePicker.emitted().input[0][0]).toMatchObject({
+      expect(wrapper.emitted().input).toHaveLength(1);
+      expect(wrapper.emitted().input[0][0]).toMatchObject({
         duration: {
           seconds: expect.any(Number),
         },
       });
     });
 
-    it('hides the popover with cancel button', done => {
+    it('hides the popover with cancel button', () => {
       dropdownToggle().trigger('click');
 
-      dateTimePicker.vm.$nextTick(() => {
+      return wrapper.vm.$nextTick(() => {
         cancelButtonElement().click();
 
-        dateTimePicker.vm.$nextTick(() => {
+        return wrapper.vm.$nextTick(() => {
           expect(dropdownMenu().classes('show')).toBe(false);
-          done();
         });
       });
     });
@@ -210,7 +292,7 @@ describe('DateTimePicker', () => {
       jest.spyOn(Date, 'now').mockImplementation(() => MOCK_NOW);
     });
 
-    it('renders dropdown with a label in the quick range', done => {
+    it('renders dropdown with a label in the quick range', () => {
       createComponent({
         value: {
           duration: { seconds: 60 * 5 },
@@ -218,14 +300,26 @@ describe('DateTimePicker', () => {
         options: otherTimeRanges,
       });
       dropdownToggle().trigger('click');
-      dateTimePicker.vm.$nextTick(() => {
+      return wrapper.vm.$nextTick(() => {
         expect(dropdownToggle().text()).toBe('5 minutes');
+      });
+    });
 
-        done();
+    it('renders dropdown with a label in the quick range and utc label', () => {
+      createComponent({
+        value: {
+          duration: { seconds: 60 * 5 },
+        },
+        utc: true,
+        options: otherTimeRanges,
+      });
+      dropdownToggle().trigger('click');
+      return wrapper.vm.$nextTick(() => {
+        expect(dropdownToggle().text()).toBe('5 minutes UTC');
       });
     });
 
-    it('renders dropdown with quick range items', done => {
+    it('renders dropdown with quick range items', () => {
       createComponent({
         value: {
           duration: { seconds: 60 * 2 },
@@ -233,7 +327,7 @@ describe('DateTimePicker', () => {
         options: otherTimeRanges,
       });
       dropdownToggle().trigger('click');
-      dateTimePicker.vm.$nextTick(() => {
+      return wrapper.vm.$nextTick(() => {
         const items = findQuickRangeItems();
 
         expect(items.length).toBe(Object.keys(otherTimeRanges).length);
@@ -245,22 +339,18 @@ describe('DateTimePicker', () => {
 
         expect(items.at(2).text()).toBe('5 minutes');
         expect(items.at(2).is('.active')).toBe(false);
-
-        done();
       });
     });
 
-    it('renders dropdown with a label not in the quick range', done => {
+    it('renders dropdown with a label not in the quick range', () => {
       createComponent({
         value: {
           duration: { seconds: 60 * 4 },
         },
       });
       dropdownToggle().trigger('click');
-      dateTimePicker.vm.$nextTick(() => {
+      return wrapper.vm.$nextTick(() => {
         expect(dropdownToggle().text()).toBe('2020-01-23 19:56:00 to 2020-01-23 20:00:00');
-
-        done();
       });
     });
   });
diff --git a/spec/javascripts/vue_shared/components/deprecated_modal_2_spec.js b/spec/frontend/vue_shared/components/deprecated_modal_2_spec.js
index e031583b43a..b201a9acdd4 100644
--- a/spec/javascripts/vue_shared/components/deprecated_modal_2_spec.js
+++ b/spec/frontend/vue_shared/components/deprecated_modal_2_spec.js
@@ -1,6 +1,5 @@
-import $ from 'jquery';
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
 
 const modalComponent = Vue.extend(DeprecatedModal2);
@@ -86,7 +85,7 @@ describe('DeprecatedModal2', () => {
     });
   });
 
-  it('works with data-toggle="modal"', done => {
+  it('works with data-toggle="modal"', () => {
     setFixtures(`
       <button id="modal-button" data-toggle="modal" data-target="#my-modal"></button>
       <div id="modal-container"></div>
@@ -101,9 +100,16 @@ describe('DeprecatedModal2', () => {
       },
       modalContainer,
     );
-    $(vm.$el).on('shown.bs.modal', () => done());
+    const modalElement = document.getElementById('my-modal');
 
     modalButton.click();
+
+    expect(modalElement).not.toHaveClass('show');
+
+    // let the modal fade in
+    jest.runOnlyPendingTimers();
+
+    expect(modalElement).toHaveClass('show');
   });
 
   describe('methods', () => {
@@ -111,7 +117,7 @@ describe('DeprecatedModal2', () => {
 
     beforeEach(() => {
       vm = mountComponent(modalComponent, {});
-      spyOn(vm, '$emit');
+      jest.spyOn(vm, '$emit').mockImplementation(() => {});
     });
 
     describe('emitCancel', () => {
@@ -149,23 +155,14 @@ describe('DeprecatedModal2', () => {
 
   describe('slots', () => {
     const slotContent = 'this should go into the slot';
-    const modalWithSlot = slotName => {
-      let template;
-      if (slotName) {
-        template = `
-          <deprecated-modal-2>
-            <template slot="${slotName}">${slotContent}</template>
-          </deprecated-modal-2>
-        `;
-      } else {
-        template = `<deprecated-modal-2>${slotContent}</deprecated-modal-2>`;
-      }
 
+    const modalWithSlot = slot => {
       return Vue.extend({
         components: {
           DeprecatedModal2,
         },
-        template,
+        render: h =>
+          h('deprecated-modal-2', [slot ? h('template', { slot }, slotContent) : slotContent]),
       });
     };
 
diff --git a/spec/javascripts/vue_shared/components/deprecated_modal_spec.js b/spec/frontend/vue_shared/components/deprecated_modal_spec.js
index d6c10e32794..b9793ce2d80 100644
--- a/spec/javascripts/vue_shared/components/deprecated_modal_spec.js
+++ b/spec/frontend/vue_shared/components/deprecated_modal_spec.js
@@ -1,6 +1,5 @@
-import $ from 'jquery';
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
 
 const modalComponent = Vue.extend(DeprecatedModal);
@@ -47,7 +46,7 @@ describe('DeprecatedModal', () => {
       });
     });
 
-    it('works with data-toggle="modal"', done => {
+    it('works with data-toggle="modal"', () => {
       setFixtures(`
         <button id="modal-button" data-toggle="modal" data-target="#my-modal"></button>
         <div id="modal-container"></div>
@@ -63,9 +62,12 @@ describe('DeprecatedModal', () => {
         modalContainer,
       );
       const modalElement = vm.$el.querySelector('#my-modal');
-      $(modalElement).on('shown.bs.modal', () => done());
+
+      expect(modalElement).not.toHaveClass('show');
 
       modalButton.click();
+
+      expect(modalElement).toHaveClass('show');
     });
   });
 });
diff --git a/spec/frontend/vue_shared/components/diff_viewer/diff_viewer_spec.js b/spec/frontend/vue_shared/components/diff_viewer/diff_viewer_spec.js
index 636508be6b6..a6e4d812c3c 100644
--- a/spec/frontend/vue_shared/components/diff_viewer/diff_viewer_spec.js
+++ b/spec/frontend/vue_shared/components/diff_viewer/diff_viewer_spec.js
@@ -8,6 +8,7 @@ describe('DiffViewer', () => {
   const requiredProps = {
     diffMode: 'replaced',
     diffViewerMode: 'image',
+    diffFile: {},
     newPath: GREEN_BOX_IMAGE_URL,
     newSha: 'ABC',
     oldPath: RED_BOX_IMAGE_URL,
@@ -71,16 +72,27 @@ describe('DiffViewer', () => {
     });
   });
 
-  it('renders renamed component', () => {
-    createComponent({
-      ...requiredProps,
-      diffMode: 'renamed',
-      diffViewerMode: 'renamed',
-      newPath: 'test.abc',
-      oldPath: 'testold.abc',
+  describe('renamed file', () => {
+    it.each`
+      altViewer
+      ${'text'}
+      ${'notText'}
+    `('renders the renamed component when the alternate viewer is $altViewer', ({ altViewer }) => {
+      createComponent({
+        ...requiredProps,
+        diffFile: {
+          content_sha: '',
+          view_path: '',
+          alternate_viewer: { name: altViewer },
+        },
+        diffMode: 'renamed',
+        diffViewerMode: 'renamed',
+        newPath: 'test.abc',
+        oldPath: 'testold.abc',
+      });
+
+      expect(vm.$el.textContent).toContain('File renamed with no changes.');
     });
-
-    expect(vm.$el.textContent).toContain('File moved');
   });
 
   it('renders mode changed component', () => {
diff --git a/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js b/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js
new file mode 100644
index 00000000000..e0e982f4e11
--- /dev/null
+++ b/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js
@@ -0,0 +1,283 @@
+import Vuex from 'vuex';
+import { createLocalVue, shallowMount, mount } from '@vue/test-utils';
+import Renamed from '~/vue_shared/components/diff_viewer/viewers/renamed.vue';
+import {
+  TRANSITION_LOAD_START,
+  TRANSITION_LOAD_ERROR,
+  TRANSITION_LOAD_SUCCEED,
+  TRANSITION_ACKNOWLEDGE_ERROR,
+  STATE_IDLING,
+  STATE_LOADING,
+  STATE_ERRORED,
+} from '~/diffs/constants';
+
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+function createRenamedComponent({
+  props = {},
+  methods = {},
+  store = new Vuex.Store({}),
+  deep = false,
+}) {
+  const mnt = deep ? mount : shallowMount;
+
+  return mnt(Renamed, {
+    propsData: { ...props },
+    localVue,
+    store,
+    methods,
+  });
+}
+
+describe('Renamed Diff Viewer', () => {
+  const DIFF_FILE_COMMIT_SHA = 'commitsha';
+  const DIFF_FILE_SHORT_SHA = 'commitsh';
+  const DIFF_FILE_VIEW_PATH = `blob/${DIFF_FILE_COMMIT_SHA}/filename.ext`;
+  let diffFile;
+  let wrapper;
+
+  beforeEach(() => {
+    diffFile = {
+      content_sha: DIFF_FILE_COMMIT_SHA,
+      view_path: DIFF_FILE_VIEW_PATH,
+      alternate_viewer: {
+        name: 'text',
+      },
+    };
+  });
+
+  afterEach(() => {
+    if (wrapper) {
+      wrapper.destroy();
+      wrapper = null;
+    }
+  });
+
+  describe('is', () => {
+    beforeEach(() => {
+      wrapper = createRenamedComponent({ props: { diffFile } });
+    });
+
+    it.each`
+      state        | request      | result
+      ${'idle'}    | ${'idle'}    | ${true}
+      ${'idle'}    | ${'loading'} | ${false}
+      ${'idle'}    | ${'errored'} | ${false}
+      ${'loading'} | ${'loading'} | ${true}
+      ${'loading'} | ${'idle'}    | ${false}
+      ${'loading'} | ${'errored'} | ${false}
+      ${'errored'} | ${'errored'} | ${true}
+      ${'errored'} | ${'idle'}    | ${false}
+      ${'errored'} | ${'loading'} | ${false}
+    `(
+      'returns the $result for "$request" when the state is "$state"',
+      ({ request, result, state }) => {
+        wrapper.vm.state = state;
+
+        expect(wrapper.vm.is(request)).toEqual(result);
+      },
+    );
+  });
+
+  describe('transition', () => {
+    beforeEach(() => {
+      wrapper = createRenamedComponent({ props: { diffFile } });
+    });
+
+    it.each`
+      state        | transition                      | result
+      ${'idle'}    | ${TRANSITION_LOAD_START}        | ${STATE_LOADING}
+      ${'idle'}    | ${TRANSITION_LOAD_ERROR}        | ${STATE_IDLING}
+      ${'idle'}    | ${TRANSITION_LOAD_SUCCEED}      | ${STATE_IDLING}
+      ${'idle'}    | ${TRANSITION_ACKNOWLEDGE_ERROR} | ${STATE_IDLING}
+      ${'loading'} | ${TRANSITION_LOAD_START}        | ${STATE_LOADING}
+      ${'loading'} | ${TRANSITION_LOAD_ERROR}        | ${STATE_ERRORED}
+      ${'loading'} | ${TRANSITION_LOAD_SUCCEED}      | ${STATE_IDLING}
+      ${'loading'} | ${TRANSITION_ACKNOWLEDGE_ERROR} | ${STATE_LOADING}
+      ${'errored'} | ${TRANSITION_LOAD_START}        | ${STATE_LOADING}
+      ${'errored'} | ${TRANSITION_LOAD_ERROR}        | ${STATE_ERRORED}
+      ${'errored'} | ${TRANSITION_LOAD_SUCCEED}      | ${STATE_ERRORED}
+      ${'errored'} | ${TRANSITION_ACKNOWLEDGE_ERROR} | ${STATE_IDLING}
+    `(
+      'correctly updates the state to "$result" when it starts as "$state" and the transition is "$transition"',
+      ({ state, transition, result }) => {
+        wrapper.vm.state = state;
+
+        wrapper.vm.transition(transition);
+
+        expect(wrapper.vm.state).toEqual(result);
+      },
+    );
+  });
+
+  describe('switchToFull', () => {
+    let store;
+
+    beforeEach(() => {
+      store = new Vuex.Store({
+        modules: {
+          diffs: {
+            namespaced: true,
+            actions: { switchToFullDiffFromRenamedFile: () => {} },
+          },
+        },
+      });
+
+      jest.spyOn(store, 'dispatch');
+
+      wrapper = createRenamedComponent({ props: { diffFile }, store });
+    });
+
+    afterEach(() => {
+      store = null;
+    });
+
+    it('calls the switchToFullDiffFromRenamedFile action when the method is triggered', () => {
+      store.dispatch.mockResolvedValue();
+
+      wrapper.vm.switchToFull();
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(store.dispatch).toHaveBeenCalledWith('diffs/switchToFullDiffFromRenamedFile', {
+          diffFile,
+        });
+      });
+    });
+
+    it.each`
+      after            | resolvePromise         | resolution
+      ${STATE_IDLING}  | ${'mockResolvedValue'} | ${'successful'}
+      ${STATE_ERRORED} | ${'mockRejectedValue'} | ${'rejected'}
+    `(
+      'moves through the correct states during a $resolution request',
+      ({ after, resolvePromise }) => {
+        store.dispatch[resolvePromise]();
+
+        expect(wrapper.vm.state).toEqual(STATE_IDLING);
+
+        wrapper.vm.switchToFull();
+
+        expect(wrapper.vm.state).toEqual(STATE_LOADING);
+
+        return (
+          wrapper.vm
+            // This tick is needed for when the action (promise) finishes
+            .$nextTick()
+            // This tick waits for the state change in the promise .then/.catch to bubble into the component
+            .then(() => wrapper.vm.$nextTick())
+            .then(() => {
+              expect(wrapper.vm.state).toEqual(after);
+            })
+        );
+      },
+    );
+  });
+
+  describe('clickLink', () => {
+    let event;
+
+    beforeEach(() => {
+      event = {
+        preventDefault: jest.fn(),
+      };
+    });
+
+    it.each`
+      alternateViewer | stops    | handled
+      ${'text'}       | ${true}  | ${'should'}
+      ${'nottext'}    | ${false} | ${'should not'}
+    `(
+      'given { alternate_viewer: { name: "$alternateViewer" } }, the click event $handled be handled in the component',
+      ({ alternateViewer, stops }) => {
+        wrapper = createRenamedComponent({
+          props: {
+            diffFile: {
+              ...diffFile,
+              alternate_viewer: { name: alternateViewer },
+            },
+          },
+        });
+
+        jest.spyOn(wrapper.vm, 'switchToFull').mockImplementation(() => {});
+
+        wrapper.vm.clickLink(event);
+
+        if (stops) {
+          expect(event.preventDefault).toHaveBeenCalled();
+          expect(wrapper.vm.switchToFull).toHaveBeenCalled();
+        } else {
+          expect(event.preventDefault).not.toHaveBeenCalled();
+          expect(wrapper.vm.switchToFull).not.toHaveBeenCalled();
+        }
+      },
+    );
+  });
+
+  describe('dismissError', () => {
+    let transitionSpy;
+
+    beforeEach(() => {
+      wrapper = createRenamedComponent({ props: { diffFile } });
+      transitionSpy = jest.spyOn(wrapper.vm, 'transition');
+    });
+
+    it(`transitions the component with "${TRANSITION_ACKNOWLEDGE_ERROR}"`, () => {
+      wrapper.vm.dismissError();
+
+      expect(transitionSpy).toHaveBeenCalledWith(TRANSITION_ACKNOWLEDGE_ERROR);
+    });
+  });
+
+  describe('output', () => {
+    it.each`
+      altViewer    | nameDisplay
+      ${'text'}    | ${'"text"'}
+      ${'nottext'} | ${'"nottext"'}
+      ${undefined} | ${undefined}
+      ${null}      | ${null}
+    `(
+      'with { alternate_viewer: { name: $nameDisplay } }, renders the component',
+      ({ altViewer }) => {
+        const file = { ...diffFile };
+
+        file.alternate_viewer.name = altViewer;
+        wrapper = createRenamedComponent({ props: { diffFile: file } });
+
+        expect(wrapper.find('[test-id="plaintext"]').text()).toEqual(
+          'File renamed with no changes.',
+        );
+      },
+    );
+
+    it.each`
+      altType      | linkText
+      ${'text'}    | ${'Show file contents'}
+      ${'nottext'} | ${`View file @ ${DIFF_FILE_SHORT_SHA}`}
+    `(
+      'includes a link to the full file for alternate viewer type "$altType"',
+      ({ altType, linkText }) => {
+        const file = { ...diffFile };
+        const clickMock = jest.fn().mockImplementation(() => {});
+
+        file.alternate_viewer.name = altType;
+        wrapper = createRenamedComponent({
+          deep: true,
+          props: { diffFile: file },
+          methods: {
+            clickLink: clickMock,
+          },
+        });
+
+        const link = wrapper.find('a');
+
+        expect(link.text()).toEqual(linkText);
+        expect(link.attributes('href')).toEqual(DIFF_FILE_VIEW_PATH);
+
+        link.vm.$emit('click');
+
+        expect(clickMock).toHaveBeenCalled();
+      },
+    );
+  });
+});
diff --git a/spec/javascripts/vue_shared/components/file_finder/index_spec.js b/spec/frontend/vue_shared/components/file_finder/index_spec.js
index 7ded228d3ea..f9e56774526 100644
--- a/spec/javascripts/vue_shared/components/file_finder/index_spec.js
+++ b/spec/frontend/vue_shared/components/file_finder/index_spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Mousetrap from 'mousetrap';
-import { file } from 'spec/ide/helpers';
-import timeoutPromise from 'spec/helpers/set_timeout_promise_helper';
+import { file } from 'jest/ide/helpers';
+import waitForPromises from 'helpers/wait_for_promises';
 import FindFileComponent from '~/vue_shared/components/file_finder/index.vue';
 import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes';
 
@@ -48,7 +48,7 @@ describe('File finder item spec', () => {
         ],
       });
 
-      setTimeout(done);
+      setImmediate(done);
     });
 
     it('renders list of blobs', () => {
@@ -60,7 +60,7 @@ describe('File finder item spec', () => {
     it('filters entries', done => {
       vm.searchText = 'index';
 
-      setTimeout(() => {
+      setImmediate(() => {
         expect(vm.$el.textContent).toContain('index.js');
         expect(vm.$el.textContent).not.toContain('component.js');
 
@@ -71,7 +71,7 @@ describe('File finder item spec', () => {
     it('shows clear button when searchText is not empty', done => {
       vm.searchText = 'index';
 
-      setTimeout(() => {
+      setImmediate(() => {
         expect(vm.$el.querySelector('.dropdown-input').classList).toContain('has-value');
         expect(vm.$el.querySelector('.dropdown-input-search').classList).toContain('hidden');
 
@@ -82,11 +82,11 @@ describe('File finder item spec', () => {
     it('clear button resets searchText', done => {
       vm.searchText = 'index';
 
-      timeoutPromise()
+      waitForPromises()
         .then(() => {
           vm.$el.querySelector('.dropdown-input-clear').click();
         })
-        .then(timeoutPromise)
+        .then(waitForPromises)
         .then(() => {
           expect(vm.searchText).toBe('');
         })
@@ -95,14 +95,14 @@ describe('File finder item spec', () => {
     });
 
     it('clear button focues search input', done => {
-      spyOn(vm.$refs.searchInput, 'focus');
+      jest.spyOn(vm.$refs.searchInput, 'focus').mockImplementation(() => {});
       vm.searchText = 'index';
 
-      timeoutPromise()
+      waitForPromises()
         .then(() => {
           vm.$el.querySelector('.dropdown-input-clear').click();
         })
-        .then(timeoutPromise)
+        .then(waitForPromises)
         .then(() => {
           expect(vm.$refs.searchInput.focus).toHaveBeenCalled();
         })
@@ -114,7 +114,7 @@ describe('File finder item spec', () => {
       it('returns 1 when no filtered entries exist', done => {
         vm.searchText = 'testing 123';
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.listShowCount).toBe(1);
 
           done();
@@ -134,7 +134,7 @@ describe('File finder item spec', () => {
       it('returns 33 when entries dont exist', done => {
         vm.searchText = 'testing 123';
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.listHeight).toBe(33);
 
           done();
@@ -146,7 +146,7 @@ describe('File finder item spec', () => {
       it('returns length of filtered blobs', done => {
         vm.searchText = 'index';
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.filteredBlobsLength).toBe(1);
 
           done();
@@ -160,7 +160,7 @@ describe('File finder item spec', () => {
           vm.focusedIndex = 1;
           vm.searchText = 'test';
 
-          setTimeout(() => {
+          setImmediate(() => {
             expect(vm.focusedIndex).toBe(0);
 
             done();
@@ -173,11 +173,11 @@ describe('File finder item spec', () => {
           vm.searchText = 'test';
           vm.visible = true;
 
-          timeoutPromise()
+          waitForPromises()
             .then(() => {
               vm.visible = false;
             })
-            .then(timeoutPromise)
+            .then(waitForPromises)
             .then(() => {
               expect(vm.searchText).toBe('');
             })
@@ -189,7 +189,7 @@ describe('File finder item spec', () => {
 
     describe('openFile', () => {
       beforeEach(() => {
-        spyOn(vm, '$emit');
+        jest.spyOn(vm, '$emit').mockImplementation(() => {});
       });
 
       it('closes file finder', () => {
@@ -210,11 +210,11 @@ describe('File finder item spec', () => {
         const event = new CustomEvent('keyup');
         event.keyCode = ENTER_KEY_CODE;
 
-        spyOn(vm, 'openFile');
+        jest.spyOn(vm, 'openFile').mockImplementation(() => {});
 
         vm.$refs.searchInput.dispatchEvent(event);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.openFile).toHaveBeenCalledWith(vm.files[0]);
 
           done();
@@ -225,11 +225,11 @@ describe('File finder item spec', () => {
         const event = new CustomEvent('keyup');
         event.keyCode = ESC_KEY_CODE;
 
-        spyOn(vm, '$emit');
+        jest.spyOn(vm, '$emit').mockImplementation(() => {});
 
         vm.$refs.searchInput.dispatchEvent(event);
 
-        setTimeout(() => {
+        setImmediate(() => {
           expect(vm.$emit).toHaveBeenCalledWith('toggle', false);
 
           done();
@@ -303,7 +303,7 @@ describe('File finder item spec', () => {
     beforeEach(done => {
       createComponent();
 
-      spyOn(vm, 'toggle');
+      jest.spyOn(vm, 'toggle').mockImplementation(() => {});
 
       vm.$nextTick(done);
     });
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js
new file mode 100644
index 00000000000..eded5b87abc
--- /dev/null
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js
@@ -0,0 +1,259 @@
+import { shallowMount } from '@vue/test-utils';
+import {
+  GlFilteredSearch,
+  GlButtonGroup,
+  GlButton,
+  GlNewDropdown as GlDropdown,
+  GlNewDropdownItem as GlDropdownItem,
+} from '@gitlab/ui';
+
+import FilteredSearchBarRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
+import { SortDirection } from '~/vue_shared/components/filtered_search_bar/constants';
+
+import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store';
+import RecentSearchesService from '~/filtered_search/services/recent_searches_service';
+
+import { mockAvailableTokens, mockSortOptions } from './mock_data';
+
+const createComponent = ({
+  namespace = 'gitlab-org/gitlab-test',
+  recentSearchesStorageKey = 'requirements',
+  tokens = mockAvailableTokens,
+  sortOptions = mockSortOptions,
+  searchInputPlaceholder = 'Filter requirements',
+} = {}) =>
+  shallowMount(FilteredSearchBarRoot, {
+    propsData: {
+      namespace,
+      recentSearchesStorageKey,
+      tokens,
+      sortOptions,
+      searchInputPlaceholder,
+    },
+  });
+
+describe('FilteredSearchBarRoot', () => {
+  let wrapper;
+
+  beforeEach(() => {
+    wrapper = createComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  describe('data', () => {
+    it('initializes `filterValue`, `selectedSortOption` and `selectedSortDirection` data props', () => {
+      expect(wrapper.vm.filterValue).toEqual([]);
+      expect(wrapper.vm.selectedSortOption).toBe(mockSortOptions[0].sortDirection.descending);
+      expect(wrapper.vm.selectedSortDirection).toBe(SortDirection.descending);
+    });
+  });
+
+  describe('computed', () => {
+    describe('tokenSymbols', () => {
+      it('returns array of map containing type and symbols from `tokens` prop', () => {
+        expect(wrapper.vm.tokenSymbols).toEqual({ author_username: '@' });
+      });
+    });
+
+    describe('sortDirectionIcon', () => {
+      it('returns string "sort-lowest" when `selectedSortDirection` is "ascending"', () => {
+        wrapper.setData({
+          selectedSortDirection: SortDirection.ascending,
+        });
+
+        expect(wrapper.vm.sortDirectionIcon).toBe('sort-lowest');
+      });
+
+      it('returns string "sort-highest" when `selectedSortDirection` is "descending"', () => {
+        wrapper.setData({
+          selectedSortDirection: SortDirection.descending,
+        });
+
+        expect(wrapper.vm.sortDirectionIcon).toBe('sort-highest');
+      });
+    });
+
+    describe('sortDirectionTooltip', () => {
+      it('returns string "Sort direction: Ascending" when `selectedSortDirection` is "ascending"', () => {
+        wrapper.setData({
+          selectedSortDirection: SortDirection.ascending,
+        });
+
+        expect(wrapper.vm.sortDirectionTooltip).toBe('Sort direction: Ascending');
+      });
+
+      it('returns string "Sort direction: Descending" when `selectedSortDirection` is "descending"', () => {
+        wrapper.setData({
+          selectedSortDirection: SortDirection.descending,
+        });
+
+        expect(wrapper.vm.sortDirectionTooltip).toBe('Sort direction: Descending');
+      });
+    });
+  });
+
+  describe('watchers', () => {
+    describe('filterValue', () => {
+      it('emits component event `onFilter` with empty array when `filterValue` is cleared by GlFilteredSearch', () => {
+        wrapper.setData({
+          initialRender: false,
+          filterValue: [
+            {
+              type: 'filtered-search-term',
+              value: { data: '' },
+            },
+          ],
+        });
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.emitted('onFilter')[0]).toEqual([[]]);
+        });
+      });
+    });
+  });
+
+  describe('methods', () => {
+    describe('setupRecentSearch', () => {
+      it('initializes `recentSearchesService` and `recentSearchesStore` props when `recentSearchesStorageKey` is available', () => {
+        expect(wrapper.vm.recentSearchesService instanceof RecentSearchesService).toBe(true);
+        expect(wrapper.vm.recentSearchesStore instanceof RecentSearchesStore).toBe(true);
+      });
+
+      it('initializes `recentSearchesPromise` prop with a promise by using `recentSearchesService.fetch()`', () => {
+        jest
+          .spyOn(wrapper.vm.recentSearchesService, 'fetch')
+          .mockReturnValue(new Promise(() => []));
+
+        wrapper.vm.setupRecentSearch();
+
+        expect(wrapper.vm.recentSearchesPromise instanceof Promise).toBe(true);
+      });
+    });
+
+    describe('getRecentSearches', () => {
+      it('returns array of strings representing recent searches', () => {
+        wrapper.vm.recentSearchesStore.setRecentSearches(['foo']);
+
+        expect(wrapper.vm.getRecentSearches()).toEqual(['foo']);
+      });
+    });
+
+    describe('handleSortOptionClick', () => {
+      it('emits component event `onSort` with selected sort by value', () => {
+        wrapper.vm.handleSortOptionClick(mockSortOptions[1]);
+
+        expect(wrapper.vm.selectedSortOption).toBe(mockSortOptions[1]);
+        expect(wrapper.emitted('onSort')[0]).toEqual([mockSortOptions[1].sortDirection.descending]);
+      });
+    });
+
+    describe('handleSortDirectionClick', () => {
+      beforeEach(() => {
+        wrapper.setData({
+          selectedSortOption: mockSortOptions[0],
+        });
+      });
+
+      it('sets `selectedSortDirection` to be opposite of its current value', () => {
+        expect(wrapper.vm.selectedSortDirection).toBe(SortDirection.descending);
+
+        wrapper.vm.handleSortDirectionClick();
+
+        expect(wrapper.vm.selectedSortDirection).toBe(SortDirection.ascending);
+      });
+
+      it('emits component event `onSort` with opposite of currently selected sort by value', () => {
+        wrapper.vm.handleSortDirectionClick();
+
+        expect(wrapper.emitted('onSort')[0]).toEqual([mockSortOptions[0].sortDirection.ascending]);
+      });
+    });
+
+    describe('handleFilterSubmit', () => {
+      const mockFilters = [
+        {
+          type: 'author_username',
+          value: {
+            data: 'root',
+            operator: '=',
+          },
+        },
+        'foo',
+      ];
+
+      it('calls `recentSearchesStore.addRecentSearch` with serialized value of provided `filters` param', () => {
+        jest.spyOn(wrapper.vm.recentSearchesStore, 'addRecentSearch');
+        // jest.spyOn(wrapper.vm.recentSearchesService, 'save');
+
+        wrapper.vm.handleFilterSubmit(mockFilters);
+
+        return wrapper.vm.recentSearchesPromise.then(() => {
+          expect(wrapper.vm.recentSearchesStore.addRecentSearch).toHaveBeenCalledWith(
+            'author_username:=@root foo',
+          );
+        });
+      });
+
+      it('calls `recentSearchesService.save` with array of searches', () => {
+        jest.spyOn(wrapper.vm.recentSearchesService, 'save');
+
+        wrapper.vm.handleFilterSubmit(mockFilters);
+
+        return wrapper.vm.recentSearchesPromise.then(() => {
+          expect(wrapper.vm.recentSearchesService.save).toHaveBeenCalledWith([
+            'author_username:=@root foo',
+          ]);
+        });
+      });
+
+      it('emits component event `onFilter` with provided filters param', () => {
+        wrapper.vm.handleFilterSubmit(mockFilters);
+
+        expect(wrapper.emitted('onFilter')[0]).toEqual([mockFilters]);
+      });
+    });
+  });
+
+  describe('template', () => {
+    beforeEach(() => {
+      wrapper.setData({
+        selectedSortOption: mockSortOptions[0],
+        selectedSortDirection: SortDirection.descending,
+      });
+
+      return wrapper.vm.$nextTick();
+    });
+
+    it('renders gl-filtered-search component', () => {
+      const glFilteredSearchEl = wrapper.find(GlFilteredSearch);
+
+      expect(glFilteredSearchEl.props('placeholder')).toBe('Filter requirements');
+      expect(glFilteredSearchEl.props('availableTokens')).toEqual(mockAvailableTokens);
+    });
+
+    it('renders sort dropdown component', () => {
+      expect(wrapper.find(GlButtonGroup).exists()).toBe(true);
+      expect(wrapper.find(GlDropdown).exists()).toBe(true);
+      expect(wrapper.find(GlDropdown).props('text')).toBe(mockSortOptions[0].title);
+    });
+
+    it('renders dropdown items', () => {
+      const dropdownItemsEl = wrapper.findAll(GlDropdownItem);
+
+      expect(dropdownItemsEl).toHaveLength(mockSortOptions.length);
+      expect(dropdownItemsEl.at(0).text()).toBe(mockSortOptions[0].title);
+      expect(dropdownItemsEl.at(0).props('isChecked')).toBe(true);
+      expect(dropdownItemsEl.at(1).text()).toBe(mockSortOptions[1].title);
+    });
+
+    it('renders sort direction button', () => {
+      const sortButtonEl = wrapper.find(GlButton);
+
+      expect(sortButtonEl.attributes('title')).toBe('Sort direction: Descending');
+      expect(sortButtonEl.props('icon')).toBe('sort-highest');
+    });
+  });
+});
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js b/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
new file mode 100644
index 00000000000..edc0f119262
--- /dev/null
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/mock_data.js
@@ -0,0 +1,64 @@
+import Api from '~/api';
+import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
+
+export const mockAuthor1 = {
+  id: 1,
+  name: 'Administrator',
+  username: 'root',
+  state: 'active',
+  avatar_url: 'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
+  web_url: 'http://0.0.0.0:3000/root',
+};
+
+export const mockAuthor2 = {
+  id: 2,
+  name: 'Claudio Beer',
+  username: 'ericka_terry',
+  state: 'active',
+  avatar_url: 'https://www.gravatar.com/avatar/12a89d115b5a398d5082897ebbcba9c2?s=80&d=identicon',
+  web_url: 'http://0.0.0.0:3000/ericka_terry',
+};
+
+export const mockAuthor3 = {
+  id: 6,
+  name: 'Shizue Hartmann',
+  username: 'junita.weimann',
+  state: 'active',
+  avatar_url: 'https://www.gravatar.com/avatar/9da1abb41b1d4c9c9e81030b71ea61a0?s=80&d=identicon',
+  web_url: 'http://0.0.0.0:3000/junita.weimann',
+};
+
+export const mockAuthors = [mockAuthor1, mockAuthor2, mockAuthor3];
+
+export const mockAuthorToken = {
+  type: 'author_username',
+  icon: 'user',
+  title: 'Author',
+  unique: false,
+  symbol: '@',
+  token: AuthorToken,
+  operators: [{ value: '=', description: 'is', default: 'true' }],
+  fetchPath: 'gitlab-org/gitlab-test',
+  fetchAuthors: Api.projectUsers.bind(Api),
+};
+
+export const mockAvailableTokens = [mockAuthorToken];
+
+export const mockSortOptions = [
+  {
+    id: 1,
+    title: 'Created date',
+    sortDirection: {
+      descending: 'created_desc',
+      ascending: 'created_asc',
+    },
+  },
+  {
+    id: 2,
+    title: 'Last updated',
+    sortDirection: {
+      descending: 'updated_desc',
+      ascending: 'updated_asc',
+    },
+  },
+];
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js
new file mode 100644
index 00000000000..3650ef79136
--- /dev/null
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js
@@ -0,0 +1,150 @@
+import { mount } from '@vue/test-utils';
+import { GlFilteredSearchToken, GlFilteredSearchTokenSegment } from '@gitlab/ui';
+import MockAdapter from 'axios-mock-adapter';
+import waitForPromises from 'helpers/wait_for_promises';
+import axios from '~/lib/utils/axios_utils';
+
+import createFlash from '~/flash';
+import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
+
+import { mockAuthorToken, mockAuthors } from '../mock_data';
+
+jest.mock('~/flash');
+
+const createComponent = ({ config = mockAuthorToken, value = { data: '' } } = {}) =>
+  mount(AuthorToken, {
+    propsData: {
+      config,
+      value,
+    },
+    provide: {
+      portalName: 'fake target',
+      alignSuggestions: function fakeAlignSuggestions() {},
+    },
+    stubs: {
+      Portal: {
+        template: '<div><slot></slot></div>',
+      },
+      GlFilteredSearchSuggestionList: {
+        template: '<div></div>',
+        methods: {
+          getValue: () => '=',
+        },
+      },
+    },
+  });
+
+describe('AuthorToken', () => {
+  let mock;
+  let wrapper;
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+    wrapper = createComponent();
+  });
+
+  afterEach(() => {
+    mock.restore();
+    wrapper.destroy();
+  });
+
+  describe('computed', () => {
+    describe('currentValue', () => {
+      it('returns lowercase string for `value.data`', () => {
+        wrapper.setProps({
+          value: { data: 'FOO' },
+        });
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.currentValue).toBe('foo');
+        });
+      });
+    });
+
+    describe('activeAuthor', () => {
+      it('returns object for currently present `value.data`', () => {
+        wrapper.setData({
+          authors: mockAuthors,
+        });
+
+        wrapper.setProps({
+          value: { data: mockAuthors[0].username },
+        });
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.activeAuthor).toEqual(mockAuthors[0]);
+        });
+      });
+    });
+  });
+
+  describe('fetchAuthorBySearchTerm', () => {
+    it('calls `config.fetchAuthors` with provided searchTerm param', () => {
+      jest.spyOn(wrapper.vm.config, 'fetchAuthors');
+
+      wrapper.vm.fetchAuthorBySearchTerm(mockAuthors[0].username);
+
+      expect(wrapper.vm.config.fetchAuthors).toHaveBeenCalledWith(
+        mockAuthorToken.fetchPath,
+        mockAuthors[0].username,
+      );
+    });
+
+    it('sets response to `authors` when request is succesful', () => {
+      jest.spyOn(wrapper.vm.config, 'fetchAuthors').mockResolvedValue(mockAuthors);
+
+      wrapper.vm.fetchAuthorBySearchTerm('root');
+
+      return waitForPromises().then(() => {
+        expect(wrapper.vm.authors).toEqual(mockAuthors);
+      });
+    });
+
+    it('calls `createFlash` with flash error message when request fails', () => {
+      jest.spyOn(wrapper.vm.config, 'fetchAuthors').mockRejectedValue({});
+
+      wrapper.vm.fetchAuthorBySearchTerm('root');
+
+      return waitForPromises().then(() => {
+        expect(createFlash).toHaveBeenCalledWith('There was a problem fetching users.');
+      });
+    });
+
+    it('sets `loading` to false when request completes', () => {
+      jest.spyOn(wrapper.vm.config, 'fetchAuthors').mockRejectedValue({});
+
+      wrapper.vm.fetchAuthorBySearchTerm('root');
+
+      return waitForPromises().then(() => {
+        expect(wrapper.vm.loading).toBe(false);
+      });
+    });
+  });
+
+  describe('template', () => {
+    beforeEach(() => {
+      wrapper.setData({
+        authors: mockAuthors,
+      });
+
+      return wrapper.vm.$nextTick();
+    });
+
+    it('renders gl-filtered-search-token component', () => {
+      expect(wrapper.find(GlFilteredSearchToken).exists()).toBe(true);
+    });
+
+    it('renders token item when value is selected', () => {
+      wrapper.setProps({
+        value: { data: mockAuthors[0].username },
+      });
+
+      return wrapper.vm.$nextTick(() => {
+        const tokenSegments = wrapper.findAll(GlFilteredSearchTokenSegment);
+
+        expect(tokenSegments).toHaveLength(3); // Author, =, "Administrator"
+        expect(tokenSegments.at(2).text()).toBe(mockAuthors[0].name); // "Administrator"
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/vue_shared/components/icon_spec.js b/spec/frontend/vue_shared/components/icon_spec.js
index 5a3e483fb03..a448953cc8e 100644
--- a/spec/javascripts/vue_shared/components/icon_spec.js
+++ b/spec/frontend/vue_shared/components/icon_spec.js
@@ -1,13 +1,16 @@
 import Vue from 'vue';
 import { mount } from '@vue/test-utils';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import Icon from '~/vue_shared/components/icon.vue';
+import iconsPath from '@gitlab/svgs/dist/icons.svg';
 
-describe('Sprite Icon Component', function() {
-  describe('Initialization', function() {
+jest.mock('@gitlab/svgs/dist/icons.svg', () => 'testing');
+
+describe('Sprite Icon Component', () => {
+  describe('Initialization', () => {
     let icon;
 
-    beforeEach(function() {
+    beforeEach(() => {
       const IconComponent = Vue.extend(Icon);
 
       icon = mountComponent(IconComponent, {
@@ -20,20 +23,20 @@ describe('Sprite Icon Component', function() {
       icon.$destroy();
     });
 
-    it('should return a defined Vue component', function() {
+    it('should return a defined Vue component', () => {
       expect(icon).toBeDefined();
     });
 
-    it('should have <svg> as a child element', function() {
+    it('should have <svg> as a child element', () => {
       expect(icon.$el.tagName).toBe('svg');
     });
 
-    it('should have <use> as a child element with the correct href', function() {
+    it('should have <use> as a child element with the correct href', () => {
       expect(icon.$el.firstChild.tagName).toBe('use');
-      expect(icon.$el.firstChild.getAttribute('xlink:href')).toBe(`${gon.sprite_icons}#commit`);
+      expect(icon.$el.firstChild.getAttribute('xlink:href')).toBe(`${iconsPath}#commit`);
     });
 
-    it('should properly compute iconSizeClass', function() {
+    it('should properly compute iconSizeClass', () => {
       expect(icon.iconSizeClass).toBe('s32');
     });
 
@@ -43,7 +46,7 @@ describe('Sprite Icon Component', function() {
       expect(icon.$options.props.size.validator(9001)).toBeFalsy();
     });
 
-    it('should properly render img css', function() {
+    it('should properly render img css', () => {
       const { classList } = icon.$el;
       const containsSizeClass = classList.contains('s32');
 
@@ -51,16 +54,18 @@ describe('Sprite Icon Component', function() {
     });
 
     it('`name` validator should return false for non existing icons', () => {
+      jest.spyOn(console, 'warn').mockImplementation();
+
       expect(Icon.props.name.validator('non_existing_icon_sprite')).toBe(false);
     });
 
-    it('`name` validator should return false for existing icons', () => {
+    it('`name` validator should return true for existing icons', () => {
       expect(Icon.props.name.validator('commit')).toBe(true);
     });
   });
 
   it('should call registered listeners when they are triggered', () => {
-    const clickHandler = jasmine.createSpy('clickHandler');
+    const clickHandler = jest.fn();
     const wrapper = mount(Icon, {
       propsData: { name: 'commit' },
       listeners: { click: clickHandler },
diff --git a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
index dd24ecf707d..9be0a67e4fa 100644
--- a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
+++ b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
@@ -6,6 +6,15 @@ import { defaultAssignees, defaultMilestone } from './related_issuable_mock_data
 
 describe('RelatedIssuableItem', () => {
   let wrapper;
+
+  function mountComponent({ mountMethod = mount, stubs = {}, props = {}, slots = {} } = {}) {
+    wrapper = mountMethod(RelatedIssuableItem, {
+      propsData: props,
+      slots,
+      stubs,
+    });
+  }
+
   const props = {
     idKey: 1,
     displayReference: 'gitlab-org/gitlab-test#1',
@@ -26,10 +35,7 @@ describe('RelatedIssuableItem', () => {
   };
 
   beforeEach(() => {
-    wrapper = mount(RelatedIssuableItem, {
-      slots,
-      propsData: props,
-    });
+    mountComponent({ props, slots });
   });
 
   afterEach(() => {
diff --git a/spec/frontend/vue_shared/components/markdown/__snapshots__/suggestion_diff_spec.js.snap b/spec/frontend/vue_shared/components/markdown/__snapshots__/suggestion_diff_spec.js.snap
index 29ac754de49..cdd7a3ccaf0 100644
--- a/spec/frontend/vue_shared/components/markdown/__snapshots__/suggestion_diff_spec.js.snap
+++ b/spec/frontend/vue_shared/components/markdown/__snapshots__/suggestion_diff_spec.js.snap
@@ -5,8 +5,11 @@ exports[`Suggestion Diff component matches snapshot 1`] = `
   class="md-suggestion"
 >
   <suggestion-diff-header-stub
+    batchsuggestionscount="1"
     class="qa-suggestion-diff-header js-suggestion-diff-header"
     helppagepath="path_to_docs"
+    isapplyingbatch="true"
+    isbatched="true"
   />
    
   <table
diff --git a/spec/frontend/vue_shared/components/markdown/field_spec.js b/spec/frontend/vue_shared/components/markdown/field_spec.js
index 54ce1f47e28..74be5f8230e 100644
--- a/spec/frontend/vue_shared/components/markdown/field_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/field_spec.js
@@ -185,7 +185,7 @@ describe('Markdown field component', () => {
         markdownButton.trigger('click');
 
         return wrapper.vm.$nextTick(() => {
-          expect(textarea.value).toContain('* testing');
+          expect(textarea.value).toContain('- testing');
         });
       });
 
@@ -197,7 +197,7 @@ describe('Markdown field component', () => {
         markdownButton.trigger('click');
 
         return wrapper.vm.$nextTick(() => {
-          expect(textarea.value).toContain('* testing\n* 123');
+          expect(textarea.value).toContain('- testing\n- 123');
         });
       });
     });
diff --git a/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js b/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
index 9b9c3d559e3..9a5b95b555f 100644
--- a/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
@@ -3,20 +3,29 @@ import { shallowMount } from '@vue/test-utils';
 import SuggestionDiffHeader from '~/vue_shared/components/markdown/suggestion_diff_header.vue';
 
 const DEFAULT_PROPS = {
+  batchSuggestionsCount: 2,
   canApply: true,
   isApplied: false,
+  isBatched: false,
+  isApplyingBatch: false,
   helpPagePath: 'path_to_docs',
 };
 
 describe('Suggestion Diff component', () => {
   let wrapper;
 
-  const createComponent = props => {
+  const createComponent = (props, glFeatures = {}) => {
     wrapper = shallowMount(SuggestionDiffHeader, {
       propsData: {
         ...DEFAULT_PROPS,
         ...props,
       },
+      provide: {
+        glFeatures: {
+          batchSuggestions: true,
+          ...glFeatures,
+        },
+      },
     });
   };
 
@@ -25,6 +34,9 @@ describe('Suggestion Diff component', () => {
   });
 
   const findApplyButton = () => wrapper.find('.js-apply-btn');
+  const findApplyBatchButton = () => wrapper.find('.js-apply-batch-btn');
+  const findAddToBatchButton = () => wrapper.find('.js-add-to-batch-btn');
+  const findRemoveFromBatchButton = () => wrapper.find('.js-remove-from-batch-btn');
   const findHeader = () => wrapper.find('.js-suggestion-diff-header');
   const findHelpButton = () => wrapper.find('.js-help-btn');
   const findLoading = () => wrapper.find(GlLoadingIcon);
@@ -44,19 +56,22 @@ describe('Suggestion Diff component', () => {
     expect(findHelpButton().exists()).toBe(true);
   });
 
-  it('renders an apply button', () => {
+  it('renders apply suggestion and add to batch buttons', () => {
     createComponent();
 
     const applyBtn = findApplyButton();
+    const addToBatchBtn = findAddToBatchButton();
 
     expect(applyBtn.exists()).toBe(true);
     expect(applyBtn.html().includes('Apply suggestion')).toBe(true);
-  });
 
-  it('does not render an apply button if `canApply` is set to false', () => {
-    createComponent({ canApply: false });
+    expect(addToBatchBtn.exists()).toBe(true);
+    expect(addToBatchBtn.html().includes('Add suggestion to batch')).toBe(true);
+  });
 
-    expect(findApplyButton().exists()).toBe(false);
+  it('renders correct tooltip message for apply button', () => {
+    createComponent();
+    expect(wrapper.vm.tooltipMessage).toBe('This also resolves the discussion');
   });
 
   describe('when apply suggestion is clicked', () => {
@@ -73,13 +88,14 @@ describe('Suggestion Diff component', () => {
       });
     });
 
-    it('hides apply button', () => {
+    it('does not render apply suggestion and add to batch buttons', () => {
       expect(findApplyButton().exists()).toBe(false);
+      expect(findAddToBatchButton().exists()).toBe(false);
     });
 
     it('shows loading', () => {
       expect(findLoading().exists()).toBe(true);
-      expect(wrapper.text()).toContain('Applying suggestion');
+      expect(wrapper.text()).toContain('Applying suggestion...');
     });
 
     it('when callback of apply is called, hides loading', () => {
@@ -93,4 +109,135 @@ describe('Suggestion Diff component', () => {
       });
     });
   });
+
+  describe('when add to batch is clicked', () => {
+    it('emits addToBatch', () => {
+      createComponent();
+
+      findAddToBatchButton().vm.$emit('click');
+
+      expect(wrapper.emittedByOrder()).toContainEqual({
+        name: 'addToBatch',
+        args: [],
+      });
+    });
+  });
+
+  describe('when remove from batch is clicked', () => {
+    it('emits removeFromBatch', () => {
+      createComponent({ isBatched: true });
+
+      findRemoveFromBatchButton().vm.$emit('click');
+
+      expect(wrapper.emittedByOrder()).toContainEqual({
+        name: 'removeFromBatch',
+        args: [],
+      });
+    });
+  });
+
+  describe('apply suggestions is clicked', () => {
+    it('emits applyBatch', () => {
+      createComponent({ isBatched: true });
+
+      findApplyBatchButton().vm.$emit('click');
+
+      expect(wrapper.emittedByOrder()).toContainEqual({
+        name: 'applyBatch',
+        args: [],
+      });
+    });
+  });
+
+  describe('when isBatched is true', () => {
+    it('shows remove from batch and apply batch buttons and displays the batch count', () => {
+      createComponent({
+        batchSuggestionsCount: 9,
+        isBatched: true,
+      });
+
+      const applyBatchBtn = findApplyBatchButton();
+      const removeFromBatchBtn = findRemoveFromBatchButton();
+
+      expect(removeFromBatchBtn.exists()).toBe(true);
+      expect(removeFromBatchBtn.html().includes('Remove from batch')).toBe(true);
+
+      expect(applyBatchBtn.exists()).toBe(true);
+      expect(applyBatchBtn.html().includes('Apply suggestions')).toBe(true);
+      expect(applyBatchBtn.html().includes(String('9'))).toBe(true);
+    });
+
+    it('hides add to batch and apply buttons', () => {
+      createComponent({
+        isBatched: true,
+      });
+
+      expect(findApplyButton().exists()).toBe(false);
+      expect(findAddToBatchButton().exists()).toBe(false);
+    });
+
+    describe('when isBatched and isApplyingBatch are true', () => {
+      it('shows loading', () => {
+        createComponent({
+          isBatched: true,
+          isApplyingBatch: true,
+        });
+
+        expect(findLoading().exists()).toBe(true);
+        expect(wrapper.text()).toContain('Applying suggestions...');
+      });
+
+      it('adjusts message for batch with single suggestion', () => {
+        createComponent({
+          batchSuggestionsCount: 1,
+          isBatched: true,
+          isApplyingBatch: true,
+        });
+
+        expect(findLoading().exists()).toBe(true);
+        expect(wrapper.text()).toContain('Applying suggestion...');
+      });
+
+      it('hides remove from batch and apply suggestions buttons', () => {
+        createComponent({
+          isBatched: true,
+          isApplyingBatch: true,
+        });
+
+        expect(findRemoveFromBatchButton().exists()).toBe(false);
+        expect(findApplyBatchButton().exists()).toBe(false);
+      });
+    });
+  });
+
+  describe('batchSuggestions feature flag is set to false', () => {
+    beforeEach(() => {
+      createComponent({}, { batchSuggestions: false });
+    });
+
+    it('disables add to batch buttons but keeps apply suggestion enabled', () => {
+      expect(findApplyButton().exists()).toBe(true);
+      expect(findAddToBatchButton().exists()).toBe(false);
+      expect(findApplyButton().attributes('disabled')).not.toBe('true');
+    });
+  });
+
+  describe('canApply is set to false', () => {
+    beforeEach(() => {
+      createComponent({ canApply: false });
+    });
+
+    it('disables apply suggestion and add to batch buttons', () => {
+      expect(findApplyButton().exists()).toBe(true);
+      expect(findAddToBatchButton().exists()).toBe(true);
+      expect(findApplyButton().attributes('disabled')).toBe('true');
+      expect(findAddToBatchButton().attributes('disabled')).toBe('true');
+    });
+
+    it('renders correct tooltip message for apply button', () => {
+      expect(wrapper.vm.tooltipMessage).toBe(
+        "Can't apply as this line has changed or the suggestion already matches its content.",
+      );
+    });
+  });
 });
diff --git a/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js b/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js
index 162ac495385..232feb126dc 100644
--- a/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/suggestion_diff_spec.js
@@ -3,9 +3,10 @@ import SuggestionDiffComponent from '~/vue_shared/components/markdown/suggestion
 import SuggestionDiffHeader from '~/vue_shared/components/markdown/suggestion_diff_header.vue';
 import SuggestionDiffRow from '~/vue_shared/components/markdown/suggestion_diff_row.vue';
 
+const suggestionId = 1;
 const MOCK_DATA = {
   suggestion: {
-    id: 1,
+    id: suggestionId,
     diff_lines: [
       {
         can_receive_suggestion: false,
@@ -38,8 +39,10 @@ const MOCK_DATA = {
         type: 'new',
       },
     ],
+    is_applying_batch: true,
   },
   helpPagePath: 'path_to_docs',
+  batchSuggestionsInfo: [{ suggestionId }],
 };
 
 describe('Suggestion Diff component', () => {
@@ -70,17 +73,24 @@ describe('Suggestion Diff component', () => {
     expect(wrapper.findAll(SuggestionDiffRow)).toHaveLength(3);
   });
 
-  it('emits apply event on sugestion diff header apply', () => {
-    wrapper.find(SuggestionDiffHeader).vm.$emit('apply', 'test-event');
+  it.each`
+    event                | childArgs         | args
+    ${'apply'}           | ${['test-event']} | ${[{ callback: 'test-event', suggestionId }]}
+    ${'applyBatch'}      | ${[]}             | ${[]}
+    ${'addToBatch'}      | ${[]}             | ${[suggestionId]}
+    ${'removeFromBatch'} | ${[]}             | ${[suggestionId]}
+  `('emits $event event on sugestion diff header $event', ({ event, childArgs, args }) => {
+    wrapper.find(SuggestionDiffHeader).vm.$emit(event, ...childArgs);
 
-    expect(wrapper.emitted('apply')).toBeDefined();
-    expect(wrapper.emitted('apply')).toEqual([
-      [
-        {
-          callback: 'test-event',
-          suggestionId: 1,
-        },
-      ],
-    ]);
+    expect(wrapper.emitted(event)).toBeDefined();
+    expect(wrapper.emitted(event)).toEqual([args]);
+  });
+
+  it('passes suggestion batch props to suggestion diff header', () => {
+    expect(wrapper.find(SuggestionDiffHeader).props()).toMatchObject({
+      batchSuggestionsCount: 1,
+      isBatched: true,
+      isApplyingBatch: MOCK_DATA.suggestion.is_applying_batch,
+    });
   });
 });
diff --git a/spec/javascripts/vue_shared/components/panel_resizer_spec.js b/spec/frontend/vue_shared/components/panel_resizer_spec.js
index d65ee8eeb2d..d8b903e5bfd 100644
--- a/spec/javascripts/vue_shared/components/panel_resizer_spec.js
+++ b/spec/frontend/vue_shared/components/panel_resizer_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import panelResizer from '~/vue_shared/components/panel_resizer.vue';
 
 describe('Panel Resizer component', () => {
@@ -69,12 +69,12 @@ describe('Panel Resizer component', () => {
       side: 'left',
     });
 
-    spyOn(vm, '$emit');
+    jest.spyOn(vm, '$emit').mockImplementation(() => {});
     triggerEvent('mousedown', vm.$el);
     triggerEvent('mousemove', document);
     triggerEvent('mouseup', document);
 
-    expect(vm.$emit.calls.allArgs()).toEqual([
+    expect(vm.$emit.mock.calls).toEqual([
       ['resize-start', 100],
       ['update:size', 100],
       ['resize-end', 100],
diff --git a/spec/frontend/vue_shared/components/pikaday_spec.js b/spec/frontend/vue_shared/components/pikaday_spec.js
index 867bf88ff50..639b4828a09 100644
--- a/spec/frontend/vue_shared/components/pikaday_spec.js
+++ b/spec/frontend/vue_shared/components/pikaday_spec.js
@@ -1,30 +1,42 @@
-import Vue from 'vue';
-import mountComponent from 'helpers/vue_mount_component_helper';
+import { shallowMount } from '@vue/test-utils';
 import datePicker from '~/vue_shared/components/pikaday.vue';
 
 describe('datePicker', () => {
-  let vm;
+  let wrapper;
   beforeEach(() => {
-    const DatePicker = Vue.extend(datePicker);
-    vm = mountComponent(DatePicker, {
-      label: 'label',
+    wrapper = shallowMount(datePicker, {
+      propsData: {
+        label: 'label',
+      },
+      attachToDocument: true,
     });
   });
 
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
   it('should render label text', () => {
-    expect(vm.$el.querySelector('.dropdown-toggle-text').innerText.trim()).toEqual('label');
+    expect(
+      wrapper
+        .find('.dropdown-toggle-text')
+        .text()
+        .trim(),
+    ).toEqual('label');
   });
 
   it('should show calendar', () => {
-    expect(vm.$el.querySelector('.pika-single')).toBeDefined();
+    expect(wrapper.find('.pika-single').element).toBeDefined();
   });
 
-  it('should toggle when dropdown is clicked', () => {
-    const hidePicker = jest.fn();
-    vm.$on('hidePicker', hidePicker);
+  it('should emit hidePicker event when dropdown is clicked', () => {
+    // Removing the bootstrap data-toggle property,
+    // because it interfers with our click event
+    delete wrapper.find('.dropdown-menu-toggle').element.dataset.toggle;
 
-    vm.$el.querySelector('.dropdown-menu-toggle').click();
+    wrapper.find('.dropdown-menu-toggle').trigger('click');
 
-    expect(hidePicker).toHaveBeenCalled();
+    expect(wrapper.emitted('hidePicker')).toEqual([[]]);
   });
 });
diff --git a/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js b/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js
index 29bced394dc..6d1ebe85aa0 100644
--- a/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js
+++ b/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js
@@ -29,6 +29,7 @@ describe('ProjectSelector component', () => {
         showMinimumSearchQueryMessage: false,
         showLoadingIndicator: false,
         showSearchErrorMessage: false,
+        totalResults: searchResults.length,
       },
       attachToDocument: true,
     });
@@ -109,4 +110,26 @@ describe('ProjectSelector component', () => {
       );
     });
   });
+
+  describe('the search results legend', () => {
+    it.each`
+      count | total | expected
+      ${0}  | ${0}  | ${'Showing 0 projects'}
+      ${1}  | ${0}  | ${'Showing 1 project'}
+      ${2}  | ${0}  | ${'Showing 2 projects'}
+      ${2}  | ${3}  | ${'Showing 2 of 3 projects'}
+    `(
+      'is "$expected" given $count results are showing out of $total',
+      ({ count, total, expected }) => {
+        wrapper.setProps({
+          projectSearchResults: searchResults.slice(0, count),
+          totalResults: total,
+        });
+
+        return wrapper.vm.$nextTick().then(() => {
+          expect(wrapper.text()).toContain(expected);
+        });
+      },
+    );
+  });
 });
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js
new file mode 100644
index 00000000000..faa32131fab
--- /dev/null
+++ b/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js
@@ -0,0 +1,77 @@
+import {
+  generateToolbarItem,
+  addCustomEventListener,
+  removeCustomEventListener,
+  addImage,
+  getMarkdown,
+} from '~/vue_shared/components/rich_content_editor/editor_service';
+
+describe('Editor Service', () => {
+  const mockInstance = {
+    eventManager: { addEventType: jest.fn(), removeEventHandler: jest.fn(), listen: jest.fn() },
+    editor: { exec: jest.fn() },
+    invoke: jest.fn(),
+  };
+  const event = 'someCustomEvent';
+  const handler = jest.fn();
+
+  describe('generateToolbarItem', () => {
+    const config = {
+      icon: 'bold',
+      command: 'some-command',
+      tooltip: 'Some Tooltip',
+      event: 'some-event',
+    };
+
+    const generatedItem = generateToolbarItem(config);
+
+    it('generates the correct command', () => {
+      expect(generatedItem.options.command).toBe(config.command);
+    });
+
+    it('generates the correct event', () => {
+      expect(generatedItem.options.event).toBe(config.event);
+    });
+
+    it('generates a divider when isDivider is set to true', () => {
+      const isDivider = true;
+
+      expect(generateToolbarItem({ isDivider })).toBe('divider');
+    });
+  });
+
+  describe('addCustomEventListener', () => {
+    it('registers an event type on the instance and adds an event handler', () => {
+      addCustomEventListener(mockInstance, event, handler);
+
+      expect(mockInstance.eventManager.addEventType).toHaveBeenCalledWith(event);
+      expect(mockInstance.eventManager.listen).toHaveBeenCalledWith(event, handler);
+    });
+  });
+
+  describe('removeCustomEventListener', () => {
+    it('removes an event handler from the instance', () => {
+      removeCustomEventListener(mockInstance, event, handler);
+
+      expect(mockInstance.eventManager.removeEventHandler).toHaveBeenCalledWith(event, handler);
+    });
+  });
+
+  describe('addImage', () => {
+    it('calls the exec method on the instance', () => {
+      const mockImage = { imageUrl: 'some/url.png', description: 'some description' };
+
+      addImage(mockInstance, mockImage);
+
+      expect(mockInstance.editor.exec).toHaveBeenCalledWith('AddImage', mockImage);
+    });
+  });
+
+  describe('getMarkdown', () => {
+    it('calls the invoke method on the instance', () => {
+      getMarkdown(mockInstance);
+
+      expect(mockInstance.invoke).toHaveBeenCalledWith('getMarkdown');
+    });
+  });
+});
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/modals/add_image_modal_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/modals/add_image_modal_spec.js
new file mode 100644
index 00000000000..4889bc8538d
--- /dev/null
+++ b/spec/frontend/vue_shared/components/rich_content_editor/modals/add_image_modal_spec.js
@@ -0,0 +1,41 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlModal } from '@gitlab/ui';
+import AddImageModal from '~/vue_shared/components/rich_content_editor/modals/add_image_modal.vue';
+
+describe('Add Image Modal', () => {
+  let wrapper;
+
+  const findModal = () => wrapper.find(GlModal);
+  const findUrlInput = () => wrapper.find({ ref: 'urlInput' });
+  const findDescriptionInput = () => wrapper.find({ ref: 'descriptionInput' });
+
+  beforeEach(() => {
+    wrapper = shallowMount(AddImageModal);
+  });
+
+  describe('when content is loaded', () => {
+    it('renders a modal component', () => {
+      expect(findModal().exists()).toBe(true);
+    });
+
+    it('renders an input to add an image URL', () => {
+      expect(findUrlInput().exists()).toBe(true);
+    });
+
+    it('renders an input to add an image description', () => {
+      expect(findDescriptionInput().exists()).toBe(true);
+    });
+  });
+
+  describe('add image', () => {
+    it('emits an addImage event when a valid URL is specified', () => {
+      const preventDefault = jest.fn();
+      const mockImage = { imageUrl: '/some/valid/url.png', altText: 'some description' };
+      wrapper.setData({ ...mockImage });
+
+      findModal().vm.$emit('ok', { preventDefault });
+      expect(preventDefault).not.toHaveBeenCalled();
+      expect(wrapper.emitted('addImage')).toEqual([[mockImage]]);
+    });
+  });
+});
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
index 549d89171c6..0db10389df4 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
@@ -1,17 +1,33 @@
 import { shallowMount } from '@vue/test-utils';
 import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue';
+import AddImageModal from '~/vue_shared/components/rich_content_editor/modals/add_image_modal.vue';
 import {
   EDITOR_OPTIONS,
   EDITOR_TYPES,
   EDITOR_HEIGHT,
   EDITOR_PREVIEW_STYLE,
+  CUSTOM_EVENTS,
 } from '~/vue_shared/components/rich_content_editor/constants';
 
+import {
+  addCustomEventListener,
+  removeCustomEventListener,
+  addImage,
+} from '~/vue_shared/components/rich_content_editor/editor_service';
+
+jest.mock('~/vue_shared/components/rich_content_editor/editor_service', () => ({
+  ...jest.requireActual('~/vue_shared/components/rich_content_editor/editor_service'),
+  addCustomEventListener: jest.fn(),
+  removeCustomEventListener: jest.fn(),
+  addImage: jest.fn(),
+}));
+
 describe('Rich Content Editor', () => {
   let wrapper;
 
   const value = '## Some Markdown';
   const findEditor = () => wrapper.find({ ref: 'editor' });
+  const findAddImageModal = () => wrapper.find(AddImageModal);
 
   beforeEach(() => {
     wrapper = shallowMount(RichContentEditor, {
@@ -56,4 +72,47 @@ describe('Rich Content Editor', () => {
       expect(wrapper.emitted().input[0][0]).toBe(changedMarkdown);
     });
   });
+
+  describe('when editor is loaded', () => {
+    it('adds the CUSTOM_EVENTS.openAddImageModal custom event listener', () => {
+      const mockEditorApi = { eventManager: { addEventType: jest.fn(), listen: jest.fn() } };
+      findEditor().vm.$emit('load', mockEditorApi);
+
+      expect(addCustomEventListener).toHaveBeenCalledWith(
+        mockEditorApi,
+        CUSTOM_EVENTS.openAddImageModal,
+        wrapper.vm.onOpenAddImageModal,
+      );
+    });
+  });
+
+  describe('when editor is destroyed', () => {
+    it('removes the CUSTOM_EVENTS.openAddImageModal custom event listener', () => {
+      const mockEditorApi = { eventManager: { removeEventHandler: jest.fn() } };
+
+      wrapper.vm.editorApi = mockEditorApi;
+      wrapper.vm.$destroy();
+
+      expect(removeCustomEventListener).toHaveBeenCalledWith(
+        mockEditorApi,
+        CUSTOM_EVENTS.openAddImageModal,
+        wrapper.vm.onOpenAddImageModal,
+      );
+    });
+  });
+
+  describe('add image modal', () => {
+    it('renders an addImageModal component', () => {
+      expect(findAddImageModal().exists()).toBe(true);
+    });
+
+    it('calls the onAddImage method when the addImage event is emitted', () => {
+      const mockImage = { imageUrl: 'some/url.png', description: 'some description' };
+      const mockInstance = { exec: jest.fn() };
+      wrapper.vm.$refs.editor = mockInstance;
+
+      findAddImageModal().vm.$emit('addImage', mockImage);
+      expect(addImage).toHaveBeenCalledWith(mockInstance, mockImage);
+    });
+  });
 });
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js
index 8545c43dc1e..2db15a71215 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js
@@ -1,4 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
+import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { GlIcon } from '@gitlab/ui';
 import ToolbarItem from '~/vue_shared/components/rich_content_editor/toolbar_item.vue';
 
@@ -9,33 +10,45 @@ describe('Toolbar Item', () => {
   const findButton = () => wrapper.find('button');
 
   const buildWrapper = propsData => {
-    wrapper = shallowMount(ToolbarItem, { propsData });
+    wrapper = shallowMount(ToolbarItem, {
+      propsData,
+      directives: {
+        GlTooltip: createMockDirective(),
+      },
+    });
   };
 
   describe.each`
-    icon
-    ${'heading'}
-    ${'bold'}
-    ${'italic'}
-    ${'strikethrough'}
-    ${'quote'}
-    ${'link'}
-    ${'doc-code'}
-    ${'list-bulleted'}
-    ${'list-numbered'}
-    ${'list-task'}
-    ${'list-indent'}
-    ${'list-outdent'}
-    ${'dash'}
-    ${'table'}
-    ${'code'}
-  `('toolbar item component', ({ icon }) => {
-    beforeEach(() => buildWrapper({ icon }));
+    icon               | tooltip
+    ${'heading'}       | ${'Headings'}
+    ${'bold'}          | ${'Add bold text'}
+    ${'italic'}        | ${'Add italic text'}
+    ${'strikethrough'} | ${'Add strikethrough text'}
+    ${'quote'}         | ${'Insert a quote'}
+    ${'link'}          | ${'Add a link'}
+    ${'doc-code'}      | ${'Insert a code block'}
+    ${'list-bulleted'} | ${'Add a bullet list'}
+    ${'list-numbered'} | ${'Add a numbered list'}
+    ${'list-task'}     | ${'Add a task list'}
+    ${'list-indent'}   | ${'Indent'}
+    ${'list-outdent'}  | ${'Outdent'}
+    ${'dash'}          | ${'Add a line'}
+    ${'table'}         | ${'Add a table'}
+    ${'code'}          | ${'Insert an image'}
+    ${'code'}          | ${'Insert inline code'}
+  `('toolbar item component', ({ icon, tooltip }) => {
+    beforeEach(() => buildWrapper({ icon, tooltip }));
 
     it('renders a toolbar button', () => {
       expect(findButton().exists()).toBe(true);
     });
 
+    it('renders the correct tooltip', () => {
+      const buttonTooltip = getBinding(wrapper.element, 'gl-tooltip');
+      expect(buttonTooltip).toBeDefined();
+      expect(buttonTooltip.value.title).toBe(tooltip);
+    });
+
     it(`renders the ${icon} icon`, () => {
       expect(findIcon().exists()).toBe(true);
       expect(findIcon().props().name).toBe(icon);
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/toolbar_service_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/toolbar_service_spec.js
deleted file mode 100644
index 7605cc6a22c..00000000000
--- a/spec/frontend/vue_shared/components/rich_content_editor/toolbar_service_spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { generateToolbarItem } from '~/vue_shared/components/rich_content_editor/toolbar_service';
-
-describe('Toolbar Service', () => {
-  const config = {
-    icon: 'bold',
-    command: 'some-command',
-    tooltip: 'Some Tooltip',
-    event: 'some-event',
-  };
-  const generatedItem = generateToolbarItem(config);
-
-  it('generates the correct command', () => {
-    expect(generatedItem.options.command).toBe(config.command);
-  });
-
-  it('generates the correct tooltip', () => {
-    expect(generatedItem.options.tooltip).toBe(config.tooltip);
-  });
-
-  it('generates the correct event', () => {
-    expect(generatedItem.options.event).toBe(config.event);
-  });
-
-  it('generates a divider when isDivider is set to true', () => {
-    const isDivider = true;
-
-    expect(generateToolbarItem({ isDivider })).toBe('divider');
-  });
-});
diff --git a/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js b/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js
index 198af09c9f5..47edfbe3115 100644
--- a/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js
@@ -1,121 +1,149 @@
-import Vue from 'vue';
-import mountComponent from 'helpers/vue_mount_component_helper';
-import sidebarDatePicker from '~/vue_shared/components/sidebar/date_picker.vue';
-
-describe('sidebarDatePicker', () => {
-  let vm;
-  beforeEach(() => {
-    const SidebarDatePicker = Vue.extend(sidebarDatePicker);
-    vm = mountComponent(SidebarDatePicker, {
-      label: 'label',
-      isLoading: true,
+import { mount } from '@vue/test-utils';
+import SidebarDatePicker from '~/vue_shared/components/sidebar/date_picker.vue';
+import DatePicker from '~/vue_shared/components/pikaday.vue';
+
+describe('SidebarDatePicker', () => {
+  let wrapper;
+
+  const mountComponent = (propsData = {}, data = {}) => {
+    if (wrapper) {
+      throw new Error('tried to call mountComponent without d');
+    }
+    wrapper = mount(SidebarDatePicker, {
+      stubs: {
+        DatePicker: true,
+      },
+      propsData,
+      data: () => data,
     });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
   });
 
   it('should emit toggleCollapse when collapsed toggle sidebar is clicked', () => {
-    const toggleCollapse = jest.fn();
-    vm.$on('toggleCollapse', toggleCollapse);
+    mountComponent();
 
-    vm.$el.querySelector('.issuable-sidebar-header .gutter-toggle').click();
+    wrapper.find('.issuable-sidebar-header .gutter-toggle').element.click();
 
-    expect(toggleCollapse).toHaveBeenCalled();
+    expect(wrapper.emitted('toggleCollapse')).toEqual([[]]);
   });
 
   it('should render collapsed-calendar-icon', () => {
-    expect(vm.$el.querySelector('.sidebar-collapsed-icon')).toBeDefined();
+    mountComponent();
+
+    expect(wrapper.find('.sidebar-collapsed-icon').element).toBeDefined();
   });
 
-  it('should render label', () => {
-    expect(vm.$el.querySelector('.title').innerText.trim()).toEqual('label');
+  it('should render value when not editing', () => {
+    mountComponent();
+
+    expect(wrapper.find('.value-content').element).toBeDefined();
   });
 
-  it('should render loading-icon when isLoading', () => {
-    expect(vm.$el.querySelector('.fa-spin')).toBeDefined();
+  it('should render None if there is no selectedDate', () => {
+    mountComponent();
+
+    expect(
+      wrapper
+        .find('.value-content span')
+        .text()
+        .trim(),
+    ).toEqual('None');
   });
 
-  it('should render value when not editing', () => {
-    expect(vm.$el.querySelector('.value-content')).toBeDefined();
+  it('should render date-picker when editing', () => {
+    mountComponent({}, { editing: true });
+
+    expect(wrapper.find(DatePicker).element).toBeDefined();
   });
 
-  it('should render None if there is no selectedDate', () => {
-    expect(vm.$el.querySelector('.value-content span').innerText.trim()).toEqual('None');
+  it('should render label', () => {
+    const label = 'label';
+    mountComponent({ label });
+    expect(
+      wrapper
+        .find('.title')
+        .text()
+        .trim(),
+    ).toEqual(label);
   });
 
-  it('should render date-picker when editing', done => {
-    vm.editing = true;
-    Vue.nextTick(() => {
-      expect(vm.$el.querySelector('.pika-label')).toBeDefined();
-      done();
-    });
+  it('should render loading-icon when isLoading', () => {
+    mountComponent({ isLoading: true });
+    expect(wrapper.find('.gl-spinner').element).toBeDefined();
   });
 
   describe('editable', () => {
-    beforeEach(done => {
-      vm.editable = true;
-      Vue.nextTick(done);
+    beforeEach(() => {
+      mountComponent({ editable: true });
     });
 
     it('should render edit button', () => {
-      expect(vm.$el.querySelector('.title .btn-blank').innerText.trim()).toEqual('Edit');
+      expect(
+        wrapper
+          .find('.title .btn-blank')
+          .text()
+          .trim(),
+      ).toEqual('Edit');
     });
 
-    it('should enable editing when edit button is clicked', done => {
-      vm.isLoading = false;
-      Vue.nextTick(() => {
-        vm.$el.querySelector('.title .btn-blank').click();
+    it('should enable editing when edit button is clicked', async () => {
+      wrapper.find('.title .btn-blank').element.click();
+
+      await wrapper.vm.$nextTick();
 
-        expect(vm.editing).toEqual(true);
-        done();
-      });
+      expect(wrapper.vm.editing).toEqual(true);
     });
   });
 
-  it('should render date if selectedDate', done => {
-    vm.selectedDate = new Date('07/07/2017');
-    Vue.nextTick(() => {
-      expect(vm.$el.querySelector('.value-content strong').innerText.trim()).toEqual('Jul 7, 2017');
-      done();
-    });
+  it('should render date if selectedDate', () => {
+    mountComponent({ selectedDate: new Date('07/07/2017') });
+
+    expect(
+      wrapper
+        .find('.value-content strong')
+        .text()
+        .trim(),
+    ).toEqual('Jul 7, 2017');
   });
 
   describe('selectedDate and editable', () => {
-    beforeEach(done => {
-      vm.selectedDate = new Date('07/07/2017');
-      vm.editable = true;
-      Vue.nextTick(done);
+    beforeEach(() => {
+      mountComponent({ selectedDate: new Date('07/07/2017'), editable: true });
     });
 
     it('should render remove button if selectedDate and editable', () => {
-      expect(vm.$el.querySelector('.value-content .btn-blank').innerText.trim()).toEqual('remove');
+      expect(
+        wrapper
+          .find('.value-content .btn-blank')
+          .text()
+          .trim(),
+      ).toEqual('remove');
     });
 
-    it('should emit saveDate when remove button is clicked', () => {
-      const saveDate = jest.fn();
-      vm.$on('saveDate', saveDate);
+    it('should emit saveDate with null when remove button is clicked', () => {
+      wrapper.find('.value-content .btn-blank').element.click();
 
-      vm.$el.querySelector('.value-content .btn-blank').click();
-
-      expect(saveDate).toHaveBeenCalled();
+      expect(wrapper.emitted('saveDate')).toEqual([[null]]);
     });
   });
 
   describe('showToggleSidebar', () => {
-    beforeEach(done => {
-      vm.showToggleSidebar = true;
-      Vue.nextTick(done);
+    beforeEach(() => {
+      mountComponent({ showToggleSidebar: true });
     });
 
     it('should render toggle-sidebar when showToggleSidebar', () => {
-      expect(vm.$el.querySelector('.title .gutter-toggle')).toBeDefined();
+      expect(wrapper.find('.title .gutter-toggle').element).toBeDefined();
     });
 
     it('should emit toggleCollapse when toggle sidebar is clicked', () => {
-      const toggleCollapse = jest.fn();
-      vm.$on('toggleCollapse', toggleCollapse);
-
-      vm.$el.querySelector('.title .gutter-toggle').click();
+      wrapper.find('.title .gutter-toggle').element.click();
 
-      expect(toggleCollapse).toHaveBeenCalled();
+      expect(wrapper.emitted('toggleCollapse')).toEqual([[]]);
     });
   });
 });
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js
index 74c769f86a3..1504e1521d3 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js
@@ -3,6 +3,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 
 import { GlButton, GlLoadingIcon, GlSearchBoxByType, GlLink } from '@gitlab/ui';
 import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes';
+import SmartVirtualList from '~/vue_shared/components/smart_virtual_list.vue';
 import DropdownContentsLabelsView from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue';
 import LabelItem from '~/vue_shared/components/sidebar/labels_select_vue/label_item.vue';
 
@@ -224,6 +225,10 @@ describe('DropdownContentsLabelsView', () => {
       expect(searchInputEl.attributes('autofocus')).toBe('true');
     });
 
+    it('renders smart-virtual-list element', () => {
+      expect(wrapper.find(SmartVirtualList).exists()).toBe(true);
+    });
+
     it('renders label elements for all labels', () => {
       expect(wrapper.findAll(LabelItem)).toHaveLength(mockLabels.length);
     });
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js
index 401d208da5c..ad3f073fdf9 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js
@@ -4,10 +4,13 @@ import { GlIcon, GlLink } from '@gitlab/ui';
 import LabelItem from '~/vue_shared/components/sidebar/labels_select_vue/label_item.vue';
 import { mockRegularLabel } from './mock_data';
 
-const createComponent = ({ label = mockRegularLabel, highlight = true } = {}) =>
+const mockLabel = { ...mockRegularLabel, set: true };
+
+const createComponent = ({ label = mockLabel, highlight = true } = {}) =>
   shallowMount(LabelItem, {
     propsData: {
       label,
+      isLabelSet: label.set,
       highlight,
     },
   });
@@ -28,13 +31,29 @@ describe('LabelItem', () => {
       it('returns an object containing `backgroundColor` based on `label` prop', () => {
         expect(wrapper.vm.labelBoxStyle).toEqual(
           expect.objectContaining({
-            backgroundColor: mockRegularLabel.color,
+            backgroundColor: mockLabel.color,
           }),
         );
       });
     });
   });
 
+  describe('watchers', () => {
+    describe('isLabelSet', () => {
+      it('sets value of `isLabelSet` to `isSet` data prop', () => {
+        expect(wrapper.vm.isSet).toBe(true);
+
+        wrapper.setProps({
+          isLabelSet: false,
+        });
+
+        return wrapper.vm.$nextTick(() => {
+          expect(wrapper.vm.isSet).toBe(false);
+        });
+      });
+    });
+  });
+
   describe('methods', () => {
     describe('handleClick', () => {
       it('sets value of `isSet` data prop to opposite of its current value', () => {
@@ -52,7 +71,7 @@ describe('LabelItem', () => {
         wrapper.vm.handleClick();
 
         expect(wrapper.emitted('clickLabel')).toBeTruthy();
-        expect(wrapper.emitted('clickLabel')[0]).toEqual([mockRegularLabel]);
+        expect(wrapper.emitted('clickLabel')[0]).toEqual([mockLabel]);
       });
     });
   });
@@ -105,7 +124,7 @@ describe('LabelItem', () => {
     });
 
     it('renders label title', () => {
-      expect(wrapper.text()).toContain(mockRegularLabel.title);
+      expect(wrapper.text()).toContain(mockLabel.title);
     });
   });
 });
diff --git a/spec/javascripts/vue_shared/components/smart_virtual_list_spec.js b/spec/frontend/vue_shared/components/smart_virtual_list_spec.js
index 47ebdc505c9..e5f9b94128e 100644
--- a/spec/javascripts/vue_shared/components/smart_virtual_list_spec.js
+++ b/spec/frontend/vue_shared/components/smart_virtual_list_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import { mount } from '@vue/test-utils';
 import SmartVirtualScrollList from '~/vue_shared/components/smart_virtual_list.vue';
 
 describe('Toggle Button', () => {
@@ -28,7 +28,7 @@ describe('Toggle Button', () => {
       </smart-virtual-scroll-list>`,
     });
 
-    return mountComponent(Component);
+    return mount(Component).vm;
   };
 
   afterEach(() => {
diff --git a/spec/javascripts/vue_shared/directives/autofocusonshow_spec.js b/spec/frontend/vue_shared/directives/autofocusonshow_spec.js
index f1ca5f61496..90530b7d5c2 100644
--- a/spec/javascripts/vue_shared/directives/autofocusonshow_spec.js
+++ b/spec/frontend/vue_shared/directives/autofocusonshow_spec.js
@@ -9,13 +9,21 @@ describe('AutofocusOnShow directive', () => {
   describe('with input invisible on component render', () => {
     let el;
 
-    beforeAll(() => {
+    beforeEach(() => {
       setFixtures('<div id="container" style="display: none;"><input id="inputel"/></div>');
       el = document.querySelector('#inputel');
+
+      window.IntersectionObserver = class {
+        observe = jest.fn();
+      };
+    });
+
+    afterEach(() => {
+      delete window.IntersectionObserver;
     });
 
     it('should bind IntersectionObserver on input element', () => {
-      spyOn(el, 'focus');
+      jest.spyOn(el, 'focus').mockImplementation(() => {});
 
       autofocusonshow.inserted(el);
 
@@ -27,7 +35,7 @@ describe('AutofocusOnShow directive', () => {
       el.visibilityObserver = {
         disconnect: () => {},
       };
-      spyOn(el.visibilityObserver, 'disconnect');
+      jest.spyOn(el.visibilityObserver, 'disconnect').mockImplementation(() => {});
 
       autofocusonshow.unbind(el);
 
diff --git a/spec/frontend/vue_shared/directives/tooltip_spec.js b/spec/frontend/vue_shared/directives/tooltip_spec.js
new file mode 100644
index 00000000000..9d3dd3c5f75
--- /dev/null
+++ b/spec/frontend/vue_shared/directives/tooltip_spec.js
@@ -0,0 +1,98 @@
+import $ from 'jquery';
+import { mount } from '@vue/test-utils';
+import tooltip from '~/vue_shared/directives/tooltip';
+
+describe('Tooltip directive', () => {
+  let vm;
+
+  afterEach(() => {
+    if (vm) {
+      vm.$destroy();
+    }
+  });
+
+  describe('with a single tooltip', () => {
+    beforeEach(() => {
+      const wrapper = mount(
+        {
+          directives: {
+            tooltip,
+          },
+          data() {
+            return {
+              tooltip: 'some text',
+            };
+          },
+          template: '<div v-tooltip :title="tooltip"></div>',
+        },
+        { attachToDocument: true },
+      );
+
+      vm = wrapper.vm;
+    });
+
+    it('should have tooltip plugin applied', () => {
+      expect($(vm.$el).data('bs.tooltip')).toBeDefined();
+    });
+
+    it('displays the title as tooltip', () => {
+      $(vm.$el).tooltip('show');
+      jest.runOnlyPendingTimers();
+
+      const tooltipElement = document.querySelector('.tooltip-inner');
+
+      expect(tooltipElement.textContent).toContain('some text');
+    });
+
+    it('updates a visible tooltip', () => {
+      $(vm.$el).tooltip('show');
+      jest.runOnlyPendingTimers();
+
+      const tooltipElement = document.querySelector('.tooltip-inner');
+
+      vm.tooltip = 'other text';
+
+      jest.runOnlyPendingTimers();
+
+      return vm.$nextTick().then(() => {
+        expect(tooltipElement.textContent).toContain('other text');
+      });
+    });
+  });
+
+  describe('with multiple tooltips', () => {
+    beforeEach(() => {
+      const wrapper = mount(
+        {
+          directives: {
+            tooltip,
+          },
+          template: `
+            <div>
+              <div
+                v-tooltip
+                class="js-look-for-tooltip"
+                title="foo">
+              </div>
+              <div
+                v-tooltip
+                title="bar">
+              </div>
+            </div>
+          `,
+        },
+        { attachToDocument: true },
+      );
+
+      vm = wrapper.vm;
+    });
+
+    it('should have tooltip plugin applied to all instances', () => {
+      expect(
+        $(vm.$el)
+          .find('.js-look-for-tooltip')
+          .data('bs.tooltip'),
+      ).toBeDefined();
+    });
+  });
+});
diff --git a/spec/frontend/vue_shared/translate_spec.js b/spec/frontend/vue_shared/translate_spec.js
new file mode 100644
index 00000000000..42aa28a6309
--- /dev/null
+++ b/spec/frontend/vue_shared/translate_spec.js
@@ -0,0 +1,214 @@
+import { mount, createLocalVue } from '@vue/test-utils';
+import locale from '~/locale';
+import Translate from '~/vue_shared/translate';
+
+const localVue = createLocalVue();
+localVue.use(Translate);
+
+describe('Vue translate filter', () => {
+  const createTranslationMock = (key, ...translations) => {
+    locale.textdomain('app');
+
+    locale.options.locale_data = {
+      app: {
+        '': {
+          domain: 'app',
+          lang: 'vo',
+          plural_forms: 'nplurals=2; plural=(n != 1);',
+        },
+        [key]: translations,
+      },
+    };
+  };
+
+  it('translate singular text (`__`)', () => {
+    const key = 'singular';
+    const translation = 'singular_translated';
+    createTranslationMock(key, translation);
+
+    const wrapper = mount(
+      {
+        template: `
+          <span>
+            {{ __('${key}') }}
+          </span>
+        `,
+      },
+      { localVue },
+    );
+
+    expect(wrapper.text()).toBe(translation);
+  });
+
+  it('translate plural text (`n__`) without any substituting text', () => {
+    const key = 'plural';
+    const translationPlural = 'plural_multiple translation';
+    createTranslationMock(key, 'plural_singular translation', translationPlural);
+
+    const wrapper = mount(
+      {
+        template: `
+          <span>
+            {{ n__('${key}', 'plurals', 2) }}
+          </span>
+        `,
+      },
+      { localVue },
+    );
+
+    expect(wrapper.text()).toBe(translationPlural);
+  });
+
+  describe('translate plural text (`n__`) with substituting %d', () => {
+    const key = '%d day';
+
+    beforeEach(() => {
+      createTranslationMock(key, '%d singular translated', '%d plural translated');
+    });
+
+    it('and n === 1', () => {
+      const wrapper = mount(
+        {
+          template: `
+            <span>
+              {{ n__('${key}', '%d days', 1) }}
+            </span>
+          `,
+        },
+        { localVue },
+      );
+
+      expect(wrapper.text()).toBe('1 singular translated');
+    });
+
+    it('and n > 1', () => {
+      const wrapper = mount(
+        {
+          template: `
+            <span>
+              {{ n__('${key}', '%d days', 2) }}
+            </span>
+          `,
+        },
+        { localVue },
+      );
+
+      expect(wrapper.text()).toBe('2 plural translated');
+    });
+  });
+
+  describe('translates text with context `s__`', () => {
+    const key = 'Context|Foobar';
+    const translation = 'Context|Foobar translated';
+    const expectation = 'Foobar translated';
+
+    beforeEach(() => {
+      createTranslationMock(key, translation);
+    });
+
+    it('and using two parameters', () => {
+      const wrapper = mount(
+        {
+          template: `
+            <span>
+              {{ s__('Context', 'Foobar') }}
+            </span>
+          `,
+        },
+        { localVue },
+      );
+
+      expect(wrapper.text()).toBe(expectation);
+    });
+
+    it('and using the pipe syntax', () => {
+      const wrapper = mount(
+        {
+          template: `
+            <span>
+              {{ s__('${key}') }}
+            </span>
+          `,
+        },
+        { localVue },
+      );
+
+      expect(wrapper.text()).toBe(expectation);
+    });
+  });
+
+  it('translate multi line text', () => {
+    const translation = 'multiline string translated';
+    createTranslationMock('multiline string', translation);
+
+    const wrapper = mount(
+      {
+        template: `
+          <span>
+            {{ __(\`
+            multiline
+            string
+            \`) }}
+          </span>
+        `,
+      },
+      { localVue },
+    );
+
+    expect(wrapper.text()).toBe(translation);
+  });
+
+  it('translate pluralized multi line text', () => {
+    const translation = 'multiline string plural';
+
+    createTranslationMock('multiline string', 'multiline string singular', translation);
+
+    const wrapper = mount(
+      {
+        template: `
+          <span>
+            {{ n__(
+            \`
+            multiline
+            string
+            \`,
+            \`
+            multiline
+            strings
+            \`,
+            2
+            ) }}
+          </span>
+        `,
+      },
+      { localVue },
+    );
+
+    expect(wrapper.text()).toBe(translation);
+  });
+
+  it('translate pluralized multi line text with context', () => {
+    const translation = 'multiline string with context';
+
+    createTranslationMock('Context| multiline string', translation);
+
+    const wrapper = mount(
+      {
+        template: `
+          <span>
+            {{ s__(
+            \`
+            Context|
+            multiline
+            string
+            \`
+            ) }}
+          </span>
+        `,
+      },
+      { localVue },
+    );
+
+    expect(wrapper.text()).toBe(translation);
+  });
+});
diff --git a/spec/javascripts/vuex_shared/modules/modal/actions_spec.js b/spec/frontend/vuex_shared/modules/modal/actions_spec.js
index 2c4cb845424..353dbcb522f 100644
--- a/spec/javascripts/vuex_shared/modules/modal/actions_spec.js
+++ b/spec/frontend/vuex_shared/modules/modal/actions_spec.js
@@ -1,4 +1,4 @@
-import testAction from 'spec/helpers/vuex_action_helper';
+import testAction from 'helpers/vuex_action_helper';
 import * as types from '~/vuex_shared/modules/modal/mutation_types';
 import * as actions from '~/vuex_shared/modules/modal/actions';
 
diff --git a/spec/frontend/wikis_spec.js b/spec/frontend/wikis_spec.js
index e5d869840aa..8c68edafd16 100644
--- a/spec/frontend/wikis_spec.js
+++ b/spec/frontend/wikis_spec.js
@@ -1,4 +1,4 @@
-import Wikis from '~/pages/projects/wikis/wikis';
+import Wikis from '~/pages/shared/wikis/wikis';
 import { setHTMLFixture } from './helpers/fixtures';
 
 describe('Wikis', () => {
diff --git a/spec/javascripts/zen_mode_spec.js b/spec/frontend/zen_mode_spec.js
index 5dee11b3810..8e0d170289b 100644
--- a/spec/javascripts/zen_mode_spec.js
+++ b/spec/frontend/zen_mode_spec.js
@@ -1,10 +1,13 @@
 import $ from 'jquery';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import Dropzone from 'dropzone';
 import Mousetrap from 'mousetrap';
 import ZenMode from '~/zen_mode';
 import initNotes from '~/init_notes';
 
 describe('ZenMode', () => {
+  let mock;
   let zen;
   let dropzoneForElementSpy;
   const fixtureName = 'snippets/show.html';
@@ -28,10 +31,13 @@ describe('ZenMode', () => {
   }
 
   beforeEach(() => {
+    mock = new MockAdapter(axios);
+    mock.onGet().reply(200);
+
     loadFixtures(fixtureName);
     initNotes();
 
-    dropzoneForElementSpy = spyOn(Dropzone, 'forElement').and.callFake(() => ({
+    dropzoneForElementSpy = jest.spyOn(Dropzone, 'forElement').mockImplementation(() => ({
       enable: () => true,
     }));
     zen = new ZenMode();
@@ -49,20 +55,20 @@ describe('ZenMode', () => {
       $('.div-dropzone').addClass('js-invalid-dropzone');
       exitZen();
 
-      expect(dropzoneForElementSpy.calls.count()).toEqual(0);
+      expect(dropzoneForElementSpy.mock.calls.length).toEqual(0);
     });
 
     it('should call dropzone if element is dropzone valid', () => {
       $('.div-dropzone').removeClass('js-invalid-dropzone');
       exitZen();
 
-      expect(dropzoneForElementSpy.calls.count()).toEqual(2);
+      expect(dropzoneForElementSpy.mock.calls.length).toEqual(2);
     });
   });
 
   describe('on enter', () => {
     it('pauses Mousetrap', () => {
-      const mouseTrapPauseSpy = spyOn(Mousetrap, 'pause');
+      const mouseTrapPauseSpy = jest.spyOn(Mousetrap, 'pause');
       enterZen();
 
       expect(mouseTrapPauseSpy).toHaveBeenCalled();
@@ -90,14 +96,14 @@ describe('ZenMode', () => {
     beforeEach(enterZen);
 
     it('unpauses Mousetrap', () => {
-      const mouseTrapUnpauseSpy = spyOn(Mousetrap, 'unpause');
+      const mouseTrapUnpauseSpy = jest.spyOn(Mousetrap, 'unpause');
       exitZen();
 
       expect(mouseTrapUnpauseSpy).toHaveBeenCalled();
     });
 
     it('restores the scroll position', () => {
-      spyOn(zen, 'scrollTo');
+      jest.spyOn(zen, 'scrollTo').mockImplementation(() => {});
       exitZen();
 
       expect(zen.scrollTo).toHaveBeenCalled();
diff --git a/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap b/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap
index a76f7960d03..fe714924c2b 100644
--- a/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap
+++ b/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap
@@ -15,7 +15,7 @@ exports[`WebIDE runs 1`] = `
         (jest: contents hidden)
       </div>
       <div
-        class="multi-file-commit-panel flex-column"
+        class="gl-relative multi-file-commit-panel flex-column"
         style="width: 340px;"
       >
         <div
diff --git a/spec/graphql/features/authorization_spec.rb b/spec/graphql/features/authorization_spec.rb
index 4f54695e5be..6e5a8b9f4be 100644
--- a/spec/graphql/features/authorization_spec.rb
+++ b/spec/graphql/features/authorization_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Gitlab::Graphql::Authorization' do
+RSpec.describe 'Gitlab::Graphql::Authorization' do
   include GraphqlHelpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/graphql/features/feature_flag_spec.rb b/spec/graphql/features/feature_flag_spec.rb
index 51914cf0ca8..b484663d675 100644
--- a/spec/graphql/features/feature_flag_spec.rb
+++ b/spec/graphql/features/feature_flag_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Graphql Field feature flags' do
+RSpec.describe 'Graphql Field feature flags' do
   include GraphqlHelpers
 
   let_it_be(:user) { create(:user) }
diff --git a/spec/graphql/gitlab_schema_spec.rb b/spec/graphql/gitlab_schema_spec.rb
index 8960ad91543..5d6aa863994 100644
--- a/spec/graphql/gitlab_schema_spec.rb
+++ b/spec/graphql/gitlab_schema_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GitlabSchema do
+RSpec.describe GitlabSchema do
   let_it_be(:connections) { GitlabSchema.connections.all_wrappers }
   let(:user) { build :user }
 
@@ -46,12 +46,6 @@ describe GitlabSchema do
     expect(connection).to eq(Gitlab::Graphql::Pagination::ExternallyPaginatedArrayConnection)
   end
 
-  it 'paginates FilterableArray using `Pagination::FilterableArrayConnection`' do
-    connection = connections[Gitlab::Graphql::FilterableArray]
-
-    expect(connection).to eq(Gitlab::Graphql::Pagination::FilterableArrayConnection)
-  end
-
   describe '.execute' do
     context 'for different types of users' do
       context 'when no context' do
diff --git a/spec/graphql/mutations/alert_management/alerts/set_assignees_spec.rb b/spec/graphql/mutations/alert_management/alerts/set_assignees_spec.rb
new file mode 100644
index 00000000000..a025b3d344a
--- /dev/null
+++ b/spec/graphql/mutations/alert_management/alerts/set_assignees_spec.rb
@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Mutations::AlertManagement::Alerts::SetAssignees do
+  let_it_be(:starting_assignee) { create(:user) }
+  let_it_be(:unassigned_user) { create(:user) }
+  let_it_be(:alert) { create(:alert_management_alert, assignees: [starting_assignee]) }
+  let_it_be(:project) { alert.project }
+
+  let(:current_user) { starting_assignee }
+  let(:assignee_usernames) { [unassigned_user.username] }
+  let(:operation_mode) { nil }
+
+  let(:args) do
+    {
+      project_path: project.full_path,
+      iid: alert.iid,
+      assignee_usernames: assignee_usernames,
+      operation_mode: operation_mode
+    }
+  end
+
+  before_all do
+    project.add_developer(starting_assignee)
+    project.add_developer(unassigned_user)
+  end
+
+  specify { expect(described_class).to require_graphql_authorizations(:update_alert_management_alert) }
+
+  describe '#resolve' do
+    let(:expected_assignees) { [unassigned_user] }
+
+    subject(:resolve) { mutation_for(project, current_user).resolve(args) }
+
+    shared_examples 'successful resolution' do
+      after do
+        alert.assignees = [starting_assignee]
+      end
+
+      it 'successfully resolves' do
+        expect(resolve).to eq(alert: alert.reload, errors: [])
+        expect(alert.assignees).to eq(expected_assignees)
+      end
+    end
+
+    shared_examples 'noop' do
+      it 'makes no changes' do
+        original_assignees = alert.assignees
+
+        expect(resolve).to eq(alert: alert.reload, errors: [])
+        expect(alert.assignees).to eq(original_assignees)
+      end
+    end
+
+    context 'when operation mode is not specified' do
+      it_behaves_like 'successful resolution'
+    end
+
+    context 'when user does not have permission to update alerts' do
+      let(:current_user) { create(:user) }
+
+      it 'raises an error if the resource is not accessible to the user' do
+        expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+      end
+    end
+
+    context 'for APPEND operation' do
+      let(:operation_mode) { Types::MutationOperationModeEnum.enum[:append] }
+
+      # Only allow a single assignee
+      context 'when a different user is already assigned' do
+        it_behaves_like 'noop'
+      end
+
+      context 'when no users are specified' do
+        let(:assignee_usernames) { [] }
+
+        it_behaves_like 'noop'
+      end
+
+      context 'when a user is specified and no user is assigned' do
+        before do
+          alert.assignees = []
+        end
+
+        it_behaves_like 'successful resolution'
+      end
+
+      context 'when the specified user is already assigned to the alert' do
+        let(:assignee_usernames) { [starting_assignee.username] }
+
+        it_behaves_like 'noop'
+      end
+    end
+
+    context 'for REPLACE operation' do
+      let(:operation_mode) { Types::MutationOperationModeEnum.enum[:replace] }
+
+      context 'when a different user is already assigned' do
+        it_behaves_like 'successful resolution'
+      end
+
+      context 'when no users are specified' do
+        let(:assignee_usernames) { [] }
+        let(:expected_assignees) { [] }
+
+        it_behaves_like 'successful resolution'
+      end
+
+      context 'when a user is specified and no user is assigned' do
+        before do
+          alert.assignees = []
+        end
+
+        it_behaves_like 'successful resolution'
+      end
+
+      context 'when the specified user is already assigned to the alert' do
+        let(:assignee_usernames) { [starting_assignee.username] }
+
+        it_behaves_like 'noop'
+      end
+
+      context 'when multiple users are specified' do
+        let(:assignees) { [starting_assignee, unassigned_user] }
+        let(:assignee_usernames) { assignees.map(&:username) }
+        let(:expected_assignees) { [assignees.last] }
+
+        it_behaves_like 'successful resolution'
+      end
+    end
+
+    context 'for REMOVE operation' do
+      let(:operation_mode) { Types::MutationOperationModeEnum.enum[:remove] }
+
+      context 'when a different user is already assigned' do
+        it_behaves_like 'noop'
+      end
+
+      context 'when no users are specified' do
+        let(:assignee_usernames) { [] }
+
+        it_behaves_like 'noop'
+      end
+
+      context 'when a user is specified and no user is assigned' do
+        before do
+          alert.assignees = []
+        end
+
+        it_behaves_like 'noop'
+      end
+
+      context 'when the specified user is already assigned to the alert' do
+        let(:assignee_usernames) { [starting_assignee.username] }
+        let(:expected_assignees) { [] }
+
+        it_behaves_like 'successful resolution'
+      end
+    end
+  end
+
+  def mutation_for(project, user)
+    described_class.new(object: project, context: { current_user: user }, field: nil)
+  end
+end
diff --git a/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb b/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb
index 1e51767cf0e..fa5a84b4fcc 100644
--- a/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb
+++ b/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::AlertManagement::CreateAlertIssue do
+RSpec.describe Mutations::AlertManagement::CreateAlertIssue do
   let_it_be(:current_user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered') }
diff --git a/spec/graphql/mutations/alert_management/update_alert_status_spec.rb b/spec/graphql/mutations/alert_management/update_alert_status_spec.rb
index 8b9abd9497d..68513c02040 100644
--- a/spec/graphql/mutations/alert_management/update_alert_status_spec.rb
+++ b/spec/graphql/mutations/alert_management/update_alert_status_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::AlertManagement::UpdateAlertStatus do
+RSpec.describe Mutations::AlertManagement::UpdateAlertStatus do
   let_it_be(:current_user) { create(:user) }
   let_it_be(:alert) { create(:alert_management_alert, :triggered) }
   let_it_be(:project) { alert.project }
@@ -33,7 +33,7 @@ describe Mutations::AlertManagement::UpdateAlertStatus do
       context 'error occurs when updating' do
         it 'returns the alert with errors' do
           # Stub an error on the alert
-          allow_next_instance_of(Resolvers::AlertManagementAlertResolver) do |resolver|
+          allow_next_instance_of(Resolvers::AlertManagement::AlertResolver) do |resolver|
             allow(resolver).to receive(:resolve).and_return(alert)
           end
 
diff --git a/spec/graphql/mutations/branches/create_spec.rb b/spec/graphql/mutations/branches/create_spec.rb
index 744f8f1f2bc..e378a8e3d41 100644
--- a/spec/graphql/mutations/branches/create_spec.rb
+++ b/spec/graphql/mutations/branches/create_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::Branches::Create do
+RSpec.describe Mutations::Branches::Create do
   subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
 
   let_it_be(:project) { create(:project, :public, :repository) }
diff --git a/spec/graphql/mutations/commits/create_spec.rb b/spec/graphql/mutations/commits/create_spec.rb
new file mode 100644
index 00000000000..bb0b8c577b0
--- /dev/null
+++ b/spec/graphql/mutations/commits/create_spec.rb
@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Mutations::Commits::Create do
+  subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
+
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let_it_be(:user) { create(:user) }
+  let(:context) do
+    GraphQL::Query::Context.new(
+      query: OpenStruct.new(schema: nil),
+      values: { current_user: user },
+      object: nil
+    )
+  end
+
+  specify { expect(described_class).to require_graphql_authorizations(:push_code) }
+
+  describe '#resolve' do
+    subject { mutation.resolve(project_path: project.full_path, branch: branch, message: message, actions: actions) }
+
+    let(:branch) { 'master' }
+    let(:message) { 'Commit message' }
+    let(:actions) do
+      [
+        {
+          action: 'create',
+          file_path: 'NEW_FILE.md',
+          content: 'Hello'
+        }
+      ]
+    end
+
+    let(:mutated_commit) { subject[:commit] }
+
+    it 'raises an error if the resource is not accessible to the user' do
+      expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+    end
+
+    context 'when user does not have enough permissions' do
+      before do
+        project.add_guest(user)
+      end
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+      end
+    end
+
+    context 'when user is a maintainer of a different project' do
+      before do
+        create(:project_empty_repo).add_maintainer(user)
+      end
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+      end
+    end
+
+    context 'when the user can create a commit' do
+      let(:deltas) { mutated_commit.raw_deltas }
+
+      before_all do
+        project.add_developer(user)
+      end
+
+      context 'when service successfully creates a new commit' do
+        it 'returns a new commit' do
+          expect(mutated_commit).to have_attributes(message: message, project: project)
+          expect(subject[:errors]).to be_empty
+
+          expect_to_contain_deltas([
+            a_hash_including(a_mode: '0', b_mode: '100644', new_file: true, new_path: 'NEW_FILE.md')
+          ])
+        end
+      end
+
+      context 'when request has multiple actions' do
+        let(:actions) do
+          [
+            {
+              action: 'create',
+              file_path: 'foo/foobar',
+              content: 'some content'
+            },
+            {
+              action: 'delete',
+              file_path: 'README.md'
+            },
+            {
+              action: 'move',
+              file_path: "LICENSE.md",
+              previous_path: "LICENSE",
+              content: "some content"
+            },
+            {
+              action: 'update',
+              file_path: 'VERSION',
+              content: 'new content'
+            },
+            {
+              action: 'chmod',
+              file_path: 'CHANGELOG',
+              execute_filemode: true
+            }
+          ]
+        end
+
+        it 'returns a new commit' do
+          expect(mutated_commit).to have_attributes(message: message, project: project)
+          expect(subject[:errors]).to be_empty
+
+          expect_to_contain_deltas([
+            a_hash_including(a_mode: '0', b_mode: '100644', new_path: 'foo/foobar'),
+            a_hash_including(deleted_file: true, new_path: 'README.md'),
+            a_hash_including(deleted_file: true, new_path: 'LICENSE'),
+            a_hash_including(new_file: true, new_path: 'LICENSE.md'),
+            a_hash_including(new_file: false, new_path: 'VERSION'),
+            a_hash_including(a_mode: '100644', b_mode: '100755', new_path: 'CHANGELOG')
+          ])
+        end
+      end
+
+      context 'when actions are not defined' do
+        let(:actions) { [] }
+
+        it 'returns a new commit' do
+          expect(mutated_commit).to have_attributes(message: message, project: project)
+          expect(subject[:errors]).to be_empty
+
+          expect_to_contain_deltas([])
+        end
+      end
+
+      context 'when branch does not exist' do
+        let(:branch) { 'unknown' }
+
+        it 'returns errors' do
+          expect(mutated_commit).to be_nil
+          expect(subject[:errors]).to eq(['You can only create or edit files when you are on a branch'])
+        end
+      end
+
+      context 'when message is not set' do
+        let(:message) { nil }
+
+        it 'returns errors' do
+          expect(mutated_commit).to be_nil
+          expect(subject[:errors]).to eq(['3:UserCommitFiles: empty CommitMessage'])
+        end
+      end
+
+      context 'when actions are incorrect' do
+        let(:actions) { [{ action: 'unknown', file_path: 'test.md', content: '' }] }
+
+        it 'returns errors' do
+          expect(mutated_commit).to be_nil
+          expect(subject[:errors]).to eq(['Unknown action \'unknown\''])
+        end
+      end
+
+      context 'when branch is protected' do
+        before do
+          create(:protected_branch, project: project, name: branch)
+        end
+
+        it 'returns errors' do
+          expect(mutated_commit).to be_nil
+          expect(subject[:errors]).to eq(['You are not allowed to push into this branch'])
+        end
+      end
+    end
+  end
+
+  def expect_to_contain_deltas(expected_deltas)
+    expect(deltas.count).to eq(expected_deltas.count)
+    expect(deltas).to include(*expected_deltas)
+  end
+end
diff --git a/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb b/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb
index 51d3c4f5d6b..6bed3a752ed 100644
--- a/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb
+++ b/spec/graphql/mutations/concerns/mutations/resolves_group_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::ResolvesGroup do
+RSpec.describe Mutations::ResolvesGroup do
   let(:mutation_class) do
     Class.new(Mutations::BaseMutation) do
       include Mutations::ResolvesGroup
diff --git a/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb b/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
index 145e42e2a51..706a54931ea 100644
--- a/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
+++ b/spec/graphql/mutations/concerns/mutations/resolves_issuable_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::ResolvesIssuable do
+RSpec.describe Mutations::ResolvesIssuable do
   let_it_be(:mutation_class) do
     Class.new(Mutations::BaseMutation) do
       include Mutations::ResolvesIssuable
diff --git a/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb b/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb
deleted file mode 100644
index b5c349f6284..00000000000
--- a/spec/graphql/mutations/concerns/mutations/resolves_project_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Mutations::ResolvesProject do
-  let(:mutation_class) do
-    Class.new(Mutations::BaseMutation) do
-      include Mutations::ResolvesProject
-    end
-  end
-
-  let(:context) { double }
-
-  subject(:mutation) { mutation_class.new(object: nil, context: context, field: nil) }
-
-  it 'uses the ProjectsResolver to resolve projects by path' do
-    project = create(:project)
-
-    expect(Resolvers::ProjectResolver).to receive(:new).with(object: nil, context: context, field: nil).and_call_original
-    expect(mutation.resolve_project(full_path: project.full_path).sync).to eq(project)
-  end
-end
diff --git a/spec/graphql/mutations/container_expiration_policies/update_spec.rb b/spec/graphql/mutations/container_expiration_policies/update_spec.rb
new file mode 100644
index 00000000000..fc90f437576
--- /dev/null
+++ b/spec/graphql/mutations/container_expiration_policies/update_spec.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Mutations::ContainerExpirationPolicies::Update do
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:project, reload: true) { create(:project) }
+  let_it_be(:user) { create(:user) }
+
+  let(:container_expiration_policy) { project.container_expiration_policy }
+  let(:params) { { project_path: project.full_path, cadence: '3month', keep_n: 100, older_than: '14d' } }
+
+  specify { expect(described_class).to require_graphql_authorizations(:destroy_container_image) }
+
+  describe '#resolve' do
+    subject { described_class.new(object: project, context: { current_user: user }, field: nil).resolve(params) }
+
+    RSpec.shared_examples 'returning a success' do
+      it 'returns the container expiration policy with no errors' do
+        expect(subject).to eq(
+          container_expiration_policy: container_expiration_policy,
+          errors: []
+        )
+      end
+    end
+
+    RSpec.shared_examples 'updating the container expiration policy' do
+      it_behaves_like 'updating the container expiration policy attributes', mode: :update, from: { cadence: '1d', keep_n: 10, older_than: '90d' }, to: { cadence: '3month', keep_n: 100, older_than: '14d' }
+
+      it_behaves_like 'returning a success'
+
+      context 'with invalid params' do
+        let_it_be(:params) { { project_path: project.full_path, cadence: '20d' } }
+
+        it_behaves_like 'not creating the container expiration policy'
+
+        it "doesn't update the cadence" do
+          expect { subject }
+            .not_to change { container_expiration_policy.reload.cadence }
+        end
+
+        it 'returns an error' do
+          expect(subject).to eq(
+            container_expiration_policy: nil,
+            errors: ['Cadence is not included in the list']
+          )
+        end
+      end
+    end
+
+    RSpec.shared_examples 'denying access to container expiration policy' do
+      it 'raises Gitlab::Graphql::Errors::ResourceNotAvailable' do
+        expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+      end
+    end
+
+    context 'with existing container expiration policy' do
+      where(:user_role, :shared_examples_name) do
+        :maintainer | 'updating the container expiration policy'
+        :developer  | 'updating the container expiration policy'
+        :reporter   | 'denying access to container expiration policy'
+        :guest      | 'denying access to container expiration policy'
+        :anonymous  | 'denying access to container expiration policy'
+      end
+
+      with_them do
+        before do
+          project.send("add_#{user_role}", user) unless user_role == :anonymous
+        end
+
+        it_behaves_like params[:shared_examples_name]
+      end
+    end
+
+    context 'without existing container expiration policy' do
+      let_it_be(:project, reload: true) { create(:project, :without_container_expiration_policy) }
+
+      where(:user_role, :shared_examples_name) do
+        :maintainer | 'creating the container expiration policy'
+        :developer  | 'creating the container expiration policy'
+        :reporter   | 'denying access to container expiration policy'
+        :guest      | 'denying access to container expiration policy'
+        :anonymous  | 'denying access to container expiration policy'
+      end
+
+      with_them do
+        before do
+          project.send("add_#{user_role}", user) unless user_role == :anonymous
+        end
+
+        it_behaves_like params[:shared_examples_name]
+      end
+    end
+  end
+end
diff --git a/spec/graphql/mutations/design_management/delete_spec.rb b/spec/graphql/mutations/design_management/delete_spec.rb
index 60be6dad62a..3efa865c64b 100644
--- a/spec/graphql/mutations/design_management/delete_spec.rb
+++ b/spec/graphql/mutations/design_management/delete_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::DesignManagement::Delete do
+RSpec.describe Mutations::DesignManagement::Delete do
   include DesignManagementTestHelpers
 
   let(:issue) { create(:issue) }
diff --git a/spec/graphql/mutations/design_management/upload_spec.rb b/spec/graphql/mutations/design_management/upload_spec.rb
index 783af70448c..326d88cea80 100644
--- a/spec/graphql/mutations/design_management/upload_spec.rb
+++ b/spec/graphql/mutations/design_management/upload_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Mutations::DesignManagement::Upload do
+RSpec.describe Mutations::DesignManagement::Upload do
   include DesignManagementTestHelpers
   include ConcurrentHelpers
 
diff --git a/spec/graphql/mutations/discussions/toggle_resolve_spec.rb b/spec/graphql/mutations/discussions/toggle_resolve_spec.rb
new file mode 100644
index 00000000000..9ac4d6ab165
--- /dev/null
+++ b/spec/graphql/mutations/discussions/toggle_resolve_spec.rb
@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Mutations::Discussions::ToggleResolve do
+  subject(:mutation) do
+    described_class.new(object: nil, context: { current_user: user }, field: nil)
+  end
+
+  let_it_be(:project) { create(:project, :repository) }
+
+  describe '#resolve' do
+    subject do
+      mutation.resolve({ id: id_arg, resolve: resolve_arg })
+    end
+
+    let(:id_arg) { discussion.to_global_id.to_s }
+    let(:resolve_arg) { true }
+    let(:mutated_discussion) { subject[:discussion] }
+    let(:errors) { subject[:errors] }
+
+    shared_examples 'a working resolve method' do
+      context 'when the user does not have permission' do
+        let_it_be(:user) { create(:user) }
+
+        it 'raises an error if the resource is not accessible to the user' do
+          expect { subject }.to raise_error(
+            Gitlab::Graphql::Errors::ResourceNotAvailable,
+            "The resource that you are attempting to access does not exist or you don't have permission to perform this action"
+          )
+        end
+      end
+
+      context 'when the user has permission' do
+        let_it_be(:user) { create(:user, developer_projects: [project]) }
+
+        context 'when discussion cannot be found' do
+          let(:id_arg) { "#{discussion.to_global_id}foo" }
+
+          it 'raises an error' do
+            expect { subject }.to raise_error(
+              Gitlab::Graphql::Errors::ResourceNotAvailable,
+              "The resource that you are attempting to access does not exist or you don't have permission to perform this action"
+            )
+          end
+        end
+
+        context 'when discussion is not a Discussion' do
+          let(:discussion) { create(:note, noteable: noteable, project: project) }
+
+          it 'raises an error' do
+            expect { subject }.to raise_error(
+              Gitlab::Graphql::Errors::ArgumentError,
+              "#{discussion.to_global_id} is not a valid id for Discussion."
+            )
+          end
+        end
+
+        shared_examples 'returns a resolved discussion without errors' do
+          it 'returns a resolved discussion' do
+            expect(mutated_discussion).to be_resolved
+          end
+
+          it 'returns empty errors' do
+            expect(errors).to be_empty
+          end
+        end
+
+        shared_examples 'returns an unresolved discussion without errors' do
+          it 'returns an unresolved discussion' do
+            expect(mutated_discussion).not_to be_resolved
+          end
+
+          it 'returns empty errors' do
+            expect(errors).to be_empty
+          end
+        end
+
+        context 'when the `resolve` argument is true' do
+          include_examples 'returns a resolved discussion without errors'
+
+          context 'when the discussion is already resolved' do
+            before do
+              discussion.resolve!(user)
+            end
+
+            include_examples 'returns a resolved discussion without errors'
+          end
+
+          context 'when the service raises an `ActiveRecord::RecordNotSaved` error' do
+            before do
+              allow_next_instance_of(::Discussions::ResolveService) do |service|
+                allow(service).to receive(:execute).and_raise(ActiveRecord::RecordNotSaved)
+              end
+            end
+
+            it 'does not resolve the discussion' do
+              expect(mutated_discussion).not_to be_resolved
+            end
+
+            it 'returns errors' do
+              expect(errors).to contain_exactly('Discussion failed to be resolved')
+            end
+          end
+        end
+
+        context 'when the `resolve` argument is false' do
+          let(:resolve_arg) { false }
+
+          context 'when the discussion is resolved' do
+            before do
+              discussion.resolve!(user)
+            end
+
+            include_examples 'returns an unresolved discussion without errors'
+
+            context 'when the service raises an `ActiveRecord::RecordNotSaved` error' do
+              before do
+                allow_next_instance_of(discussion.class) do |instance|
+                  allow(instance).to receive(:unresolve!).and_raise(ActiveRecord::RecordNotSaved)
+                end
+              end
+
+              it 'does not unresolve the discussion' do
+                expect(mutated_discussion).to be_resolved
+              end
+
+              it 'returns errors' do
+                expect(errors).to contain_exactly('Discussion failed to be unresolved')
+              end
+            end
+          end
+
+          context 'when the discussion is already unresolved' do
+            include_examples 'returns an unresolved discussion without errors'
+          end
+        end
+      end
+    end
+
+    context 'when discussion is on a merge request' do
+      let_it_be(:noteable) { create(:merge_request, source_project: project) }
+      let(:discussion) { create(:diff_note_on_merge_request, noteable: noteable, project: project).to_discussion }
+
+      it_behaves_like 'a working resolve method'
+    end
+
+    context 'when discussion is on a design' do
+      let_it_be(:noteable) { create(:design, :with_file, issue: create(:issue, project: project)) }
+      let(:discussion) { create(:diff_note_on_design, noteable: noteable, project: project).to_discussion }
+
+      it_behaves_like 'a working resolve method'
+    end
+  end
+end
diff --git a/spec/graphql/mutations/issues/set_confidential_spec.rb b/spec/graphql/mutations/issues/set_confidential_spec.rb
index c90ce2658d6..820f9aa5e17 100644
--- a/spec/graphql/mutations/issues/set_confidential_spec.rb
+++ b/spec/graphql/mutations/issues/set_confidential_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::Issues::SetConfidential do
+RSpec.describe Mutations::Issues::SetConfidential do
   let(:issue) { create(:issue) }
   let(:user) { create(:user) }
 
diff --git a/spec/graphql/mutations/issues/set_due_date_spec.rb b/spec/graphql/mutations/issues/set_due_date_spec.rb
index 84df6fce7c7..a638971d966 100644
--- a/spec/graphql/mutations/issues/set_due_date_spec.rb
+++ b/spec/graphql/mutations/issues/set_due_date_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Mutations::Issues::SetDueDate do
+RSpec.describe Mutations::Issues::SetDueDate do
   let(:issue) { create(:issue) }
   let(:user) { create(:user) }
 
diff --git a/spec/graphql/mutations/merge_requests/create_spec.rb b/spec/graphql/mutations/merge_requests/create_spec.rb
new file mode 100644
index 00000000000..88acd3ed5b6
--- /dev/null
+++ b/spec/graphql/mutations/merge_requests/create_spec.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Mutations::MergeRequests::Create do
+  subject(:mutation) { described_class.new(object: nil, context: context, field: nil) }
+
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:context) do
+    GraphQL::Query::Context.new(
+      query: OpenStruct.new(schema: nil),
+      values: { current_user: user },
+      object: nil
+    )
+  end
+
+  describe '#resolve' do
+    subject do
+      mutation.resolve(
+        project_path: project.full_path,
+        title: title,
+        source_branch: source_branch,
+        target_branch: target_branch,
+        description: description
+      )
+    end
+
+    let(:title) { 'MergeRequest' }
+    let(:source_branch) { 'feature' }
+    let(:target_branch) { 'master' }
+    let(:description) { nil }
+
+    let(:mutated_merge_request) { subject[:merge_request] }
+
+    it 'raises an error if the resource is not accessible to the user' do
+      expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+    end
+
+    context 'when user does not have enough permissions to create a merge request' do
+      before do
+        project.add_guest(user)
+      end
+
+      it 'raises an error if the resource is not accessible to the user' do
+        expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+      end
+    end
+
+    context 'when the user can create a merge request' do
+      before_all do
+        project.add_developer(user)
+      end
+
+      it 'creates a new merge request' do
+        expect { mutated_merge_request }.to change(MergeRequest, :count).by(1)
+      end
+
+      it 'returns a new merge request' do
+        expect(mutated_merge_request.title).to eq(title)
+        expect(subject[:errors]).to be_empty
+      end
+
+      context 'when optional description field is set' do
+        let(:description) { 'content' }
+
+        it 'returns a new merge request with a description' do
+          expect(mutated_merge_request.description).to eq(description)
+          expect(subject[:errors]).to be_empty
+        end
+      end
+
+      context 'when service cannot create a merge request' do
+        let(:title) { nil }
+
+        it 'does not create a new merge request' do
+          expect { mutated_merge_request }.not_to change(MergeRequest, :count)
+        end
+
+        it 'returns errors' do
+          expect(mutated_merge_request).to be_nil
+          expect(subject[:errors]).to eq(['Title can\'t be blank'])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/graphql/resolvers/alert_management_alert_resolver_spec.rb b/spec/graphql/resolvers/alert_management/alert_resolver_spec.rb
index 971a81a826d..6c12f765e69 100644
--- a/spec/graphql/resolvers/alert_management_alert_resolver_spec.rb
+++ b/spec/graphql/resolvers/alert_management/alert_resolver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Resolvers::AlertManagementAlertResolver do
+describe Resolvers::AlertManagement::AlertResolver do
   include GraphqlHelpers
 
   let_it_be(:current_user) { create(:user) }
@@ -45,11 +45,11 @@ describe Resolvers::AlertManagementAlertResolver do
         let_it_be(:alert_count_3) { create(:alert_management_alert, project: project, events: 3) }
 
         it 'sorts alerts ascending' do
-          expect(resolve_alerts(sort: :events_count_asc)).to eq [alert_2, alert_1, alert_count_3, alert_count_6]
+          expect(resolve_alerts(sort: :event_count_asc)).to eq [alert_2, alert_1, alert_count_3, alert_count_6]
         end
 
         it 'sorts alerts descending' do
-          expect(resolve_alerts(sort: :events_count_desc)).to eq [alert_count_6, alert_count_3, alert_1, alert_2]
+          expect(resolve_alerts(sort: :event_count_desc)).to eq [alert_count_6, alert_count_3, alert_1, alert_2]
         end
       end
     end
diff --git a/spec/graphql/resolvers/base_resolver_spec.rb b/spec/graphql/resolvers/base_resolver_spec.rb
index 0a21b2797ee..6c384349577 100644
--- a/spec/graphql/resolvers/base_resolver_spec.rb
+++ b/spec/graphql/resolvers/base_resolver_spec.rb
@@ -41,9 +41,35 @@ describe Resolvers::BaseResolver do
     end
   end
 
+  context 'when the resolver returns early' do
+    let(:resolver) do
+      Class.new(described_class) do
+        def ready?(**args)
+          [false, %w(early return)]
+        end
+
+        def resolve(**args)
+          raise 'Should not get here'
+        end
+      end
+    end
+
+    it 'runs correctly in our test framework' do
+      expect(resolve(resolver)).to contain_exactly('early', 'return')
+    end
+
+    it 'single selects the first early return value' do
+      expect(resolve(resolver.single)).to eq('early')
+    end
+
+    it 'last selects the last early return value' do
+      expect(resolve(resolver.last)).to eq('return')
+    end
+  end
+
   describe '.last' do
     it 'returns a subclass from the resolver' do
-      expect(last_resolver.last.superclass).to eq(last_resolver)
+      expect(last_resolver.last.ancestors).to include(last_resolver)
     end
 
     it 'returns the same subclass every time' do
@@ -95,4 +121,28 @@ describe Resolvers::BaseResolver do
       end
     end
   end
+
+  describe '#synchronized_object' do
+    let(:object) { double(foo: :the_foo) }
+
+    let(:resolver) do
+      Class.new(described_class) do
+        def resolve(**args)
+          [synchronized_object.foo]
+        end
+      end
+    end
+
+    it 'handles raw objects' do
+      expect(resolve(resolver, obj: object)).to contain_exactly(:the_foo)
+    end
+
+    it 'handles lazy objects' do
+      delayed = BatchLoader::GraphQL.for(1).batch do |_, loader|
+        loader.call(1, object)
+      end
+
+      expect(resolve(resolver, obj: delayed)).to contain_exactly(:the_foo)
+    end
+  end
 end
diff --git a/spec/graphql/resolvers/concerns/looks_ahead_spec.rb b/spec/graphql/resolvers/concerns/looks_ahead_spec.rb
new file mode 100644
index 00000000000..8b83f887846
--- /dev/null
+++ b/spec/graphql/resolvers/concerns/looks_ahead_spec.rb
@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe LooksAhead do
+  include GraphqlHelpers
+
+  let_it_be(:the_user) { create(:user) }
+  let_it_be(:label_a) { create(:label) }
+  let_it_be(:label_b) { create(:label) }
+  let_it_be(:issue_a) { create(:issue, author: the_user, labels: [label_a, label_b]) }
+  let_it_be(:issue_b) { create(:issue, author: the_user, labels: [label_a]) }
+  let_it_be(:issue_c) { create(:issue, author: the_user, labels: [label_b]) }
+
+  # Simplified schema to test lookahead
+  let_it_be(:schema) do
+    issues_resolver = Class.new(Resolvers::BaseResolver) do
+      include LooksAhead
+
+      def resolve_with_lookahead(**args)
+        apply_lookahead(object.issues)
+      end
+
+      def preloads
+        { labels: [:labels] }
+      end
+    end
+
+    label = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'Label'
+      field :id, Integer, null: false
+    end
+    issue = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'Issue'
+      field :title, String, null: true
+      field :labels, label.connection_type, null: true
+    end
+    user = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'User'
+      field :name, String, null: true
+      field :issues, issue.connection_type,
+        null: true
+      field :issues_with_lookahead, issue.connection_type,
+        extras: [:lookahead],
+        resolver: issues_resolver,
+        null: true
+    end
+
+    Class.new(GraphQL::Schema) do
+      query(Class.new(GraphQL::Schema::Object) do
+        graphql_name 'Query'
+        field :find_user, user, null: true do
+          argument :username, String, required: true
+        end
+
+        def find_user(username:)
+          context[:user_db].find { |u| u.username == username }
+        end
+      end)
+    end
+  end
+
+  def query(doc = document)
+    GraphQL::Query.new(schema,
+                       document: doc,
+                       context: { user_db: [the_user] },
+                       variables: { username: the_user.username })
+  end
+
+  let(:document) do
+    GraphQL.parse <<-GRAPHQL
+    query($username: String!){
+      findUser(username: $username) {
+        name
+        issues {
+          nodes {
+            title
+            labels { nodes { id } }
+          }
+        }
+        issuesWithLookahead {
+          nodes {
+            title
+            labels { nodes { id } }
+          }
+        }
+      }
+    }
+    GRAPHQL
+  end
+
+  def run_query(gql_query)
+    query(GraphQL.parse(gql_query)).result
+  end
+
+  shared_examples 'a working query on the test schema' do
+    it 'has a good test setup', :aggregate_failures do
+      expected_label_ids = [label_a, label_b].cycle.take(4).map(&:id)
+      issue_titles = [issue_a, issue_b, issue_c].map(&:title)
+
+      res = query.result
+
+      expect(res['errors']).to be_blank
+      expect(res.dig('data', 'findUser', 'name')).to eq(the_user.name)
+      %w(issues issuesWithLookahead).each do |field|
+        expect(all_issue_titles(res, field)).to match_array(issue_titles)
+        expect(all_label_ids(res, field)).to match_array(expected_label_ids)
+      end
+    end
+  end
+
+  it_behaves_like 'a working query on the test schema'
+
+  it 'preloads labels on issues' do
+    expect(the_user.issues).to receive(:preload).with(:labels)
+
+    query.result
+  end
+
+  context 'the feature flag is off' do
+    before do
+      stub_feature_flags(described_class::FEATURE_FLAG => false)
+    end
+
+    it_behaves_like 'a working query on the test schema'
+
+    it 'does not preload labels on issues' do
+      expect(the_user.issues).not_to receive(:preload).with(:labels)
+
+      query.result
+    end
+  end
+
+  it 'issues fewer queries than the naive approach' do
+    the_user.reload # ensure no attributes are loaded before we begin
+    naive = <<-GQL
+    query($username: String!){
+      findUser(username: $username) {
+        name
+        issues {
+          nodes {
+            labels { nodes { id } }
+          }
+        }
+      }
+    }
+    GQL
+    with_lookahead = <<-GQL
+    query($username: String!){
+      findUser(username: $username) {
+        name
+        issuesWithLookahead {
+          nodes {
+            labels { nodes { id } }
+          }
+        }
+      }
+    }
+    GQL
+
+    expect { run_query(with_lookahead) }.to issue_fewer_queries_than { run_query(naive) }
+  end
+
+  private
+
+  def all_label_ids(result, field_name)
+    result.dig('data', 'findUser', field_name, 'nodes').flat_map do |node|
+      node.dig('labels', 'nodes').map { |n| n['id'] }
+    end
+  end
+
+  def all_issue_titles(result, field_name)
+    result.dig('data', 'findUser', field_name, 'nodes').map do |node|
+      node['title']
+    end
+  end
+end
diff --git a/spec/graphql/resolvers/concerns/resolves_project_spec.rb b/spec/graphql/resolvers/concerns/resolves_project_spec.rb
new file mode 100644
index 00000000000..f29f54483d6
--- /dev/null
+++ b/spec/graphql/resolvers/concerns/resolves_project_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ResolvesProject do
+  include GraphqlHelpers
+
+  let(:implementing_class) do
+    Class.new do
+      include ResolvesProject
+    end
+  end
+
+  subject(:instance) { implementing_class.new }
+
+  let_it_be(:project) { create(:project) }
+
+  it 'can resolve projects by path' do
+    expect(sync(instance.resolve_project(full_path: project.full_path))).to eq(project)
+  end
+
+  it 'can resolve projects by id' do
+    expect(sync(instance.resolve_project(project_id: global_id_of(project)))).to eq(project)
+  end
+
+  it 'complains when both are present' do
+    expect do
+      instance.resolve_project(full_path: project.full_path, project_id: global_id_of(project))
+    end.to raise_error(::Gitlab::Graphql::Errors::ArgumentError)
+  end
+
+  it 'complains when neither is present' do
+    expect do
+      instance.resolve_project(full_path: nil, project_id: nil)
+    end.to raise_error(::Gitlab::Graphql::Errors::ArgumentError)
+  end
+end
diff --git a/spec/graphql/resolvers/merge_requests_resolver_spec.rb b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
index 4217d257ab3..6ff7e1ecac6 100644
--- a/spec/graphql/resolvers/merge_requests_resolver_spec.rb
+++ b/spec/graphql/resolvers/merge_requests_resolver_spec.rb
@@ -6,61 +6,164 @@ describe Resolvers::MergeRequestsResolver do
   include GraphqlHelpers
 
   let_it_be(:project) { create(:project, :repository) }
-  let_it_be(:merge_request_1) { create(:merge_request, :simple, source_project: project, target_project: project) }
-  let_it_be(:merge_request_2) { create(:merge_request, :rebased, source_project: project, target_project: project) }
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:common_attrs) { { author: current_user, source_project: project, target_project: project } }
+  let_it_be(:merge_request_1) { create(:merge_request, :simple, **common_attrs) }
+  let_it_be(:merge_request_2) { create(:merge_request, :rebased, **common_attrs) }
+  let_it_be(:merge_request_3) { create(:merge_request, :unique_branches, **common_attrs) }
+  let_it_be(:merge_request_4) { create(:merge_request, :unique_branches, :locked, **common_attrs) }
+  let_it_be(:merge_request_5) { create(:merge_request, :simple, :locked, **common_attrs) }
+  let_it_be(:merge_request_6) { create(:labeled_merge_request, :unique_branches, labels: create_list(:label, 2), **common_attrs) }
   let_it_be(:other_project) { create(:project, :repository) }
   let_it_be(:other_merge_request) { create(:merge_request, source_project: other_project, target_project: other_project) }
   let(:iid_1) { merge_request_1.iid }
   let(:iid_2) { merge_request_2.iid }
   let(:other_iid) { other_merge_request.iid }
 
+  before do
+    project.add_developer(current_user)
+  end
+
   describe '#resolve' do
-    it 'batch-resolves by target project full path and individual IID' do
-      result = batch_sync(max_queries: 2) do
-        resolve_mr(project, iid: iid_1) + resolve_mr(project, iid: iid_2)
+    context 'no arguments' do
+      it 'returns all merge requests' do
+        result = resolve_mr(project, {})
+
+        expect(result).to contain_exactly(merge_request_1, merge_request_2, merge_request_3, merge_request_4, merge_request_5, merge_request_6)
       end
 
-      expect(result).to contain_exactly(merge_request_1, merge_request_2)
+      it 'returns only merge requests that the current user can see' do
+        result = resolve_mr(project, {}, user: build(:user))
+
+        expect(result).to be_empty
+      end
     end
 
-    it 'batch-resolves by target project full path and IIDS' do
-      result = batch_sync(max_queries: 2) do
-        resolve_mr(project, iids: [iid_1, iid_2])
+    context 'by iid alone' do
+      it 'batch-resolves by target project full path and individual IID' do
+        result = batch_sync(max_queries: 2) do
+          [iid_1, iid_2].map { |iid| resolve_mr_single(project, iid) }
+        end
+
+        expect(result).to contain_exactly(merge_request_1, merge_request_2)
+      end
+
+      it 'batch-resolves by target project full path and IIDS' do
+        result = batch_sync(max_queries: 2) do
+          resolve_mr(project, iids: [iid_1, iid_2])
+        end
+
+        expect(result).to contain_exactly(merge_request_1, merge_request_2)
+      end
+
+      it 'can batch-resolve merge requests from different projects' do
+        result = batch_sync(max_queries: 3) do
+          resolve_mr(project, iids: iid_1) +
+            resolve_mr(project, iids: iid_2) +
+            resolve_mr(other_project, iids: other_iid)
+        end
+
+        expect(result).to contain_exactly(merge_request_1, merge_request_2, other_merge_request)
+      end
+
+      it 'resolves an unknown iid to be empty' do
+        result = batch_sync { resolve_mr_single(project, -1) }
+
+        expect(result).to be_nil
       end
 
-      expect(result).to contain_exactly(merge_request_1, merge_request_2)
+      it 'resolves empty iids to be empty' do
+        result = batch_sync { resolve_mr(project, iids: []) }
+
+        expect(result).to be_empty
+      end
+
+      it 'resolves an unknown project to be nil when single' do
+        result = batch_sync { resolve_mr_single(nil, iid_1) }
+
+        expect(result).to be_nil
+      end
+
+      it 'resolves an unknown project to be empty' do
+        result = batch_sync { resolve_mr(nil, iids: [iid_1]) }
+
+        expect(result).to be_empty
+      end
     end
 
-    it 'can batch-resolve merge requests from different projects' do
-      result = batch_sync(max_queries: 3) do
-        resolve_mr(project, iid: iid_1) +
-          resolve_mr(project, iid: iid_2) +
-          resolve_mr(other_project, iid: other_iid)
+    context 'by source branches' do
+      it 'takes one argument' do
+        result = resolve_mr(project, source_branch: [merge_request_3.source_branch])
+
+        expect(result).to contain_exactly(merge_request_3)
       end
 
-      expect(result).to contain_exactly(merge_request_1, merge_request_2, other_merge_request)
+      it 'takes more than one argument' do
+        mrs = [merge_request_3, merge_request_4]
+        branches = mrs.map(&:source_branch)
+        result = resolve_mr(project, source_branch: branches )
+
+        expect(result).to match_array(mrs)
+      end
     end
 
-    it 'resolves an unknown iid to be empty' do
-      result = batch_sync { resolve_mr(project, iid: -1) }
+    context 'by target branches' do
+      it 'takes one argument' do
+        result = resolve_mr(project, target_branch: [merge_request_3.target_branch])
+
+        expect(result).to contain_exactly(merge_request_3)
+      end
 
-      expect(result.compact).to be_empty
+      it 'takes more than one argument' do
+        mrs = [merge_request_3, merge_request_4]
+        branches = mrs.map(&:target_branch)
+        result = resolve_mr(project, target_branch: branches )
+
+        expect(result.compact).to match_array(mrs)
+      end
     end
 
-    it 'resolves empty iids to be empty' do
-      result = batch_sync { resolve_mr(project, iids: []) }
+    context 'by state' do
+      it 'takes one argument' do
+        result = resolve_mr(project, state: 'locked')
 
-      expect(result).to be_empty
+        expect(result).to contain_exactly(merge_request_4, merge_request_5)
+      end
     end
 
-    it 'resolves an unknown project to be empty' do
-      result = batch_sync { resolve_mr(nil, iid: iid_1) }
+    context 'by label' do
+      let_it_be(:label) { merge_request_6.labels.first }
+      let_it_be(:with_label) { create(:labeled_merge_request, :closed, labels: [label], **common_attrs) }
 
-      expect(result.compact).to be_empty
+      it 'takes one argument' do
+        result = resolve_mr(project, label_name: [label.title])
+
+        expect(result).to contain_exactly(merge_request_6, with_label)
+      end
+
+      it 'takes multiple arguments, with semantics of ALL MUST MATCH' do
+        result = resolve_mr(project, label_name: merge_request_6.labels.map(&:title))
+
+        expect(result).to contain_exactly(merge_request_6)
+      end
+    end
+
+    describe 'combinations' do
+      it 'requires all filters' do
+        create(:merge_request, :closed, source_project: project, target_project: project, source_branch: merge_request_4.source_branch)
+
+        result = resolve_mr(project, source_branch: [merge_request_4.source_branch], state: 'locked')
+
+        expect(result.compact).to contain_exactly(merge_request_4)
+      end
     end
   end
 
-  def resolve_mr(project, args)
-    resolve(described_class, obj: project, args: args)
+  def resolve_mr_single(project, iid)
+    resolve_mr(project, { iids: iid }, resolver: described_class.single)
+  end
+
+  def resolve_mr(project, args, resolver: described_class, user: current_user)
+    resolve(resolver, obj: project, args: args, ctx: { current_user: user })
   end
 end
diff --git a/spec/graphql/resolvers/project_members_resolver_spec.rb b/spec/graphql/resolvers/project_members_resolver_spec.rb
new file mode 100644
index 00000000000..3209838850b
--- /dev/null
+++ b/spec/graphql/resolvers/project_members_resolver_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::ProjectMembersResolver do
+  include GraphqlHelpers
+
+  context "with a group" do
+    let_it_be(:root_group)   { create(:group) }
+    let_it_be(:group_1)      { create(:group, parent: root_group) }
+    let_it_be(:group_2)      { create(:group, parent: root_group) }
+    let_it_be(:project)      { create(:project, :public, group: group_1) }
+
+    let_it_be(:user_1) { create(:user, name: 'test user') }
+    let_it_be(:user_2) { create(:user, name: 'test user 2') }
+    let_it_be(:user_3) { create(:user, name: 'another user 1') }
+    let_it_be(:user_4) { create(:user, name: 'another user 2') }
+
+    let_it_be(:project_member)    { create(:project_member, user: user_1, project: project) }
+    let_it_be(:group_1_member)    { create(:group_member, user: user_2, group: group_1) }
+    let_it_be(:group_2_member)    { create(:group_member, user: user_3, group: group_2) }
+    let_it_be(:root_group_member) { create(:group_member, user: user_4, group: root_group) }
+
+    let(:args) { {} }
+
+    subject do
+      resolve(described_class, obj: project, args: args, ctx: { context: user_4 })
+    end
+
+    describe '#resolve' do
+      it 'finds all project members' do
+        expect(subject).to contain_exactly(project_member, group_1_member, root_group_member)
+      end
+
+      context 'with search' do
+        context 'when the search term matches a user' do
+          let(:args) { { search: 'test' } }
+
+          it 'searches users by user name' do
+            expect(subject).to contain_exactly(project_member, group_1_member)
+          end
+        end
+
+        context 'when the search term does not match any user' do
+          let(:args) { { search: 'nothing' } }
+
+          it 'is empty' do
+            expect(subject).to be_empty
+          end
+        end
+      end
+
+      context 'when project is nil' do
+        let(:project) { nil }
+
+        it 'returns nil' do
+          expect(subject).to be_empty
+        end
+      end
+    end
+  end
+end
diff --git a/spec/graphql/resolvers/project_pipeline_resolver_spec.rb b/spec/graphql/resolvers/project_pipeline_resolver_spec.rb
new file mode 100644
index 00000000000..72049f16d7d
--- /dev/null
+++ b/spec/graphql/resolvers/project_pipeline_resolver_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::ProjectPipelineResolver do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:pipeline) { create(:ci_pipeline, project: project, iid: '1234') }
+  let_it_be(:other_pipeline) { create(:ci_pipeline) }
+  let(:current_user) { create(:user) }
+
+  def resolve_pipeline(project, args)
+    resolve(described_class, obj: project, args: args, ctx: { current_user: current_user })
+  end
+
+  it 'resolves pipeline for the passed iid' do
+    result = batch_sync do
+      resolve_pipeline(project, { iid: '1234' })
+    end
+
+    expect(result).to eq(pipeline)
+  end
+
+  it 'does not resolve a pipeline outside the project' do
+    result = batch_sync do
+      resolve_pipeline(other_pipeline.project, { iid: '1234' })
+    end
+
+    expect(result).to be_nil
+  end
+
+  it 'errors when no iid is passed' do
+    expect { resolve_pipeline(project, {}) }.to raise_error(ArgumentError)
+  end
+end
diff --git a/spec/graphql/resolvers/projects/jira_imports_resolver_spec.rb b/spec/graphql/resolvers/projects/jira_imports_resolver_spec.rb
index 7146bfb441b..9811075a613 100644
--- a/spec/graphql/resolvers/projects/jira_imports_resolver_spec.rb
+++ b/spec/graphql/resolvers/projects/jira_imports_resolver_spec.rb
@@ -40,16 +40,6 @@ describe Resolvers::Projects::JiraImportsResolver do
       let_it_be(:jira_import1) { create(:jira_import_state, :finished, project: project, jira_project_key: 'AA', created_at: 2.days.ago) }
       let_it_be(:jira_import2) { create(:jira_import_state, :finished, project: project, jira_project_key: 'BB', created_at: 5.days.ago) }
 
-      context 'when feature flag disabled' do
-        let(:current_user) { user }
-
-        before do
-          stub_feature_flags(jira_issue_import: false)
-        end
-
-        it_behaves_like 'no Jira import access'
-      end
-
       context 'when user cannot read Jira imports' do
         context 'when anonymous user' do
           let(:current_user) { nil }
diff --git a/spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb b/spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb
new file mode 100644
index 00000000000..364e2aa6ca8
--- /dev/null
+++ b/spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::Projects::JiraProjectsResolver do
+  include GraphqlHelpers
+
+  describe '#resolve' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:project) { create(:project) }
+
+    shared_examples 'no project service access' do
+      it 'raises error' do
+        expect do
+          resolve_jira_projects
+        end.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+      end
+    end
+
+    context 'when project has no jira service' do
+      let_it_be(:jira_service) { nil }
+
+      context 'when user is a maintainer' do
+        before do
+          project.add_maintainer(user)
+        end
+
+        it_behaves_like 'no project service access'
+      end
+    end
+
+    context 'when project has jira service' do
+      let(:jira_service) { create(:jira_service, project: project) }
+
+      context 'when user is a developer' do
+        before do
+          project.add_developer(user)
+        end
+
+        it_behaves_like 'no project service access'
+      end
+
+      context 'when user is a maintainer' do
+        before do
+          project.add_maintainer(user)
+        end
+
+        context 'when Jira connection is valid' do
+          include_context 'jira projects request context'
+
+          it 'returns jira projects' do
+            jira_projects = resolve_jira_projects
+            project_keys = jira_projects.map(&:key)
+            project_names = jira_projects.map(&:name)
+            project_ids = jira_projects.map(&:id)
+
+            expect(jira_projects.size).to eq 2
+            expect(project_keys).to eq(%w(EX ABC))
+            expect(project_names).to eq(%w(Example Alphabetical))
+            expect(project_ids).to eq(%w(10000 10001))
+          end
+        end
+
+        context 'when Jira connection is not valid' do
+          before do
+            WebMock.stub_request(:get, 'https://jira.example.com/rest/api/2/project/search?maxResults=50&query=&startAt=0')
+              .to_raise(JIRA::HTTPError.new(double(message: 'Some failure.')))
+          end
+
+          it 'raises failure error' do
+            expect { resolve_jira_projects }.to raise_error('Jira request error: Some failure.')
+          end
+        end
+      end
+    end
+  end
+
+  def resolve_jira_projects(args = {}, context = { current_user: user })
+    resolve(described_class, obj: jira_service, args: args, ctx: context)
+  end
+end
diff --git a/spec/graphql/resolvers/user_resolver_spec.rb b/spec/graphql/resolvers/user_resolver_spec.rb
new file mode 100644
index 00000000000..45a8816bf26
--- /dev/null
+++ b/spec/graphql/resolvers/user_resolver_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::UserResolver do
+  include GraphqlHelpers
+
+  describe '#resolve' do
+    let_it_be(:user) { create(:user) }
+
+    context 'when neither an ID or a username is provided' do
+      it 'raises an ArgumentError' do
+        expect { resolve_user }
+        .to raise_error(Gitlab::Graphql::Errors::ArgumentError)
+      end
+    end
+
+    it 'raises an ArgumentError when both an ID and username are provided' do
+      expect { resolve_user(id: user.to_global_id, username: user.username) }
+        .to raise_error(Gitlab::Graphql::Errors::ArgumentError)
+    end
+
+    context 'by username' do
+      it 'returns the correct user' do
+        expect(
+          resolve_user(username: user.username)
+        ).to eq(user)
+      end
+    end
+
+    context 'by ID' do
+      it 'returns the correct user' do
+        expect(
+          resolve_user(id: user.to_global_id)
+        ).to eq(user)
+      end
+    end
+  end
+
+  private
+
+  def resolve_user(args = {})
+    sync(resolve(described_class, args: args))
+  end
+end
diff --git a/spec/graphql/resolvers/users_resolver_spec.rb b/spec/graphql/resolvers/users_resolver_spec.rb
new file mode 100644
index 00000000000..e752500d52f
--- /dev/null
+++ b/spec/graphql/resolvers/users_resolver_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::UsersResolver do
+  include GraphqlHelpers
+
+  let_it_be(:user1) { create(:user) }
+  let_it_be(:user2) { create(:user) }
+
+  describe '#resolve' do
+    it 'raises an error when read_users_list is not authorized' do
+      expect(Ability).to receive(:allowed?).with(nil, :read_users_list).and_return(false)
+
+      expect { resolve_users }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
+    end
+
+    context 'when no arguments are passed' do
+      it 'returns all users' do
+        expect(resolve_users).to contain_exactly(user1, user2)
+      end
+    end
+
+    context 'when both ids and usernames are passed ' do
+      it 'raises an error' do
+        expect { resolve_users(ids: [user1.to_global_id.to_s], usernames: [user1.username]) }
+        .to raise_error(Gitlab::Graphql::Errors::ArgumentError)
+      end
+    end
+
+    context 'when a set of IDs is passed' do
+      it 'returns those users' do
+        expect(
+          resolve_users(ids: [user1.to_global_id.to_s, user2.to_global_id.to_s])
+        ).to contain_exactly(user1, user2)
+      end
+    end
+
+    context 'when a set of usernames is passed' do
+      it 'returns those users' do
+        expect(
+          resolve_users(usernames: [user1.username, user2.username])
+        ).to contain_exactly(user1, user2)
+      end
+    end
+  end
+
+  def resolve_users(args = {})
+    resolve(described_class, args: args)
+  end
+end
diff --git a/spec/graphql/types/access_level_enum_spec.rb b/spec/graphql/types/access_level_enum_spec.rb
new file mode 100644
index 00000000000..05a6d6d5545
--- /dev/null
+++ b/spec/graphql/types/access_level_enum_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['AccessLevelEnum'] do
+  specify { expect(described_class.graphql_name).to eq('AccessLevelEnum') }
+
+  it 'exposes all the existing access levels' do
+    expect(described_class.values.keys).to match_array(%w[NO_ACCESS GUEST REPORTER DEVELOPER MAINTAINER OWNER])
+  end
+end
diff --git a/spec/graphql/types/access_level_type_spec.rb b/spec/graphql/types/access_level_type_spec.rb
new file mode 100644
index 00000000000..b9711a9aa4b
--- /dev/null
+++ b/spec/graphql/types/access_level_type_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe GitlabSchema.types['AccessLevel'] do
+  specify { expect(described_class.graphql_name).to eq('AccessLevel') }
+  specify { expect(described_class).to require_graphql_authorizations(nil) }
+
+  it 'has expected fields' do
+    expected_fields = [:integer_value, :string_value]
+
+    expect(described_class).to have_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/alert_management/alert_type_spec.rb b/spec/graphql/types/alert_management/alert_type_spec.rb
index 9c326f30e3c..5acbf8ebb7a 100644
--- a/spec/graphql/types/alert_management/alert_type_spec.rb
+++ b/spec/graphql/types/alert_management/alert_type_spec.rb
@@ -24,6 +24,9 @@ describe GitlabSchema.types['AlertManagementAlert'] do
       details
       created_at
       updated_at
+      assignees
+      notes
+      discussions
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
diff --git a/spec/graphql/types/base_field_spec.rb b/spec/graphql/types/base_field_spec.rb
index daed5725e26..3ec33c75803 100644
--- a/spec/graphql/types/base_field_spec.rb
+++ b/spec/graphql/types/base_field_spec.rb
@@ -135,25 +135,6 @@ describe Types::BaseField do
         it 'returns true if the feature is enabled' do
           expect(field.visible?(context)).to eq(true)
         end
-
-        context 'falsey feature_flag values' do
-          using RSpec::Parameterized::TableSyntax
-
-          where(:flag, :feature_value, :visible) do
-            ''  | false | true
-            ''  | true  | true
-            nil | false | true
-            nil | true  | true
-          end
-
-          with_them do
-            it 'returns the correct value' do
-              stub_feature_flags(flag => feature_value)
-
-              expect(field.visible?(context)).to eq(visible)
-            end
-          end
-        end
       end
     end
   end
diff --git a/spec/graphql/types/commit_action_mode_enum_spec.rb b/spec/graphql/types/commit_action_mode_enum_spec.rb
new file mode 100644
index 00000000000..9e1a27ea254
--- /dev/null
+++ b/spec/graphql/types/commit_action_mode_enum_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['CommitActionMode'] do
+  it { expect(described_class.graphql_name).to eq('CommitActionMode') }
+
+  it 'exposes all the existing commit actions' do
+    expect(described_class.values.keys).to match_array(%w[CREATE UPDATE MOVE DELETE CHMOD])
+  end
+end
diff --git a/spec/graphql/types/commit_encoding_enum_spec.rb b/spec/graphql/types/commit_encoding_enum_spec.rb
new file mode 100644
index 00000000000..30686a0c712
--- /dev/null
+++ b/spec/graphql/types/commit_encoding_enum_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['CommitEncoding'] do
+  it { expect(described_class.graphql_name).to eq('CommitEncoding') }
+
+  it 'exposes all the existing encoding option' do
+    expect(described_class.values.keys).to match_array(%w[TEXT BASE64])
+  end
+end
diff --git a/spec/graphql/types/container_expiration_policy_cadence_enum_spec.rb b/spec/graphql/types/container_expiration_policy_cadence_enum_spec.rb
new file mode 100644
index 00000000000..08c777cd365
--- /dev/null
+++ b/spec/graphql/types/container_expiration_policy_cadence_enum_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ContainerExpirationPolicyCadenceEnum'] do
+  let_it_be(:expected_values) { %w[EVERY_DAY EVERY_WEEK EVERY_TWO_WEEKS EVERY_MONTH EVERY_THREE_MONTHS] }
+
+  it_behaves_like 'exposing container expiration policy option', :cadence
+end
diff --git a/spec/graphql/types/container_expiration_policy_keep_enum_spec.rb b/spec/graphql/types/container_expiration_policy_keep_enum_spec.rb
new file mode 100644
index 00000000000..1a5b4bdd3bb
--- /dev/null
+++ b/spec/graphql/types/container_expiration_policy_keep_enum_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ContainerExpirationPolicyKeepEnum'] do
+  let_it_be(:expected_values) { %w[ONE_TAG FIVE_TAGS TEN_TAGS TWENTY_FIVE_TAGS FIFTY_TAGS ONE_HUNDRED_TAGS] }
+
+  it_behaves_like 'exposing container expiration policy option', :keep_n
+end
diff --git a/spec/graphql/types/container_expiration_policy_older_than_enum_spec.rb b/spec/graphql/types/container_expiration_policy_older_than_enum_spec.rb
new file mode 100644
index 00000000000..47f0ca22522
--- /dev/null
+++ b/spec/graphql/types/container_expiration_policy_older_than_enum_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ContainerExpirationPolicyOlderThanEnum'] do
+  let_it_be(:expected_values) { %w[SEVEN_DAYS FOURTEEN_DAYS THIRTY_DAYS NINETY_DAYS] }
+
+  it_behaves_like 'exposing container expiration policy option', :older_than
+end
diff --git a/spec/graphql/types/container_expiration_policy_type_spec.rb b/spec/graphql/types/container_expiration_policy_type_spec.rb
new file mode 100644
index 00000000000..8924ab67847
--- /dev/null
+++ b/spec/graphql/types/container_expiration_policy_type_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ContainerExpirationPolicy'] do
+  specify { expect(described_class.graphql_name).to eq('ContainerExpirationPolicy') }
+
+  specify { expect(described_class.description).to eq('A tag expiration policy designed to keep only the images that matter most') }
+
+  specify { expect(described_class).to require_graphql_authorizations(:destroy_container_image) }
+
+  describe 'older_than field' do
+    subject { described_class.fields['olderThan'] }
+
+    it 'returns older_than enum' do
+      is_expected.to have_graphql_type(Types::ContainerExpirationPolicyOlderThanEnum)
+    end
+  end
+
+  describe 'keep n field' do
+    subject { described_class.fields['keepN'] }
+
+    it 'returns keep enum' do
+      is_expected.to have_graphql_type(Types::ContainerExpirationPolicyKeepEnum)
+    end
+  end
+end
diff --git a/spec/graphql/types/evidence_type_spec.rb b/spec/graphql/types/evidence_type_spec.rb
new file mode 100644
index 00000000000..4a11f7bcda9
--- /dev/null
+++ b/spec/graphql/types/evidence_type_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ReleaseEvidence'] do
+  it { expect(described_class).to require_graphql_authorizations(:download_code) }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      id sha filepath collected_at
+    ]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/group_member_type_spec.rb b/spec/graphql/types/group_member_type_spec.rb
new file mode 100644
index 00000000000..5d09e60d21c
--- /dev/null
+++ b/spec/graphql/types/group_member_type_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Types::GroupMemberType do
+  specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Group) }
+
+  specify { expect(described_class.graphql_name).to eq('GroupMember') }
+
+  specify { expect(described_class).to require_graphql_authorizations(:read_group) }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      access_level created_by created_at updated_at expires_at group
+    ]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/group_type_spec.rb b/spec/graphql/types/group_type_spec.rb
index a834a9038db..c56cd40ef12 100644
--- a/spec/graphql/types/group_type_spec.rb
+++ b/spec/graphql/types/group_type_spec.rb
@@ -29,4 +29,6 @@ describe GitlabSchema.types['Group'] do
       is_expected.to have_graphql_type(Types::BoardType.connection_type)
     end
   end
+
+  it_behaves_like 'a GraphQL type with labels'
 end
diff --git a/spec/graphql/types/jira_import_type_spec.rb b/spec/graphql/types/jira_import_type_spec.rb
index ac1aa672e30..fa1152aec41 100644
--- a/spec/graphql/types/jira_import_type_spec.rb
+++ b/spec/graphql/types/jira_import_type_spec.rb
@@ -6,6 +6,9 @@ describe GitlabSchema.types['JiraImport'] do
   specify { expect(described_class.graphql_name).to eq('JiraImport') }
 
   it 'has the expected fields' do
-    expect(described_class).to have_graphql_fields(:jira_project_key, :createdAt, :scheduled_at, :scheduled_by)
+    expect(described_class).to have_graphql_fields(
+      :jira_project_key, :created_at, :scheduled_at, :scheduled_by,
+      :failed_to_import_count, :imported_issues_count, :total_issue_count
+    )
   end
 end
diff --git a/spec/graphql/types/merge_request_type_spec.rb b/spec/graphql/types/merge_request_type_spec.rb
index e7ab2100084..0f48264c99f 100644
--- a/spec/graphql/types/merge_request_type_spec.rb
+++ b/spec/graphql/types/merge_request_type_spec.rb
@@ -19,10 +19,11 @@ describe GitlabSchema.types['MergeRequest'] do
       force_remove_source_branch merge_status in_progress_merge_commit_sha
       merge_error allow_collaboration should_be_rebased rebase_commit_sha
       rebase_in_progress merge_commit_message default_merge_commit_message
-      merge_ongoing source_branch_exists mergeable_discussions_state web_url
+      merge_ongoing mergeable_discussions_state web_url
+      source_branch_exists target_branch_exists
       upvotes downvotes head_pipeline pipelines task_completion_status
       milestone assignees participants subscribed labels discussion_locked time_estimate
-      total_time_spent reference
+      total_time_spent reference author merged_at
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
diff --git a/spec/graphql/types/metrics/dashboard_type_spec.rb b/spec/graphql/types/metrics/dashboard_type_spec.rb
index 81219c596a7..0dbd0d8b38d 100644
--- a/spec/graphql/types/metrics/dashboard_type_spec.rb
+++ b/spec/graphql/types/metrics/dashboard_type_spec.rb
@@ -7,7 +7,7 @@ describe GitlabSchema.types['MetricsDashboard'] do
 
   it 'has the expected fields' do
     expected_fields = %w[
-        path annotations
+        path annotations schema_validation_warnings
       ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
diff --git a/spec/graphql/types/notes/diff_position_type_spec.rb b/spec/graphql/types/notes/diff_position_type_spec.rb
index 01f355cb278..87f3810d55c 100644
--- a/spec/graphql/types/notes/diff_position_type_spec.rb
+++ b/spec/graphql/types/notes/diff_position_type_spec.rb
@@ -1,11 +1,22 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GitlabSchema.types['DiffPosition'] do
   it 'exposes the expected fields' do
-    expected_fields = [:diff_refs, :file_path, :old_path,
-                       :new_path, :position_type, :old_line, :new_line, :x, :y,
-                       :width, :height]
+    expected_fields = %i[
+      diff_refs
+      file_path
+      height
+      new_line
+      new_path
+      old_line
+      old_path
+      position_type
+      width
+      x
+      y
+    ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
   end
diff --git a/spec/graphql/types/notes/discussion_type_spec.rb b/spec/graphql/types/notes/discussion_type_spec.rb
index 44774594d17..177000b01b2 100644
--- a/spec/graphql/types/notes/discussion_type_spec.rb
+++ b/spec/graphql/types/notes/discussion_type_spec.rb
@@ -1,8 +1,22 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GitlabSchema.types['Discussion'] do
-  specify { expect(described_class).to have_graphql_fields(:id, :created_at, :notes, :reply_id) }
+  it 'exposes the expected fields' do
+    expected_fields = %i[
+      created_at
+      id
+      notes
+      reply_id
+      resolvable
+      resolved
+      resolved_at
+      resolved_by
+    ]
+
+    expect(described_class).to have_graphql_fields(*expected_fields)
+  end
 
   specify { expect(described_class).to require_graphql_authorizations(:read_note) }
 end
diff --git a/spec/graphql/types/notes/note_type_spec.rb b/spec/graphql/types/notes/note_type_spec.rb
index 019f742ee77..d6cd0800234 100644
--- a/spec/graphql/types/notes/note_type_spec.rb
+++ b/spec/graphql/types/notes/note_type_spec.rb
@@ -1,11 +1,27 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GitlabSchema.types['Note'] do
   it 'exposes the expected fields' do
-    expected_fields = [:id, :project, :author, :body, :created_at,
-                       :updated_at, :discussion, :resolvable, :position, :user_permissions,
-                       :resolved_by, :resolved_at, :system, :body_html, :confidential]
+    expected_fields = %i[
+      author
+      body
+      body_html
+      confidential
+      created_at
+      discussion
+      id
+      position
+      project
+      resolvable
+      resolved
+      resolved_at
+      resolved_by
+      system
+      updated_at
+      user_permissions
+    ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
   end
diff --git a/spec/graphql/types/notes/noteable_type_spec.rb b/spec/graphql/types/notes/noteable_type_spec.rb
index 4a81f45bd4e..88d8eae56d1 100644
--- a/spec/graphql/types/notes/noteable_type_spec.rb
+++ b/spec/graphql/types/notes/noteable_type_spec.rb
@@ -1,14 +1,23 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Types::Notes::NoteableType do
-  specify { expect(described_class).to have_graphql_fields(:notes, :discussions) }
+  it 'exposes the expected fields' do
+    expected_fields = %i[
+      discussions
+      notes
+    ]
+
+    expect(described_class).to have_graphql_fields(*expected_fields)
+  end
 
   describe ".resolve_type" do
     it 'knows the correct type for objects' do
       expect(described_class.resolve_type(build(:issue), {})).to eq(Types::IssueType)
       expect(described_class.resolve_type(build(:merge_request), {})).to eq(Types::MergeRequestType)
       expect(described_class.resolve_type(build(:design), {})).to eq(Types::DesignManagement::DesignType)
+      expect(described_class.resolve_type(build(:alert_management_alert), {})).to eq(Types::AlertManagement::AlertType)
     end
   end
 end
diff --git a/spec/graphql/types/project_member_type_spec.rb b/spec/graphql/types/project_member_type_spec.rb
new file mode 100644
index 00000000000..1b1f6c24a32
--- /dev/null
+++ b/spec/graphql/types/project_member_type_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Types::ProjectMemberType do
+  specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Project) }
+
+  specify { expect(described_class.graphql_name).to eq('ProjectMember') }
+
+  specify { expect(described_class).to require_graphql_authorizations(:read_project) }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      access_level created_by created_at updated_at expires_at project user
+    ]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index 6368f743720..8ee9aa9cf3a 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -26,6 +26,7 @@ describe GitlabSchema.types['Project'] do
       grafanaIntegration autocloseReferencedIssues suggestion_commit_message environments
       boards jira_import_status jira_imports services releases release
       alert_management_alerts alert_management_alert alert_management_alert_status_counts
+      container_expiration_policy
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)
@@ -45,18 +46,32 @@ describe GitlabSchema.types['Project'] do
     it { is_expected.to have_graphql_resolver(Resolvers::IssuesResolver) }
   end
 
-  describe 'merge_requests field' do
+  describe 'merge_request field' do
     subject { described_class.fields['mergeRequest'] }
 
     it { is_expected.to have_graphql_type(Types::MergeRequestType) }
     it { is_expected.to have_graphql_resolver(Resolvers::MergeRequestsResolver.single) }
+    it { is_expected.to have_graphql_arguments(:iid) }
   end
 
-  describe 'merge_request field' do
+  describe 'merge_requests field' do
     subject { described_class.fields['mergeRequests'] }
 
     it { is_expected.to have_graphql_type(Types::MergeRequestType.connection_type) }
     it { is_expected.to have_graphql_resolver(Resolvers::MergeRequestsResolver) }
+
+    it do
+      is_expected.to have_graphql_arguments(:iids,
+                                            :source_branches,
+                                            :target_branches,
+                                            :state,
+                                            :labels,
+                                            :before,
+                                            :after,
+                                            :first,
+                                            :last
+                                           )
+    end
   end
 
   describe 'snippets field' do
@@ -80,6 +95,13 @@ describe GitlabSchema.types['Project'] do
     it { is_expected.to have_graphql_resolver(Resolvers::EnvironmentsResolver) }
   end
 
+  describe 'members field' do
+    subject { described_class.fields['projectMembers'] }
+
+    it { is_expected.to have_graphql_type(Types::ProjectMemberType.connection_type) }
+    it { is_expected.to have_graphql_resolver(Resolvers::ProjectMembersResolver) }
+  end
+
   describe 'boards field' do
     subject { described_class.fields['boards'] }
 
@@ -111,4 +133,12 @@ describe GitlabSchema.types['Project'] do
     it { is_expected.to have_graphql_type(Types::ReleaseType.connection_type) }
     it { is_expected.to have_graphql_resolver(Resolvers::ReleasesResolver) }
   end
+
+  describe 'container expiration policy field' do
+    subject { described_class.fields['containerExpirationPolicy'] }
+
+    it { is_expected.to have_graphql_type(Types::ContainerExpirationPolicyType) }
+  end
+
+  it_behaves_like 'a GraphQL type with labels'
 end
diff --git a/spec/graphql/types/projects/jira_project_type_spec.rb b/spec/graphql/types/projects/jira_project_type_spec.rb
new file mode 100644
index 00000000000..cbb01117717
--- /dev/null
+++ b/spec/graphql/types/projects/jira_project_type_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['JiraProject'] do
+  it { expect(described_class.graphql_name).to eq('JiraProject') }
+
+  it 'has basic expected fields' do
+    expect(described_class).to have_graphql_fields(:key, :project_id, :name)
+  end
+end
diff --git a/spec/graphql/types/projects/jira_service_type_spec.rb b/spec/graphql/types/projects/jira_service_type_spec.rb
index 91d7e4586cb..fad0c91caab 100644
--- a/spec/graphql/types/projects/jira_service_type_spec.rb
+++ b/spec/graphql/types/projects/jira_service_type_spec.rb
@@ -6,7 +6,7 @@ describe GitlabSchema.types['JiraService'] do
   specify { expect(described_class.graphql_name).to eq('JiraService') }
 
   it 'has basic expected fields' do
-    expect(described_class).to have_graphql_fields(:type, :active)
+    expect(described_class).to have_graphql_fields(:type, :active, :projects)
   end
 
   specify { expect(described_class).to require_graphql_authorizations(:admin_project) }
diff --git a/spec/graphql/types/query_type_spec.rb b/spec/graphql/types/query_type_spec.rb
index 1f269a80d00..1194391c26a 100644
--- a/spec/graphql/types/query_type_spec.rb
+++ b/spec/graphql/types/query_type_spec.rb
@@ -8,7 +8,18 @@ describe GitlabSchema.types['Query'] do
   end
 
   it 'has the expected fields' do
-    expected_fields = %i[project namespace group echo metadata current_user snippets design_management]
+    expected_fields = %i[
+      project
+      namespace
+      group
+      echo
+      metadata
+      current_user
+      snippets
+      design_management
+      user
+      users
+    ]
 
     expect(described_class).to have_graphql_fields(*expected_fields).at_least
   end
diff --git a/spec/graphql/types/release_assets_type_spec.rb b/spec/graphql/types/release_assets_type_spec.rb
new file mode 100644
index 00000000000..58f0f7ee697
--- /dev/null
+++ b/spec/graphql/types/release_assets_type_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ReleaseAssets'] do
+  it { expect(described_class).to require_graphql_authorizations(:read_release) }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      assets_count links sources
+    ]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+
+  describe 'links field' do
+    subject { described_class.fields['links'] }
+
+    it { is_expected.to have_graphql_type(Types::ReleaseLinkType.connection_type) }
+  end
+
+  describe 'sources field' do
+    subject { described_class.fields['sources'] }
+
+    it { is_expected.to have_graphql_type(Types::ReleaseSourceType.connection_type) }
+  end
+end
diff --git a/spec/graphql/types/release_links_type_spec.rb b/spec/graphql/types/release_links_type_spec.rb
new file mode 100644
index 00000000000..49e04e120f4
--- /dev/null
+++ b/spec/graphql/types/release_links_type_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ReleaseLink'] do
+  it { expect(described_class).to require_graphql_authorizations(:read_release) }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      id name url external link_type
+    ]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/release_source_type_spec.rb b/spec/graphql/types/release_source_type_spec.rb
new file mode 100644
index 00000000000..e471ac1a5ac
--- /dev/null
+++ b/spec/graphql/types/release_source_type_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['ReleaseSource'] do
+  it { expect(described_class).to require_graphql_authorizations(:read_release_sources) }
+
+  it 'has the expected fields' do
+    expected_fields = %w[
+      format url
+    ]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/release_type_spec.rb b/spec/graphql/types/release_type_spec.rb
index d22a0b4f0fa..feafe5ed519 100644
--- a/spec/graphql/types/release_type_spec.rb
+++ b/spec/graphql/types/release_type_spec.rb
@@ -9,19 +9,31 @@ describe GitlabSchema.types['Release'] do
     expected_fields = %w[
       tag_name tag_path
       description description_html
-      name milestones author commit
+      name assets milestones evidences author commit
       created_at released_at
     ]
 
     expect(described_class).to include_graphql_fields(*expected_fields)
   end
 
+  describe 'assets field' do
+    subject { described_class.fields['assets'] }
+
+    it { is_expected.to have_graphql_type(Types::ReleaseAssetsType) }
+  end
+
   describe 'milestones field' do
     subject { described_class.fields['milestones'] }
 
     it { is_expected.to have_graphql_type(Types::MilestoneType.connection_type) }
   end
 
+  describe 'evidences field' do
+    subject { described_class.fields['evidences'] }
+
+    it { is_expected.to have_graphql_type(Types::EvidenceType.connection_type) }
+  end
+
   describe 'author field' do
     subject { described_class.fields['author'] }
 
diff --git a/spec/graphql/types/resolvable_interface_spec.rb b/spec/graphql/types/resolvable_interface_spec.rb
new file mode 100644
index 00000000000..231287f9969
--- /dev/null
+++ b/spec/graphql/types/resolvable_interface_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Types::ResolvableInterface do
+  it 'exposes the expected fields' do
+    expected_fields = %i[
+      resolvable
+      resolved
+      resolved_at
+      resolved_by
+    ]
+
+    expect(described_class).to have_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/snippet_type_spec.rb b/spec/graphql/types/snippet_type_spec.rb
index adc13d4d651..f24419ce9cc 100644
--- a/spec/graphql/types/snippet_type_spec.rb
+++ b/spec/graphql/types/snippet_type_spec.rb
@@ -11,11 +11,49 @@ describe GitlabSchema.types['Snippet'] do
                        :visibility_level, :created_at, :updated_at,
                        :web_url, :raw_url, :ssh_url_to_repo, :http_url_to_repo,
                        :notes, :discussions, :user_permissions,
-                       :description_html, :blob]
+                       :description_html, :blob, :blobs]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
   end
 
+  context 'when restricted visibility level is set to public' do
+    let_it_be(:snippet) { create(:personal_snippet, :repository, :public, author: user) }
+
+    let(:current_user) { user }
+    let(:query) do
+      %(
+        {
+          snippets {
+            nodes {
+              author {
+                id
+              }
+            }
+          }
+        }
+      )
+    end
+    let(:response) { subject.dig('data', 'snippets', 'nodes')[0] }
+
+    subject { GitlabSchema.execute(query, context: { current_user: current_user }).as_json }
+
+    before do
+      stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC])
+    end
+
+    it 'returns snippet author' do
+      expect(response['author']).to be_present
+    end
+
+    context 'when user is not logged in' do
+      let(:current_user) { nil }
+
+      it 'returns snippet author as nil' do
+        expect(response['author']).to be_nil
+      end
+    end
+  end
+
   describe 'authorizations' do
     specify { expect(described_class).to require_graphql_authorizations(:read_snippet) }
   end
@@ -76,30 +114,14 @@ describe GitlabSchema.types['Snippet'] do
 
   describe '#blob' do
     let(:query_blob) { subject.dig('data', 'snippets', 'edges')[0]['node']['blob'] }
-    let(:query) do
-      %(
-        {
-          snippets {
-            edges {
-              node {
-                blob {
-                  name
-                  path
-                }
-              }
-            }
-          }
-        }
-      )
-    end
 
-    subject { GitlabSchema.execute(query, context: { current_user: user }).as_json }
+    subject { GitlabSchema.execute(snippet_query_for(field: 'blob'), context: { current_user: user }).as_json }
 
     context 'when snippet has repository' do
       let!(:snippet) { create(:personal_snippet, :repository, :public, author: user) }
       let(:blob) { snippet.blobs.first }
 
-      it 'returns blob from the repository' do
+      it 'returns the first blob from the repository' do
         expect(query_blob['name']).to eq blob.name
         expect(query_blob['path']).to eq blob.path
       end
@@ -115,4 +137,58 @@ describe GitlabSchema.types['Snippet'] do
       end
     end
   end
+
+  describe '#blobs' do
+    let_it_be(:snippet) { create(:personal_snippet, :public, author: user) }
+    let(:query_blobs) { subject.dig('data', 'snippets', 'edges')[0]['node']['blobs'] }
+
+    subject { GitlabSchema.execute(snippet_query_for(field: 'blobs'), context: { current_user: user }).as_json }
+
+    shared_examples 'an array' do
+      it 'returns an array of snippet blobs' do
+        expect(query_blobs).to be_an(Array)
+      end
+    end
+
+    context 'when snippet does not have a repository' do
+      let(:blob) { snippet.blob }
+
+      it_behaves_like 'an array'
+
+      it 'contains the first blob from the snippet' do
+        expect(query_blobs.first['name']).to eq blob.name
+        expect(query_blobs.first['path']).to eq blob.path
+      end
+    end
+
+    context 'when snippet has repository' do
+      let_it_be(:snippet) { create(:personal_snippet, :repository, :public, author: user) }
+      let(:blobs) { snippet.blobs }
+
+      it_behaves_like 'an array'
+
+      it 'contains all the blobs from the repository' do
+        resulting_blobs_names = query_blobs.map { |b| b['name'] }
+
+        expect(resulting_blobs_names).to match_array(blobs.map(&:name))
+      end
+    end
+  end
+
+  def snippet_query_for(field:)
+    %(
+      {
+        snippets {
+          edges {
+            node {
+              #{field} {
+                name
+                path
+              }
+            }
+          }
+        }
+      }
+    )
+  end
 end
diff --git a/spec/graphql/types/snippets/file_input_action_enum_spec.rb b/spec/graphql/types/snippets/file_input_action_enum_spec.rb
new file mode 100644
index 00000000000..2ccc8b04b8f
--- /dev/null
+++ b/spec/graphql/types/snippets/file_input_action_enum_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Types::Snippets::FileInputActionEnum do
+  specify { expect(described_class.graphql_name).to eq('SnippetFileInputActionEnum') }
+
+  it 'exposes all file input action types' do
+    expect(described_class.values.keys).to eq(%w[create update delete move])
+  end
+end
diff --git a/spec/graphql/types/snippets/file_input_type_spec.rb b/spec/graphql/types/snippets/file_input_type_spec.rb
new file mode 100644
index 00000000000..62e5caf20b7
--- /dev/null
+++ b/spec/graphql/types/snippets/file_input_type_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Types::Snippets::FileInputType do
+  specify { expect(described_class.graphql_name).to eq('SnippetFileInputType') }
+
+  it 'has the correct arguments' do
+    expect(described_class.arguments.keys).to match_array(%w[filePath action previousPath content])
+  end
+
+  it 'sets the type of action argument to FileInputActionEnum' do
+    expect(described_class.arguments['action'].type.of_type).to eq(Types::Snippets::FileInputActionEnum)
+  end
+end
diff --git a/spec/graphql/types/user_type_spec.rb b/spec/graphql/types/user_type_spec.rb
index cf1e91afb80..7b34588b0ff 100644
--- a/spec/graphql/types/user_type_spec.rb
+++ b/spec/graphql/types/user_type_spec.rb
@@ -9,7 +9,19 @@ describe GitlabSchema.types['User'] do
 
   it 'has the expected fields' do
     expected_fields = %w[
-      id user_permissions snippets name username avatarUrl webUrl todos state
+      id
+      user_permissions
+      snippets
+      name
+      username
+      avatarUrl
+      webUrl
+      todos
+      state
+      authoredMergeRequests
+      assignedMergeRequests
+      groupMemberships
+      projectMemberships
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 05231cc6d09..75377356445 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -278,7 +278,7 @@ describe ApplicationHelper do
             page: 'application',
             page_type_id: nil,
             find_file: nil,
-            group: ''
+            group: nil
           }
         )
       end
@@ -317,7 +317,7 @@ describe ApplicationHelper do
             page: 'application',
             page_type_id: nil,
             find_file: nil,
-            group: '',
+            group: nil,
             project_id: project.id,
             project: project.name,
             namespace_id: project.namespace.id
@@ -325,6 +325,25 @@ describe ApplicationHelper do
         )
       end
 
+      context 'when @project is owned by a group' do
+        let_it_be(:project) { create(:project, :repository, group: create(:group)) }
+
+        it 'includes all possible body data elements and associates the project elements with project' do
+          expect(helper).to receive(:can?).with(nil, :download_code, project)
+          expect(helper.body_data).to eq(
+            {
+              page: 'application',
+              page_type_id: nil,
+              find_file: nil,
+              group: project.group.name,
+              project_id: project.id,
+              project: project.name,
+              namespace_id: project.namespace.id
+            }
+          )
+        end
+      end
+
       context 'when controller is issues' do
         before do
           stub_controller_method(:controller_path, 'projects:issues')
@@ -342,7 +361,7 @@ describe ApplicationHelper do
                 page: 'projects:issues:show',
                 page_type_id: issue.id,
                 find_file: nil,
-                group: '',
+                group: nil,
                 project_id: issue.project.id,
                 project: issue.project.name,
                 namespace_id: issue.project.namespace.id
diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
index c2f3e26f97b..3fb754f1090 100644
--- a/spec/helpers/application_settings_helper_spec.rb
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -123,4 +123,27 @@ describe ApplicationSettingsHelper do
       end
     end
   end
+
+  describe '.storage_weights' do
+    let(:application_setting) { build(:application_setting) }
+
+    before do
+      helper.instance_variable_set(:@application_setting, application_setting)
+      stub_storage_settings({ 'default': {}, 'storage_1': {}, 'storage_2': {} })
+      allow(ApplicationSetting).to receive(:repository_storages_weighted_attributes).and_return(
+        [:repository_storages_weighted_default,
+         :repository_storages_weighted_storage_1,
+         :repository_storages_weighted_storage_2])
+
+      stub_application_setting(repository_storages_weighted: { 'default' => 100, 'storage_1' => 50, 'storage_2' => nil })
+    end
+
+    it 'returns storages correctly' do
+      expect(helper.storage_weights).to eq([
+          { name: :repository_storages_weighted_default, label: 'default', value: 100 },
+          { name: :repository_storages_weighted_storage_1, label: 'storage_1', value: 50 },
+          { name: :repository_storages_weighted_storage_2, label: 'storage_2', value: 0 }
+        ])
+    end
+  end
 end
diff --git a/spec/helpers/auto_devops_helper_spec.rb b/spec/helpers/auto_devops_helper_spec.rb
index d06548f1595..e0fecb0c159 100644
--- a/spec/helpers/auto_devops_helper_spec.rb
+++ b/spec/helpers/auto_devops_helper_spec.rb
@@ -13,7 +13,7 @@ describe AutoDevopsHelper do
       allow(helper).to receive(:can?).with(user, :admin_pipeline, project) { allowed }
       allow(helper).to receive(:current_user) { user }
 
-      Feature.get(:auto_devops_banner_disabled).disable
+      stub_feature_flags(auto_devops_banner_disabled: false)
     end
 
     subject { helper.show_auto_devops_callout?(project) }
@@ -32,7 +32,7 @@ describe AutoDevopsHelper do
 
     context 'when the banner is disabled by feature flag' do
       before do
-        Feature.get(:auto_devops_banner_disabled).enable
+        stub_feature_flags(auto_devops_banner_disabled: true)
       end
 
       it { is_expected.to be_falsy }
diff --git a/spec/helpers/clusters_helper_spec.rb b/spec/helpers/clusters_helper_spec.rb
index d40ed2248ce..c41d4f0ede7 100644
--- a/spec/helpers/clusters_helper_spec.rb
+++ b/spec/helpers/clusters_helper_spec.rb
@@ -59,6 +59,22 @@ describe ClustersHelper do
     end
   end
 
+  describe '#js_clusters_list_data' do
+    it 'displays endpoint path and images' do
+      js_data = helper.js_clusters_list_data('/path')
+
+      expect(js_data[:endpoint]).to eq('/path')
+
+      expect(js_data.dig(:img_tags, :aws, :path)).to match(%r(/illustrations/logos/amazon_eks|svg))
+      expect(js_data.dig(:img_tags, :default, :path)).to match(%r(/illustrations/logos/kubernetes|svg))
+      expect(js_data.dig(:img_tags, :gcp, :path)).to match(%r(/illustrations/logos/google_gke|svg))
+
+      expect(js_data.dig(:img_tags, :aws, :text)).to eq('Amazon EKS')
+      expect(js_data.dig(:img_tags, :default, :text)).to eq('Kubernetes Cluster')
+      expect(js_data.dig(:img_tags, :gcp, :text)).to eq('Google GKE')
+    end
+  end
+
   describe '#provider_icon' do
     it 'will return GCP logo with gcp argument' do
       logo = helper.provider_icon('gcp')
diff --git a/spec/helpers/environments_helper_spec.rb b/spec/helpers/environments_helper_spec.rb
index 0756e0162a5..48104dfc5a6 100644
--- a/spec/helpers/environments_helper_spec.rb
+++ b/spec/helpers/environments_helper_spec.rb
@@ -20,6 +20,7 @@ describe EnvironmentsHelper do
       expect(metrics_data).to include(
         'settings-path' => edit_project_service_path(project, 'prometheus'),
         'clusters-path' => project_clusters_path(project),
+        'metrics-dashboard-base-path' => environment_metrics_path(environment),
         'current-environment-name' => environment.name,
         'documentation-path' => help_page_path('administration/monitoring/prometheus/index.md'),
         'empty-getting-started-svg-path' => match_asset_path('/assets/illustrations/monitoring/getting_started.svg'),
@@ -39,7 +40,8 @@ describe EnvironmentsHelper do
         'validate-query-path' => validate_query_project_prometheus_metrics_path(project),
         'custom-metrics-available' => 'true',
         'alerts-endpoint' => project_prometheus_alerts_path(project, environment_id: environment.id, format: :json),
-        'prometheus-alerts-available' => 'true'
+        'prometheus-alerts-available' => 'true',
+        'custom-dashboard-base-path' => Metrics::Dashboard::CustomDashboardService::DASHBOARD_ROOT
       )
     end
 
diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index 12519390137..6f24308757d 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -150,6 +150,21 @@ describe EventsHelper do
 
       expect(helper.event_wiki_page_target_url(event)).to eq(url)
     end
+
+    context 'there is no canonical slug' do
+      let(:event) { create(:wiki_page_event, project: project) }
+
+      before do
+        event.target.slugs.update_all(canonical: false)
+        event.target.clear_memoization(:canonical_slug)
+      end
+
+      it 'links to the home page' do
+        url = helper.project_wiki_url(project, Wiki::HOMEPAGE)
+
+        expect(helper.event_wiki_page_target_url(event)).to eq(url)
+      end
+    end
   end
 
   describe '#event_wiki_title_html' do
diff --git a/spec/helpers/gitlab_routing_helper_spec.rb b/spec/helpers/gitlab_routing_helper_spec.rb
index 1955927e2df..4def04f4284 100644
--- a/spec/helpers/gitlab_routing_helper_spec.rb
+++ b/spec/helpers/gitlab_routing_helper_spec.rb
@@ -121,6 +121,16 @@ describe GitlabRoutingHelper do
       it 'matches the Rails download path' do
         expect(fast_download_project_job_artifacts_path(project, job)).to eq(download_project_job_artifacts_path(project, job))
       end
+
+      context 'when given parameters' do
+        it 'adds them to the path' do
+          expect(
+            fast_download_project_job_artifacts_path(project, job, file_type: :dast)
+          ).to eq(
+            download_project_job_artifacts_path(project, job, file_type: :dast)
+          )
+        end
+      end
     end
 
     describe '#fast_keep_project_job_artifacts_path' do
@@ -228,5 +238,25 @@ describe GitlabRoutingHelper do
         expect(gitlab_toggle_award_emoji_snippet_url(personal_snippet)).to eq("http://test.host/snippets/#{personal_snippet.id}/toggle_award_emoji")
       end
     end
+
+    describe '#gitlab_dashboard_snippets_path' do
+      it 'returns the personal snippets dashboard path' do
+        expect(gitlab_dashboard_snippets_path(personal_snippet)).to eq("/dashboard/snippets")
+      end
+
+      it 'returns the project snippets dashboard path' do
+        expect(gitlab_dashboard_snippets_path(project_snippet)).to eq("/#{project_snippet.project.full_path}/snippets")
+      end
+    end
+  end
+
+  context 'wikis' do
+    let(:wiki) { create(:project_wiki) }
+
+    describe '#wiki_page_path' do
+      it 'returns the url for the wiki page' do
+        expect(wiki_page_path(wiki, 'page')).to eq("/#{wiki.project.full_path}/-/wikis/page")
+      end
+    end
   end
 end
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index dad740d3b80..3ef6745958c 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -7,59 +7,6 @@ describe IssuesHelper do
   let(:issue) { create :issue, project: project }
   let(:ext_project) { create :redmine_project }
 
-  describe "url_for_issue" do
-    let(:issues_url) { ext_project.external_issue_tracker.issues_url}
-    let(:ext_expected) { issues_url.gsub(':id', issue.iid.to_s).gsub(':project_id', ext_project.id.to_s) }
-    let(:int_expected) { polymorphic_path([@project.namespace, @project, issue]) }
-
-    it "returns internal path if used internal tracker" do
-      @project = project
-
-      expect(url_for_issue(issue.iid)).to match(int_expected)
-    end
-
-    it "returns path to external tracker" do
-      @project = ext_project
-
-      expect(url_for_issue(issue.iid)).to match(ext_expected)
-    end
-
-    it "returns path to internal issue when internal option passed" do
-      @project = ext_project
-
-      expect(url_for_issue(issue.iid, ext_project, internal: true)).to match(int_expected)
-    end
-
-    it "returns empty string if project nil" do
-      @project = nil
-
-      expect(url_for_issue(issue.iid)).to eq ""
-    end
-
-    it 'returns an empty string if issue_url is invalid' do
-      expect(project).to receive_message_chain('issues_tracker.issue_url') { 'javascript:alert("foo");' }
-
-      expect(url_for_issue(issue.iid, project)).to eq ''
-    end
-
-    it 'returns an empty string if issue_path is invalid' do
-      expect(project).to receive_message_chain('issues_tracker.issue_path') { 'javascript:alert("foo");' }
-
-      expect(url_for_issue(issue.iid, project, only_path: true)).to eq ''
-    end
-
-    describe "when external tracker was enabled and then config removed" do
-      before do
-        @project = ext_project
-        allow(Gitlab.config).to receive(:issues_tracker).and_return(nil)
-      end
-
-      it "returns external path" do
-        expect(url_for_issue(issue.iid)).to match(ext_expected)
-      end
-    end
-  end
-
   describe '#award_user_list' do
     it "returns a comma-separated list of the first X users" do
       user = build_stubbed(:user, name: 'Joe')
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb
index b2df543d651..1fc79a9762a 100644
--- a/spec/helpers/markup_helper_spec.rb
+++ b/spec/helpers/markup_helper_spec.rb
@@ -317,7 +317,7 @@ describe MarkupHelper do
     let(:wiki_repository) { double('Repository') }
     let(:context) do
       {
-        pipeline: :wiki, project: project, project_wiki: wiki,
+        pipeline: :wiki, project: project, wiki: wiki,
         page_slug: 'nested/page', issuable_state_filter_enabled: true,
         repository: wiki_repository
       }
@@ -327,7 +327,7 @@ describe MarkupHelper do
       expect(wiki).to receive(:content).and_return('wiki content')
       expect(wiki).to receive(:slug).and_return('nested/page')
       expect(wiki).to receive(:repository).and_return(wiki_repository)
-      helper.instance_variable_set(:@project_wiki, wiki)
+      helper.instance_variable_set(:@wiki, wiki)
     end
 
     context 'when file is Markdown' do
diff --git a/spec/helpers/namespaces_helper_spec.rb b/spec/helpers/namespaces_helper_spec.rb
index 36465069311..ebce296d7c2 100644
--- a/spec/helpers/namespaces_helper_spec.rb
+++ b/spec/helpers/namespaces_helper_spec.rb
@@ -174,4 +174,96 @@ describe NamespacesHelper do
       end
     end
   end
+
+  describe '#namespace_storage_alert' do
+    subject { helper.namespace_storage_alert(namespace) }
+
+    let(:namespace) { build(:namespace) }
+
+    let(:payload) do
+      {
+        alert_level: :info,
+        usage_message: "Usage",
+        explanation_message: "Explanation",
+        root_namespace: namespace
+      }
+    end
+
+    before do
+      allow(helper).to receive(:current_user).and_return(admin)
+      allow_next_instance_of(Namespaces::CheckStorageSizeService, namespace, admin) do |check_storage_size_service|
+        expect(check_storage_size_service).to receive(:execute).and_return(ServiceResponse.success(payload: payload))
+      end
+    end
+
+    context 'when payload is not empty and no cookie is set' do
+      it { is_expected.to eq(payload) }
+    end
+
+    context 'when there is no current_user' do
+      before do
+        allow(helper).to receive(:current_user).and_return(nil)
+      end
+
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when payload is empty' do
+      let(:payload) { {} }
+
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when cookie is set' do
+      before do
+        helper.request.cookies["hide_storage_limit_alert_#{namespace.id}_info"] = 'true'
+      end
+
+      it { is_expected.to eq({}) }
+    end
+
+    context 'when payload is empty and cookie is set' do
+      let(:payload) { {} }
+
+      before do
+        helper.request.cookies["hide_storage_limit_alert_#{namespace.id}_info"] = 'true'
+      end
+
+      it { is_expected.to eq({}) }
+    end
+  end
+
+  describe '#namespace_storage_alert_style' do
+    using RSpec::Parameterized::TableSyntax
+
+    subject { helper.namespace_storage_alert_style(alert_level) }
+
+    where(:alert_level, :result) do
+      :info      | 'info'
+      :warning   | 'warning'
+      :error     | 'danger'
+      :alert     | 'danger'
+    end
+
+    with_them do
+      it { is_expected.to eq(result) }
+    end
+  end
+
+  describe '#namespace_storage_alert_icon' do
+    using RSpec::Parameterized::TableSyntax
+
+    subject { helper.namespace_storage_alert_icon(alert_level) }
+
+    where(:alert_level, :result) do
+      :info      | 'information-o'
+      :warning   | 'warning'
+      :error     | 'error'
+      :alert     | 'error'
+    end
+
+    with_them do
+      it { is_expected.to eq(result) }
+    end
+  end
 end
diff --git a/spec/helpers/notes_helper_spec.rb b/spec/helpers/notes_helper_spec.rb
index f074a918e7f..543a9081779 100644
--- a/spec/helpers/notes_helper_spec.rb
+++ b/spec/helpers/notes_helper_spec.rb
@@ -24,6 +24,36 @@ describe NotesHelper do
     project.add_guest(guest)
   end
 
+  describe '#note_target_title' do
+    context 'note does not exist' do
+      it 'returns nil' do
+        expect(helper.note_target_title(nil)).to be_blank
+      end
+    end
+
+    context 'target does not exist' do
+      it 'returns nil' do
+        note = Note.new
+        expect(helper.note_target_title(note)).to be_blank
+      end
+    end
+
+    context 'when given a design target' do
+      it 'returns nil' do
+        note = build_stubbed(:note_on_design)
+        expect(helper.note_target_title(note)).to be_blank
+      end
+    end
+
+    context 'when given a non-design target' do
+      it 'returns the issue title' do
+        issue = build_stubbed(:issue, title: 'Issue 1')
+        note = build_stubbed(:note, noteable: issue)
+        expect(helper.note_target_title(note)).to eq('Issue 1')
+      end
+    end
+  end
+
   describe "#notes_max_access_for_users" do
     it 'returns access levels' do
       expect(helper.note_max_access_for_user(owner_note)).to eq(Gitlab::Access::OWNER)
diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index 7e851a1af01..55f743ac683 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -117,4 +117,19 @@ describe PageLayoutHelper do
       expect(tags).to include(%q{content="foo&quot; http-equiv=&quot;refresh"})
     end
   end
+
+  describe '#search_context' do
+    subject(:search_context) { helper.search_context }
+
+    describe 'a bare controller' do
+      it 'returns an empty context' do
+        expect(search_context).to have_attributes(project: nil,
+                                                  group: nil,
+                                                  snippets: [],
+                                                  project_metadata: {},
+                                                  group_metadata: {},
+                                                  search_url: '/search')
+      end
+    end
+  end
 end
diff --git a/spec/helpers/projects/alert_management_helper_spec.rb b/spec/helpers/projects/alert_management_helper_spec.rb
index 078759de39c..49b64b316e7 100644
--- a/spec/helpers/projects/alert_management_helper_spec.rb
+++ b/spec/helpers/projects/alert_management_helper_spec.rb
@@ -69,13 +69,13 @@ describe Projects::AlertManagementHelper do
 
   describe '#alert_management_detail_data' do
     let(:alert_id) { 1 }
-    let(:new_issue_path) { new_project_issue_path(project) }
+    let(:issues_path) { project_issues_path(project) }
 
     it 'returns detail page configuration' do
       expect(helper.alert_management_detail_data(project, alert_id)).to eq(
         'alert-id' => alert_id,
         'project-path' => project_path,
-        'new-issue-path' => new_issue_path
+        'project-issues-path' => issues_path
       )
     end
   end
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 189ab1a8354..4e072f02ae0 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -5,6 +5,9 @@ require 'spec_helper'
 describe ProjectsHelper do
   include ProjectForksHelper
 
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+
   describe '#project_incident_management_setting' do
     let(:project) { create(:project) }
 
@@ -29,8 +32,8 @@ describe ProjectsHelper do
         setting = helper.project_incident_management_setting
 
         expect(setting).not_to be_persisted
+        expect(setting.create_issue).to be_falsey
         expect(setting.send_email).to be_falsey
-        expect(setting.create_issue).to be_truthy
         expect(setting.issue_template_key).to be_nil
       end
     end
@@ -500,6 +503,23 @@ describe ProjectsHelper do
     end
   end
 
+  describe '#can_view_operations_tab?' do
+    before do
+      allow(helper).to receive(:current_user).and_return(user)
+    end
+
+    subject { helper.send(:can_view_operations_tab?, user, project) }
+
+    [:read_environment, :read_cluster, :metrics_dashboard].each do |ability|
+      it 'includes operations tab' do
+        allow(helper).to receive(:can?).and_return(false)
+        allow(helper).to receive(:can?).with(user, ability, project).and_return(true)
+
+        is_expected.to be(true)
+      end
+    end
+  end
+
   describe '#show_projects' do
     let(:projects) do
       create(:project)
@@ -665,11 +685,11 @@ describe ProjectsHelper do
     end
   end
 
-  describe 'link_to_bfg' do
-    subject { helper.link_to_bfg }
+  describe 'link_to_filter_repo' do
+    subject { helper.link_to_filter_repo }
 
-    it 'generates a hardcoded link to the BFG Repo-Cleaner' do
-      result = helper.link_to_bfg
+    it 'generates a hardcoded link to git filter-repo' do
+      result = helper.link_to_filter_repo
       doc = Nokogiri::HTML.fragment(result)
 
       expect(doc.children.size).to eq(1)
@@ -682,8 +702,8 @@ describe ProjectsHelper do
         expect(link.name).to eq('a')
         expect(link[:target]).to eq('_blank')
         expect(link[:rel]).to eq('noopener noreferrer')
-        expect(link[:href]).to eq('https://rtyley.github.io/bfg-repo-cleaner/')
-        expect(link.inner_html).to eq('BFG')
+        expect(link[:href]).to eq('https://github.com/newren/git-filter-repo')
+        expect(link.inner_html).to eq('git filter-repo')
 
         expect(result).to be_html_safe
       end
diff --git a/spec/helpers/recaptcha_experiment_helper_spec.rb b/spec/helpers/recaptcha_experiment_helper_spec.rb
index 775c2caa082..a5b233e28a0 100644
--- a/spec/helpers/recaptcha_experiment_helper_spec.rb
+++ b/spec/helpers/recaptcha_experiment_helper_spec.rb
@@ -3,6 +3,12 @@
 require 'spec_helper'
 
 describe RecaptchaExperimentHelper, type: :helper do
+  let(:session) { {} }
+
+  before do
+    allow(helper).to receive(:session) { session }
+  end
+
   describe '.show_recaptcha_sign_up?' do
     context 'when reCAPTCHA is disabled' do
       it 'returns false' do
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index 6a06b012c6c..b209ed869bf 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -8,99 +8,6 @@ describe SearchHelper do
     str
   end
 
-  describe 'search_autocomplete_opts' do
-    context "with no current user" do
-      before do
-        allow(self).to receive(:current_user).and_return(nil)
-      end
-
-      it "returns nil" do
-        expect(search_autocomplete_opts("q")).to be_nil
-      end
-    end
-
-    context "with a standard user" do
-      let(:user) { create(:user) }
-
-      before do
-        allow(self).to receive(:current_user).and_return(user)
-      end
-
-      it "includes Help sections" do
-        expect(search_autocomplete_opts("hel").size).to eq(9)
-      end
-
-      it "includes default sections" do
-        expect(search_autocomplete_opts("dash").size).to eq(1)
-      end
-
-      it "does not include admin sections" do
-        expect(search_autocomplete_opts("admin").size).to eq(0)
-      end
-
-      it "does not allow regular expression in search term" do
-        expect(search_autocomplete_opts("(webhooks|api)").size).to eq(0)
-      end
-
-      it "includes the user's groups" do
-        create(:group).add_owner(user)
-        expect(search_autocomplete_opts("gro").size).to eq(1)
-      end
-
-      it "includes nested group" do
-        create(:group, :nested, name: 'foo').add_owner(user)
-        expect(search_autocomplete_opts('foo').size).to eq(1)
-      end
-
-      it "includes the user's projects" do
-        project = create(:project, namespace: create(:namespace, owner: user))
-        expect(search_autocomplete_opts(project.name).size).to eq(1)
-      end
-
-      it "includes the required project attrs" do
-        project = create(:project, namespace: create(:namespace, owner: user))
-        result = search_autocomplete_opts(project.name).first
-
-        expect(result.keys).to match_array(%i[category id value label url avatar_url])
-      end
-
-      it "includes the required group attrs" do
-        create(:group).add_owner(user)
-        result = search_autocomplete_opts("gro").first
-
-        expect(result.keys).to match_array(%i[category id label url avatar_url])
-      end
-
-      it "does not include the public group" do
-        group = create(:group)
-        expect(search_autocomplete_opts(group.name).size).to eq(0)
-      end
-
-      context "with a current project" do
-        before do
-          @project = create(:project, :repository)
-        end
-
-        it "includes project-specific sections" do
-          expect(search_autocomplete_opts("Files").size).to eq(1)
-          expect(search_autocomplete_opts("Commits").size).to eq(1)
-        end
-      end
-    end
-
-    context 'with an admin user' do
-      let(:admin) { create(:admin) }
-
-      before do
-        allow(self).to receive(:current_user).and_return(admin)
-      end
-
-      it "includes admin sections" do
-        expect(search_autocomplete_opts("admin").size).to eq(1)
-      end
-    end
-  end
-
   describe 'search_entries_info' do
     using RSpec::Parameterized::TableSyntax
 
diff --git a/spec/helpers/subscribable_banner_helper_spec.rb b/spec/helpers/subscribable_banner_helper_spec.rb
new file mode 100644
index 00000000000..75f2e32d7d8
--- /dev/null
+++ b/spec/helpers/subscribable_banner_helper_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe SubscribableBannerHelper do
+  describe '#display_subscription_banner!' do
+    it 'is over-written in EE' do
+      expect { helper.display_subscription_banner! }.not_to raise_error
+    end
+  end
+end
diff --git a/spec/helpers/milestones_helper_spec.rb b/spec/helpers/timeboxes_helper_spec.rb
index 4ce7143bdf0..6fe738914ce 100644
--- a/spec/helpers/milestones_helper_spec.rb
+++ b/spec/helpers/timeboxes_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MilestonesHelper do
+describe TimeboxesHelper do
   describe '#milestones_filter_dropdown_path' do
     let(:project) { create(:project) }
     let(:project2) { create(:project) }
@@ -39,23 +39,34 @@ describe MilestonesHelper do
     end
   end
 
-  describe "#milestone_date_range" do
-    def result_for(*args)
-      milestone_date_range(build(:milestone, *args))
-    end
-
+  describe "#timebox_date_range" do
     let(:yesterday) { Date.yesterday }
     let(:tomorrow) { yesterday + 2 }
     let(:format) { '%b %-d, %Y' }
     let(:yesterday_formatted) { yesterday.strftime(format) }
     let(:tomorrow_formatted) { tomorrow.strftime(format) }
 
-    it { expect(result_for(due_date: nil, start_date: nil)).to be_nil }
-    it { expect(result_for(due_date: tomorrow)).to eq("expires on #{tomorrow_formatted}") }
-    it { expect(result_for(due_date: yesterday)).to eq("expired on #{yesterday_formatted}") }
-    it { expect(result_for(start_date: tomorrow)).to eq("starts on #{tomorrow_formatted}") }
-    it { expect(result_for(start_date: yesterday)).to eq("started on #{yesterday_formatted}") }
-    it { expect(result_for(start_date: yesterday, due_date: tomorrow)).to eq("#{yesterday_formatted}–#{tomorrow_formatted}") }
+    context 'milestone' do
+      def result_for(*args)
+        timebox_date_range(build(:milestone, *args))
+      end
+
+      it { expect(result_for(due_date: nil, start_date: nil)).to be_nil }
+      it { expect(result_for(due_date: tomorrow)).to eq("expires on #{tomorrow_formatted}") }
+      it { expect(result_for(due_date: yesterday)).to eq("expired on #{yesterday_formatted}") }
+      it { expect(result_for(start_date: tomorrow)).to eq("starts on #{tomorrow_formatted}") }
+      it { expect(result_for(start_date: yesterday)).to eq("started on #{yesterday_formatted}") }
+      it { expect(result_for(start_date: yesterday, due_date: tomorrow)).to eq("#{yesterday_formatted}–#{tomorrow_formatted}") }
+    end
+
+    context 'iteration' do
+      # Iterations always have start and due dates, so only A-B format is expected
+      it 'formats properly' do
+        iteration = build(:iteration, start_date: yesterday, due_date: tomorrow)
+
+        expect(timebox_date_range(iteration)).to eq("#{yesterday_formatted}–#{tomorrow_formatted}")
+      end
+    end
   end
 
   describe '#milestone_counts' do
diff --git a/spec/helpers/milestones_routing_helper_spec.rb b/spec/helpers/timeboxes_routing_helper_spec.rb
index 4da589a5007..1b0eb2c0ad2 100644
--- a/spec/helpers/milestones_routing_helper_spec.rb
+++ b/spec/helpers/timeboxes_routing_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MilestonesRoutingHelper do
+describe TimeboxesRoutingHelper do
   let(:project) { build_stubbed(:project) }
   let(:group) { build_stubbed(:group) }
 
diff --git a/spec/helpers/todos_helper_spec.rb b/spec/helpers/todos_helper_spec.rb
index b09e1e2b83b..0811c2af891 100644
--- a/spec/helpers/todos_helper_spec.rb
+++ b/spec/helpers/todos_helper_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 describe TodosHelper do
   let_it_be(:user) { create(:user) }
   let_it_be(:author) { create(:user) }
-  let_it_be(:issue) { create(:issue) }
+  let_it_be(:issue) { create(:issue, title: 'Issue 1') }
   let_it_be(:design) { create(:design, issue: issue) }
   let_it_be(:note) do
     create(:note,
@@ -20,6 +20,10 @@ describe TodosHelper do
            author: author,
            note: note)
   end
+  let_it_be(:alert_todo) do
+    alert = create(:alert_management_alert, iid: 1001)
+    create(:todo, target: alert)
+  end
 
   describe '#todos_count_format' do
     it 'shows fuzzy count for 100 or more items' do
@@ -68,6 +72,41 @@ describe TodosHelper do
     end
   end
 
+  describe '#todo_target_title' do
+    context 'when the target does not exist' do
+      let(:todo) { double('Todo', target: nil) }
+
+      it 'returns an empty string' do
+        title = helper.todo_target_title(todo)
+        expect(title).to eq("")
+      end
+    end
+
+    context 'when given a design todo' do
+      let(:todo) { design_todo }
+
+      it 'returns an empty string' do
+        title = helper.todo_target_title(todo)
+        expect(title).to eq("")
+      end
+    end
+
+    context 'when given a non-design todo' do
+      let(:todo) do
+        build_stubbed(:todo, :assigned,
+        user: user,
+        project: issue.project,
+        target: issue,
+        author: author)
+      end
+
+      it 'returns the title' do
+        title = helper.todo_target_title(todo)
+        expect(title).to eq("\"Issue 1\"")
+      end
+    end
+  end
+
   describe '#todo_target_path' do
     context 'when given a design' do
       let(:todo) { design_todo }
@@ -80,6 +119,18 @@ describe TodosHelper do
         expect(path).to eq("#{issue_path}/designs/#{design.filename}##{dom_id(design_todo.note)}")
       end
     end
+
+    context 'when given an alert' do
+      let(:todo) { alert_todo }
+
+      it 'responds with an appropriate path' do
+        path = helper.todo_target_path(todo)
+
+        expect(path).to eq(
+          "/#{todo.project.full_path}/-/alert_management/#{todo.target.iid}/details"
+        )
+      end
+    end
   end
 
   describe '#todo_target_type_name' do
@@ -92,6 +143,16 @@ describe TodosHelper do
         expect(name).to eq('design')
       end
     end
+
+    context 'when given an alert todo' do
+      let(:todo) { alert_todo }
+
+      it 'responds with an appropriate target type name' do
+        name = helper.todo_target_type_name(todo)
+
+        expect(name).to eq('alert')
+      end
+    end
   end
 
   describe '#todo_types_options' do
diff --git a/spec/helpers/visibility_level_helper_spec.rb b/spec/helpers/visibility_level_helper_spec.rb
index b7a88ee5010..3b4d82c65ac 100644
--- a/spec/helpers/visibility_level_helper_spec.rb
+++ b/spec/helpers/visibility_level_helper_spec.rb
@@ -184,6 +184,84 @@ describe VisibilityLevelHelper do
     end
   end
 
+  shared_examples_for 'available visibility level' do
+    using RSpec::Parameterized::TableSyntax
+
+    let(:user) { create(:user) }
+
+    subject { helper.available_visibility_levels(form_model) }
+
+    public_vis = Gitlab::VisibilityLevel::PUBLIC
+    internal_vis = Gitlab::VisibilityLevel::INTERNAL
+    private_vis = Gitlab::VisibilityLevel::PRIVATE
+
+    where(:restricted_visibility_levels, :expected) do
+      [] | [private_vis, internal_vis, public_vis]
+      [private_vis] | [internal_vis, public_vis]
+      [private_vis, internal_vis] | [public_vis]
+      [private_vis, public_vis] | [internal_vis]
+      [internal_vis] | [private_vis, public_vis]
+      [internal_vis, private_vis] | [public_vis]
+      [internal_vis, public_vis] | [private_vis]
+      [public_vis] | [private_vis, internal_vis]
+      [public_vis, private_vis] | [internal_vis]
+      [public_vis, internal_vis] | [private_vis]
+    end
+
+    before do
+      allow(helper).to receive(:current_user) { user }
+    end
+
+    with_them do
+      before do
+        stub_application_setting(restricted_visibility_levels: restricted_visibility_levels)
+      end
+
+      it { is_expected.to eq(expected) }
+    end
+
+    it 'excludes disallowed visibility levels' do
+      stub_application_setting(restricted_visibility_levels: [])
+      allow(helper).to receive(:disallowed_visibility_level?).with(form_model, private_vis) { true }
+      allow(helper).to receive(:disallowed_visibility_level?).with(form_model, internal_vis) { false }
+      allow(helper).to receive(:disallowed_visibility_level?).with(form_model, public_vis) { false }
+
+      expect(subject).to eq([internal_vis, public_vis])
+    end
+  end
+
+  describe '#available_visibility_levels' do
+    it_behaves_like 'available visibility level' do
+      let(:form_model) { project_snippet }
+    end
+
+    it_behaves_like 'available visibility level' do
+      let(:form_model) { personal_snippet }
+    end
+
+    it_behaves_like 'available visibility level' do
+      let(:form_model) { project }
+    end
+
+    it_behaves_like 'available visibility level' do
+      let(:form_model) { group }
+    end
+  end
+
+  describe '#snippets_selected_visibility_level' do
+    let(:available_levels) { [Gitlab::VisibilityLevel::PUBLIC, Gitlab::VisibilityLevel::INTERNAL] }
+
+    it 'returns the selected visibility level' do
+      expect(helper.snippets_selected_visibility_level(available_levels, Gitlab::VisibilityLevel::PUBLIC))
+        .to eq(Gitlab::VisibilityLevel::PUBLIC)
+    end
+
+    it "fallbacks using the lowest available visibility level when selected level isn't available" do
+      expect(helper.snippets_selected_visibility_level(available_levels, Gitlab::VisibilityLevel::PRIVATE))
+       .to eq(Gitlab::VisibilityLevel::INTERNAL)
+    end
+  end
+
   describe 'multiple_visibility_levels_restricted?' do
     using RSpec::Parameterized::TableSyntax
 
diff --git a/spec/helpers/wiki_helper_spec.rb b/spec/helpers/wiki_helper_spec.rb
index 1aab01281c6..4b53823aaed 100644
--- a/spec/helpers/wiki_helper_spec.rb
+++ b/spec/helpers/wiki_helper_spec.rb
@@ -22,12 +22,12 @@ describe WikiHelper do
   end
 
   describe '#wiki_sort_controls' do
-    let(:project) { create(:project) }
-    let(:wiki_link) { helper.wiki_sort_controls(project, sort, direction) }
+    let(:wiki) { create(:project_wiki) }
+    let(:wiki_link) { helper.wiki_sort_controls(wiki, sort, direction) }
     let(:classes) { "btn btn-default has-tooltip reverse-sort-btn qa-reverse-sort rspec-reverse-sort" }
 
     def expected_link(sort, direction, icon_class)
-      path = "/#{project.full_path}/-/wikis/pages?direction=#{direction}&sort=#{sort}"
+      path = "/#{wiki.project.full_path}/-/wikis/pages?direction=#{direction}&sort=#{sort}"
 
       helper.link_to(path, type: 'button', class: classes, title: 'Sort direction') do
         helper.sprite_icon("sort-#{icon_class}", size: 16)
diff --git a/spec/initializers/actionpack_generate_old_csrf_token_spec.rb b/spec/initializers/actionpack_generate_old_csrf_token_spec.rb
new file mode 100644
index 00000000000..036f52398bb
--- /dev/null
+++ b/spec/initializers/actionpack_generate_old_csrf_token_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ActionController::Base, 'CSRF token generation patch', type: :controller do # rubocop:disable RSpec/FilePath
+  let(:fixed_seed) { SecureRandom.random_bytes(described_class::AUTHENTICITY_TOKEN_LENGTH) }
+
+  context 'global_csrf_token feature flag is enabled' do
+    it 'generates 6.0.3.1 style CSRF token', :aggregate_failures do
+      generated_token = controller.send(:form_authenticity_token)
+
+      expect(valid_authenticity_token?(generated_token)).to be_truthy
+      expect(compare_with_real_token(generated_token)).to be_falsey
+      expect(compare_with_global_token(generated_token)).to be_truthy
+    end
+  end
+
+  context 'global_csrf_token feature flag is disabled' do
+    before do
+      stub_feature_flags(global_csrf_token: false)
+    end
+
+    it 'generates 6.0.3 style CSRF token', :aggregate_failures do
+      generated_token = controller.send(:form_authenticity_token)
+
+      expect(valid_authenticity_token?(generated_token)).to be_truthy
+      expect(compare_with_real_token(generated_token)).to be_truthy
+      expect(compare_with_global_token(generated_token)).to be_falsey
+    end
+  end
+
+  def compare_with_global_token(token)
+    unmasked_token = controller.send :unmask_token, Base64.strict_decode64(token)
+
+    controller.send(:compare_with_global_token, unmasked_token, session)
+  end
+
+  def compare_with_real_token(token)
+    unmasked_token = controller.send :unmask_token, Base64.strict_decode64(token)
+
+    controller.send(:compare_with_real_token, unmasked_token, session)
+  end
+
+  def valid_authenticity_token?(token)
+    controller.send(:valid_authenticity_token?, session, token)
+  end
+end
diff --git a/spec/initializers/database_config_spec.rb b/spec/initializers/database_config_spec.rb
index 85577ce007a..7c0b280fdaf 100644
--- a/spec/initializers/database_config_spec.rb
+++ b/spec/initializers/database_config_spec.rb
@@ -48,6 +48,21 @@ describe 'Database config initializer' do
         expect { subject }.not_to change { Gitlab::Database.config['pool'] }
       end
     end
+
+    context "when specifying headroom through an ENV variable" do
+      let(:headroom) { 10 }
+
+      before do
+        stub_database_config(pool_size: 1)
+        stub_env("DB_POOL_HEADROOM", headroom)
+      end
+
+      it "adds headroom on top of the calculated size" do
+        expect { subject }.to change { Gitlab::Database.config['pool'] }
+                                .from(1)
+                                .to(max_threads + headroom)
+      end
+    end
   end
 
   context "when using single-threaded runtime" do
diff --git a/spec/initializers/google_api_client_spec.rb b/spec/initializers/google_api_client_spec.rb
deleted file mode 100644
index 44a1bc0836c..00000000000
--- a/spec/initializers/google_api_client_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe './config/initializers/google_api_client.rb' do
-  subject { Google::Apis::ContainerV1beta1 }
-
-  it 'is needed' do |example|
-    is_expected.not_to be_const_defined(:CloudRunConfig),
-      <<-MSG.strip_heredoc
-        The google-api-client gem has been upgraded!
-        Remove:
-          #{example.example_group.description}
-          #{example.file_path}
-      MSG
-  end
-end
diff --git a/spec/initializers/lograge_spec.rb b/spec/initializers/lograge_spec.rb
index c243217d2a2..f283ac100a9 100644
--- a/spec/initializers/lograge_spec.rb
+++ b/spec/initializers/lograge_spec.rb
@@ -99,7 +99,7 @@ describe 'lograge', type: :request do
   end
 
   context 'with a log subscriber' do
-    let(:subscriber) { Lograge::RequestLogSubscriber.new }
+    let(:subscriber) { Lograge::LogSubscribers::ActionController.new }
 
     let(:event) do
       ActiveSupport::Notifications::Event.new(
diff --git a/spec/javascripts/comment_type_toggle_spec.js b/spec/javascripts/comment_type_toggle_spec.js
deleted file mode 100644
index 8b1217a000f..00000000000
--- a/spec/javascripts/comment_type_toggle_spec.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import CommentTypeToggle from '~/comment_type_toggle';
-import InputSetter from '~/droplab/plugins/input_setter';
-
-describe('CommentTypeToggle', function() {
-  describe('class constructor', function() {
-    beforeEach(function() {
-      this.dropdownTrigger = {};
-      this.dropdownList = {};
-      this.noteTypeInput = {};
-      this.submitButton = {};
-      this.closeButton = {};
-
-      this.commentTypeToggle = new CommentTypeToggle({
-        dropdownTrigger: this.dropdownTrigger,
-        dropdownList: this.dropdownList,
-        noteTypeInput: this.noteTypeInput,
-        submitButton: this.submitButton,
-        closeButton: this.closeButton,
-      });
-    });
-
-    it('should set .dropdownTrigger', function() {
-      expect(this.commentTypeToggle.dropdownTrigger).toBe(this.dropdownTrigger);
-    });
-
-    it('should set .dropdownList', function() {
-      expect(this.commentTypeToggle.dropdownList).toBe(this.dropdownList);
-    });
-
-    it('should set .noteTypeInput', function() {
-      expect(this.commentTypeToggle.noteTypeInput).toBe(this.noteTypeInput);
-    });
-
-    it('should set .submitButton', function() {
-      expect(this.commentTypeToggle.submitButton).toBe(this.submitButton);
-    });
-
-    it('should set .closeButton', function() {
-      expect(this.commentTypeToggle.closeButton).toBe(this.closeButton);
-    });
-
-    it('should set .reopenButton', function() {
-      expect(this.commentTypeToggle.reopenButton).toBe(this.reopenButton);
-    });
-  });
-
-  describe('initDroplab', function() {
-    beforeEach(function() {
-      this.commentTypeToggle = {
-        dropdownTrigger: {},
-        dropdownList: {},
-        noteTypeInput: {},
-        submitButton: {},
-        closeButton: {},
-        setConfig: () => {},
-      };
-      this.config = {};
-
-      this.droplab = jasmine.createSpyObj('droplab', ['init']);
-
-      this.droplabConstructor = spyOnDependency(CommentTypeToggle, 'DropLab').and.returnValue(
-        this.droplab,
-      );
-      spyOn(this.commentTypeToggle, 'setConfig').and.returnValue(this.config);
-
-      CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle);
-    });
-
-    it('should instantiate a DropLab instance', function() {
-      expect(this.droplabConstructor).toHaveBeenCalled();
-    });
-
-    it('should set .droplab', function() {
-      expect(this.commentTypeToggle.droplab).toBe(this.droplab);
-    });
-
-    it('should call .setConfig', function() {
-      expect(this.commentTypeToggle.setConfig).toHaveBeenCalled();
-    });
-
-    it('should call DropLab.prototype.init', function() {
-      expect(this.droplab.init).toHaveBeenCalledWith(
-        this.commentTypeToggle.dropdownTrigger,
-        this.commentTypeToggle.dropdownList,
-        [InputSetter],
-        this.config,
-      );
-    });
-  });
-
-  describe('setConfig', function() {
-    describe('if no .closeButton is provided', function() {
-      beforeEach(function() {
-        this.commentTypeToggle = {
-          dropdownTrigger: {},
-          dropdownList: {},
-          noteTypeInput: {},
-          submitButton: {},
-          reopenButton: {},
-        };
-
-        this.setConfig = CommentTypeToggle.prototype.setConfig.call(this.commentTypeToggle);
-      });
-
-      it('should not add .closeButton related InputSetter config', function() {
-        expect(this.setConfig).toEqual({
-          InputSetter: [
-            {
-              input: this.commentTypeToggle.noteTypeInput,
-              valueAttribute: 'data-value',
-            },
-            {
-              input: this.commentTypeToggle.submitButton,
-              valueAttribute: 'data-submit-text',
-            },
-            {
-              input: this.commentTypeToggle.reopenButton,
-              valueAttribute: 'data-reopen-text',
-            },
-            {
-              input: this.commentTypeToggle.reopenButton,
-              valueAttribute: 'data-reopen-text',
-              inputAttribute: 'data-alternative-text',
-            },
-          ],
-        });
-      });
-    });
-
-    describe('if no .reopenButton is provided', function() {
-      beforeEach(function() {
-        this.commentTypeToggle = {
-          dropdownTrigger: {},
-          dropdownList: {},
-          noteTypeInput: {},
-          submitButton: {},
-          closeButton: {},
-        };
-
-        this.setConfig = CommentTypeToggle.prototype.setConfig.call(this.commentTypeToggle);
-      });
-
-      it('should not add .reopenButton related InputSetter config', function() {
-        expect(this.setConfig).toEqual({
-          InputSetter: [
-            {
-              input: this.commentTypeToggle.noteTypeInput,
-              valueAttribute: 'data-value',
-            },
-            {
-              input: this.commentTypeToggle.submitButton,
-              valueAttribute: 'data-submit-text',
-            },
-            {
-              input: this.commentTypeToggle.closeButton,
-              valueAttribute: 'data-close-text',
-            },
-            {
-              input: this.commentTypeToggle.closeButton,
-              valueAttribute: 'data-close-text',
-              inputAttribute: 'data-alternative-text',
-            },
-          ],
-        });
-      });
-    });
-  });
-});
diff --git a/spec/javascripts/droplab/drop_down_spec.js b/spec/javascripts/droplab/drop_down_spec.js
deleted file mode 100644
index 22346c10547..00000000000
--- a/spec/javascripts/droplab/drop_down_spec.js
+++ /dev/null
@@ -1,650 +0,0 @@
-import DropDown from '~/droplab/drop_down';
-import utils from '~/droplab/utils';
-import { SELECTED_CLASS } from '~/droplab/constants';
-
-describe('DropLab DropDown', function() {
-  describe('class constructor', function() {
-    beforeEach(function() {
-      spyOn(DropDown.prototype, 'getItems');
-      spyOn(DropDown.prototype, 'initTemplateString');
-      spyOn(DropDown.prototype, 'addEvents');
-
-      this.list = { innerHTML: 'innerHTML' };
-      this.dropdown = new DropDown(this.list);
-    });
-
-    it('sets the .hidden property to true', function() {
-      expect(this.dropdown.hidden).toBe(true);
-    });
-
-    it('sets the .list property', function() {
-      expect(this.dropdown.list).toBe(this.list);
-    });
-
-    it('calls .getItems', function() {
-      expect(DropDown.prototype.getItems).toHaveBeenCalled();
-    });
-
-    it('calls .initTemplateString', function() {
-      expect(DropDown.prototype.initTemplateString).toHaveBeenCalled();
-    });
-
-    it('calls .addEvents', function() {
-      expect(DropDown.prototype.addEvents).toHaveBeenCalled();
-    });
-
-    it('sets the .initialState property to the .list.innerHTML', function() {
-      expect(this.dropdown.initialState).toBe(this.list.innerHTML);
-    });
-
-    describe('if the list argument is a string', function() {
-      beforeEach(function() {
-        this.element = {};
-        this.selector = '.selector';
-
-        spyOn(Document.prototype, 'querySelector').and.returnValue(this.element);
-
-        this.dropdown = new DropDown(this.selector);
-      });
-
-      it('calls .querySelector with the selector string', function() {
-        expect(Document.prototype.querySelector).toHaveBeenCalledWith(this.selector);
-      });
-
-      it('sets the .list property element', function() {
-        expect(this.dropdown.list).toBe(this.element);
-      });
-    });
-  });
-
-  describe('getItems', function() {
-    beforeEach(function() {
-      this.list = { querySelectorAll: () => {} };
-      this.dropdown = { list: this.list };
-      this.nodeList = [];
-
-      spyOn(this.list, 'querySelectorAll').and.returnValue(this.nodeList);
-
-      this.getItems = DropDown.prototype.getItems.call(this.dropdown);
-    });
-
-    it('calls .querySelectorAll with a list item query', function() {
-      expect(this.list.querySelectorAll).toHaveBeenCalledWith('li');
-    });
-
-    it('sets the .items property to the returned list items', function() {
-      expect(this.dropdown.items).toEqual(jasmine.any(Array));
-    });
-
-    it('returns the .items', function() {
-      expect(this.getItems).toEqual(jasmine.any(Array));
-    });
-  });
-
-  describe('initTemplateString', function() {
-    beforeEach(function() {
-      this.items = [{ outerHTML: '<a></a>' }, { outerHTML: '<img>' }];
-      this.dropdown = { items: this.items };
-
-      DropDown.prototype.initTemplateString.call(this.dropdown);
-    });
-
-    it('should set .templateString to the last items .outerHTML', function() {
-      expect(this.dropdown.templateString).toBe(this.items[1].outerHTML);
-    });
-
-    it('should not set .templateString to a non-last items .outerHTML', function() {
-      expect(this.dropdown.templateString).not.toBe(this.items[0].outerHTML);
-    });
-
-    describe('if .items is not set', function() {
-      beforeEach(function() {
-        this.dropdown = { getItems: () => {} };
-
-        spyOn(this.dropdown, 'getItems').and.returnValue([]);
-
-        DropDown.prototype.initTemplateString.call(this.dropdown);
-      });
-
-      it('should call .getItems', function() {
-        expect(this.dropdown.getItems).toHaveBeenCalled();
-      });
-    });
-
-    describe('if items array is empty', function() {
-      beforeEach(function() {
-        this.dropdown = { items: [] };
-
-        DropDown.prototype.initTemplateString.call(this.dropdown);
-      });
-
-      it('should set .templateString to an empty string', function() {
-        expect(this.dropdown.templateString).toBe('');
-      });
-    });
-  });
-
-  describe('clickEvent', function() {
-    beforeEach(function() {
-      this.classList = jasmine.createSpyObj('classList', ['contains']);
-      this.list = { dispatchEvent: () => {} };
-      this.dropdown = {
-        hideOnClick: true,
-        hide: () => {},
-        list: this.list,
-        addSelectedClass: () => {},
-      };
-      this.event = {
-        preventDefault: () => {},
-        target: {
-          classList: this.classList,
-          closest: () => null,
-        },
-      };
-      this.customEvent = {};
-      this.dummyListItem = document.createElement('li');
-      spyOn(this.event.target, 'closest').and.callFake(selector => {
-        if (selector === 'li') {
-          return this.dummyListItem;
-        }
-
-        return null;
-      });
-
-      spyOn(this.dropdown, 'hide');
-      spyOn(this.dropdown, 'addSelectedClass');
-      spyOn(this.list, 'dispatchEvent');
-      spyOn(this.event, 'preventDefault');
-      spyOn(window, 'CustomEvent').and.returnValue(this.customEvent);
-      this.classList.contains.and.returnValue(false);
-    });
-
-    it('should call event.target.closest', function() {
-      DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-      expect(this.event.target.closest).toHaveBeenCalledWith('.droplab-item-ignore');
-      expect(this.event.target.closest).toHaveBeenCalledWith('li');
-    });
-
-    it('should call addSelectedClass', function() {
-      DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-      expect(this.dropdown.addSelectedClass).toHaveBeenCalledWith(this.dummyListItem);
-    });
-
-    it('should call .preventDefault', function() {
-      DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-      expect(this.event.preventDefault).toHaveBeenCalled();
-    });
-
-    it('should call .hide', function() {
-      DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-      expect(this.dropdown.hide).toHaveBeenCalled();
-    });
-
-    it('should construct CustomEvent', function() {
-      DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-      expect(window.CustomEvent).toHaveBeenCalledWith('click.dl', jasmine.any(Object));
-    });
-
-    it('should call .dispatchEvent with the customEvent', function() {
-      DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-      expect(this.list.dispatchEvent).toHaveBeenCalledWith(this.customEvent);
-    });
-
-    describe('if the target is a UL element', function() {
-      beforeEach(function() {
-        this.event.target = document.createElement('ul');
-
-        spyOn(this.event.target, 'closest');
-      });
-
-      it('should return immediately', function() {
-        DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-        expect(this.event.target.closest).not.toHaveBeenCalled();
-        expect(this.dropdown.addSelectedClass).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('if the target has the droplab-item-ignore class', function() {
-      beforeEach(function() {
-        this.ignoredButton = document.createElement('button');
-        this.ignoredButton.classList.add('droplab-item-ignore');
-        this.event.target = this.ignoredButton;
-
-        spyOn(this.ignoredButton, 'closest').and.callThrough();
-      });
-
-      it('does not select element', function() {
-        DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-        expect(this.ignoredButton.closest.calls.count()).toBe(1);
-        expect(this.ignoredButton.closest).toHaveBeenCalledWith('.droplab-item-ignore');
-        expect(this.dropdown.addSelectedClass).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('if no selected element exists', function() {
-      beforeEach(function() {
-        this.event.preventDefault.calls.reset();
-        this.dummyListItem = null;
-      });
-
-      it('should return before .preventDefault is called', function() {
-        DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-        expect(this.event.preventDefault).not.toHaveBeenCalled();
-        expect(this.dropdown.addSelectedClass).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('if hideOnClick is false', () => {
-      beforeEach(function() {
-        this.dropdown.hideOnClick = false;
-        this.dropdown.hide.calls.reset();
-      });
-
-      it('should not call .hide', function() {
-        DropDown.prototype.clickEvent.call(this.dropdown, this.event);
-
-        expect(this.dropdown.hide).not.toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('addSelectedClass', function() {
-    beforeEach(function() {
-      this.items = Array(4).forEach((item, i) => {
-        this.items[i] = { classList: { add: () => {} } };
-        spyOn(this.items[i].classList, 'add');
-      });
-      this.selected = { classList: { add: () => {} } };
-      this.dropdown = { removeSelectedClasses: () => {} };
-
-      spyOn(this.dropdown, 'removeSelectedClasses');
-      spyOn(this.selected.classList, 'add');
-
-      DropDown.prototype.addSelectedClass.call(this.dropdown, this.selected);
-    });
-
-    it('should call .removeSelectedClasses', function() {
-      expect(this.dropdown.removeSelectedClasses).toHaveBeenCalled();
-    });
-
-    it('should call .classList.add', function() {
-      expect(this.selected.classList.add).toHaveBeenCalledWith(SELECTED_CLASS);
-    });
-  });
-
-  describe('removeSelectedClasses', function() {
-    beforeEach(function() {
-      this.items = Array(4);
-      this.items.forEach((item, i) => {
-        this.items[i] = { classList: { add: () => {} } };
-        spyOn(this.items[i].classList, 'add');
-      });
-      this.dropdown = { items: this.items };
-
-      DropDown.prototype.removeSelectedClasses.call(this.dropdown);
-    });
-
-    it('should call .classList.remove for all items', function() {
-      this.items.forEach((item, i) => {
-        expect(this.items[i].classList.add).toHaveBeenCalledWith(SELECTED_CLASS);
-      });
-    });
-
-    describe('if .items is not set', function() {
-      beforeEach(function() {
-        this.dropdown = { getItems: () => {} };
-
-        spyOn(this.dropdown, 'getItems').and.returnValue([]);
-
-        DropDown.prototype.removeSelectedClasses.call(this.dropdown);
-      });
-
-      it('should call .getItems', function() {
-        expect(this.dropdown.getItems).toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('addEvents', function() {
-    beforeEach(function() {
-      this.list = {
-        addEventListener: () => {},
-        querySelectorAll: () => [],
-      };
-      this.dropdown = {
-        list: this.list,
-        clickEvent: () => {},
-        closeDropdown: () => {},
-        eventWrapper: {},
-      };
-    });
-
-    it('should call .addEventListener', function() {
-      spyOn(this.list, 'addEventListener');
-
-      DropDown.prototype.addEvents.call(this.dropdown);
-
-      expect(this.list.addEventListener).toHaveBeenCalledWith('click', jasmine.any(Function));
-      expect(this.list.addEventListener).toHaveBeenCalledWith('keyup', jasmine.any(Function));
-    });
-  });
-
-  describe('setData', function() {
-    beforeEach(function() {
-      this.dropdown = { render: () => {} };
-      this.data = ['data'];
-
-      spyOn(this.dropdown, 'render');
-
-      DropDown.prototype.setData.call(this.dropdown, this.data);
-    });
-
-    it('should set .data', function() {
-      expect(this.dropdown.data).toBe(this.data);
-    });
-
-    it('should call .render with the .data', function() {
-      expect(this.dropdown.render).toHaveBeenCalledWith(this.data);
-    });
-  });
-
-  describe('addData', function() {
-    beforeEach(function() {
-      this.dropdown = { render: () => {}, data: ['data1'] };
-      this.data = ['data2'];
-
-      spyOn(this.dropdown, 'render');
-      spyOn(Array.prototype, 'concat').and.callThrough();
-
-      DropDown.prototype.addData.call(this.dropdown, this.data);
-    });
-
-    it('should call .concat with data', function() {
-      expect(Array.prototype.concat).toHaveBeenCalledWith(this.data);
-    });
-
-    it('should set .data with concatination', function() {
-      expect(this.dropdown.data).toEqual(['data1', 'data2']);
-    });
-
-    it('should call .render with the .data', function() {
-      expect(this.dropdown.render).toHaveBeenCalledWith(['data1', 'data2']);
-    });
-
-    describe('if .data is undefined', function() {
-      beforeEach(function() {
-        this.dropdown = { render: () => {}, data: undefined };
-        this.data = ['data2'];
-
-        spyOn(this.dropdown, 'render');
-
-        DropDown.prototype.addData.call(this.dropdown, this.data);
-      });
-
-      it('should set .data with concatination', function() {
-        expect(this.dropdown.data).toEqual(['data2']);
-      });
-    });
-  });
-
-  describe('render', function() {
-    beforeEach(function() {
-      this.renderableList = {};
-      this.list = {
-        querySelector: q => {
-          if (q === '.filter-dropdown-loading') {
-            return false;
-          }
-          return this.renderableList;
-        },
-        dispatchEvent: () => {},
-      };
-      this.dropdown = { renderChildren: () => {}, list: this.list };
-      this.data = [0, 1];
-      this.customEvent = {};
-
-      spyOn(this.dropdown, 'renderChildren').and.callFake(data => data);
-      spyOn(this.list, 'dispatchEvent');
-      spyOn(this.data, 'map').and.callThrough();
-      spyOn(window, 'CustomEvent').and.returnValue(this.customEvent);
-
-      DropDown.prototype.render.call(this.dropdown, this.data);
-    });
-
-    it('should call .map', function() {
-      expect(this.data.map).toHaveBeenCalledWith(jasmine.any(Function));
-    });
-
-    it('should call .renderChildren for each data item', function() {
-      expect(this.dropdown.renderChildren.calls.count()).toBe(this.data.length);
-    });
-
-    it('sets the renderableList .innerHTML', function() {
-      expect(this.renderableList.innerHTML).toBe('01');
-    });
-
-    it('should call render.dl', function() {
-      expect(window.CustomEvent).toHaveBeenCalledWith('render.dl', jasmine.any(Object));
-    });
-
-    it('should call dispatchEvent with the customEvent', function() {
-      expect(this.list.dispatchEvent).toHaveBeenCalledWith(this.customEvent);
-    });
-
-    describe('if no data argument is passed', function() {
-      beforeEach(function() {
-        this.data.map.calls.reset();
-        this.dropdown.renderChildren.calls.reset();
-
-        DropDown.prototype.render.call(this.dropdown, undefined);
-      });
-
-      it('should not call .map', function() {
-        expect(this.data.map).not.toHaveBeenCalled();
-      });
-
-      it('should not call .renderChildren', function() {
-        expect(this.dropdown.renderChildren).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('if no dynamic list is present', function() {
-      beforeEach(function() {
-        this.list = { querySelector: () => {}, dispatchEvent: () => {} };
-        this.dropdown = { renderChildren: () => {}, list: this.list };
-        this.data = [0, 1];
-
-        spyOn(this.dropdown, 'renderChildren').and.callFake(data => data);
-        spyOn(this.list, 'querySelector');
-        spyOn(this.data, 'map').and.callThrough();
-
-        DropDown.prototype.render.call(this.dropdown, this.data);
-      });
-
-      it('sets the .list .innerHTML', function() {
-        expect(this.list.innerHTML).toBe('01');
-      });
-    });
-  });
-
-  describe('renderChildren', function() {
-    beforeEach(function() {
-      this.templateString = 'templateString';
-      this.dropdown = { templateString: this.templateString };
-      this.data = { droplab_hidden: true };
-      this.html = 'html';
-      this.template = { firstChild: { outerHTML: 'outerHTML', style: {} } };
-
-      spyOn(utils, 'template').and.returnValue(this.html);
-      spyOn(document, 'createElement').and.returnValue(this.template);
-      spyOn(DropDown, 'setImagesSrc');
-
-      this.renderChildren = DropDown.prototype.renderChildren.call(this.dropdown, this.data);
-    });
-
-    it('should call utils.t with .templateString and data', function() {
-      expect(utils.template).toHaveBeenCalledWith(this.templateString, this.data);
-    });
-
-    it('should call document.createElement', function() {
-      expect(document.createElement).toHaveBeenCalledWith('div');
-    });
-
-    it('should set the templates .innerHTML to the HTML', function() {
-      expect(this.template.innerHTML).toBe(this.html);
-    });
-
-    it('should call .setImagesSrc with the template', function() {
-      expect(DropDown.setImagesSrc).toHaveBeenCalledWith(this.template);
-    });
-
-    it('should set the template display to none', function() {
-      expect(this.template.firstChild.style.display).toBe('none');
-    });
-
-    it('should return the templates .firstChild.outerHTML', function() {
-      expect(this.renderChildren).toBe(this.template.firstChild.outerHTML);
-    });
-
-    describe('if droplab_hidden is false', function() {
-      beforeEach(function() {
-        this.data = { droplab_hidden: false };
-        this.renderChildren = DropDown.prototype.renderChildren.call(this.dropdown, this.data);
-      });
-
-      it('should set the template display to block', function() {
-        expect(this.template.firstChild.style.display).toBe('block');
-      });
-    });
-  });
-
-  describe('setImagesSrc', function() {
-    beforeEach(function() {
-      this.template = { querySelectorAll: () => {} };
-
-      spyOn(this.template, 'querySelectorAll').and.returnValue([]);
-
-      DropDown.setImagesSrc(this.template);
-    });
-
-    it('should call .querySelectorAll', function() {
-      expect(this.template.querySelectorAll).toHaveBeenCalledWith('img[data-src]');
-    });
-  });
-
-  describe('show', function() {
-    beforeEach(function() {
-      this.list = { style: {} };
-      this.dropdown = { list: this.list, hidden: true };
-
-      DropDown.prototype.show.call(this.dropdown);
-    });
-
-    it('it should set .list display to block', function() {
-      expect(this.list.style.display).toBe('block');
-    });
-
-    it('it should set .hidden to false', function() {
-      expect(this.dropdown.hidden).toBe(false);
-    });
-
-    describe('if .hidden is false', function() {
-      beforeEach(function() {
-        this.list = { style: {} };
-        this.dropdown = { list: this.list, hidden: false };
-
-        this.show = DropDown.prototype.show.call(this.dropdown);
-      });
-
-      it('should return undefined', function() {
-        expect(this.show).toEqual(undefined);
-      });
-
-      it('should not set .list display to block', function() {
-        expect(this.list.style.display).not.toEqual('block');
-      });
-    });
-  });
-
-  describe('hide', function() {
-    beforeEach(function() {
-      this.list = { style: {} };
-      this.dropdown = { list: this.list };
-
-      DropDown.prototype.hide.call(this.dropdown);
-    });
-
-    it('it should set .list display to none', function() {
-      expect(this.list.style.display).toBe('none');
-    });
-
-    it('it should set .hidden to true', function() {
-      expect(this.dropdown.hidden).toBe(true);
-    });
-  });
-
-  describe('toggle', function() {
-    beforeEach(function() {
-      this.hidden = true;
-      this.dropdown = { hidden: this.hidden, show: () => {}, hide: () => {} };
-
-      spyOn(this.dropdown, 'show');
-      spyOn(this.dropdown, 'hide');
-
-      DropDown.prototype.toggle.call(this.dropdown);
-    });
-
-    it('should call .show', function() {
-      expect(this.dropdown.show).toHaveBeenCalled();
-    });
-
-    describe('if .hidden is false', function() {
-      beforeEach(function() {
-        this.hidden = false;
-        this.dropdown = { hidden: this.hidden, show: () => {}, hide: () => {} };
-
-        spyOn(this.dropdown, 'show');
-        spyOn(this.dropdown, 'hide');
-
-        DropDown.prototype.toggle.call(this.dropdown);
-      });
-
-      it('should call .hide', function() {
-        expect(this.dropdown.hide).toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('destroy', function() {
-    beforeEach(function() {
-      this.list = { removeEventListener: () => {} };
-      this.eventWrapper = { clickEvent: 'clickEvent' };
-      this.dropdown = { list: this.list, hide: () => {}, eventWrapper: this.eventWrapper };
-
-      spyOn(this.list, 'removeEventListener');
-      spyOn(this.dropdown, 'hide');
-
-      DropDown.prototype.destroy.call(this.dropdown);
-    });
-
-    it('it should call .hide', function() {
-      expect(this.dropdown.hide).toHaveBeenCalled();
-    });
-
-    it('it should call .removeEventListener', function() {
-      expect(this.list.removeEventListener).toHaveBeenCalledWith(
-        'click',
-        this.eventWrapper.clickEvent,
-      );
-    });
-  });
-});
diff --git a/spec/javascripts/droplab/hook_spec.js b/spec/javascripts/droplab/hook_spec.js
deleted file mode 100644
index 40470436f19..00000000000
--- a/spec/javascripts/droplab/hook_spec.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import Hook from '~/droplab/hook';
-
-describe('Hook', function() {
-  describe('class constructor', function() {
-    beforeEach(function() {
-      this.trigger = { id: 'id' };
-      this.list = {};
-      this.plugins = {};
-      this.config = {};
-      this.dropdown = {};
-
-      this.dropdownConstructor = spyOnDependency(Hook, 'DropDown').and.returnValue(this.dropdown);
-
-      this.hook = new Hook(this.trigger, this.list, this.plugins, this.config);
-    });
-
-    it('should set .trigger', function() {
-      expect(this.hook.trigger).toBe(this.trigger);
-    });
-
-    it('should set .list', function() {
-      expect(this.hook.list).toBe(this.dropdown);
-    });
-
-    it('should call DropDown constructor', function() {
-      expect(this.dropdownConstructor).toHaveBeenCalledWith(this.list, this.config);
-    });
-
-    it('should set .type', function() {
-      expect(this.hook.type).toBe('Hook');
-    });
-
-    it('should set .event', function() {
-      expect(this.hook.event).toBe('click');
-    });
-
-    it('should set .plugins', function() {
-      expect(this.hook.plugins).toBe(this.plugins);
-    });
-
-    it('should set .config', function() {
-      expect(this.hook.config).toBe(this.config);
-    });
-
-    it('should set .id', function() {
-      expect(this.hook.id).toBe(this.trigger.id);
-    });
-
-    describe('if config argument is undefined', function() {
-      beforeEach(function() {
-        this.config = undefined;
-
-        this.hook = new Hook(this.trigger, this.list, this.plugins, this.config);
-      });
-
-      it('should set .config to an empty object', function() {
-        expect(this.hook.config).toEqual({});
-      });
-    });
-
-    describe('if plugins argument is undefined', function() {
-      beforeEach(function() {
-        this.plugins = undefined;
-
-        this.hook = new Hook(this.trigger, this.list, this.plugins, this.config);
-      });
-
-      it('should set .plugins to an empty array', function() {
-        expect(this.hook.plugins).toEqual([]);
-      });
-    });
-  });
-});
diff --git a/spec/javascripts/droplab/plugins/input_setter_spec.js b/spec/javascripts/droplab/plugins/input_setter_spec.js
deleted file mode 100644
index 711e0486bff..00000000000
--- a/spec/javascripts/droplab/plugins/input_setter_spec.js
+++ /dev/null
@@ -1,214 +0,0 @@
-import InputSetter from '~/droplab/plugins/input_setter';
-
-describe('InputSetter', function() {
-  describe('init', function() {
-    beforeEach(function() {
-      this.config = { InputSetter: {} };
-      this.hook = { config: this.config };
-      this.inputSetter = jasmine.createSpyObj('inputSetter', ['addEvents']);
-
-      InputSetter.init.call(this.inputSetter, this.hook);
-    });
-
-    it('should set .hook', function() {
-      expect(this.inputSetter.hook).toBe(this.hook);
-    });
-
-    it('should set .config', function() {
-      expect(this.inputSetter.config).toBe(this.config.InputSetter);
-    });
-
-    it('should set .eventWrapper', function() {
-      expect(this.inputSetter.eventWrapper).toEqual({});
-    });
-
-    it('should call .addEvents', function() {
-      expect(this.inputSetter.addEvents).toHaveBeenCalled();
-    });
-
-    describe('if config.InputSetter is not set', function() {
-      beforeEach(function() {
-        this.config = { InputSetter: undefined };
-        this.hook = { config: this.config };
-
-        InputSetter.init.call(this.inputSetter, this.hook);
-      });
-
-      it('should set .config to an empty object', function() {
-        expect(this.inputSetter.config).toEqual({});
-      });
-
-      it('should set hook.config to an empty object', function() {
-        expect(this.hook.config.InputSetter).toEqual({});
-      });
-    });
-  });
-
-  describe('addEvents', function() {
-    beforeEach(function() {
-      this.hook = { list: { list: jasmine.createSpyObj('list', ['addEventListener']) } };
-      this.inputSetter = { eventWrapper: {}, hook: this.hook, setInputs: () => {} };
-
-      InputSetter.addEvents.call(this.inputSetter);
-    });
-
-    it('should set .eventWrapper.setInputs', function() {
-      expect(this.inputSetter.eventWrapper.setInputs).toEqual(jasmine.any(Function));
-    });
-
-    it('should call .addEventListener', function() {
-      expect(this.hook.list.list.addEventListener).toHaveBeenCalledWith(
-        'click.dl',
-        this.inputSetter.eventWrapper.setInputs,
-      );
-    });
-  });
-
-  describe('removeEvents', function() {
-    beforeEach(function() {
-      this.hook = { list: { list: jasmine.createSpyObj('list', ['removeEventListener']) } };
-      this.eventWrapper = jasmine.createSpyObj('eventWrapper', ['setInputs']);
-      this.inputSetter = { eventWrapper: this.eventWrapper, hook: this.hook };
-
-      InputSetter.removeEvents.call(this.inputSetter);
-    });
-
-    it('should call .removeEventListener', function() {
-      expect(this.hook.list.list.removeEventListener).toHaveBeenCalledWith(
-        'click.dl',
-        this.eventWrapper.setInputs,
-      );
-    });
-  });
-
-  describe('setInputs', function() {
-    beforeEach(function() {
-      this.event = { detail: { selected: {} } };
-      this.config = [0, 1];
-      this.inputSetter = { config: this.config, setInput: () => {} };
-
-      spyOn(this.inputSetter, 'setInput');
-
-      InputSetter.setInputs.call(this.inputSetter, this.event);
-    });
-
-    it('should call .setInput for each config element', function() {
-      const allArgs = this.inputSetter.setInput.calls.allArgs();
-
-      expect(allArgs.length).toEqual(2);
-
-      allArgs.forEach((args, i) => {
-        expect(args[0]).toBe(this.config[i]);
-        expect(args[1]).toBe(this.event.detail.selected);
-      });
-    });
-
-    describe('if config isnt an array', function() {
-      beforeEach(function() {
-        this.inputSetter = { config: {}, setInput: () => {} };
-
-        InputSetter.setInputs.call(this.inputSetter, this.event);
-      });
-
-      it('should set .config to an array with .config as the first element', function() {
-        expect(this.inputSetter.config).toEqual([{}]);
-      });
-    });
-  });
-
-  describe('setInput', function() {
-    beforeEach(function() {
-      this.selectedItem = { getAttribute: () => {} };
-      this.input = { value: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} };
-      this.config = { valueAttribute: {}, input: this.input };
-      this.inputSetter = { hook: { trigger: {} } };
-      this.newValue = 'newValue';
-
-      spyOn(this.selectedItem, 'getAttribute').and.returnValue(this.newValue);
-      spyOn(this.input, 'hasAttribute').and.returnValue(false);
-
-      InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem);
-    });
-
-    it('should call .getAttribute', function() {
-      expect(this.selectedItem.getAttribute).toHaveBeenCalledWith(this.config.valueAttribute);
-    });
-
-    it('should call .hasAttribute', function() {
-      expect(this.input.hasAttribute).toHaveBeenCalledWith(undefined);
-    });
-
-    it('should set the value of the input', function() {
-      expect(this.input.value).toBe(this.newValue);
-    });
-
-    describe('if no config.input is provided', function() {
-      beforeEach(function() {
-        this.config = { valueAttribute: {} };
-        this.trigger = { value: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} };
-        this.inputSetter = { hook: { trigger: this.trigger } };
-
-        InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem);
-      });
-
-      it('should set the value of the hook.trigger', function() {
-        expect(this.trigger.value).toBe(this.newValue);
-      });
-    });
-
-    describe('if the input tag is not INPUT', function() {
-      beforeEach(function() {
-        this.input = { textContent: 'oldValue', tagName: 'SPAN', hasAttribute: () => {} };
-        this.config = { valueAttribute: {}, input: this.input };
-
-        InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem);
-      });
-
-      it('should set the textContent of the input', function() {
-        expect(this.input.textContent).toBe(this.newValue);
-      });
-    });
-
-    describe('if there is an inputAttribute', function() {
-      beforeEach(function() {
-        this.selectedItem = { getAttribute: () => {} };
-        this.input = { id: 'oldValue', hasAttribute: () => {}, setAttribute: () => {} };
-        this.inputSetter = { hook: { trigger: {} } };
-        this.newValue = 'newValue';
-        this.inputAttribute = 'id';
-        this.config = {
-          valueAttribute: {},
-          input: this.input,
-          inputAttribute: this.inputAttribute,
-        };
-
-        spyOn(this.selectedItem, 'getAttribute').and.returnValue(this.newValue);
-        spyOn(this.input, 'hasAttribute').and.returnValue(true);
-        spyOn(this.input, 'setAttribute');
-
-        InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem);
-      });
-
-      it('should call setAttribute', function() {
-        expect(this.input.setAttribute).toHaveBeenCalledWith(this.inputAttribute, this.newValue);
-      });
-
-      it('should not set the value or textContent of the input', function() {
-        expect(this.input.value).not.toBe('newValue');
-        expect(this.input.textContent).not.toBe('newValue');
-      });
-    });
-  });
-
-  describe('destroy', function() {
-    beforeEach(function() {
-      this.inputSetter = jasmine.createSpyObj('inputSetter', ['removeEvents']);
-
-      InputSetter.destroy.call(this.inputSetter);
-    });
-
-    it('should call .removeEvents', function() {
-      expect(this.inputSetter.removeEvents).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/spec/javascripts/helpers/scroll_into_view_promise.js b/spec/javascripts/helpers/scroll_into_view_promise.js
deleted file mode 100644
index 0edea2103da..00000000000
--- a/spec/javascripts/helpers/scroll_into_view_promise.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export default function scrollIntoViewPromise(intersectionTarget, timeout = 100, maxTries = 5) {
-  return new Promise((resolve, reject) => {
-    let intersectionObserver;
-    let retry = 0;
-
-    const intervalId = setInterval(() => {
-      if (retry >= maxTries) {
-        intersectionObserver.disconnect();
-        clearInterval(intervalId);
-        reject(new Error(`Could not scroll target into viewPort within ${timeout * maxTries} ms`));
-      }
-      retry += 1;
-      intersectionTarget.scrollIntoView();
-    }, timeout);
-
-    intersectionObserver = new IntersectionObserver(entries => {
-      if (entries[0].isIntersecting) {
-        intersectionObserver.disconnect();
-        clearInterval(intervalId);
-        resolve();
-      }
-    });
-
-    intersectionObserver.observe(intersectionTarget);
-
-    intersectionTarget.scrollIntoView();
-  });
-}
diff --git a/spec/javascripts/helpers/vuex_action_helper_spec.js b/spec/javascripts/helpers/vuex_action_helper_spec.js
deleted file mode 100644
index 09f0bd395c3..00000000000
--- a/spec/javascripts/helpers/vuex_action_helper_spec.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import MockAdapter from 'axios-mock-adapter';
-import { TEST_HOST } from 'spec/test_constants';
-import axios from '~/lib/utils/axios_utils';
-import testAction from './vuex_action_helper';
-
-describe('VueX test helper (testAction)', () => {
-  let originalExpect;
-  let assertion;
-  let mock;
-  const noop = () => {};
-
-  beforeAll(() => {
-    mock = new MockAdapter(axios);
-    /*
-    In order to test the helper properly, we need to overwrite the jasmine `expect` helper.
-    We test that the testAction helper properly passes the dispatched actions/committed mutations
-    to the jasmine helper.
-     */
-    originalExpect = expect;
-    assertion = null;
-    global.expect = actual => ({
-      toEqual: () => {
-        originalExpect(actual).toEqual(assertion);
-      },
-    });
-  });
-
-  afterAll(() => {
-    mock.restore();
-    global.expect = originalExpect;
-  });
-
-  it('should properly pass on state and payload', () => {
-    const exampleState = { FOO: 12, BAR: 3 };
-    const examplePayload = { BAZ: 73, BIZ: 55 };
-
-    const action = ({ state }, payload) => {
-      originalExpect(state).toEqual(exampleState);
-      originalExpect(payload).toEqual(examplePayload);
-    };
-
-    assertion = { mutations: [], actions: [] };
-
-    testAction(action, examplePayload, exampleState);
-  });
-
-  describe('should work with synchronous actions', () => {
-    it('committing mutation', () => {
-      const action = ({ commit }) => {
-        commit('MUTATION');
-      };
-
-      assertion = { mutations: [{ type: 'MUTATION' }], actions: [] };
-
-      testAction(action, null, {}, assertion.mutations, assertion.actions, noop);
-    });
-
-    it('dispatching action', () => {
-      const action = ({ dispatch }) => {
-        dispatch('ACTION');
-      };
-
-      assertion = { actions: [{ type: 'ACTION' }], mutations: [] };
-
-      testAction(action, null, {}, assertion.mutations, assertion.actions, noop);
-    });
-
-    it('work with jasmine done once finished', done => {
-      assertion = { mutations: [], actions: [] };
-
-      testAction(noop, null, {}, assertion.mutations, assertion.actions, done);
-    });
-
-    it('provide promise interface', done => {
-      assertion = { mutations: [], actions: [] };
-
-      testAction(noop, null, {}, assertion.mutations, assertion.actions)
-        .then(done)
-        .catch(done.fail);
-    });
-  });
-
-  describe('should work with promise based actions (fetch action)', () => {
-    let lastError;
-    const data = { FOO: 'BAR' };
-
-    const promiseAction = ({ commit, dispatch }) => {
-      dispatch('ACTION');
-
-      return axios
-        .get(TEST_HOST)
-        .catch(error => {
-          commit('ERROR');
-          lastError = error;
-          throw error;
-        })
-        .then(() => {
-          commit('SUCCESS');
-          return data;
-        });
-    };
-
-    beforeEach(() => {
-      lastError = null;
-    });
-
-    it('work with jasmine done once finished', done => {
-      mock.onGet(TEST_HOST).replyOnce(200, 42);
-
-      assertion = { mutations: [{ type: 'SUCCESS' }], actions: [{ type: 'ACTION' }] };
-
-      testAction(promiseAction, null, {}, assertion.mutations, assertion.actions, done);
-    });
-
-    it('return original data of successful promise while checking actions/mutations', done => {
-      mock.onGet(TEST_HOST).replyOnce(200, 42);
-
-      assertion = { mutations: [{ type: 'SUCCESS' }], actions: [{ type: 'ACTION' }] };
-
-      testAction(promiseAction, null, {}, assertion.mutations, assertion.actions)
-        .then(res => {
-          originalExpect(res).toEqual(data);
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('return original error of rejected promise while checking actions/mutations', done => {
-      mock.onGet(TEST_HOST).replyOnce(500, '');
-
-      assertion = { mutations: [{ type: 'ERROR' }], actions: [{ type: 'ACTION' }] };
-
-      testAction(promiseAction, null, {}, assertion.mutations, assertion.actions)
-        .then(done.fail)
-        .catch(error => {
-          originalExpect(error).toBe(lastError);
-          done();
-        });
-    });
-  });
-
-  it('should work with async actions not returning promises', done => {
-    const data = { FOO: 'BAR' };
-
-    const promiseAction = ({ commit, dispatch }) => {
-      dispatch('ACTION');
-
-      axios
-        .get(TEST_HOST)
-        .then(() => {
-          commit('SUCCESS');
-          return data;
-        })
-        .catch(error => {
-          commit('ERROR');
-          throw error;
-        });
-    };
-
-    mock.onGet(TEST_HOST).replyOnce(200, 42);
-
-    assertion = { mutations: [{ type: 'SUCCESS' }], actions: [{ type: 'ACTION' }] };
-
-    testAction(promiseAction, null, {}, assertion.mutations, assertion.actions, done);
-  });
-});
diff --git a/spec/javascripts/helpers/wait_for_attribute_change.js b/spec/javascripts/helpers/wait_for_attribute_change.js
deleted file mode 100644
index 8f22d569222..00000000000
--- a/spec/javascripts/helpers/wait_for_attribute_change.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export default (domElement, attributes, timeout = 1500) =>
-  new Promise((resolve, reject) => {
-    let observer;
-    const timeoutId = setTimeout(() => {
-      observer.disconnect();
-      reject(new Error(`Could not see an attribute update within ${timeout} ms`));
-    }, timeout);
-
-    observer = new MutationObserver(() => {
-      clearTimeout(timeoutId);
-      observer.disconnect();
-      resolve();
-    });
-
-    observer.observe(domElement, { attributes: true, attributeFilter: attributes });
-  });
diff --git a/spec/javascripts/ide/components/jobs/detail_spec.js b/spec/javascripts/ide/components/jobs/detail_spec.js
deleted file mode 100644
index a4e6b81acba..00000000000
--- a/spec/javascripts/ide/components/jobs/detail_spec.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import Vue from 'vue';
-import JobDetail from '~/ide/components/jobs/detail.vue';
-import { createStore } from '~/ide/stores';
-import { createComponentWithStore } from '../../../helpers/vue_mount_component_helper';
-import { jobs } from '../../mock_data';
-
-describe('IDE jobs detail view', () => {
-  const Component = Vue.extend(JobDetail);
-  let vm;
-
-  beforeEach(() => {
-    const store = createStore();
-
-    store.state.pipelines.detailJob = {
-      ...jobs[0],
-      isLoading: true,
-      output: 'testing',
-      rawPath: `${gl.TEST_HOST}/raw`,
-    };
-
-    vm = createComponentWithStore(Component, store);
-
-    spyOn(vm, 'fetchJobTrace').and.returnValue(Promise.resolve());
-
-    vm = vm.$mount();
-
-    spyOn(vm.$refs.buildTrace, 'scrollTo');
-  });
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('calls fetchJobTrace on mount', () => {
-    expect(vm.fetchJobTrace).toHaveBeenCalled();
-  });
-
-  it('scrolls to bottom on mount', done => {
-    setTimeout(() => {
-      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalled();
-
-      done();
-    });
-  });
-
-  it('renders job output', () => {
-    expect(vm.$el.querySelector('.bash').textContent).toContain('testing');
-  });
-
-  it('renders empty message output', done => {
-    vm.$store.state.pipelines.detailJob.output = '';
-
-    vm.$nextTick(() => {
-      expect(vm.$el.querySelector('.bash').textContent).toContain('No messages were logged');
-
-      done();
-    });
-  });
-
-  it('renders loading icon', () => {
-    expect(vm.$el.querySelector('.build-loader-animation')).not.toBe(null);
-    expect(vm.$el.querySelector('.build-loader-animation').style.display).toBe('');
-  });
-
-  it('hides output when loading', () => {
-    expect(vm.$el.querySelector('.bash')).not.toBe(null);
-    expect(vm.$el.querySelector('.bash').style.display).toBe('none');
-  });
-
-  it('hide loading icon when isLoading is false', done => {
-    vm.$store.state.pipelines.detailJob.isLoading = false;
-
-    vm.$nextTick(() => {
-      expect(vm.$el.querySelector('.build-loader-animation').style.display).toBe('none');
-
-      done();
-    });
-  });
-
-  it('resets detailJob when clicking header button', () => {
-    spyOn(vm, 'setDetailJob');
-
-    vm.$el.querySelector('.btn').click();
-
-    expect(vm.setDetailJob).toHaveBeenCalledWith(null);
-  });
-
-  it('renders raw path link', () => {
-    expect(vm.$el.querySelector('.controllers-buttons').getAttribute('href')).toBe(
-      `${gl.TEST_HOST}/raw`,
-    );
-  });
-
-  describe('scroll buttons', () => {
-    it('triggers scrollDown when clicking down button', done => {
-      spyOn(vm, 'scrollDown');
-
-      vm.$el.querySelectorAll('.btn-scroll')[1].click();
-
-      vm.$nextTick(() => {
-        expect(vm.scrollDown).toHaveBeenCalled();
-
-        done();
-      });
-    });
-
-    it('triggers scrollUp when clicking up button', done => {
-      spyOn(vm, 'scrollUp');
-
-      vm.scrollPos = 1;
-
-      vm.$nextTick()
-        .then(() => vm.$el.querySelector('.btn-scroll').click())
-        .then(() => vm.$nextTick())
-        .then(() => {
-          expect(vm.scrollUp).toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-  });
-
-  describe('scrollDown', () => {
-    it('scrolls build trace to bottom', () => {
-      spyOnProperty(vm.$refs.buildTrace, 'scrollHeight').and.returnValue(1000);
-
-      vm.scrollDown();
-
-      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalledWith(0, 1000);
-    });
-  });
-
-  describe('scrollUp', () => {
-    it('scrolls build trace to top', () => {
-      vm.scrollUp();
-
-      expect(vm.$refs.buildTrace.scrollTo).toHaveBeenCalledWith(0, 0);
-    });
-  });
-
-  describe('scrollBuildLog', () => {
-    beforeEach(() => {
-      spyOnProperty(vm.$refs.buildTrace, 'offsetHeight').and.returnValue(100);
-      spyOnProperty(vm.$refs.buildTrace, 'scrollHeight').and.returnValue(200);
-    });
-
-    it('sets scrollPos to bottom when at the bottom', done => {
-      spyOnProperty(vm.$refs.buildTrace, 'scrollTop').and.returnValue(100);
-
-      vm.scrollBuildLog();
-
-      setTimeout(() => {
-        expect(vm.scrollPos).toBe(1);
-
-        done();
-      });
-    });
-
-    it('sets scrollPos to top when at the top', done => {
-      spyOnProperty(vm.$refs.buildTrace, 'scrollTop').and.returnValue(0);
-      vm.scrollPos = 1;
-
-      vm.scrollBuildLog();
-
-      setTimeout(() => {
-        expect(vm.scrollPos).toBe(0);
-
-        done();
-      });
-    });
-
-    it('resets scrollPos when not at top or bottom', done => {
-      spyOnProperty(vm.$refs.buildTrace, 'scrollTop').and.returnValue(10);
-
-      vm.scrollBuildLog();
-
-      setTimeout(() => {
-        expect(vm.scrollPos).toBe('');
-
-        done();
-      });
-    });
-  });
-});
diff --git a/spec/javascripts/ide/components/repo_editor_spec.js b/spec/javascripts/ide/components/repo_editor_spec.js
deleted file mode 100644
index 8db29011da7..00000000000
--- a/spec/javascripts/ide/components/repo_editor_spec.js
+++ /dev/null
@@ -1,512 +0,0 @@
-import Vue from 'vue';
-import MockAdapter from 'axios-mock-adapter';
-import '~/behaviors/markdown/render_gfm';
-import axios from '~/lib/utils/axios_utils';
-import store from '~/ide/stores';
-import repoEditor from '~/ide/components/repo_editor.vue';
-import Editor from '~/ide/lib/editor';
-import { leftSidebarViews, FILE_VIEW_MODE_EDITOR, FILE_VIEW_MODE_PREVIEW } from '~/ide/constants';
-import { createComponentWithStore } from '../../helpers/vue_mount_component_helper';
-import setTimeoutPromise from '../../helpers/set_timeout_promise_helper';
-import { file, resetStore } from '../helpers';
-
-describe('RepoEditor', () => {
-  let vm;
-
-  beforeEach(done => {
-    const f = {
-      ...file(),
-      viewMode: FILE_VIEW_MODE_EDITOR,
-    };
-    const RepoEditor = Vue.extend(repoEditor);
-
-    vm = createComponentWithStore(RepoEditor, store, {
-      file: f,
-    });
-
-    f.active = true;
-    f.tempFile = true;
-
-    vm.$store.state.openFiles.push(f);
-    vm.$store.state.projects = {
-      'gitlab-org/gitlab': {
-        branches: {
-          master: {
-            name: 'master',
-            commit: {
-              id: 'abcdefgh',
-            },
-          },
-        },
-      },
-    };
-    vm.$store.state.currentProjectId = 'gitlab-org/gitlab';
-    vm.$store.state.currentBranchId = 'master';
-
-    Vue.set(vm.$store.state.entries, f.path, f);
-
-    spyOn(vm, 'getFileData').and.returnValue(Promise.resolve());
-    spyOn(vm, 'getRawFileData').and.returnValue(Promise.resolve());
-
-    vm.$mount();
-
-    Vue.nextTick(() => setTimeout(done));
-  });
-
-  afterEach(() => {
-    vm.$destroy();
-
-    resetStore(vm.$store);
-
-    Editor.editorInstance.dispose();
-  });
-
-  const findEditor = () => vm.$el.querySelector('.multi-file-editor-holder');
-
-  it('sets renderWhitespace to `all`', () => {
-    vm.$store.state.renderWhitespaceInCode = true;
-
-    expect(vm.editorOptions.renderWhitespace).toEqual('all');
-  });
-
-  it('sets renderWhitespace to `none`', () => {
-    vm.$store.state.renderWhitespaceInCode = false;
-
-    expect(vm.editorOptions.renderWhitespace).toEqual('none');
-  });
-
-  it('renders an ide container', () => {
-    expect(vm.shouldHideEditor).toBeFalsy();
-    expect(vm.showEditor).toBe(true);
-    expect(findEditor()).not.toHaveCss({ display: 'none' });
-  });
-
-  it('renders only an edit tab', done => {
-    Vue.nextTick(() => {
-      const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li');
-
-      expect(tabs.length).toBe(1);
-      expect(tabs[0].textContent.trim()).toBe('Edit');
-
-      done();
-    });
-  });
-
-  describe('when file is markdown', () => {
-    beforeEach(done => {
-      vm.file.previewMode = {
-        id: 'markdown',
-        previewTitle: 'Preview Markdown',
-      };
-
-      vm.$nextTick(done);
-    });
-
-    it('renders an Edit and a Preview Tab', done => {
-      Vue.nextTick(() => {
-        const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li');
-
-        expect(tabs.length).toBe(2);
-        expect(tabs[0].textContent.trim()).toBe('Edit');
-        expect(tabs[1].textContent.trim()).toBe('Preview Markdown');
-
-        done();
-      });
-    });
-  });
-
-  describe('when file is markdown and viewer mode is review', () => {
-    let mock;
-
-    beforeEach(done => {
-      mock = new MockAdapter(axios);
-
-      vm.file.projectId = 'namespace/project';
-      vm.file.previewMode = {
-        id: 'markdown',
-        previewTitle: 'Preview Markdown',
-      };
-      vm.file.content = 'testing 123';
-      vm.$store.state.viewer = 'diff';
-
-      mock.onPost(/(.*)\/preview_markdown/).reply(200, {
-        body: '<p>testing 123</p>',
-      });
-
-      vm.$nextTick(done);
-    });
-
-    afterEach(() => {
-      mock.restore();
-    });
-
-    it('renders an Edit and a Preview Tab', done => {
-      Vue.nextTick(() => {
-        const tabs = vm.$el.querySelectorAll('.ide-mode-tabs .nav-links li');
-
-        expect(tabs.length).toBe(2);
-        expect(tabs[0].textContent.trim()).toBe('Review');
-        expect(tabs[1].textContent.trim()).toBe('Preview Markdown');
-
-        done();
-      });
-    });
-
-    it('renders markdown for tempFile', done => {
-      vm.file.tempFile = true;
-      vm.file.path = `${vm.file.path}.md`;
-      vm.$store.state.entries[vm.file.path] = vm.file;
-
-      vm.$nextTick()
-        .then(() => {
-          vm.$el.querySelectorAll('.ide-mode-tabs .nav-links a')[1].click();
-        })
-        .then(setTimeoutPromise)
-        .then(() => {
-          expect(vm.$el.querySelector('.preview-container').innerHTML).toContain(
-            '<p>testing 123</p>',
-          );
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-  });
-
-  describe('when open file is binary and not raw', () => {
-    beforeEach(done => {
-      vm.file.binary = true;
-
-      vm.$nextTick(done);
-    });
-
-    it('does not render the IDE', () => {
-      expect(vm.shouldHideEditor).toBeTruthy();
-    });
-  });
-
-  describe('createEditorInstance', () => {
-    it('calls createInstance when viewer is editor', done => {
-      spyOn(vm.editor, 'createInstance');
-
-      vm.createEditorInstance();
-
-      vm.$nextTick(() => {
-        expect(vm.editor.createInstance).toHaveBeenCalled();
-
-        done();
-      });
-    });
-
-    it('calls createDiffInstance when viewer is diff', done => {
-      vm.$store.state.viewer = 'diff';
-
-      spyOn(vm.editor, 'createDiffInstance');
-
-      vm.createEditorInstance();
-
-      vm.$nextTick(() => {
-        expect(vm.editor.createDiffInstance).toHaveBeenCalled();
-
-        done();
-      });
-    });
-
-    it('calls createDiffInstance when viewer is a merge request diff', done => {
-      vm.$store.state.viewer = 'mrdiff';
-
-      spyOn(vm.editor, 'createDiffInstance');
-
-      vm.createEditorInstance();
-
-      vm.$nextTick(() => {
-        expect(vm.editor.createDiffInstance).toHaveBeenCalled();
-
-        done();
-      });
-    });
-  });
-
-  describe('setupEditor', () => {
-    it('creates new model', () => {
-      spyOn(vm.editor, 'createModel').and.callThrough();
-
-      Editor.editorInstance.modelManager.dispose();
-
-      vm.setupEditor();
-
-      expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, null);
-      expect(vm.model).not.toBeNull();
-    });
-
-    it('attaches model to editor', () => {
-      spyOn(vm.editor, 'attachModel').and.callThrough();
-
-      Editor.editorInstance.modelManager.dispose();
-
-      vm.setupEditor();
-
-      expect(vm.editor.attachModel).toHaveBeenCalledWith(vm.model);
-    });
-
-    it('attaches model to merge request editor', () => {
-      vm.$store.state.viewer = 'mrdiff';
-      vm.file.mrChange = true;
-      spyOn(vm.editor, 'attachMergeRequestModel');
-
-      Editor.editorInstance.modelManager.dispose();
-
-      vm.setupEditor();
-
-      expect(vm.editor.attachMergeRequestModel).toHaveBeenCalledWith(vm.model);
-    });
-
-    it('does not attach model to merge request editor when not a MR change', () => {
-      vm.$store.state.viewer = 'mrdiff';
-      vm.file.mrChange = false;
-      spyOn(vm.editor, 'attachMergeRequestModel');
-
-      Editor.editorInstance.modelManager.dispose();
-
-      vm.setupEditor();
-
-      expect(vm.editor.attachMergeRequestModel).not.toHaveBeenCalledWith(vm.model);
-    });
-
-    it('adds callback methods', () => {
-      spyOn(vm.editor, 'onPositionChange').and.callThrough();
-
-      Editor.editorInstance.modelManager.dispose();
-
-      vm.setupEditor();
-
-      expect(vm.editor.onPositionChange).toHaveBeenCalled();
-      expect(vm.model.events.size).toBe(2);
-    });
-
-    it('updates state when model content changed', done => {
-      vm.model.setValue('testing 123\n');
-
-      setTimeout(() => {
-        expect(vm.file.content).toBe('testing 123\n');
-
-        done();
-      });
-    });
-
-    it('sets head model as staged file', () => {
-      spyOn(vm.editor, 'createModel').and.callThrough();
-
-      Editor.editorInstance.modelManager.dispose();
-
-      vm.$store.state.stagedFiles.push({ ...vm.file, key: 'staged' });
-      vm.file.staged = true;
-      vm.file.key = `unstaged-${vm.file.key}`;
-
-      vm.setupEditor();
-
-      expect(vm.editor.createModel).toHaveBeenCalledWith(vm.file, vm.$store.state.stagedFiles[0]);
-    });
-  });
-
-  describe('editor updateDimensions', () => {
-    beforeEach(() => {
-      spyOn(vm.editor, 'updateDimensions').and.callThrough();
-      spyOn(vm.editor, 'updateDiffView');
-    });
-
-    it('calls updateDimensions when panelResizing is false', done => {
-      vm.$store.state.panelResizing = true;
-
-      vm.$nextTick()
-        .then(() => {
-          vm.$store.state.panelResizing = false;
-        })
-        .then(vm.$nextTick)
-        .then(() => {
-          expect(vm.editor.updateDimensions).toHaveBeenCalled();
-          expect(vm.editor.updateDiffView).toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-
-    it('does not call updateDimensions when panelResizing is true', done => {
-      vm.$store.state.panelResizing = true;
-
-      vm.$nextTick(() => {
-        expect(vm.editor.updateDimensions).not.toHaveBeenCalled();
-        expect(vm.editor.updateDiffView).not.toHaveBeenCalled();
-
-        done();
-      });
-    });
-
-    it('calls updateDimensions when rightPane is opened', done => {
-      vm.$store.state.rightPane.isOpen = true;
-
-      vm.$nextTick(() => {
-        expect(vm.editor.updateDimensions).toHaveBeenCalled();
-        expect(vm.editor.updateDiffView).toHaveBeenCalled();
-
-        done();
-      });
-    });
-  });
-
-  describe('show tabs', () => {
-    it('shows tabs in edit mode', () => {
-      expect(vm.$el.querySelector('.nav-links')).not.toBe(null);
-    });
-
-    it('hides tabs in review mode', done => {
-      vm.$store.state.currentActivityView = leftSidebarViews.review.name;
-
-      vm.$nextTick(() => {
-        expect(vm.$el.querySelector('.nav-links')).toBe(null);
-
-        done();
-      });
-    });
-
-    it('hides tabs in commit mode', done => {
-      vm.$store.state.currentActivityView = leftSidebarViews.commit.name;
-
-      vm.$nextTick(() => {
-        expect(vm.$el.querySelector('.nav-links')).toBe(null);
-
-        done();
-      });
-    });
-  });
-
-  describe('when files view mode is preview', () => {
-    beforeEach(done => {
-      spyOn(vm.editor, 'updateDimensions');
-      vm.file.viewMode = FILE_VIEW_MODE_PREVIEW;
-      vm.$nextTick(done);
-    });
-
-    it('should hide editor', () => {
-      expect(vm.showEditor).toBe(false);
-      expect(findEditor()).toHaveCss({ display: 'none' });
-    });
-
-    describe('when file view mode changes to editor', () => {
-      beforeEach(done => {
-        vm.file.viewMode = FILE_VIEW_MODE_EDITOR;
-
-        // one tick to trigger watch
-        vm.$nextTick()
-          // another tick needed until we can update dimensions
-          .then(() => vm.$nextTick())
-          .then(done)
-          .catch(done.fail);
-      });
-
-      it('should update dimensions', () => {
-        expect(vm.editor.updateDimensions).toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('initEditor', () => {
-    beforeEach(() => {
-      vm.file.tempFile = false;
-      spyOn(vm.editor, 'createInstance');
-      spyOnProperty(vm, 'shouldHideEditor').and.returnValue(true);
-    });
-
-    it('does not fetch file information for temp entries', done => {
-      vm.file.tempFile = true;
-
-      vm.initEditor();
-      vm.$nextTick()
-        .then(() => {
-          expect(vm.getFileData).not.toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-
-    it('is being initialised for files without content even if shouldHideEditor is `true`', done => {
-      vm.file.content = '';
-      vm.file.raw = '';
-
-      vm.initEditor();
-      vm.$nextTick()
-        .then(() => {
-          expect(vm.getFileData).toHaveBeenCalled();
-          expect(vm.getRawFileData).toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-
-    it('does not initialize editor for files already with content', done => {
-      vm.file.content = 'foo';
-
-      vm.initEditor();
-      vm.$nextTick()
-        .then(() => {
-          expect(vm.getFileData).not.toHaveBeenCalled();
-          expect(vm.getRawFileData).not.toHaveBeenCalled();
-          expect(vm.editor.createInstance).not.toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-  });
-
-  describe('updates on file changes', () => {
-    beforeEach(() => {
-      spyOn(vm, 'initEditor');
-    });
-
-    it('calls removePendingTab when old file is pending', done => {
-      spyOnProperty(vm, 'shouldHideEditor').and.returnValue(true);
-      spyOn(vm, 'removePendingTab');
-
-      vm.file.pending = true;
-
-      vm.$nextTick()
-        .then(() => {
-          vm.file = file('testing');
-          vm.file.content = 'foo'; // need to prevent full cycle of initEditor
-
-          return vm.$nextTick();
-        })
-        .then(() => {
-          expect(vm.removePendingTab).toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-
-    it('does not call initEditor if the file did not change', done => {
-      Vue.set(vm, 'file', vm.file);
-
-      vm.$nextTick()
-        .then(() => {
-          expect(vm.initEditor).not.toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-
-    it('calls initEditor when file key is changed', done => {
-      expect(vm.initEditor).not.toHaveBeenCalled();
-
-      Vue.set(vm, 'file', {
-        ...vm.file,
-        key: 'new',
-      });
-
-      vm.$nextTick()
-        .then(() => {
-          expect(vm.initEditor).toHaveBeenCalled();
-        })
-        .then(done)
-        .catch(done.fail);
-    });
-  });
-});
diff --git a/spec/javascripts/ide/helpers.js b/spec/javascripts/ide/helpers.js
deleted file mode 100644
index 2c52780f316..00000000000
--- a/spec/javascripts/ide/helpers.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../../frontend/ide/helpers';
diff --git a/spec/javascripts/ide/mock_data.js b/spec/javascripts/ide/mock_data.js
deleted file mode 100644
index 27f0ad01f54..00000000000
--- a/spec/javascripts/ide/mock_data.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../../frontend/ide/mock_data';
diff --git a/spec/javascripts/lazy_loader_spec.js b/spec/javascripts/lazy_loader_spec.js
deleted file mode 100644
index 82ab73c2170..00000000000
--- a/spec/javascripts/lazy_loader_spec.js
+++ /dev/null
@@ -1,244 +0,0 @@
-import LazyLoader from '~/lazy_loader';
-import { TEST_HOST } from './test_constants';
-import scrollIntoViewPromise from './helpers/scroll_into_view_promise';
-import waitForPromises from './helpers/wait_for_promises';
-import waitForAttributeChange from './helpers/wait_for_attribute_change';
-
-const execImmediately = callback => {
-  callback();
-};
-
-describe('LazyLoader', function() {
-  let lazyLoader = null;
-
-  preloadFixtures('issues/issue_with_comment.html');
-
-  describe('without IntersectionObserver', () => {
-    beforeEach(function() {
-      loadFixtures('issues/issue_with_comment.html');
-
-      lazyLoader = new LazyLoader({
-        observerNode: 'foobar',
-      });
-
-      spyOn(LazyLoader, 'supportsIntersectionObserver').and.callFake(() => false);
-
-      spyOn(LazyLoader, 'loadImage').and.callThrough();
-
-      spyOn(window, 'requestAnimationFrame').and.callFake(execImmediately);
-      spyOn(window, 'requestIdleCallback').and.callFake(execImmediately);
-
-      // Doing everything that happens normally in onload
-      lazyLoader.register();
-    });
-
-    afterEach(() => {
-      lazyLoader.unregister();
-    });
-
-    it('should copy value from data-src to src for img 1', function(done) {
-      const img = document.querySelectorAll('img[data-src]')[0];
-      const originalDataSrc = img.getAttribute('data-src');
-
-      Promise.all([scrollIntoViewPromise(img), waitForAttributeChange(img, ['data-src', 'src'])])
-        .then(() => {
-          expect(LazyLoader.loadImage).toHaveBeenCalled();
-          expect(img.getAttribute('src')).toBe(originalDataSrc);
-          expect(img).toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should lazy load dynamically added data-src images', function(done) {
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.className = 'lazy';
-      newImg.setAttribute('data-src', testPath);
-      document.body.appendChild(newImg);
-
-      Promise.all([
-        scrollIntoViewPromise(newImg),
-        waitForAttributeChange(newImg, ['data-src', 'src']),
-      ])
-        .then(() => {
-          expect(LazyLoader.loadImage).toHaveBeenCalledWith(newImg);
-          expect(newImg.getAttribute('src')).toBe(testPath);
-          expect(newImg).toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should not alter normal images', function(done) {
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.setAttribute('src', testPath);
-      document.body.appendChild(newImg);
-
-      scrollIntoViewPromise(newImg)
-        .then(waitForPromises)
-        .then(() => {
-          expect(LazyLoader.loadImage).not.toHaveBeenCalledWith(newImg);
-          expect(newImg).not.toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should not load dynamically added pictures if content observer is turned off', done => {
-      lazyLoader.stopContentObserver();
-
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.className = 'lazy';
-      newImg.setAttribute('data-src', testPath);
-      document.body.appendChild(newImg);
-
-      scrollIntoViewPromise(newImg)
-        .then(waitForPromises)
-        .then(() => {
-          expect(LazyLoader.loadImage).not.toHaveBeenCalledWith(newImg);
-          expect(newImg).not.toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should load dynamically added pictures if content observer is turned off and on again', done => {
-      lazyLoader.stopContentObserver();
-      lazyLoader.startContentObserver();
-
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.className = 'lazy';
-      newImg.setAttribute('data-src', testPath);
-      document.body.appendChild(newImg);
-
-      Promise.all([
-        scrollIntoViewPromise(newImg),
-        waitForAttributeChange(newImg, ['data-src', 'src']),
-      ])
-        .then(waitForPromises)
-        .then(() => {
-          expect(LazyLoader.loadImage).toHaveBeenCalledWith(newImg);
-          expect(newImg).toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-  });
-
-  describe('with IntersectionObserver', () => {
-    beforeEach(function() {
-      loadFixtures('issues/issue_with_comment.html');
-
-      lazyLoader = new LazyLoader({
-        observerNode: 'foobar',
-      });
-
-      spyOn(LazyLoader, 'loadImage').and.callThrough();
-
-      spyOn(window, 'requestAnimationFrame').and.callFake(execImmediately);
-      spyOn(window, 'requestIdleCallback').and.callFake(execImmediately);
-
-      // Doing everything that happens normally in onload
-      lazyLoader.register();
-    });
-
-    afterEach(() => {
-      lazyLoader.unregister();
-    });
-
-    it('should copy value from data-src to src for img 1', function(done) {
-      const img = document.querySelectorAll('img[data-src]')[0];
-      const originalDataSrc = img.getAttribute('data-src');
-
-      Promise.all([scrollIntoViewPromise(img), waitForAttributeChange(img, ['data-src', 'src'])])
-        .then(() => {
-          expect(LazyLoader.loadImage).toHaveBeenCalledWith(img);
-          expect(img.getAttribute('src')).toBe(originalDataSrc);
-          expect(img).toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should lazy load dynamically added data-src images', function(done) {
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.className = 'lazy';
-      newImg.setAttribute('data-src', testPath);
-      document.body.appendChild(newImg);
-
-      Promise.all([
-        scrollIntoViewPromise(newImg),
-        waitForAttributeChange(newImg, ['data-src', 'src']),
-      ])
-        .then(() => {
-          expect(LazyLoader.loadImage).toHaveBeenCalledWith(newImg);
-          expect(newImg.getAttribute('src')).toBe(testPath);
-          expect(newImg).toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should not alter normal images', function(done) {
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.setAttribute('src', testPath);
-      document.body.appendChild(newImg);
-
-      scrollIntoViewPromise(newImg)
-        .then(waitForPromises)
-        .then(() => {
-          expect(LazyLoader.loadImage).not.toHaveBeenCalledWith(newImg);
-          expect(newImg).not.toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should not load dynamically added pictures if content observer is turned off', done => {
-      lazyLoader.stopContentObserver();
-
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.className = 'lazy';
-      newImg.setAttribute('data-src', testPath);
-      document.body.appendChild(newImg);
-
-      scrollIntoViewPromise(newImg)
-        .then(waitForPromises)
-        .then(() => {
-          expect(LazyLoader.loadImage).not.toHaveBeenCalledWith(newImg);
-          expect(newImg).not.toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-
-    it('should load dynamically added pictures if content observer is turned off and on again', done => {
-      lazyLoader.stopContentObserver();
-      lazyLoader.startContentObserver();
-
-      const newImg = document.createElement('img');
-      const testPath = `${TEST_HOST}/img/testimg.png`;
-      newImg.className = 'lazy';
-      newImg.setAttribute('data-src', testPath);
-      document.body.appendChild(newImg);
-
-      Promise.all([
-        scrollIntoViewPromise(newImg),
-        waitForAttributeChange(newImg, ['data-src', 'src']),
-      ])
-        .then(() => {
-          expect(LazyLoader.loadImage).toHaveBeenCalledWith(newImg);
-          expect(newImg).toHaveClass('js-lazy-loaded');
-          done();
-        })
-        .catch(done.fail);
-    });
-  });
-});
diff --git a/spec/javascripts/line_highlighter_spec.js b/spec/javascripts/line_highlighter_spec.js
deleted file mode 100644
index bedab0fd003..00000000000
--- a/spec/javascripts/line_highlighter_spec.js
+++ /dev/null
@@ -1,261 +0,0 @@
-/* eslint-disable dot-notation, no-return-assign, no-new, no-underscore-dangle */
-
-import $ from 'jquery';
-import LineHighlighter from '~/line_highlighter';
-
-describe('LineHighlighter', function() {
-  preloadFixtures('static/line_highlighter.html');
-  const clickLine = function(number, eventData = {}) {
-    if ($.isEmptyObject(eventData)) {
-      return $(`#L${number}`).click();
-    }
-    const e = $.Event('click', eventData);
-    return $(`#L${number}`).trigger(e);
-  };
-  beforeEach(function() {
-    loadFixtures('static/line_highlighter.html');
-    this['class'] = new LineHighlighter();
-    this.css = this['class'].highlightLineClass;
-    return (this.spies = {
-      __setLocationHash__: spyOn(this['class'], '__setLocationHash__').and.callFake(function() {}),
-    });
-  });
-
-  describe('behavior', function() {
-    it('highlights one line given in the URL hash', function() {
-      new LineHighlighter({ hash: '#L13' });
-
-      expect($('#LC13')).toHaveClass(this.css);
-    });
-
-    it('highlights one line given in the URL hash with given CSS class name', function() {
-      const hiliter = new LineHighlighter({ hash: '#L13', highlightLineClass: 'hilite' });
-
-      expect(hiliter.highlightLineClass).toBe('hilite');
-      expect($('#LC13')).toHaveClass('hilite');
-      expect($('#LC13')).not.toHaveClass('hll');
-    });
-
-    it('highlights a range of lines given in the URL hash', function() {
-      new LineHighlighter({ hash: '#L5-25' });
-
-      expect($(`.${this.css}`).length).toBe(21);
-      for (let line = 5; line <= 25; line += 1) {
-        expect($(`#LC${line}`)).toHaveClass(this.css);
-      }
-    });
-
-    it('scrolls to the first highlighted line on initial load', function() {
-      const spy = spyOn($, 'scrollTo');
-      new LineHighlighter({ hash: '#L5-25' });
-
-      expect(spy).toHaveBeenCalledWith('#L5', jasmine.anything());
-    });
-
-    it('discards click events', function() {
-      const spy = spyOnEvent('a[data-line-number]', 'click');
-      clickLine(13);
-
-      expect(spy).toHaveBeenPrevented();
-    });
-
-    it('handles garbage input from the hash', function() {
-      const func = function() {
-        return new LineHighlighter({ fileHolderSelector: '#blob-content-holder' });
-      };
-
-      expect(func).not.toThrow();
-    });
-
-    it('handles hashchange event', () => {
-      const highlighter = new LineHighlighter();
-
-      spyOn(highlighter, 'highlightHash');
-
-      window.dispatchEvent(new Event('hashchange'), 'L15');
-
-      expect(highlighter.highlightHash).toHaveBeenCalled();
-    });
-  });
-
-  describe('clickHandler', function() {
-    it('handles clicking on a child icon element', function() {
-      const spy = spyOn(this['class'], 'setHash').and.callThrough();
-      $('#L13 i')
-        .mousedown()
-        .click();
-
-      expect(spy).toHaveBeenCalledWith(13);
-      expect($('#LC13')).toHaveClass(this.css);
-    });
-
-    describe('without shiftKey', function() {
-      it('highlights one line when clicked', function() {
-        clickLine(13);
-
-        expect($('#LC13')).toHaveClass(this.css);
-      });
-
-      it('unhighlights previously highlighted lines', function() {
-        clickLine(13);
-        clickLine(20);
-
-        expect($('#LC13')).not.toHaveClass(this.css);
-        expect($('#LC20')).toHaveClass(this.css);
-      });
-
-      it('sets the hash', function() {
-        const spy = spyOn(this['class'], 'setHash').and.callThrough();
-        clickLine(13);
-
-        expect(spy).toHaveBeenCalledWith(13);
-      });
-    });
-
-    describe('with shiftKey', function() {
-      it('sets the hash', function() {
-        const spy = spyOn(this['class'], 'setHash').and.callThrough();
-        clickLine(13);
-        clickLine(20, {
-          shiftKey: true,
-        });
-
-        expect(spy).toHaveBeenCalledWith(13);
-        expect(spy).toHaveBeenCalledWith(13, 20);
-      });
-
-      describe('without existing highlight', function() {
-        it('highlights the clicked line', function() {
-          clickLine(13, {
-            shiftKey: true,
-          });
-
-          expect($('#LC13')).toHaveClass(this.css);
-          expect($(`.${this.css}`).length).toBe(1);
-        });
-
-        it('sets the hash', function() {
-          const spy = spyOn(this['class'], 'setHash');
-          clickLine(13, {
-            shiftKey: true,
-          });
-
-          expect(spy).toHaveBeenCalledWith(13);
-        });
-      });
-
-      describe('with existing single-line highlight', function() {
-        it('uses existing line as last line when target is lesser', function() {
-          clickLine(20);
-          clickLine(15, {
-            shiftKey: true,
-          });
-
-          expect($(`.${this.css}`).length).toBe(6);
-          for (let line = 15; line <= 20; line += 1) {
-            expect($(`#LC${line}`)).toHaveClass(this.css);
-          }
-        });
-
-        it('uses existing line as first line when target is greater', function() {
-          clickLine(5);
-          clickLine(10, {
-            shiftKey: true,
-          });
-
-          expect($(`.${this.css}`).length).toBe(6);
-          for (let line = 5; line <= 10; line += 1) {
-            expect($(`#LC${line}`)).toHaveClass(this.css);
-          }
-        });
-      });
-
-      describe('with existing multi-line highlight', function() {
-        beforeEach(function() {
-          clickLine(10, {
-            shiftKey: true,
-          });
-          clickLine(13, {
-            shiftKey: true,
-          });
-        });
-
-        it('uses target as first line when it is less than existing first line', function() {
-          clickLine(5, {
-            shiftKey: true,
-          });
-
-          expect($(`.${this.css}`).length).toBe(6);
-          for (let line = 5; line <= 10; line += 1) {
-            expect($(`#LC${line}`)).toHaveClass(this.css);
-          }
-        });
-
-        it('uses target as last line when it is greater than existing first line', function() {
-          clickLine(15, {
-            shiftKey: true,
-          });
-
-          expect($(`.${this.css}`).length).toBe(6);
-          for (let line = 10; line <= 15; line += 1) {
-            expect($(`#LC${line}`)).toHaveClass(this.css);
-          }
-        });
-      });
-    });
-  });
-
-  describe('hashToRange', function() {
-    beforeEach(function() {
-      this.subject = this['class'].hashToRange;
-    });
-
-    it('extracts a single line number from the hash', function() {
-      expect(this.subject('#L5')).toEqual([5, null]);
-    });
-
-    it('extracts a range of line numbers from the hash', function() {
-      expect(this.subject('#L5-15')).toEqual([5, 15]);
-    });
-
-    it('returns [null, null] when the hash is not a line number', function() {
-      expect(this.subject('#foo')).toEqual([null, null]);
-    });
-  });
-
-  describe('highlightLine', function() {
-    beforeEach(function() {
-      this.subject = this['class'].highlightLine;
-    });
-
-    it('highlights the specified line', function() {
-      this.subject(13);
-
-      expect($('#LC13')).toHaveClass(this.css);
-    });
-
-    it('accepts a String-based number', function() {
-      this.subject('13');
-
-      expect($('#LC13')).toHaveClass(this.css);
-    });
-  });
-
-  describe('setHash', function() {
-    beforeEach(function() {
-      this.subject = this['class'].setHash;
-    });
-
-    it('sets the location hash for a single line', function() {
-      this.subject(5);
-
-      expect(this.spies.__setLocationHash__).toHaveBeenCalledWith('#L5');
-    });
-
-    it('sets the location hash for a range', function() {
-      this.subject(5, 15);
-
-      expect(this.spies.__setLocationHash__).toHaveBeenCalledWith('#L5-15');
-    });
-  });
-});
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
deleted file mode 100644
index cbb61333d77..00000000000
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ /dev/null
@@ -1,283 +0,0 @@
-import $ from 'jquery';
-import MockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
-import MergeRequestTabs from '~/merge_request_tabs';
-import '~/commit/pipelines/pipelines_bundle';
-import '~/lib/utils/common_utils';
-import 'vendor/jquery.scrollTo';
-import initMrPage from './helpers/init_vue_mr_page_helper';
-
-describe('MergeRequestTabs', function() {
-  let mrPageMock;
-  const stubLocation = {};
-  const setLocation = function(stubs) {
-    const defaults = {
-      pathname: '',
-      search: '',
-      hash: '',
-    };
-    $.extend(stubLocation, defaults, stubs || {});
-  };
-
-  preloadFixtures(
-    'merge_requests/merge_request_with_task_list.html',
-    'merge_requests/diff_comment.html',
-  );
-
-  beforeEach(function() {
-    mrPageMock = initMrPage();
-    this.class = new MergeRequestTabs({ stubLocation });
-    setLocation();
-
-    this.spies = {
-      history: spyOn(window.history, 'replaceState').and.callFake(function() {}),
-    };
-  });
-
-  afterEach(function() {
-    this.class.unbindEvents();
-    this.class.destroyPipelinesView();
-    mrPageMock.restore();
-    $('.js-merge-request-test').remove();
-  });
-
-  describe('opensInNewTab', function() {
-    const windowTarget = '_blank';
-    let clickTabParams;
-    let tabUrl;
-
-    beforeEach(function() {
-      loadFixtures('merge_requests/merge_request_with_task_list.html');
-
-      tabUrl = $('.commits-tab a').attr('href');
-
-      clickTabParams = {
-        metaKey: false,
-        ctrlKey: false,
-        which: 1,
-        stopImmediatePropagation() {},
-        preventDefault() {},
-        currentTarget: {
-          getAttribute(attr) {
-            return attr === 'href' ? tabUrl : null;
-          },
-        },
-      };
-    });
-
-    describe('meta click', () => {
-      let metakeyEvent;
-
-      beforeEach(function() {
-        metakeyEvent = $.Event('click', { keyCode: 91, ctrlKey: true });
-      });
-
-      it('opens page when commits link is clicked', function() {
-        spyOn(window, 'open').and.callFake(function(url, name) {
-          expect(url).toEqual(tabUrl);
-          expect(name).toEqual(windowTarget);
-        });
-
-        this.class.bindEvents();
-        $('.merge-request-tabs .commits-tab a').trigger(metakeyEvent);
-
-        expect(window.open).toHaveBeenCalled();
-      });
-
-      it('opens page when commits badge is clicked', function() {
-        spyOn(window, 'open').and.callFake(function(url, name) {
-          expect(url).toEqual(tabUrl);
-          expect(name).toEqual(windowTarget);
-        });
-
-        this.class.bindEvents();
-        $('.merge-request-tabs .commits-tab a .badge').trigger(metakeyEvent);
-
-        expect(window.open).toHaveBeenCalled();
-      });
-    });
-
-    it('opens page tab in a new browser tab with Ctrl+Click - Windows/Linux', function() {
-      spyOn(window, 'open').and.callFake(function(url, name) {
-        expect(url).toEqual(tabUrl);
-        expect(name).toEqual(windowTarget);
-      });
-
-      this.class.clickTab({ ...clickTabParams, metaKey: true });
-
-      expect(window.open).toHaveBeenCalled();
-    });
-
-    it('opens page tab in a new browser tab with Cmd+Click - Mac', function() {
-      spyOn(window, 'open').and.callFake(function(url, name) {
-        expect(url).toEqual(tabUrl);
-        expect(name).toEqual(windowTarget);
-      });
-
-      this.class.clickTab({ ...clickTabParams, ctrlKey: true });
-
-      expect(window.open).toHaveBeenCalled();
-    });
-
-    it('opens page tab in a new browser tab with Middle-click - Mac/PC', function() {
-      spyOn(window, 'open').and.callFake(function(url, name) {
-        expect(url).toEqual(tabUrl);
-        expect(name).toEqual(windowTarget);
-      });
-
-      this.class.clickTab({ ...clickTabParams, which: 2 });
-
-      expect(window.open).toHaveBeenCalled();
-    });
-  });
-
-  describe('setCurrentAction', function() {
-    let mock;
-
-    beforeEach(function() {
-      mock = new MockAdapter(axios);
-      mock.onAny().reply({ data: {} });
-      this.subject = this.class.setCurrentAction;
-    });
-
-    afterEach(() => {
-      mock.restore();
-    });
-
-    it('changes from commits', function() {
-      setLocation({
-        pathname: '/foo/bar/-/merge_requests/1/commits',
-      });
-
-      expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1');
-      expect(this.subject('diffs')).toBe('/foo/bar/-/merge_requests/1/diffs');
-    });
-
-    it('changes from diffs', function() {
-      setLocation({
-        pathname: '/foo/bar/-/merge_requests/1/diffs',
-      });
-
-      expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1');
-      expect(this.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits');
-    });
-
-    it('changes from diffs.html', function() {
-      setLocation({
-        pathname: '/foo/bar/-/merge_requests/1/diffs.html',
-      });
-
-      expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1');
-      expect(this.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits');
-    });
-
-    it('changes from notes', function() {
-      setLocation({
-        pathname: '/foo/bar/-/merge_requests/1',
-      });
-
-      expect(this.subject('diffs')).toBe('/foo/bar/-/merge_requests/1/diffs');
-      expect(this.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits');
-    });
-
-    it('includes search parameters and hash string', function() {
-      setLocation({
-        pathname: '/foo/bar/-/merge_requests/1/diffs',
-        search: '?view=parallel',
-        hash: '#L15-35',
-      });
-
-      expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1?view=parallel#L15-35');
-    });
-
-    it('replaces the current history state', function() {
-      setLocation({
-        pathname: '/foo/bar/-/merge_requests/1',
-      });
-      const newState = this.subject('commits');
-
-      expect(this.spies.history).toHaveBeenCalledWith(
-        {
-          url: newState,
-        },
-        document.title,
-        newState,
-      );
-    });
-
-    it('treats "show" like "notes"', function() {
-      setLocation({
-        pathname: '/foo/bar/-/merge_requests/1/commits',
-      });
-
-      expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1');
-    });
-  });
-
-  describe('expandViewContainer', function() {
-    beforeEach(() => {
-      $('body').append(
-        '<div class="content-wrapper"><div class="container-fluid container-limited"></div></div>',
-      );
-    });
-
-    afterEach(() => {
-      $('.content-wrapper').remove();
-    });
-
-    it('removes container-limited from containers', function() {
-      this.class.expandViewContainer();
-
-      expect($('.content-wrapper')).not.toContainElement('.container-limited');
-    });
-
-    it('does not add container-limited when fluid layout is prefered', function() {
-      $('.content-wrapper .container-fluid').removeClass('container-limited');
-
-      this.class.expandViewContainer(false);
-
-      expect($('.content-wrapper')).not.toContainElement('.container-limited');
-    });
-
-    it('does remove container-limited from breadcrumbs', function() {
-      $('.container-limited').addClass('breadcrumbs');
-      this.class.expandViewContainer();
-
-      expect($('.content-wrapper')).toContainElement('.container-limited');
-    });
-  });
-
-  describe('tabShown', function() {
-    const mainContent = document.createElement('div');
-    const tabContent = document.createElement('div');
-
-    beforeEach(function() {
-      spyOn(mainContent, 'getBoundingClientRect').and.returnValue({ top: 10 });
-      spyOn(tabContent, 'getBoundingClientRect').and.returnValue({ top: 100 });
-      spyOn(document, 'querySelector').and.callFake(function(selector) {
-        return selector === '.content-wrapper' ? mainContent : tabContent;
-      });
-      this.class.currentAction = 'commits';
-    });
-
-    it('calls window scrollTo with options if document has scrollBehavior', function() {
-      document.documentElement.style.scrollBehavior = '';
-
-      spyOn(window, 'scrollTo');
-
-      this.class.tabShown('commits', 'foobar');
-
-      expect(window.scrollTo.calls.first().args[0]).toEqual({ top: 39, behavior: 'smooth' });
-    });
-
-    it('calls window scrollTo with two args if document does not have scrollBehavior', function() {
-      spyOnProperty(document.documentElement, 'style', 'get').and.returnValue({});
-
-      spyOn(window, 'scrollTo');
-
-      this.class.tabShown('commits', 'foobar');
-
-      expect(window.scrollTo.calls.first().args).toEqual([0, 39]);
-    });
-  });
-});
diff --git a/spec/javascripts/releases/mock_data.js b/spec/javascripts/releases/mock_data.js
deleted file mode 100644
index 72875dff172..00000000000
--- a/spec/javascripts/releases/mock_data.js
+++ /dev/null
@@ -1,148 +0,0 @@
-export const pageInfoHeadersWithoutPagination = {
-  'X-NEXT-PAGE': '',
-  'X-PAGE': '1',
-  'X-PER-PAGE': '20',
-  'X-PREV-PAGE': '',
-  'X-TOTAL': '19',
-  'X-TOTAL-PAGES': '1',
-};
-
-export const pageInfoHeadersWithPagination = {
-  'X-NEXT-PAGE': '2',
-  'X-PAGE': '1',
-  'X-PER-PAGE': '20',
-  'X-PREV-PAGE': '',
-  'X-TOTAL': '21',
-  'X-TOTAL-PAGES': '2',
-};
-
-export const release = {
-  name: 'Bionic Beaver',
-  tag_name: '18.04',
-  description: '## changelog\n\n* line 1\n* line2',
-  description_html: '<div><h2>changelog</h2><ul><li>line1</li<li>line 2</li></ul></div>',
-  author_name: 'Release bot',
-  author_email: 'release-bot@example.com',
-  created_at: '2012-05-28T05:00:00-07:00',
-  commit: {
-    id: '2695effb5807a22ff3d138d593fd856244e155e7',
-    short_id: '2695effb',
-    title: 'Initial commit',
-    created_at: '2017-07-26T11:08:53.000+02:00',
-    parent_ids: ['2a4b78934375d7f53875269ffd4f45fd83a84ebe'],
-    message: 'Initial commit',
-    author: {
-      avatar_url: 'uploads/-/system/user/avatar/johndoe/avatar.png',
-      id: 482476,
-      name: 'John Doe',
-      path: '/johndoe',
-      state: 'active',
-      status_tooltip_html: null,
-      username: 'johndoe',
-      web_url: 'https://gitlab.com/johndoe',
-    },
-    authored_date: '2012-05-28T04:42:42-07:00',
-    committer_name: 'Jack Smith',
-    committer_email: 'jack@example.com',
-    committed_date: '2012-05-28T04:42:42-07:00',
-  },
-  assets: {
-    count: 6,
-    sources: [
-      {
-        format: 'zip',
-        url: 'https://gitlab.com/gitlab-org/gitlab-foss/-/archive/v11.3.12/gitlab-ce-v11.3.12.zip',
-      },
-      {
-        format: 'tar.gz',
-        url:
-          'https://gitlab.com/gitlab-org/gitlab-foss/-/archive/v11.3.12/gitlab-ce-v11.3.12.tar.gz',
-      },
-      {
-        format: 'tar.bz2',
-        url:
-          'https://gitlab.com/gitlab-org/gitlab-foss/-/archive/v11.3.12/gitlab-ce-v11.3.12.tar.bz2',
-      },
-      {
-        format: 'tar',
-        url: 'https://gitlab.com/gitlab-org/gitlab-foss/-/archive/v11.3.12/gitlab-ce-v11.3.12.tar',
-      },
-    ],
-    links: [
-      {
-        name: 'release-18.04.dmg',
-        url: 'https://my-external-hosting.example.com/scrambled-url/',
-        external: true,
-      },
-      {
-        name: 'binary-linux-amd64',
-        url:
-          'https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/artifacts/v11.6.0-rc4/download?job=rspec-mysql+41%2F50',
-        external: false,
-      },
-    ],
-  },
-};
-
-export const releases = [
-  release,
-  {
-    name: 'JoJos Bizarre Adventure',
-    tag_name: '19.00',
-    description: '## changelog\n\n* line 1\n* line2',
-    description_html: '<div><h2>changelog</h2><ul><li>line1</li<li>line 2</li></ul></div>',
-    author_name: 'Release bot',
-    author_email: 'release-bot@example.com',
-    created_at: '2012-05-28T05:00:00-07:00',
-    commit: {
-      id: '2695effb5807a22ff3d138d593fd856244e155e7',
-      short_id: '2695effb',
-      title: 'Initial commit',
-      created_at: '2017-07-26T11:08:53.000+02:00',
-      parent_ids: ['2a4b78934375d7f53875269ffd4f45fd83a84ebe'],
-      message: 'Initial commit',
-      author: {
-        avatar_url: 'uploads/-/system/user/avatar/johndoe/avatar.png',
-        id: 482476,
-        name: 'John Doe',
-        path: '/johndoe',
-        state: 'active',
-        status_tooltip_html: null,
-        username: 'johndoe',
-        web_url: 'https://gitlab.com/johndoe',
-      },
-      authored_date: '2012-05-28T04:42:42-07:00',
-      committer_name: 'Jack Smith',
-      committer_email: 'jack@example.com',
-      committed_date: '2012-05-28T04:42:42-07:00',
-    },
-    assets: {
-      count: 4,
-      sources: [
-        {
-          format: 'tar.gz',
-          url:
-            'https://gitlab.com/gitlab-org/gitlab-foss/-/archive/v11.3.12/gitlab-ce-v11.3.12.tar.gz',
-        },
-        {
-          format: 'tar.bz2',
-          url:
-            'https://gitlab.com/gitlab-org/gitlab-foss/-/archive/v11.3.12/gitlab-ce-v11.3.12.tar.bz2',
-        },
-        {
-          format: 'tar',
-          url:
-            'https://gitlab.com/gitlab-org/gitlab-foss/-/archive/v11.3.12/gitlab-ce-v11.3.12.tar',
-        },
-      ],
-      links: [
-        {
-          name: 'binary-linux-amd64',
-          url:
-            'https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/artifacts/v11.6.0-rc4/download?job=rspec-mysql+41%2F50',
-          external: false,
-        },
-      ],
-    },
-  },
-];
diff --git a/spec/javascripts/shortcuts_spec.js b/spec/javascripts/shortcuts_spec.js
deleted file mode 100644
index df7012bb659..00000000000
--- a/spec/javascripts/shortcuts_spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import $ from 'jquery';
-import Shortcuts from '~/behaviors/shortcuts/shortcuts';
-
-describe('Shortcuts', () => {
-  const fixtureName = 'snippets/show.html';
-  const createEvent = (type, target) =>
-    $.Event(type, {
-      target,
-    });
-
-  preloadFixtures(fixtureName);
-
-  describe('toggleMarkdownPreview', () => {
-    beforeEach(() => {
-      loadFixtures(fixtureName);
-
-      spyOnEvent('.js-new-note-form .js-md-preview-button', 'focus');
-      spyOnEvent('.edit-note .js-md-preview-button', 'focus');
-
-      new Shortcuts(); // eslint-disable-line no-new
-    });
-
-    it('focuses preview button in form', () => {
-      Shortcuts.toggleMarkdownPreview(
-        createEvent('KeyboardEvent', document.querySelector('.js-new-note-form .js-note-text')),
-      );
-
-      expect('focus').toHaveBeenTriggeredOn('.js-new-note-form .js-md-preview-button');
-    });
-
-    it('focues preview button inside edit comment form', done => {
-      document.querySelector('.js-note-edit').click();
-
-      setTimeout(() => {
-        Shortcuts.toggleMarkdownPreview(
-          createEvent('KeyboardEvent', document.querySelector('.edit-note .js-note-text')),
-        );
-
-        expect('focus').not.toHaveBeenTriggeredOn('.js-new-note-form .js-md-preview-button');
-        expect('focus').toHaveBeenTriggeredOn('.edit-note .js-md-preview-button');
-
-        done();
-      });
-    });
-  });
-});
diff --git a/spec/javascripts/vue_mr_widget/mock_data.js b/spec/javascripts/vue_mr_widget/mock_data.js
deleted file mode 100644
index 7783fcb6f93..00000000000
--- a/spec/javascripts/vue_mr_widget/mock_data.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from '../../frontend/vue_mr_widget/mock_data';
-export * from '../../frontend/vue_mr_widget/mock_data';
diff --git a/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js b/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js
deleted file mode 100644
index 3c42f0c2aa9..00000000000
--- a/spec/javascripts/vue_shared/components/issue/related_issuable_mock_data.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../../../../frontend/vue_shared/components/issue/related_issuable_mock_data';
diff --git a/spec/javascripts/vue_shared/directives/tooltip_spec.js b/spec/javascripts/vue_shared/directives/tooltip_spec.js
deleted file mode 100644
index 1d516a280b0..00000000000
--- a/spec/javascripts/vue_shared/directives/tooltip_spec.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import $ from 'jquery';
-import Vue from 'vue';
-import tooltip from '~/vue_shared/directives/tooltip';
-
-describe('Tooltip directive', () => {
-  let vm;
-
-  afterEach(() => {
-    if (vm) {
-      vm.$destroy();
-    }
-  });
-
-  describe('with a single tooltip', () => {
-    beforeEach(() => {
-      setFixtures('<div id="dummy-element"></div>');
-      vm = new Vue({
-        el: '#dummy-element',
-        directives: {
-          tooltip,
-        },
-        data() {
-          return {
-            tooltip: 'some text',
-          };
-        },
-        template: '<div v-tooltip :title="tooltip"></div>',
-      });
-    });
-
-    it('should have tooltip plugin applied', () => {
-      expect($(vm.$el).data('bs.tooltip')).toBeDefined();
-    });
-
-    it('displays the title as tooltip', () => {
-      $(vm.$el).tooltip('show');
-      const tooltipElement = document.querySelector('.tooltip-inner');
-
-      expect(tooltipElement.innerText).toContain('some text');
-    });
-
-    it('updates a visible tooltip', done => {
-      $(vm.$el).tooltip('show');
-      const tooltipElement = document.querySelector('.tooltip-inner');
-
-      vm.tooltip = 'other text';
-
-      Vue.nextTick()
-        .then(() => {
-          expect(tooltipElement).toContainText('other text');
-          done();
-        })
-        .catch(done.fail);
-    });
-  });
-
-  describe('with multiple tooltips', () => {
-    beforeEach(() => {
-      const SomeComponent = Vue.extend({
-        directives: {
-          tooltip,
-        },
-        template: `
-          <div>
-            <div
-              v-tooltip
-              class="js-look-for-tooltip"
-              title="foo">
-            </div>
-            <div
-              v-tooltip
-              title="bar">
-            </div>
-          </div>
-        `,
-      });
-
-      vm = new SomeComponent().$mount();
-    });
-
-    it('should have tooltip plugin applied to all instances', () => {
-      expect(
-        $(vm.$el)
-          .find('.js-look-for-tooltip')
-          .data('bs.tooltip'),
-      ).toBeDefined();
-    });
-  });
-});
diff --git a/spec/javascripts/vue_shared/translate_spec.js b/spec/javascripts/vue_shared/translate_spec.js
deleted file mode 100644
index adca7cd64a1..00000000000
--- a/spec/javascripts/vue_shared/translate_spec.js
+++ /dev/null
@@ -1,251 +0,0 @@
-import Vue from 'vue';
-import Jed from 'jed';
-
-import { trimText } from 'spec/helpers/text_helper';
-import locale from '~/locale';
-import Translate from '~/vue_shared/translate';
-
-describe('Vue translate filter', () => {
-  let el;
-
-  const createTranslationMock = (key, ...translations) => {
-    const fakeLocale = new Jed({
-      domain: 'app',
-      locale_data: {
-        app: {
-          '': {
-            domain: 'app',
-            lang: 'vo',
-            plural_forms: 'nplurals=2; plural=(n != 1);',
-          },
-          [key]: translations,
-        },
-      },
-    });
-
-    // eslint-disable-next-line no-underscore-dangle
-    locale.__Rewire__('locale', fakeLocale);
-  };
-
-  afterEach(() => {
-    // eslint-disable-next-line no-underscore-dangle
-    locale.__ResetDependency__('locale');
-  });
-
-  beforeEach(() => {
-    Vue.use(Translate);
-
-    el = document.createElement('div');
-
-    document.body.appendChild(el);
-  });
-
-  it('translate singular text (`__`)', done => {
-    const key = 'singular';
-    const translation = 'singular_translated';
-    createTranslationMock(key, translation);
-
-    const vm = new Vue({
-      el,
-      template: `
-        <span>
-          {{ __('${key}') }}
-        </span>
-      `,
-    }).$mount();
-
-    Vue.nextTick(() => {
-      expect(trimText(vm.$el.textContent)).toBe(translation);
-
-      done();
-    });
-  });
-
-  it('translate plural text (`n__`) without any substituting text', done => {
-    const key = 'plural';
-    const translationPlural = 'plural_multiple translation';
-    createTranslationMock(key, 'plural_singular translation', translationPlural);
-
-    const vm = new Vue({
-      el,
-      template: `
-        <span>
-          {{ n__('${key}', 'plurals', 2) }}
-        </span>
-      `,
-    }).$mount();
-
-    Vue.nextTick(() => {
-      expect(trimText(vm.$el.textContent)).toBe(translationPlural);
-
-      done();
-    });
-  });
-
-  describe('translate plural text (`n__`) with substituting %d', () => {
-    const key = '%d day';
-
-    beforeEach(() => {
-      createTranslationMock(key, '%d singular translated', '%d plural translated');
-    });
-
-    it('and n === 1', done => {
-      const vm = new Vue({
-        el,
-        template: `
-        <span>
-          {{ n__('${key}', '%d days', 1) }}
-        </span>
-      `,
-      }).$mount();
-
-      Vue.nextTick(() => {
-        expect(trimText(vm.$el.textContent)).toBe('1 singular translated');
-
-        done();
-      });
-    });
-
-    it('and n > 1', done => {
-      const vm = new Vue({
-        el,
-        template: `
-        <span>
-          {{ n__('${key}', '%d days', 2) }}
-        </span>
-      `,
-      }).$mount();
-
-      Vue.nextTick(() => {
-        expect(trimText(vm.$el.textContent)).toBe('2 plural translated');
-
-        done();
-      });
-    });
-  });
-
-  describe('translates text with context `s__`', () => {
-    const key = 'Context|Foobar';
-    const translation = 'Context|Foobar translated';
-    const expectation = 'Foobar translated';
-
-    beforeEach(() => {
-      createTranslationMock(key, translation);
-    });
-
-    it('and using two parameters', done => {
-      const vm = new Vue({
-        el,
-        template: `
-        <span>
-          {{ s__('Context', 'Foobar') }}
-        </span>
-      `,
-      }).$mount();
-
-      Vue.nextTick(() => {
-        expect(trimText(vm.$el.textContent)).toBe(expectation);
-
-        done();
-      });
-    });
-
-    it('and using the pipe syntax', done => {
-      const vm = new Vue({
-        el,
-        template: `
-        <span>
-          {{ s__('${key}') }}
-        </span>
-      `,
-      }).$mount();
-
-      Vue.nextTick(() => {
-        expect(trimText(vm.$el.textContent)).toBe(expectation);
-
-        done();
-      });
-    });
-  });
-
-  it('translate multi line text', done => {
-    const translation = 'multiline string translated';
-    createTranslationMock('multiline string', translation);
-
-    const vm = new Vue({
-      el,
-      template: `
-        <span>
-          {{ __(\`
-          multiline
-          string
-          \`) }}
-        </span>
-      `,
-    }).$mount();
-
-    Vue.nextTick(() => {
-      expect(trimText(vm.$el.textContent)).toBe(translation);
-
-      done();
-    });
-  });
-
-  it('translate pluralized multi line text', done => {
-    const translation = 'multiline string plural';
-
-    createTranslationMock('multiline string', 'multiline string singular', translation);
-
-    const vm = new Vue({
-      el,
-      template: `
-        <span>
-          {{ n__(
-          \`
-          multiline
-          string
-          \`,
-          \`
-          multiline
-          strings
-          \`,
-          2
-          ) }}
-        </span>
-      `,
-    }).$mount();
-
-    Vue.nextTick(() => {
-      expect(trimText(vm.$el.textContent)).toBe(translation);
-
-      done();
-    });
-  });
-
-  it('translate pluralized multi line text with context', done => {
-    const translation = 'multiline string with context';
-
-    createTranslationMock('Context| multiline string', translation);
-
-    const vm = new Vue({
-      el,
-      template: `
-        <span>
-          {{ s__(
-          \`
-          Context|
-          multiline
-          string
-          \`
-          ) }}
-        </span>
-      `,
-    }).$mount();
-
-    Vue.nextTick(() => {
-      expect(trimText(vm.$el.textContent)).toBe(translation);
-
-      done();
-    });
-  });
-});
diff --git a/spec/lib/api/entities/release_spec.rb b/spec/lib/api/entities/release_spec.rb
index c45dbc15856..fa9e1e74f9b 100644
--- a/spec/lib/api/entities/release_spec.rb
+++ b/spec/lib/api/entities/release_spec.rb
@@ -4,11 +4,15 @@ require 'spec_helper'
 
 describe API::Entities::Release do
   let_it_be(:project) { create(:project) }
-  let_it_be(:release) { create(:release, :with_evidence, project: project) }
+  let(:release) { create(:release, project: project) }
   let(:evidence) { release.evidences.first }
   let(:user) { create(:user) }
   let(:entity) { described_class.new(release, current_user: user).as_json }
 
+  before do
+    ::Releases::CreateEvidenceService.new(release).execute
+  end
+
   describe 'evidences' do
     context 'when the current user can download code' do
       let(:entity_evidence) { entity[:evidences].first }
diff --git a/spec/lib/api/validations/validators/untrusted_regexp_spec.rb b/spec/lib/api/validations/validators/untrusted_regexp_spec.rb
new file mode 100644
index 00000000000..491bf94fd79
--- /dev/null
+++ b/spec/lib/api/validations/validators/untrusted_regexp_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe API::Validations::Validators::UntrustedRegexp do
+  include ApiValidatorsHelpers
+
+  subject do
+    described_class.new(['test'], {}, false, scope.new)
+  end
+
+  context 'valid regex' do
+    it 'does not raise a validation error' do
+      expect_no_validation_error('test' => 'test')
+      expect_no_validation_error('test' => '.*')
+      expect_no_validation_error('test' => Gitlab::Regex.environment_name_regex_chars)
+    end
+  end
+
+  context 'invalid regex' do
+    it 'raises a validation error' do
+      expect_validation_error('test' => '[')
+      expect_validation_error('test' => '*foobar')
+      expect_validation_error('test' => '?foobar')
+      expect_validation_error('test' => '\A[^/%\s]+(..\z')
+    end
+  end
+end
diff --git a/spec/lib/banzai/filter/design_reference_filter_spec.rb b/spec/lib/banzai/filter/design_reference_filter_spec.rb
new file mode 100644
index 00000000000..8a6c2e3b3f9
--- /dev/null
+++ b/spec/lib/banzai/filter/design_reference_filter_spec.rb
@@ -0,0 +1,307 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Banzai::Filter::DesignReferenceFilter do
+  include FilterSpecHelper
+  include DesignManagementTestHelpers
+
+  let_it_be(:issue)         { create(:issue, iid: 10) }
+  let_it_be(:issue_proj_2)  { create(:issue, iid: 20) }
+  let_it_be(:issue_b)       { create(:issue, project: issue.project) }
+  let_it_be(:developer)     { create(:user, developer_projects: [issue.project, issue_proj_2.project]) }
+  let_it_be(:design_a)      { create(:design, :with_versions, issue: issue) }
+  let_it_be(:design_b)      { create(:design, :with_versions, issue: issue_b) }
+  let_it_be(:design_proj_2) { create(:design, :with_versions, issue: issue_proj_2) }
+  let_it_be(:project_with_no_lfs) { create(:project, :public, lfs_enabled: false) }
+
+  let(:design)       { design_a }
+  let(:project)      { issue.project }
+  let(:project_2)    { issue_proj_2.project }
+  let(:reference)    { design.to_reference }
+  let(:design_url)   { url_for_design(design) }
+  let(:input_text)   { "Added #{design_url}" }
+  let(:doc)          { process_doc(input_text) }
+  let(:current_user) { developer }
+
+  before do
+    enable_design_management
+  end
+
+  shared_examples 'a no-op filter' do
+    it 'does nothing' do
+      expect(process(input_text)).to eq(baseline(input_text).to_html)
+    end
+  end
+
+  shared_examples 'a good link reference' do
+    let(:link) { doc.css('a').first }
+    let(:href) { url_for_design(design) }
+    let(:title) { design.filename }
+
+    it 'produces a good link', :aggregate_failures do
+      expect(link.attr('href')).to eq(href)
+      expect(link.attr('title')).to eq(title)
+      expect(link.attr('class')).to eq('gfm gfm-design has-tooltip')
+      expect(link.attr('data-project')).to eq(design.project.id.to_s)
+      expect(link.attr('data-issue')).to eq(design.issue.id.to_s)
+      expect(link.attr('data-original')).to eq(href)
+      expect(link.attr('data-reference-type')).to eq('design')
+      expect(link.text).to eq(design.to_reference(project))
+    end
+  end
+
+  describe '.call' do
+    it 'requires project context' do
+      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+    end
+  end
+
+  it 'does not error when we add redaction to the pipeline' do
+    enable_design_management
+
+    res = reference_pipeline(redact: true).to_document(input_text)
+
+    expect(res.css('a').first).to be_present
+  end
+
+  describe '#call' do
+    describe 'feature flags' do
+      context 'design management is not enabled' do
+        before do
+          enable_design_management(false)
+        end
+
+        it_behaves_like 'a no-op filter'
+      end
+
+      context 'design reference filter is not enabled' do
+        before do
+          stub_feature_flags(described_class::FEATURE_FLAG => false)
+        end
+
+        it_behaves_like 'a no-op filter'
+
+        it 'issues no queries' do
+          expect { process(input_text) }.not_to exceed_query_limit(0)
+        end
+      end
+
+      context 'the filter is enabled for the context project' do
+        before do
+          stub_feature_flags(described_class::FEATURE_FLAG => project)
+        end
+
+        it_behaves_like 'a good link reference'
+      end
+    end
+  end
+
+  %w(pre code a style).each do |elem|
+    context "wrapped in a <#{elem}/>" do
+      let(:input_text) { "<#{elem}>Design #{url_for_design(design)}</#{elem}>" }
+
+      it_behaves_like 'a no-op filter'
+    end
+  end
+
+  describe '.identifier' do
+    where(:filename) do
+      [
+        ['simple.png'],
+        ['SIMPLE.PNG'],
+        ['has spaces.png'],
+        ['has-hyphen.jpg'],
+        ['snake_case.svg'],
+        ['has "quotes".svg'],
+        ['has <special> characters [o].svg']
+      ]
+    end
+
+    with_them do
+      let(:design) { build(:design, issue: issue, filename: filename) }
+      let(:url) { url_for_design(design) }
+      let(:pattern) { described_class.object_class.link_reference_pattern }
+      let(:parsed) do
+        m = pattern.match(url)
+        described_class.identifier(m) if m
+      end
+
+      it 'can parse the reference' do
+        expect(parsed).to have_attributes(
+          filename: filename,
+          issue_iid: issue.iid
+        )
+      end
+    end
+  end
+
+  describe 'static properties' do
+    specify do
+      expect(described_class).to have_attributes(
+        object_sym: :design,
+        object_class: ::DesignManagement::Design
+      )
+    end
+  end
+
+  describe '#data_attributes_for' do
+    let(:subject) { filter_instance.data_attributes_for(input_text, project, design) }
+
+    specify do
+      is_expected.to include(issue: design.issue_id,
+                             original: input_text,
+                             project: project.id,
+                             design: design.id)
+    end
+  end
+
+  context 'a design with a quoted filename' do
+    let(:filename) { %q{A "very" good file.png} }
+    let(:design) { create(:design, :with_versions, issue: issue, filename: filename) }
+
+    it 'links to the design' do
+      expect(doc.css('a').first.attr('href'))
+        .to eq url_for_design(design)
+    end
+  end
+
+  context 'internal reference' do
+    it_behaves_like 'a reference containing an element node'
+
+    context 'the reference is valid' do
+      it_behaves_like 'a good link reference'
+
+      context 'the filename needs to be escaped' do
+        where(:filename) do
+          [
+            ['with some spaces.png'],
+            ['with <script>console.log("pwded")<%2Fscript>.png']
+          ]
+        end
+
+        with_them do
+          let(:design) { create(:design, :with_versions, filename: filename, issue: issue) }
+          let(:link) { doc.css('a').first }
+
+          it 'replaces the content with the reference, but keeps the link', :aggregate_failures do
+            expect(doc.text).to eq(CGI.unescapeHTML("Added #{design.to_reference}"))
+            expect(link.attr('title')).to eq(design.filename)
+            expect(link.attr('href')).to eq(design_url)
+          end
+        end
+      end
+    end
+
+    context 'the reference is to a non-existant design' do
+      let(:design_url) { url_for_design(build(:design, issue: issue)) }
+
+      it_behaves_like 'a no-op filter'
+    end
+
+    context 'design management is disabled for the referenced project' do
+      let(:public_issue) { create(:issue, project: project_with_no_lfs) }
+      let(:design) { create(:design, :with_versions, issue: public_issue) }
+
+      it_behaves_like 'a no-op filter'
+    end
+  end
+
+  describe 'link pattern' do
+    let(:reference) { url_for_design(design) }
+
+    it 'matches' do
+      expect(reference).to match(DesignManagement::Design.link_reference_pattern)
+    end
+  end
+
+  context 'cross-project / cross-namespace complete reference' do
+    let(:design) { design_proj_2 }
+
+    it_behaves_like 'a reference containing an element node'
+
+    it_behaves_like 'a good link reference'
+
+    it 'links to a valid reference' do
+      expect(doc.css('a').first.attr('href')).to eq(design_url)
+    end
+
+    context 'design management is disabled for that project' do
+      let(:design) { create(:design, project: project_with_no_lfs) }
+
+      it_behaves_like 'a no-op filter'
+    end
+
+    it 'link has valid text' do
+      ref = "#{design.project.full_path}##{design.issue.iid}[#{design.filename}]"
+
+      expect(doc.css('a').first.text).to eql(ref)
+    end
+
+    it 'includes default classes' do
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-design has-tooltip'
+    end
+
+    context 'the reference is invalid' do
+      let(:design_url) { url_for_design(design).gsub(/jpg/, 'gif') }
+
+      it_behaves_like 'a no-op filter'
+    end
+  end
+
+  describe 'performance' do
+    it 'is linear in the number of projects with design management enabled each design refers to' do
+      design_c = build(:design, :with_versions, issue: issue)
+      design_d = build(:design, :with_versions, issue: issue_b)
+      design_e = build(:design, :with_versions, issue: build_stubbed(:issue, project: project_2))
+
+      one_ref_per_project = <<~MD
+      Design #{url_for_design(design_a)}, #{url_for_design(design_proj_2)}
+      MD
+
+      multiple_references = <<~MD
+      Designs that affect the count:
+       * #{url_for_design(design_a)}
+       * #{url_for_design(design_b)}
+       * #{url_for_design(design_c)}
+       * #{url_for_design(design_d)}
+       * #{url_for_design(design_proj_2)}
+       * #{url_for_design(design_e)}
+
+     Things that do not affect the count:
+       * #{url_for_design(build_stubbed(:design, project: project_with_no_lfs))}
+       * #{url_for_designs(issue)}
+       * #1[not a valid reference.gif]
+      MD
+
+      baseline = ActiveRecord::QueryRecorder.new { process(one_ref_per_project) }
+
+      # each project mentioned requires 2 queries:
+      #
+      #  * SELECT "issues".* FROM "issues" WHERE "issues"."project_id" = 1 AND ...
+      #      :in `parent_records'*/
+      #  * SELECT "_designs".* FROM "_designs"
+      #      WHERE (issue_id = ? AND filename = ?) OR ...
+      #      :in `parent_records'*/
+      #
+      # In addition there is a 1 query overhead for all the projects at the
+      # start. Currently, the baseline for 2 projects is `2 * 2 + 1 = 5` queries
+      #
+      expect { process(multiple_references) }.not_to exceed_query_limit(baseline.count)
+    end
+  end
+
+  private
+
+  def process_doc(text)
+    reference_filter(text, project: project)
+  end
+
+  def baseline(text)
+    null_filter(text, project: project)
+  end
+
+  def process(text)
+    process_doc(text).to_html
+  end
+end
diff --git a/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb b/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
index 78795a157f8..a70c820f97a 100644
--- a/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
@@ -5,10 +5,6 @@ require 'spec_helper'
 describe Banzai::Filter::ExternalIssueReferenceFilter do
   include FilterSpecHelper
 
-  def helper
-    IssuesHelper
-  end
-
   shared_examples_for "external issue tracker" do
     it_behaves_like 'a reference containing an element node'
 
@@ -36,7 +32,7 @@ describe Banzai::Filter::ExternalIssueReferenceFilter do
       issue_id = doc.css('a').first.attr("data-external-issue")
 
       expect(doc.css('a').first.attr('href'))
-        .to eq helper.url_for_issue(issue_id, project)
+        .to eq project.external_issue_tracker.issue_url(issue_id)
     end
 
     it 'links to the external tracker' do
@@ -45,7 +41,7 @@ describe Banzai::Filter::ExternalIssueReferenceFilter do
       link = doc.css('a').first.attr('href')
       issue_id = doc.css('a').first.attr("data-external-issue")
 
-      expect(link).to eq(helper.url_for_issue(issue_id, project))
+      expect(link).to eq(project.external_issue_tracker.issue_url(issue_id))
     end
 
     it 'links with adjacent text' do
@@ -56,7 +52,7 @@ describe Banzai::Filter::ExternalIssueReferenceFilter do
 
     it 'includes a title attribute' do
       doc = filter("Issue #{reference}")
-      expect(doc.css('a').first.attr('title')).to include("Issue in #{project.issues_tracker.title}")
+      expect(doc.css('a').first.attr('title')).to include("Issue in #{project.external_issue_tracker.title}")
     end
 
     it 'escapes the title attribute' do
@@ -78,7 +74,25 @@ describe Banzai::Filter::ExternalIssueReferenceFilter do
       link = doc.css('a').first.attr('href')
       issue_id = doc.css('a').first["data-external-issue"]
 
-      expect(link).to eq helper.url_for_issue(issue_id, project, only_path: true)
+      expect(link).to eq project.external_issue_tracker.issue_path(issue_id)
+    end
+
+    it 'has an empty link if issue_url is invalid' do
+      expect_any_instance_of(project.external_issue_tracker.class).to receive(:issue_url) { 'javascript:alert("foo");' }
+
+      doc = filter("Issue #{reference}")
+      link = doc.css('a').first.attr('href')
+
+      expect(link).to eq ''
+    end
+
+    it 'has an empty link if issue_path is invalid' do
+      expect_any_instance_of(project.external_issue_tracker.class).to receive(:issue_path) { 'javascript:alert("foo");' }
+
+      doc = filter("Issue #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).to eq ''
     end
 
     context 'with RequestStore enabled', :request_store do
diff --git a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
index 1580177eaad..00d8b871224 100644
--- a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
+++ b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
@@ -7,11 +7,11 @@ describe Banzai::Filter::GollumTagsFilter do
 
   let(:project) { create(:project) }
   let(:user) { double }
-  let(:project_wiki) { ProjectWiki.new(project, user) }
+  let(:wiki) { ProjectWiki.new(project, user) }
 
   describe 'validation' do
-    it 'ensure that a :project_wiki key exists in context' do
-      expect { filter("See [[images/image.jpg]]", {}) }.to raise_error ArgumentError, "Missing context keys for Banzai::Filter::GollumTagsFilter: :project_wiki"
+    it 'ensure that a :wiki key exists in context' do
+      expect { filter("See [[images/image.jpg]]", {}) }.to raise_error ArgumentError, "Missing context keys for Banzai::Filter::GollumTagsFilter: :wiki"
     end
   end
 
@@ -23,19 +23,19 @@ describe Banzai::Filter::GollumTagsFilter do
                                   path: 'images/image.jpg',
                                   raw_data: '')
       wiki_file = Gitlab::Git::WikiFile.new(gollum_file_double)
-      expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(wiki_file)
+      expect(wiki).to receive(:find_file).with('images/image.jpg').and_return(wiki_file)
 
       tag = '[[images/image.jpg]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
-      expect(doc.at_css('img')['data-src']).to eq "#{project_wiki.wiki_base_path}/images/image.jpg"
+      expect(doc.at_css('img')['data-src']).to eq "#{wiki.wiki_base_path}/images/image.jpg"
     end
 
     it 'does not creates img tag if image does not exist' do
-      expect(project_wiki).to receive(:find_file).with('images/image.jpg').and_return(nil)
+      expect(wiki).to receive(:find_file).with('images/image.jpg').and_return(nil)
 
       tag = '[[images/image.jpg]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.css('img').size).to eq 0
     end
@@ -44,14 +44,14 @@ describe Banzai::Filter::GollumTagsFilter do
   context 'linking external images' do
     it 'creates img tag for valid URL' do
       tag = '[[http://example.com/image.jpg]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.at_css('img')['data-src']).to eq "http://example.com/image.jpg"
     end
 
     it 'does not creates img tag for invalid URL' do
       tag = '[[http://example.com/image.pdf]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.css('img').size).to eq 0
     end
@@ -60,7 +60,7 @@ describe Banzai::Filter::GollumTagsFilter do
   context 'linking external resources' do
     it "the created link's text will be equal to the resource's text" do
       tag = '[[http://example.com]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.at_css('a').text).to eq 'http://example.com'
       expect(doc.at_css('a')['href']).to eq 'http://example.com'
@@ -68,7 +68,7 @@ describe Banzai::Filter::GollumTagsFilter do
 
     it "the created link's text will be link-text" do
       tag = '[[link-text|http://example.com/pdfs/gollum.pdf]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
+      doc = filter("See #{tag}", wiki: wiki)
 
       expect(doc.at_css('a').text).to eq 'link-text'
       expect(doc.at_css('a')['href']).to eq 'http://example.com/pdfs/gollum.pdf'
@@ -78,8 +78,8 @@ describe Banzai::Filter::GollumTagsFilter do
   context 'linking internal resources' do
     it "the created link's text includes the resource's text and wiki base path" do
       tag = '[[wiki-slug]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
-      expected_path = ::File.join(project_wiki.wiki_base_path, 'wiki-slug')
+      doc = filter("See #{tag}", wiki: wiki)
+      expected_path = ::File.join(wiki.wiki_base_path, 'wiki-slug')
 
       expect(doc.at_css('a').text).to eq 'wiki-slug'
       expect(doc.at_css('a')['href']).to eq expected_path
@@ -87,15 +87,15 @@ describe Banzai::Filter::GollumTagsFilter do
 
     it "the created link's text will be link-text" do
       tag = '[[link-text|wiki-slug]]'
-      doc = filter("See #{tag}", project_wiki: project_wiki)
-      expected_path = ::File.join(project_wiki.wiki_base_path, 'wiki-slug')
+      doc = filter("See #{tag}", wiki: wiki)
+      expected_path = ::File.join(wiki.wiki_base_path, 'wiki-slug')
 
       expect(doc.at_css('a').text).to eq 'link-text'
       expect(doc.at_css('a')['href']).to eq expected_path
     end
 
     it "inside back ticks will be exempt from linkification" do
-      doc = filter('<code>[[link-in-backticks]]</code>', project_wiki: project_wiki)
+      doc = filter('<code>[[link-in-backticks]]</code>', wiki: wiki)
 
       expect(doc.at_css('code').text).to eq '[[link-in-backticks]]'
     end
diff --git a/spec/lib/banzai/filter/issue_reference_filter_spec.rb b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
index 61c59162a30..603da2b4421 100644
--- a/spec/lib/banzai/filter/issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
@@ -11,7 +11,9 @@ describe Banzai::Filter::IssueReferenceFilter do
   end
 
   let(:project) { create(:project, :public) }
-  let(:issue)  { create(:issue, project: project) }
+  let(:issue) { create(:issue, project: project) }
+  let(:issue_path) { "/#{issue.project.namespace.path}/#{issue.project.path}/-/issues/#{issue.iid}" }
+  let(:issue_url) { "http://#{Gitlab.config.gitlab.host}#{issue_path}" }
 
   it 'requires project context' do
     expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
@@ -46,7 +48,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       doc = reference_filter("Fixed #{reference}")
 
       expect(doc.css('a').first.attr('href'))
-        .to eq helper.url_for_issue(issue.iid, project)
+        .to eq issue_url
     end
 
     it 'links with adjacent text' do
@@ -113,7 +115,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       link = doc.css('a').first.attr('href')
 
       expect(link).not_to match %r(https?://)
-      expect(link).to eq helper.url_for_issue(issue.iid, project, only_path: true)
+      expect(link).to eq issue_path
     end
 
     it 'does not process links containing issue numbers followed by text' do
@@ -145,7 +147,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       doc = reference_filter("See #{reference}")
 
       expect(doc.css('a').first.attr('href'))
-        .to eq helper.url_for_issue(issue.iid, project2)
+        .to eq issue_url
     end
 
     it 'link has valid text' do
@@ -195,7 +197,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       doc = reference_filter("See #{reference}")
 
       expect(doc.css('a').first.attr('href'))
-        .to eq helper.url_for_issue(issue.iid, project2)
+        .to eq issue_url
     end
 
     it 'link has valid text' do
@@ -245,7 +247,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       doc = reference_filter("See #{reference}")
 
       expect(doc.css('a').first.attr('href'))
-        .to eq helper.url_for_issue(issue.iid, project2)
+        .to eq issue_url
     end
 
     it 'link has valid text' do
@@ -279,7 +281,7 @@ describe Banzai::Filter::IssueReferenceFilter do
     let(:namespace) { create(:namespace, name: 'cross-reference') }
     let(:project2)  { create(:project, :public, namespace: namespace) }
     let(:issue)     { create(:issue, project: project2) }
-    let(:reference) { helper.url_for_issue(issue.iid, project2) + "#note_123" }
+    let(:reference) { issue_url + "#note_123" }
 
     it 'links to a valid reference' do
       doc = reference_filter("See #{reference}")
@@ -314,7 +316,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       doc = reference_filter("See #{reference_link}")
 
       expect(doc.css('a').first.attr('href'))
-        .to eq helper.url_for_issue(issue.iid, project2)
+        .to eq issue_url
     end
 
     it 'links with adjacent text' do
@@ -336,14 +338,14 @@ describe Banzai::Filter::IssueReferenceFilter do
     let(:namespace) { create(:namespace, name: 'cross-reference') }
     let(:project2)  { create(:project, :public, namespace: namespace) }
     let(:issue)     { create(:issue, project: project2) }
-    let(:reference) { "#{helper.url_for_issue(issue.iid, project2) + "#note_123"}" }
+    let(:reference) { "#{issue_url + "#note_123"}" }
     let(:reference_link) { %{<a href="#{reference}">Reference</a>} }
 
     it 'links to a valid reference' do
       doc = reference_filter("See #{reference_link}")
 
       expect(doc.css('a').first.attr('href'))
-        .to eq helper.url_for_issue(issue.iid, project2) + "#note_123"
+        .to eq issue_url + "#note_123"
     end
 
     it 'links with adjacent text' do
@@ -374,6 +376,16 @@ describe Banzai::Filter::IssueReferenceFilter do
       expect(link.attr('href')).to eq(designs_tab_url)
       expect(link.text).to eq("#{issue.to_reference} (designs)")
     end
+
+    context 'design management is not available' do
+      before do
+        enable_design_management(false)
+      end
+
+      it 'links to the issue, but not to the designs tab' do
+        expect(link.text).to eq(issue.to_reference)
+      end
+    end
   end
 
   context 'group context' do
@@ -403,7 +415,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       doc = reference_filter("See #{reference}", context)
 
       link = doc.css('a').first
-      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project))
+      expect(link.attr('href')).to eq(issue_url)
       expect(link.text).to include("#{project.full_path}##{issue.iid}")
     end
 
@@ -415,23 +427,23 @@ describe Banzai::Filter::IssueReferenceFilter do
     end
 
     it 'links to a valid reference for url cross-reference' do
-      reference = helper.url_for_issue(issue.iid, project) + "#note_123"
+      reference = issue_url + "#note_123"
 
       doc = reference_filter("See #{reference}", context)
 
       link = doc.css('a').first
-      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project) + "#note_123")
+      expect(link.attr('href')).to eq(issue_url + "#note_123")
       expect(link.text).to include("#{project.full_path}##{issue.iid}")
     end
 
     it 'links to a valid reference for cross-reference in link href' do
-      reference = "#{helper.url_for_issue(issue.iid, project) + "#note_123"}"
+      reference = "#{issue_url + "#note_123"}"
       reference_link = %{<a href="#{reference}">Reference</a>}
 
       doc = reference_filter("See #{reference_link}", context)
 
       link = doc.css('a').first
-      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project) + "#note_123")
+      expect(link.attr('href')).to eq(issue_url + "#note_123")
       expect(link.text).to include('Reference')
     end
 
@@ -441,7 +453,7 @@ describe Banzai::Filter::IssueReferenceFilter do
       doc = reference_filter("See #{reference_link}", context)
 
       link = doc.css('a').first
-      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project))
+      expect(link.attr('href')).to eq(issue_url)
       expect(link.text).to include('Reference')
     end
   end
diff --git a/spec/lib/banzai/filter/label_reference_filter_spec.rb b/spec/lib/banzai/filter/label_reference_filter_spec.rb
index de7a70db1ac..0b697ab2040 100644
--- a/spec/lib/banzai/filter/label_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/label_reference_filter_spec.rb
@@ -47,14 +47,34 @@ describe Banzai::Filter::LabelReferenceFilter do
     expect(link.attr('data-label')).to eq label.id.to_s
   end
 
-  it 'supports an :only_path context' do
+  it 'includes protocol when :only_path not present' do
+    doc = reference_filter("Label #{reference}")
+    link = doc.css('a').first.attr('href')
+
+    expect(link).to match %r(https?://)
+  end
+
+  it 'does not include protocol when :only_path true' do
     doc = reference_filter("Label #{reference}", only_path: true)
     link = doc.css('a').first.attr('href')
 
     expect(link).not_to match %r(https?://)
+  end
+
+  it 'links to issue list when :label_url_method is not present' do
+    doc = reference_filter("Label #{reference}", only_path: true)
+    link = doc.css('a').first.attr('href')
+
     expect(link).to eq urls.project_issues_path(project, label_name: label.name)
   end
 
+  it 'links to merge request list when `label_url_method: :project_merge_requests_url`' do
+    doc = reference_filter("Label #{reference}", { only_path: true, label_url_method: "project_merge_requests_url" })
+    link = doc.css('a').first.attr('href')
+
+    expect(link).to eq urls.project_merge_requests_path(project, label_name: label.name)
+  end
+
   context 'project that does not exist referenced' do
     let(:result) { reference_filter('aaa/bbb~ccc') }
 
diff --git a/spec/lib/banzai/filter/repository_link_filter_spec.rb b/spec/lib/banzai/filter/repository_link_filter_spec.rb
index 460c76acd78..81f93f885f7 100644
--- a/spec/lib/banzai/filter/repository_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/repository_link_filter_spec.rb
@@ -12,7 +12,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       project:        project,
       current_user:   user,
       group:          group,
-      project_wiki:   project_wiki,
+      wiki:           wiki,
       ref:            ref,
       requested_path: requested_path,
       only_path:      only_path
@@ -53,7 +53,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
   let(:project_path)   { project.full_path }
   let(:ref)            { 'markdown' }
   let(:commit)         { project.commit(ref) }
-  let(:project_wiki)   { nil }
+  let(:wiki)           { nil }
   let(:requested_path) { '/' }
   let(:only_path)      { true }
 
@@ -94,8 +94,8 @@ describe Banzai::Filter::RepositoryLinkFilter do
     end
   end
 
-  context 'with a project_wiki' do
-    let(:project_wiki) { double('ProjectWiki') }
+  context 'with a wiki' do
+    let(:wiki) { double('ProjectWiki') }
 
     include_examples :preserve_unchanged
   end
diff --git a/spec/lib/banzai/filter/wiki_link_filter_spec.rb b/spec/lib/banzai/filter/wiki_link_filter_spec.rb
index 4587bd85939..827f38ef717 100644
--- a/spec/lib/banzai/filter/wiki_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/wiki_link_filter_spec.rb
@@ -12,13 +12,13 @@ describe Banzai::Filter::WikiLinkFilter do
   let(:repository_upload_folder) { Wikis::CreateAttachmentService::ATTACHMENT_PATH }
 
   it "doesn't rewrite absolute links" do
-    filtered_link = filter("<a href='http://example.com:8000/'>Link</a>", project_wiki: wiki).children[0]
+    filtered_link = filter("<a href='http://example.com:8000/'>Link</a>", wiki: wiki).children[0]
 
     expect(filtered_link.attribute('href').value).to eq('http://example.com:8000/')
   end
 
   it "doesn't rewrite links to project uploads" do
-    filtered_link = filter("<a href='/uploads/a.test'>Link</a>", project_wiki: wiki).children[0]
+    filtered_link = filter("<a href='/uploads/a.test'>Link</a>", wiki: wiki).children[0]
 
     expect(filtered_link.attribute('href').value).to eq('/uploads/a.test')
   end
@@ -26,7 +26,7 @@ describe Banzai::Filter::WikiLinkFilter do
   describe "when links point to the #{Wikis::CreateAttachmentService::ATTACHMENT_PATH} folder" do
     context 'with an "a" html tag' do
       it 'rewrites links' do
-        filtered_link = filter("<a href='#{repository_upload_folder}/a.test'>Link</a>", project_wiki: wiki).children[0]
+        filtered_link = filter("<a href='#{repository_upload_folder}/a.test'>Link</a>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('href').value).to eq("#{wiki.wiki_base_path}/#{repository_upload_folder}/a.test")
       end
@@ -37,7 +37,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
       context 'inside an "a" html tag' do
         it 'rewrites links' do
-          filtered_elements = filter("<a href='#{repository_upload_folder}/a.jpg'><img src='#{repository_upload_folder}/a.jpg'>example</img></a>", project_wiki: wiki)
+          filtered_elements = filter("<a href='#{repository_upload_folder}/a.jpg'><img src='#{repository_upload_folder}/a.jpg'>example</img></a>", wiki: wiki)
 
           expect(filtered_elements.search('img').first.attribute('src').value).to eq(path)
           expect(filtered_elements.search('a').first.attribute('href').value).to eq(path)
@@ -46,7 +46,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
       context 'outside an "a" html tag' do
         it 'rewrites links' do
-          filtered_link = filter("<img src='#{repository_upload_folder}/a.jpg'>example</img>", project_wiki: wiki).children[0]
+          filtered_link = filter("<img src='#{repository_upload_folder}/a.jpg'>example</img>", wiki: wiki).children[0]
 
           expect(filtered_link.attribute('src').value).to eq(path)
         end
@@ -55,7 +55,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
     context 'with "video" html tag' do
       it 'rewrites links' do
-        filtered_link = filter("<video src='#{repository_upload_folder}/a.mp4'></video>", project_wiki: wiki).children[0]
+        filtered_link = filter("<video src='#{repository_upload_folder}/a.mp4'></video>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('src').value).to eq("#{wiki.wiki_base_path}/#{repository_upload_folder}/a.mp4")
       end
@@ -63,7 +63,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
     context 'with "audio" html tag' do
       it 'rewrites links' do
-        filtered_link = filter("<audio src='#{repository_upload_folder}/a.wav'></audio>", project_wiki: wiki).children[0]
+        filtered_link = filter("<audio src='#{repository_upload_folder}/a.wav'></audio>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('src').value).to eq("#{wiki.wiki_base_path}/#{repository_upload_folder}/a.wav")
       end
@@ -75,7 +75,7 @@ describe Banzai::Filter::WikiLinkFilter do
 
     invalid_links.each do |invalid_link|
       it "doesn't rewrite invalid invalid_links like #{invalid_link}" do
-        filtered_link = filter("<a href='#{invalid_link}'>Link</a>", project_wiki: wiki).children[0]
+        filtered_link = filter("<a href='#{invalid_link}'>Link</a>", wiki: wiki).children[0]
 
         expect(filtered_link.attribute('href').value).to eq(invalid_link)
       end
diff --git a/spec/lib/banzai/pipeline/description_pipeline_spec.rb b/spec/lib/banzai/pipeline/description_pipeline_spec.rb
index 5ecd3df5151..6778a273bba 100644
--- a/spec/lib/banzai/pipeline/description_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/description_pipeline_spec.rb
@@ -3,12 +3,14 @@
 require 'spec_helper'
 
 describe Banzai::Pipeline::DescriptionPipeline do
+  let_it_be(:project) { create(:project) }
+
   def parse(html)
     # When we pass HTML to Redcarpet, it gets wrapped in `p` tags...
     # ...except when we pass it pre-wrapped text. Rabble rabble.
     unwrap = !html.start_with?('<p ')
 
-    output = described_class.to_html(html, project: spy)
+    output = described_class.to_html(html, project: project)
 
     output.gsub!(%r{\A<p dir="auto">(.*)</p>(.*)\z}, '\1\2') if unwrap
 
diff --git a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
index 4d16c568c13..b2c24284eb9 100644
--- a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
@@ -3,6 +3,11 @@
 require 'spec_helper'
 
 describe Banzai::Pipeline::WikiPipeline do
+  let_it_be(:namespace) { create(:namespace, name: "wiki_link_ns") }
+  let_it_be(:project)   { create(:project, :public, name: "wiki_link_project", namespace: namespace) }
+  let_it_be(:wiki)      { ProjectWiki.new(project, double(:user)) }
+  let_it_be(:page)      { build(:wiki_page, wiki: wiki, title: 'nested/twice/start-page') }
+
   describe 'TableOfContents' do
     it 'replaces the tag with the TableOfContentsFilter result' do
       markdown = <<-MD.strip_heredoc
@@ -13,7 +18,7 @@ describe Banzai::Pipeline::WikiPipeline do
           Foo
       MD
 
-      result = described_class.call(markdown, project: spy, project_wiki: spy)
+      result = described_class.call(markdown, project: project, wiki: wiki)
 
       aggregate_failures do
         expect(result[:output].text).not_to include '[['
@@ -31,7 +36,7 @@ describe Banzai::Pipeline::WikiPipeline do
           Foo
       MD
 
-      output = described_class.to_html(markdown, project: spy, project_wiki: spy)
+      output = described_class.to_html(markdown, project: project, wiki: wiki)
 
       expect(output).to include('[[<em>toc</em>]]')
     end
@@ -44,7 +49,7 @@ describe Banzai::Pipeline::WikiPipeline do
           Foo
       MD
 
-      output = described_class.to_html(markdown, project: spy, project_wiki: spy)
+      output = described_class.to_html(markdown, project: project, wiki: wiki)
 
       aggregate_failures do
         expect(output).not_to include('<ul>')
@@ -54,30 +59,25 @@ describe Banzai::Pipeline::WikiPipeline do
   end
 
   describe "Links" do
-    let(:namespace) { create(:namespace, name: "wiki_link_ns") }
-    let(:project)   { create(:project, :public, name: "wiki_link_project", namespace: namespace) }
-    let(:project_wiki) { ProjectWiki.new(project, double(:user)) }
-    let(:page) { build(:wiki_page, wiki: project_wiki, title: 'nested/twice/start-page') }
-
     { 'when GitLab is hosted at a root URL' => '',
       'when GitLab is hosted at a relative URL' => '/nested/relative/gitlab' }.each do |test_name, relative_url_root|
       context test_name do
         before do
-          allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return(relative_url_root)
+          allow(Rails.application.routes).to receive(:default_url_options).and_return(script_name: relative_url_root)
         end
 
         describe "linking to pages within the wiki" do
           context "when creating hierarchical links to the current directory" do
             it "rewrites non-file links to be at the scope of the current directory" do
               markdown = "[Page](./page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page\"")
             end
 
             it "rewrites file links to be at the scope of the current directory" do
               markdown = "[Link to Page](./page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page.md\"")
             end
@@ -86,14 +86,14 @@ describe Banzai::Pipeline::WikiPipeline do
           context "when creating hierarchical links to the parent directory" do
             it "rewrites non-file links to be at the scope of the parent directory" do
               markdown = "[Link to Page](../page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/page\"")
             end
 
             it "rewrites file links to be at the scope of the parent directory" do
               markdown = "[Link to Page](../page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/page.md\"")
             end
@@ -102,14 +102,14 @@ describe Banzai::Pipeline::WikiPipeline do
           context "when creating hierarchical links to a sub-directory" do
             it "rewrites non-file links to be at the scope of the sub-directory" do
               markdown = "[Link to Page](./subdirectory/page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/subdirectory/page\"")
             end
 
             it "rewrites file links to be at the scope of the sub-directory" do
               markdown = "[Link to Page](./subdirectory/page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/subdirectory/page.md\"")
             end
@@ -118,35 +118,35 @@ describe Banzai::Pipeline::WikiPipeline do
           describe "when creating non-hierarchical links" do
             it 'rewrites non-file links to be at the scope of the wiki root' do
               markdown = "[Link to Page](page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page\"")
             end
 
             it 'rewrites non-file links (with spaces) to be at the scope of the wiki root' do
               markdown = "[Link to Page](page slug)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page%20slug\"")
             end
 
             it "rewrites file links to be at the scope of the current directory" do
               markdown = "[Link to Page](page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/page.md\"")
             end
 
             it 'rewrites links with anchor' do
               markdown = '[Link to Header](start-page#title)'
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/start-page#title\"")
             end
 
             it 'rewrites links (with spaces) with anchor' do
               markdown = '[Link to Header](start page#title)'
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/start%20page#title\"")
             end
@@ -155,14 +155,14 @@ describe Banzai::Pipeline::WikiPipeline do
           describe "when creating root links" do
             it 'rewrites non-file links to be at the scope of the wiki root' do
               markdown = "[Link to Page](/page)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page\"")
             end
 
             it 'rewrites file links to be at the scope of the wiki root' do
               markdown = "[Link to Page](/page.md)"
-              output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+              output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
               expect(output).to include("href=\"#{relative_url_root}/wiki_link_ns/wiki_link_project/-/wikis/page.md\"")
             end
@@ -172,7 +172,7 @@ describe Banzai::Pipeline::WikiPipeline do
         describe "linking to pages outside the wiki (absolute)" do
           it "doesn't rewrite links" do
             markdown = "[Link to Page](http://example.com/page)"
-            output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+            output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
             expect(output).to include('href="http://example.com/page"')
           end
@@ -188,7 +188,7 @@ describe Banzai::Pipeline::WikiPipeline do
           output = described_class.to_html(
             "[Link](./alert(1);)",
             project: project,
-            project_wiki: project_wiki,
+            wiki: wiki,
             page_slug: valid_slug
           )
 
@@ -199,7 +199,7 @@ describe Banzai::Pipeline::WikiPipeline do
           output = described_class.to_html(
             "[Link](../alert(1);)",
             project: project,
-            project_wiki: project_wiki,
+            wiki: wiki,
             page_slug: valid_slug
           )
 
@@ -236,7 +236,7 @@ describe Banzai::Pipeline::WikiPipeline do
                 output = described_class.to_html(
                   "[Link](./#{link})",
                   project: project,
-                  project_wiki: project_wiki,
+                  wiki: wiki,
                   page_slug: slug
                 )
 
@@ -247,7 +247,7 @@ describe Banzai::Pipeline::WikiPipeline do
                 output = described_class.to_html(
                   "[Link](../#{link})",
                   project: project,
-                  project_wiki: project_wiki,
+                  wiki: wiki,
                   page_slug: slug
                 )
 
@@ -261,35 +261,30 @@ describe Banzai::Pipeline::WikiPipeline do
   end
 
   describe 'videos and audio' do
-    let_it_be(:namespace) { create(:namespace, name: "wiki_link_ns") }
-    let_it_be(:project)   { create(:project, :public, name: "wiki_link_project", namespace: namespace) }
-    let_it_be(:project_wiki) { ProjectWiki.new(project, double(:user)) }
-    let_it_be(:page) { build(:wiki_page, wiki: project_wiki, title: 'nested/twice/start-page') }
-
     it 'generates video html structure' do
       markdown = "![video_file](video_file_name.mp4)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/video_file_name.mp4"')
     end
 
     it 'rewrites and replaces video links names with white spaces to %20' do
       markdown = "![video file](video file name.mp4)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<video src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/video%20file%20name.mp4"')
     end
 
     it 'generates audio html structure' do
       markdown = "![audio_file](audio_file_name.wav)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/audio_file_name.wav"')
     end
 
     it 'rewrites and replaces audio links names with white spaces to %20' do
       markdown = "![audio file](audio file name.wav)"
-      output = described_class.to_html(markdown, project: project, project_wiki: project_wiki, page_slug: page.slug)
+      output = described_class.to_html(markdown, project: project, wiki: wiki, page_slug: page.slug)
 
       expect(output).to include('<audio src="/wiki_link_ns/wiki_link_project/-/wikis/nested/twice/audio%20file%20name.wav"')
     end
diff --git a/spec/lib/constraints/feature_constrainer_spec.rb b/spec/lib/constraints/feature_constrainer_spec.rb
index 0739da801a7..7665d5b3547 100644
--- a/spec/lib/constraints/feature_constrainer_spec.rb
+++ b/spec/lib/constraints/feature_constrainer_spec.rb
@@ -5,9 +5,12 @@ require 'spec_helper'
 describe Constraints::FeatureConstrainer do
   describe '#matches' do
     it 'calls Feature.enabled? with the correct arguments' do
-      expect(Feature).to receive(:enabled?).with(:feature_name, "an object", default_enabled: true)
+      gate = stub_feature_flag_gate("an object")
 
-      described_class.new(:feature_name, "an object", default_enabled: true).matches?(double('request'))
+      expect(Feature).to receive(:enabled?)
+        .with(:feature_name, gate, default_enabled: true)
+
+      described_class.new(:feature_name, gate, default_enabled: true).matches?(double('request'))
     end
   end
 end
diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb
index ef9929a9dce..a56768a1a88 100644
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
@@ -7,17 +7,15 @@ describe ExtractsPath do
   include RepoHelpers
   include Gitlab::Routing
 
-  let(:project) { double('project') }
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:container) { create(:project, :repository, creator: owner) }
   let(:request) { double('request') }
 
   before do
-    @project = project
+    @project = container
+    ref_names = ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0', 'release/app', 'release/app/v1.0.0']
 
-    repo = double(ref_names: ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0',
-                              'release/app', 'release/app/v1.0.0'])
-    allow(project).to receive(:repository).and_return(repo)
-    allow(project).to receive(:full_path)
-      .and_return('gitlab/gitlab-ci')
+    allow(container.repository).to receive(:ref_names).and_return(ref_names)
     allow(request).to receive(:format=)
   end
 
@@ -25,45 +23,12 @@ describe ExtractsPath do
     let(:ref) { sample_commit[:id] }
     let(:params) { { path: sample_commit[:line_code_path], ref: ref } }
 
-    before do
-      @project = create(:project, :repository)
-    end
+    it_behaves_like 'assigns ref vars'
 
-    it "log tree path has no escape sequences" do
+    it 'log tree path has no escape sequences' do
       assign_ref_vars
-      expect(@logs_path).to eq("/#{@project.full_path}/-/refs/#{ref}/logs_tree/files/ruby/popen.rb")
-    end
-
-    context 'ref contains %20' do
-      let(:ref) { 'foo%20bar' }
-
-      it 'is not converted to a space in @id' do
-        @project.repository.add_branch(@project.owner, 'foo%20bar', 'master')
-
-        assign_ref_vars
-
-        expect(@id).to start_with('foo%20bar/')
-      end
-    end
-
-    context 'ref contains trailing space' do
-      let(:ref) { 'master ' }
-
-      it 'strips surrounding space' do
-        assign_ref_vars
 
-        expect(@ref).to eq('master')
-      end
-    end
-
-    context 'ref contains leading space' do
-      let(:ref) { ' master ' }
-
-      it 'strips surrounding space' do
-        assign_ref_vars
-
-        expect(@ref).to eq('master')
-      end
+      expect(@logs_path).to eq("/#{@project.full_path}/-/refs/#{ref}/logs_tree/files/ruby/popen.rb")
     end
 
     context 'ref contains space in the middle' do
@@ -76,28 +41,6 @@ describe ExtractsPath do
       end
     end
 
-    context 'path contains space' do
-      let(:params) { { path: 'with space', ref: '38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e' } }
-
-      it 'is not converted to %20 in @path' do
-        assign_ref_vars
-
-        expect(@path).to eq(params[:path])
-      end
-    end
-
-    context 'subclass overrides get_id' do
-      it 'uses ref returned by get_id' do
-        allow_next_instance_of(self.class) do |instance|
-          allow(instance).to receive(:get_id) { '38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e' }
-        end
-
-        assign_ref_vars
-
-        expect(@id).to eq(get_id)
-      end
-    end
-
     context 'ref only exists without .atom suffix' do
       context 'with a path' do
         let(:params) { { ref: 'v1.0.0.atom', path: 'README.md' } }
@@ -171,58 +114,7 @@ describe ExtractsPath do
     end
   end
 
-  describe '#extract_ref' do
-    it "returns an empty pair when no @project is set" do
-      @project = nil
-      expect(extract_ref('master/CHANGELOG')).to eq(['', ''])
-    end
-
-    context "without a path" do
-      it "extracts a valid branch" do
-        expect(extract_ref('master')).to eq(['master', ''])
-      end
-
-      it "extracts a valid tag" do
-        expect(extract_ref('v2.0.0')).to eq(['v2.0.0', ''])
-      end
-
-      it "extracts a valid commit ref without a path" do
-        expect(extract_ref('f4b14494ef6abf3d144c28e4af0c20143383e062')).to eq(
-          ['f4b14494ef6abf3d144c28e4af0c20143383e062', '']
-        )
-      end
-
-      it "falls back to a primitive split for an invalid ref" do
-        expect(extract_ref('stable')).to eq(['stable', ''])
-      end
-
-      it "extracts the longest matching ref" do
-        expect(extract_ref('release/app/v1.0.0/README.md')).to eq(
-          ['release/app/v1.0.0', 'README.md'])
-      end
-    end
-
-    context "with a path" do
-      it "extracts a valid branch" do
-        expect(extract_ref('foo/bar/baz/CHANGELOG')).to eq(
-          ['foo/bar/baz', 'CHANGELOG'])
-      end
-
-      it "extracts a valid tag" do
-        expect(extract_ref('v2.0.0/CHANGELOG')).to eq(['v2.0.0', 'CHANGELOG'])
-      end
-
-      it "extracts a valid commit SHA" do
-        expect(extract_ref('f4b14494ef6abf3d144c28e4af0c20143383e062/CHANGELOG')).to eq(
-          %w(f4b14494ef6abf3d144c28e4af0c20143383e062 CHANGELOG)
-        )
-      end
-
-      it "falls back to a primitive split for an invalid ref" do
-        expect(extract_ref('stable/CHANGELOG')).to eq(%w(stable CHANGELOG))
-      end
-    end
-  end
+  it_behaves_like 'extracts refs'
 
   describe '#extract_ref_without_atom' do
     it 'ignores any matching refs suffixed with atom' do
diff --git a/spec/lib/extracts_ref_spec.rb b/spec/lib/extracts_ref_spec.rb
new file mode 100644
index 00000000000..1867f639711
--- /dev/null
+++ b/spec/lib/extracts_ref_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ExtractsRef do
+  include described_class
+  include RepoHelpers
+
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:container) { create(:snippet, :repository, author: owner) }
+  let(:ref) { sample_commit[:id] }
+  let(:params) { { path: sample_commit[:line_code_path], ref: ref } }
+
+  before do
+    ref_names = ['master', 'foo/bar/baz', 'v1.0.0', 'v2.0.0', 'release/app', 'release/app/v1.0.0']
+
+    allow(container.repository).to receive(:ref_names).and_return(ref_names)
+    allow_any_instance_of(described_class).to receive(:repository_container).and_return(container)
+  end
+
+  it_behaves_like 'assigns ref vars'
+  it_behaves_like 'extracts refs'
+end
diff --git a/spec/lib/feature/gitaly_spec.rb b/spec/lib/feature/gitaly_spec.rb
index 08651c42276..6654b7627cd 100644
--- a/spec/lib/feature/gitaly_spec.rb
+++ b/spec/lib/feature/gitaly_spec.rb
@@ -25,7 +25,7 @@ describe Feature::Gitaly do
 
   describe ".server_feature_flags" do
     before do
-      allow(Feature).to receive(:persisted_names).and_return(%w[gitaly_mep_mep foo])
+      stub_feature_flags(gitaly_mep_mep: true, foo: true)
     end
 
     subject { described_class.server_feature_flags }
diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index 81fa2dc5cad..37f8d3ad47d 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -2,12 +2,10 @@
 
 require 'spec_helper'
 
-describe Feature do
+describe Feature, stub_feature_flags: false do
   before do
-    # We mock all calls to .enabled? to return true in order to force all
-    # specs to run the feature flag gated behavior, but here we need a clean
-    # behavior from the class
-    allow(described_class).to receive(:enabled?).and_call_original
+    # reset Flipper AR-engine
+    Feature.reset
   end
 
   describe '.get' do
@@ -23,67 +21,106 @@ describe Feature do
   end
 
   describe '.persisted_names' do
-    it 'returns the names of the persisted features' do
-      Feature::FlipperFeature.create!(key: 'foo')
+    context 'when FF_LEGACY_PERSISTED_NAMES=false' do
+      before do
+        stub_env('FF_LEGACY_PERSISTED_NAMES', 'false')
+      end
 
-      expect(described_class.persisted_names).to eq(%w[foo])
-    end
+      it 'returns the names of the persisted features' do
+        Feature.enable('foo')
+
+        expect(described_class.persisted_names).to contain_exactly('foo')
+      end
+
+      it 'returns an empty Array when no features are presisted' do
+        expect(described_class.persisted_names).to be_empty
+      end
+
+      it 'caches the feature names when request store is active',
+       :request_store, :use_clean_rails_memory_store_caching do
+        Feature.enable('foo')
 
-    it 'returns an empty Array when no features are presisted' do
-      expect(described_class.persisted_names).to be_empty
+        expect(Gitlab::ProcessMemoryCache.cache_backend)
+          .to receive(:fetch)
+          .once
+          .with('flipper/v1/features', expires_in: 1.minute)
+          .and_call_original
+
+        2.times do
+          expect(described_class.persisted_names).to contain_exactly('foo')
+        end
+      end
     end
 
-    it 'caches the feature names when request store is active',
+    context 'when FF_LEGACY_PERSISTED_NAMES=true' do
+      before do
+        stub_env('FF_LEGACY_PERSISTED_NAMES', 'true')
+      end
+
+      it 'returns the names of the persisted features' do
+        Feature.enable('foo')
+
+        expect(described_class.persisted_names).to contain_exactly('foo')
+      end
+
+      it 'returns an empty Array when no features are presisted' do
+        expect(described_class.persisted_names).to be_empty
+      end
+
+      it 'caches the feature names when request store is active',
        :request_store, :use_clean_rails_memory_store_caching do
-      Feature::FlipperFeature.create!(key: 'foo')
+        Feature.enable('foo')
 
-      expect(Feature::FlipperFeature)
-        .to receive(:feature_names)
-        .once
-        .and_call_original
+        expect(Gitlab::ProcessMemoryCache.cache_backend)
+          .to receive(:fetch)
+          .once
+          .with('flipper:persisted_names', expires_in: 1.minute)
+          .and_call_original
 
-      expect(Gitlab::ProcessMemoryCache.cache_backend)
-        .to receive(:fetch)
-        .once
-        .with('flipper:persisted_names', expires_in: 1.minute)
-        .and_call_original
+        2.times do
+          expect(described_class.persisted_names).to contain_exactly('foo')
+        end
+      end
+    end
 
-      2.times do
-        expect(described_class.persisted_names).to eq(%w[foo])
+    it 'fetches all flags once in a single query', :request_store do
+      Feature.enable('foo1')
+      Feature.enable('foo2')
+
+      queries = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+        expect(described_class.persisted_names).to contain_exactly('foo1', 'foo2')
+
+        RequestStore.clear!
+
+        expect(described_class.persisted_names).to contain_exactly('foo1', 'foo2')
       end
+
+      expect(queries.count).to eq(1)
     end
   end
 
-  describe '.persisted?' do
+  describe '.persisted_name?' do
     context 'when the feature is persisted' do
       it 'returns true when feature name is a string' do
-        Feature::FlipperFeature.create!(key: 'foo')
-
-        feature = double(:feature, name: 'foo')
+        Feature.enable('foo')
 
-        expect(described_class.persisted?(feature)).to eq(true)
+        expect(described_class.persisted_name?('foo')).to eq(true)
       end
 
       it 'returns true when feature name is a symbol' do
-        Feature::FlipperFeature.create!(key: 'foo')
+        Feature.enable('foo')
 
-        feature = double(:feature, name: :foo)
-
-        expect(described_class.persisted?(feature)).to eq(true)
+        expect(described_class.persisted_name?(:foo)).to eq(true)
       end
     end
 
     context 'when the feature is not persisted' do
       it 'returns false when feature name is a string' do
-        feature = double(:feature, name: 'foo')
-
-        expect(described_class.persisted?(feature)).to eq(false)
+        expect(described_class.persisted_name?('foo')).to eq(false)
       end
 
       it 'returns false when feature name is a symbol' do
-        feature = double(:feature, name: :bar)
-
-        expect(described_class.persisted?(feature)).to eq(false)
+        expect(described_class.persisted_name?(:bar)).to eq(false)
       end
     end
   end
@@ -100,16 +137,12 @@ describe Feature do
   end
 
   describe '.flipper' do
-    before do
-      described_class.instance_variable_set(:@flipper, nil)
-    end
-
     context 'when request store is inactive' do
       it 'memoizes the Flipper instance' do
         expect(Flipper).to receive(:new).once.and_call_original
 
         2.times do
-          described_class.flipper
+          described_class.send(:flipper)
         end
       end
     end
@@ -118,9 +151,9 @@ describe Feature do
       it 'memoizes the Flipper instance' do
         expect(Flipper).to receive(:new).once.and_call_original
 
-        described_class.flipper
+        described_class.send(:flipper)
         described_class.instance_variable_set(:@flipper, nil)
-        described_class.flipper
+        described_class.send(:flipper)
       end
     end
   end
@@ -146,21 +179,21 @@ describe Feature do
       expect(described_class.enabled?(:enabled_feature_flag)).to be_truthy
     end
 
-    it { expect(described_class.l1_cache_backend).to eq(Gitlab::ProcessMemoryCache.cache_backend) }
-    it { expect(described_class.l2_cache_backend).to eq(Rails.cache) }
+    it { expect(described_class.send(:l1_cache_backend)).to eq(Gitlab::ProcessMemoryCache.cache_backend) }
+    it { expect(described_class.send(:l2_cache_backend)).to eq(Rails.cache) }
 
     it 'caches the status in L1 and L2 caches',
        :request_store, :use_clean_rails_memory_store_caching do
       described_class.enable(:enabled_feature_flag)
       flipper_key = "flipper/v1/feature/enabled_feature_flag"
 
-      expect(described_class.l2_cache_backend)
+      expect(described_class.send(:l2_cache_backend))
         .to receive(:fetch)
         .once
         .with(flipper_key, expires_in: 1.hour)
         .and_call_original
 
-      expect(described_class.l1_cache_backend)
+      expect(described_class.send(:l1_cache_backend))
         .to receive(:fetch)
         .once
         .with(flipper_key, expires_in: 1.minute)
@@ -182,14 +215,14 @@ describe Feature do
       let(:flag) { :some_feature_flag }
 
       before do
-        described_class.flipper.memoize = false
+        described_class.send(:flipper).memoize = false
         described_class.enabled?(flag)
       end
 
       it 'caches the status in L1 cache for the first minute' do
         expect do
-          expect(described_class.l1_cache_backend).to receive(:fetch).once.and_call_original
-          expect(described_class.l2_cache_backend).not_to receive(:fetch)
+          expect(described_class.send(:l1_cache_backend)).to receive(:fetch).once.and_call_original
+          expect(described_class.send(:l2_cache_backend)).not_to receive(:fetch)
           expect(described_class.enabled?(flag)).to be_truthy
         end.not_to exceed_query_limit(0)
       end
@@ -197,8 +230,8 @@ describe Feature do
       it 'caches the status in L2 cache after 2 minutes' do
         Timecop.travel 2.minutes do
           expect do
-            expect(described_class.l1_cache_backend).to receive(:fetch).once.and_call_original
-            expect(described_class.l2_cache_backend).to receive(:fetch).once.and_call_original
+            expect(described_class.send(:l1_cache_backend)).to receive(:fetch).once.and_call_original
+            expect(described_class.send(:l2_cache_backend)).to receive(:fetch).once.and_call_original
             expect(described_class.enabled?(flag)).to be_truthy
           end.not_to exceed_query_limit(0)
         end
@@ -207,8 +240,8 @@ describe Feature do
       it 'fetches the status after an hour' do
         Timecop.travel 61.minutes do
           expect do
-            expect(described_class.l1_cache_backend).to receive(:fetch).once.and_call_original
-            expect(described_class.l2_cache_backend).to receive(:fetch).once.and_call_original
+            expect(described_class.send(:l1_cache_backend)).to receive(:fetch).once.and_call_original
+            expect(described_class.send(:l2_cache_backend)).to receive(:fetch).once.and_call_original
             expect(described_class.enabled?(flag)).to be_truthy
           end.not_to exceed_query_limit(1)
         end
@@ -216,10 +249,8 @@ describe Feature do
     end
 
     context 'with an individual actor' do
-      CustomActor = Struct.new(:flipper_id)
-
-      let(:actor) { CustomActor.new(flipper_id: 'CustomActor:5') }
-      let(:another_actor) { CustomActor.new(flipper_id: 'CustomActor:10') }
+      let(:actor) { stub_feature_flag_gate('CustomActor:5') }
+      let(:another_actor) { stub_feature_flag_gate('CustomActor:10') }
 
       before do
         described_class.enable(:enabled_feature_flag, actor)
@@ -237,6 +268,17 @@ describe Feature do
         expect(described_class.enabled?(:enabled_feature_flag)).to be_falsey
       end
     end
+
+    context 'with invalid actor' do
+      let(:actor) { double('invalid actor') }
+
+      context 'when is dev_or_test_env' do
+        it 'does raise exception' do
+          expect { described_class.enabled?(:enabled_feature_flag, actor) }
+            .to raise_error /needs to include `FeatureGate` or implement `flipper_id`/
+        end
+      end
+    end
   end
 
   describe '.disable?' do
diff --git a/spec/lib/gitaly/server_spec.rb b/spec/lib/gitaly/server_spec.rb
index 5142f705251..390855b30ad 100644
--- a/spec/lib/gitaly/server_spec.rb
+++ b/spec/lib/gitaly/server_spec.rb
@@ -20,6 +20,7 @@ describe Gitaly::Server do
   it { is_expected.to respond_to(:git_binary_version) }
   it { is_expected.to respond_to(:up_to_date?) }
   it { is_expected.to respond_to(:address) }
+  it { is_expected.to respond_to(:replication_factor) }
 
   describe 'readable?' do
     context 'when the storage is readable' do
@@ -134,4 +135,22 @@ describe Gitaly::Server do
       end
     end
   end
+
+  describe 'replication_factor' do
+    context 'when examining for a given server' do
+      let(:storage_status) { double('storage_status', storage_name: 'default') }
+
+      before do
+        response = double('response', storage_statuses: [storage_status])
+        allow_next_instance_of(Gitlab::GitalyClient::ServerService) do |instance|
+          allow(instance).to receive(:info).and_return(response)
+        end
+      end
+
+      it do
+        allow(storage_status).to receive(:replication_factor).and_return(2)
+        expect(server.replication_factor).to eq(2)
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/alert_management/alert_params_spec.rb b/spec/lib/gitlab/alert_management/alert_params_spec.rb
index 5cf34038f68..284af421f05 100644
--- a/spec/lib/gitlab/alert_management/alert_params_spec.rb
+++ b/spec/lib/gitlab/alert_management/alert_params_spec.rb
@@ -32,7 +32,8 @@ describe Gitlab::AlertManagement::AlertParams do
         severity: 'critical',
         hosts: ['gitlab.com'],
         payload: payload,
-        started_at: started_at
+        started_at: started_at,
+        fingerprint: nil
       )
     end
 
diff --git a/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb b/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb
index 816ed918fe8..728cbf11cda 100644
--- a/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb
+++ b/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb
@@ -50,6 +50,19 @@ describe Gitlab::AlertManagement::AlertStatusCounts do
           expect(counts.acknowledged).to eq(0)
         end
       end
+
+      context 'when search param is included' do
+        let(:params) { { search: alert_1.title } }
+
+        it 'returns the correct countss' do
+          expect(counts.open).to eq(0)
+          expect(counts.all).to eq(1)
+          expect(counts.resolved).to eq(1)
+          expect(counts.ignored).to eq(0)
+          expect(counts.triggered).to eq(0)
+          expect(counts.acknowledged).to eq(0)
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/alert_management/fingerprint_spec.rb b/spec/lib/gitlab/alert_management/fingerprint_spec.rb
new file mode 100644
index 00000000000..7865d667f71
--- /dev/null
+++ b/spec/lib/gitlab/alert_management/fingerprint_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::AlertManagement::Fingerprint do
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:alert) { create(:alert_management_alert) }
+
+  describe '.generate' do
+    subject { described_class.generate(data) }
+
+    context 'when data is an array' do
+      let(:data) { [1, 'fingerprint', 'given'] }
+
+      it 'flattens the array' do
+        expect_next_instance_of(described_class) do |obj|
+          expect(obj).to receive(:flatten_array)
+        end
+
+        subject
+      end
+
+      it 'returns the hashed fingerprint' do
+        expected_fingerprint = Digest::SHA1.hexdigest(data.flatten.map!(&:to_s).join)
+        expect(subject).to eq(expected_fingerprint)
+      end
+    end
+
+    context 'when data is a non-array type' do
+      where(:data) do
+        [
+          111,
+          'fingerprint',
+          :fingerprint,
+          true,
+          { test: true }
+        ]
+      end
+
+      with_them do
+        it 'performs like a hashed fingerprint' do
+          expect(subject).to eq(Digest::SHA1.hexdigest(data.to_s))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/alerting/alert_spec.rb b/spec/lib/gitlab/alerting/alert_spec.rb
index a0582515f3d..d582ff6f32a 100644
--- a/spec/lib/gitlab/alerting/alert_spec.rb
+++ b/spec/lib/gitlab/alerting/alert_spec.rb
@@ -253,7 +253,7 @@ describe Gitlab::Alerting::Alert do
       include_context 'gitlab alert'
 
       it 'returns a fingerprint' do
-        plain_fingerprint = [alert.metric_id, alert.starts_at].join('/')
+        plain_fingerprint = [alert.metric_id, alert.starts_at_raw].join('/')
 
         is_expected.to eq(Digest::SHA1.hexdigest(plain_fingerprint))
       end
@@ -263,7 +263,7 @@ describe Gitlab::Alerting::Alert do
       include_context 'full query'
 
       it 'returns a fingerprint' do
-        plain_fingerprint = [alert.starts_at, alert.title, alert.full_query].join('/')
+        plain_fingerprint = [alert.starts_at_raw, alert.title, alert.full_query].join('/')
 
         is_expected.to eq(Digest::SHA1.hexdigest(plain_fingerprint))
       end
diff --git a/spec/lib/gitlab/alerting/notification_payload_parser_spec.rb b/spec/lib/gitlab/alerting/notification_payload_parser_spec.rb
index f32095b3c86..889efae9585 100644
--- a/spec/lib/gitlab/alerting/notification_payload_parser_spec.rb
+++ b/spec/lib/gitlab/alerting/notification_payload_parser_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'fast_spec_helper'
+require 'spec_helper'
 
 describe Gitlab::Alerting::NotificationPayloadParser do
   describe '.call' do
@@ -89,6 +89,39 @@ describe Gitlab::Alerting::NotificationPayloadParser do
       end
     end
 
+    context 'with fingerprint' do
+      before do
+        payload[:fingerprint] = data
+      end
+
+      shared_examples 'fingerprint generation' do
+        it 'generates the fingerprint correctly' do
+          expect(result).to eq(Gitlab::AlertManagement::Fingerprint.generate(data))
+        end
+      end
+
+      context 'with blank fingerprint' do
+        it_behaves_like 'fingerprint generation' do
+          let(:data) { '   ' }
+          let(:result) { subject.dig('annotations', 'fingerprint') }
+        end
+      end
+
+      context 'with fingerprint given' do
+        it_behaves_like 'fingerprint generation' do
+          let(:data) { 'fingerprint' }
+          let(:result) { subject.dig('annotations', 'fingerprint') }
+        end
+      end
+
+      context 'with array fingerprint given' do
+        it_behaves_like 'fingerprint generation' do
+          let(:data) { [1, 'fingerprint', 'given'] }
+          let(:result) { subject.dig('annotations', 'fingerprint') }
+        end
+      end
+    end
+
     context 'when payload attributes have blank lines' do
       let(:payload) do
         {
diff --git a/spec/lib/gitlab/analytics/cycle_analytics/base_query_builder_spec.rb b/spec/lib/gitlab/analytics/cycle_analytics/base_query_builder_spec.rb
index 0fc9d3c1e9e..250e2f16aec 100644
--- a/spec/lib/gitlab/analytics/cycle_analytics/base_query_builder_spec.rb
+++ b/spec/lib/gitlab/analytics/cycle_analytics/base_query_builder_spec.rb
@@ -6,7 +6,8 @@ describe Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder do
   let_it_be(:project) { create(:project, :empty_repo) }
   let_it_be(:mr1) { create(:merge_request, target_project: project, source_project: project, allow_broken: true, created_at: 3.months.ago) }
   let_it_be(:mr2) { create(:merge_request, target_project: project, source_project: project, allow_broken: true, created_at: 1.month.ago) }
-  let(:params) { {} }
+  let_it_be(:user) { create(:user) }
+  let(:params) { { current_user: user } }
   let(:records) do
     stage = build(:cycle_analytics_project_stage, {
       start_event_identifier: :merge_request_created,
@@ -17,6 +18,7 @@ describe Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder do
   end
 
   before do
+    project.add_maintainer(user)
     mr1.metrics.update!(merged_at: 1.month.ago)
     mr2.metrics.update!(merged_at: Time.now)
   end
diff --git a/spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb b/spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb
index 334cab0b799..e3429b0ca57 100644
--- a/spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb
+++ b/spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb
@@ -23,7 +23,7 @@ describe Gitlab::Analytics::CycleAnalytics::RecordsFetcher do
   describe '#serialized_records' do
     shared_context 'when records are loaded by maintainer' do
       before do
-        project.add_user(user, Gitlab::Access::MAINTAINER)
+        project.add_user(user, Gitlab::Access::DEVELOPER)
       end
 
       it 'returns all records' do
@@ -103,6 +103,8 @@ describe Gitlab::Analytics::CycleAnalytics::RecordsFetcher do
           latest_build_finished_at: 7.days.ago,
           pipeline: ci_build2.pipeline
         })
+
+        project.add_user(user, Gitlab::Access::MAINTAINER)
       end
 
       context 'returns build records' do
diff --git a/spec/lib/gitlab/auth/auth_finders_spec.rb b/spec/lib/gitlab/auth/auth_finders_spec.rb
index 774a87752b9..2aef206c7fd 100644
--- a/spec/lib/gitlab/auth/auth_finders_spec.rb
+++ b/spec/lib/gitlab/auth/auth_finders_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 describe Gitlab::Auth::AuthFinders do
   include described_class
+  include HttpBasicAuthHelpers
 
   let(:user) { create(:user) }
   let(:env) do
@@ -22,10 +23,7 @@ describe Gitlab::Auth::AuthFinders do
   end
 
   def set_basic_auth_header(username, password)
-    set_header(
-      'HTTP_AUTHORIZATION',
-      ActionController::HttpAuthentication::Basic.encode_credentials(username, password)
-    )
+    env.merge!(basic_auth_header(username, password))
   end
 
   describe '#find_user_from_warden' do
@@ -653,6 +651,24 @@ describe Gitlab::Auth::AuthFinders do
       it_behaves_like 'job token params', described_class::JOB_TOKEN_PARAM
       it_behaves_like 'job token params', described_class::RUNNER_JOB_TOKEN_PARAM
     end
+
+    context 'when the job token is provided via basic auth' do
+      let(:route_authentication_setting) { { job_token_allowed: :basic_auth } }
+      let(:username) { Ci::Build::CI_REGISTRY_USER }
+      let(:token) { job.token }
+
+      before do
+        set_basic_auth_header(username, token)
+      end
+
+      it { is_expected.to eq(user) }
+
+      context 'credentials are provided but route setting is incorrect' do
+        let(:route_authentication_setting) { { job_token_allowed: :unknown } }
+
+        it { is_expected.to be_nil }
+      end
+    end
   end
 
   describe '#find_runner_from_token' do
diff --git a/spec/lib/gitlab/auth/ldap/person_spec.rb b/spec/lib/gitlab/auth/ldap/person_spec.rb
index e90917cfce1..403a48d40ef 100644
--- a/spec/lib/gitlab/auth/ldap/person_spec.rb
+++ b/spec/lib/gitlab/auth/ldap/person_spec.rb
@@ -57,14 +57,17 @@ describe Gitlab::Auth::Ldap::Person do
           'attributes' => {
             'name'     => 'cn',
             'email'    => 'mail',
-            'username' => %w(uid mail memberof)
+            'username' => %w(uid mail),
+            'first_name' => ''
           }
         }
       )
       config = Gitlab::Auth::Ldap::Config.new('ldapmain')
       ldap_attributes = described_class.ldap_attributes(config)
 
-      expect(ldap_attributes).to match_array(%w(dn uid cn mail memberof))
+      expect(ldap_attributes).to include('dn', 'uid', 'cn', 'mail')
+      expect(ldap_attributes).to be_present
+      expect(ldap_attributes.uniq!).to eq(nil)
     end
   end
 
diff --git a/spec/lib/gitlab/background_migration/merge_request_assignees_migration_progress_check_spec.rb b/spec/lib/gitlab/background_migration/merge_request_assignees_migration_progress_check_spec.rb
index eecd290e3ca..9dd97b58014 100644
--- a/spec/lib/gitlab/background_migration/merge_request_assignees_migration_progress_check_spec.rb
+++ b/spec/lib/gitlab/background_migration/merge_request_assignees_migration_progress_check_spec.rb
@@ -54,6 +54,10 @@ describe Gitlab::BackgroundMigration::MergeRequestAssigneesMigrationProgressChec
   end
 
   context 'when there are no scheduled, or retrying or dead' do
+    before do
+      stub_feature_flags(multiple_merge_request_assignees: false)
+    end
+
     it 'enables feature' do
       allow(Gitlab::BackgroundMigration).to receive(:exists?)
                                               .with('PopulateMergeRequestAssigneesTable')
@@ -67,9 +71,9 @@ describe Gitlab::BackgroundMigration::MergeRequestAssigneesMigrationProgressChec
                                               .with('PopulateMergeRequestAssigneesTable')
                                               .and_return(false)
 
-      expect(Feature).to receive(:enable).with(:multiple_merge_request_assignees)
-
       described_class.new.perform
+
+      expect(Feature.enabled?(:multiple_merge_request_assignees)).to eq(true)
     end
   end
 
diff --git a/spec/lib/gitlab/background_migration/reset_merge_status_spec.rb b/spec/lib/gitlab/background_migration/reset_merge_status_spec.rb
index 40340f89448..e057aea6bb3 100644
--- a/spec/lib/gitlab/background_migration/reset_merge_status_spec.rb
+++ b/spec/lib/gitlab/background_migration/reset_merge_status_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::ResetMergeStatus, schema: 20190528180441 do
+describe Gitlab::BackgroundMigration::ResetMergeStatus do
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
   let(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab-org') }
@@ -23,24 +23,24 @@ describe Gitlab::BackgroundMigration::ResetMergeStatus, schema: 20190528180441 d
   end
 
   it 'correctly updates opened mergeable MRs to unchecked' do
-    create_merge_request(1, state: 'opened', merge_status: 'can_be_merged')
-    create_merge_request(2, state: 'opened', merge_status: 'can_be_merged')
-    create_merge_request(3, state: 'opened', merge_status: 'can_be_merged')
-    create_merge_request(4, state: 'merged', merge_status: 'can_be_merged')
-    create_merge_request(5, state: 'opened', merge_status: 'cannot_be_merged')
+    create_merge_request(1, state_id: MergeRequest.available_states[:opened], merge_status: 'can_be_merged')
+    create_merge_request(2, state_id: MergeRequest.available_states[:opened], merge_status: 'can_be_merged')
+    create_merge_request(3, state_id: MergeRequest.available_states[:opened], merge_status: 'can_be_merged')
+    create_merge_request(4, state_id: MergeRequest.available_states[:merged], merge_status: 'can_be_merged')
+    create_merge_request(5, state_id: MergeRequest.available_states[:opened], merge_status: 'cannot_be_merged')
 
     subject.perform(1, 5)
 
     expected_rows = [
-      { id: 1, state: 'opened', merge_status: 'unchecked' },
-      { id: 2, state: 'opened', merge_status: 'unchecked' },
-      { id: 3, state: 'opened', merge_status: 'unchecked' },
-      { id: 4, state: 'merged', merge_status: 'can_be_merged' },
-      { id: 5, state: 'opened', merge_status: 'cannot_be_merged' }
+      { id: 1, state_id: MergeRequest.available_states[:opened], merge_status: 'unchecked' },
+      { id: 2, state_id: MergeRequest.available_states[:opened], merge_status: 'unchecked' },
+      { id: 3, state_id: MergeRequest.available_states[:opened], merge_status: 'unchecked' },
+      { id: 4, state_id: MergeRequest.available_states[:merged], merge_status: 'can_be_merged' },
+      { id: 5, state_id: MergeRequest.available_states[:opened], merge_status: 'cannot_be_merged' }
     ]
 
     rows = merge_requests.order(:id).map do |row|
-      row.attributes.slice('id', 'state', 'merge_status').symbolize_keys
+      row.attributes.slice('id', 'state_id', 'merge_status').symbolize_keys
     end
 
     expect(rows).to eq(expected_rows)
diff --git a/spec/lib/gitlab/badge/coverage/report_spec.rb b/spec/lib/gitlab/badge/coverage/report_spec.rb
index 560072a3d83..284ca53a996 100644
--- a/spec/lib/gitlab/badge/coverage/report_spec.rb
+++ b/spec/lib/gitlab/badge/coverage/report_spec.rb
@@ -7,7 +7,7 @@ describe Gitlab::Badge::Coverage::Report do
   let(:job_name) { nil }
 
   let(:badge) do
-    described_class.new(project, 'master', job_name)
+    described_class.new(project, 'master', opts: { job: job_name })
   end
 
   describe '#entity' do
diff --git a/spec/lib/gitlab/badge/coverage/template_spec.rb b/spec/lib/gitlab/badge/coverage/template_spec.rb
index b51d707a61d..3940b37830e 100644
--- a/spec/lib/gitlab/badge/coverage/template_spec.rb
+++ b/spec/lib/gitlab/badge/coverage/template_spec.rb
@@ -3,13 +3,33 @@
 require 'spec_helper'
 
 describe Gitlab::Badge::Coverage::Template do
-  let(:badge) { double(entity: 'coverage', status: 90.00) }
+  let(:badge) { double(entity: 'coverage', status: 90.00, customization: {}) }
   let(:template) { described_class.new(badge) }
 
   describe '#key_text' do
-    it 'is always says coverage' do
+    it 'says coverage by default' do
       expect(template.key_text).to eq 'coverage'
     end
+
+    context 'when custom key_text is defined' do
+      before do
+        allow(badge).to receive(:customization).and_return({ key_text: "custom text" })
+      end
+
+      it 'returns custom value' do
+        expect(template.key_text).to eq "custom text"
+      end
+
+      context 'when its size is larger than the max allowed value' do
+        before do
+          allow(badge).to receive(:customization).and_return({ key_text: 't' * 129 })
+        end
+
+        it 'returns default value' do
+          expect(template.key_text).to eq 'coverage'
+        end
+      end
+    end
   end
 
   describe '#value_text' do
@@ -41,9 +61,29 @@ describe Gitlab::Badge::Coverage::Template do
   end
 
   describe '#key_width' do
-    it 'has a fixed key width' do
+    it 'is fixed by default' do
       expect(template.key_width).to eq 62
     end
+
+    context 'when custom key_width is defined' do
+      before do
+        allow(badge).to receive(:customization).and_return({ key_width: 101 })
+      end
+
+      it 'returns custom value' do
+        expect(template.key_width).to eq 101
+      end
+
+      context 'when it is larger than the max allowed value' do
+        before do
+          allow(badge).to receive(:customization).and_return({ key_width: 129 })
+        end
+
+        it 'returns default value' do
+          expect(template.key_width).to eq 62
+        end
+      end
+    end
   end
 
   describe '#value_width' do
diff --git a/spec/lib/gitlab/badge/pipeline/template_spec.rb b/spec/lib/gitlab/badge/pipeline/template_spec.rb
index da95c7219a4..751a5d6645e 100644
--- a/spec/lib/gitlab/badge/pipeline/template_spec.rb
+++ b/spec/lib/gitlab/badge/pipeline/template_spec.rb
@@ -3,13 +3,33 @@
 require 'spec_helper'
 
 describe Gitlab::Badge::Pipeline::Template do
-  let(:badge) { double(entity: 'pipeline', status: 'success') }
+  let(:badge) { double(entity: 'pipeline', status: 'success', customization: {}) }
   let(:template) { described_class.new(badge) }
 
   describe '#key_text' do
-    it 'is always says pipeline' do
+    it 'says pipeline by default' do
       expect(template.key_text).to eq 'pipeline'
     end
+
+    context 'when custom key_text is defined' do
+      before do
+        allow(badge).to receive(:customization).and_return({ key_text: 'custom text' })
+      end
+
+      it 'returns custom value' do
+        expect(template.key_text).to eq 'custom text'
+      end
+
+      context 'when its size is larger than the max allowed value' do
+        before do
+          allow(badge).to receive(:customization).and_return({ key_text: 't' * 129 })
+        end
+
+        it 'returns default value' do
+          expect(template.key_text).to eq 'pipeline'
+        end
+      end
+    end
   end
 
   describe '#value_text' do
@@ -18,6 +38,32 @@ describe Gitlab::Badge::Pipeline::Template do
     end
   end
 
+  describe '#key_width' do
+    it 'is fixed by default' do
+      expect(template.key_width).to eq 62
+    end
+
+    context 'when custom key_width is defined' do
+      before do
+        allow(badge).to receive(:customization).and_return({ key_width: 101 })
+      end
+
+      it 'returns custom value' do
+        expect(template.key_width).to eq 101
+      end
+
+      context 'when it is larger than the max allowed value' do
+        before do
+          allow(badge).to receive(:customization).and_return({ key_width: 129 })
+        end
+
+        it 'returns default value' do
+          expect(template.key_width).to eq 62
+        end
+      end
+    end
+  end
+
   describe 'widths and text anchors' do
     it 'has fixed width and text anchors' do
       expect(template.width).to eq 116
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
index b3c1f86c5ee..137d0fd4f9e 100644
--- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
@@ -190,11 +190,14 @@ describe Gitlab::BitbucketImport::Importer do
 
     context 'when importing a pull request throws an exception' do
       before do
-        allow(pull_request).to receive(:raw).and_return('hello world')
+        allow(pull_request).to receive(:raw).and_return({ error: "broken" })
         allow(subject.client).to receive(:pull_request_comments).and_raise(Gitlab::HTTP::Error)
       end
 
       it 'logs an error without the backtrace' do
+        expect(Gitlab::ErrorTracking).to receive(:log_exception)
+          .with(instance_of(Gitlab::HTTP::Error), hash_including(raw_response: '{"error":"broken"}'))
+
         subject.execute
 
         expect(subject.errors.count).to eq(1)
diff --git a/spec/lib/gitlab/cache/import/caching_spec.rb b/spec/lib/gitlab/cache/import/caching_spec.rb
index e4aec0f4dec..7b4308d32ae 100644
--- a/spec/lib/gitlab/cache/import/caching_spec.rb
+++ b/spec/lib/gitlab/cache/import/caching_spec.rb
@@ -89,7 +89,7 @@ describe Gitlab::Cache::Import::Caching, :clean_gitlab_redis_cache do
   end
 
   describe '.write_multiple' do
-    it 'sets multiple keys' do
+    it 'sets multiple keys when key_prefix not set' do
       mapping = { 'foo' => 10, 'bar' => 20 }
 
       described_class.write_multiple(mapping)
@@ -101,6 +101,19 @@ describe Gitlab::Cache::Import::Caching, :clean_gitlab_redis_cache do
         expect(found).to eq(value.to_s)
       end
     end
+
+    it 'sets multiple keys with correct prefix' do
+      mapping = { 'foo' => 10, 'bar' => 20 }
+
+      described_class.write_multiple(mapping, key_prefix: 'pref/')
+
+      mapping.each do |key, value|
+        full_key = described_class.cache_key_for("pref/#{key}")
+        found = Gitlab::Redis::Cache.with { |r| r.get(full_key) }
+
+        expect(found).to eq(value.to_s)
+      end
+    end
   end
 
   describe '.expire' do
diff --git a/spec/lib/gitlab/chat_spec.rb b/spec/lib/gitlab/chat_spec.rb
index 08cc16314c5..be606fe6db1 100644
--- a/spec/lib/gitlab/chat_spec.rb
+++ b/spec/lib/gitlab/chat_spec.rb
@@ -5,19 +5,13 @@ require 'spec_helper'
 describe Gitlab::Chat, :use_clean_rails_memory_store_caching do
   describe '.available?' do
     it 'returns true when the chatops feature is available' do
-      allow(Feature)
-        .to receive(:enabled?)
-        .with(:chatops, default_enabled: true)
-        .and_return(true)
+      stub_feature_flags(chatops: true)
 
       expect(described_class).to be_available
     end
 
     it 'returns false when the chatops feature is not available' do
-      allow(Feature)
-        .to receive(:enabled?)
-        .with(:chatops, default_enabled: true)
-        .and_return(false)
+      stub_feature_flags(chatops: false)
 
       expect(described_class).not_to be_available
     end
diff --git a/spec/lib/gitlab/ci/build/credentials/factory_spec.rb b/spec/lib/gitlab/ci/build/credentials/factory_spec.rb
index 848adb2e6e5..159f89f4985 100644
--- a/spec/lib/gitlab/ci/build/credentials/factory_spec.rb
+++ b/spec/lib/gitlab/ci/build/credentials/factory_spec.rb
@@ -7,11 +7,13 @@ describe Gitlab::Ci::Build::Credentials::Factory do
 
   subject { described_class.new(build).create! }
 
-  class TestProvider
-    def initialize(build); end
-  end
-
   before do
+    stub_const('TestProvider', Class.new)
+
+    TestProvider.class_eval do
+      def initialize(build); end
+    end
+
     allow_next_instance_of(described_class) do |instance|
       allow(instance).to receive(:providers).and_return([TestProvider])
     end
diff --git a/spec/lib/gitlab/ci/build/releaser_spec.rb b/spec/lib/gitlab/ci/build/releaser_spec.rb
new file mode 100644
index 00000000000..2f7bca777dd
--- /dev/null
+++ b/spec/lib/gitlab/ci/build/releaser_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Ci::Build::Releaser do
+  subject { described_class.new(config: config[:release]).script }
+
+  describe '#script' do
+    context 'all nodes' do
+      let(:config) do
+        {
+          release: {
+            name: 'Release $CI_COMMIT_SHA',
+            description: 'Created using the release-cli $EXTRA_DESCRIPTION',
+            tag_name: 'release-$CI_COMMIT_SHA',
+            ref: '$CI_COMMIT_SHA'
+          }
+        }
+      end
+
+      it 'generates the script' do
+        expect(subject).to eq('release-cli create --name "Release $CI_COMMIT_SHA" --description "Created using the release-cli $EXTRA_DESCRIPTION" --tag-name "release-$CI_COMMIT_SHA" --ref "$CI_COMMIT_SHA"')
+      end
+    end
+
+    context 'individual nodes' do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:node_name, :node_value, :result) do
+        'name' | 'Release $CI_COMMIT_SHA' | 'release-cli create --name "Release $CI_COMMIT_SHA"'
+        'description' | 'Release-cli $EXTRA_DESCRIPTION' | 'release-cli create --description "Release-cli $EXTRA_DESCRIPTION"'
+        'tag_name' | 'release-$CI_COMMIT_SHA' | 'release-cli create --tag-name "release-$CI_COMMIT_SHA"'
+        'ref' | '$CI_COMMIT_SHA' | 'release-cli create --ref "$CI_COMMIT_SHA"'
+      end
+
+      with_them do
+        let(:config) do
+          {
+            release: {
+              node_name => node_value
+            }
+          }
+        end
+
+        it 'generates the script' do
+          expect(subject).to eq(result)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/build/step_spec.rb b/spec/lib/gitlab/ci/build/step_spec.rb
index 9c1a8cf5e91..1cebda2cc7e 100644
--- a/spec/lib/gitlab/ci/build/step_spec.rb
+++ b/spec/lib/gitlab/ci/build/step_spec.rb
@@ -51,6 +51,30 @@ describe Gitlab::Ci::Build::Step do
     end
   end
 
+  describe '#from_release' do
+    subject { described_class.from_release(job) }
+
+    before do
+      job.run!
+    end
+
+    context 'with release' do
+      let(:job) { create(:ci_build, :release_options) }
+
+      it 'returns the release-cli command line' do
+        expect(subject.script).to eq("release-cli create --name \"Release $CI_COMMIT_SHA\" --description \"Created using the release-cli $EXTRA_DESCRIPTION\" --tag-name \"release-$CI_COMMIT_SHA\" --ref \"$CI_COMMIT_SHA\"")
+      end
+    end
+
+    context 'when release is empty' do
+      let(:job) { create(:ci_build) }
+
+      it 'does not fabricate an object' do
+        is_expected.to be_nil
+      end
+    end
+  end
+
   describe '#from_after_script' do
     let(:job) { create(:ci_build) }
 
@@ -61,7 +85,7 @@ describe Gitlab::Ci::Build::Step do
     end
 
     context 'when after_script is empty' do
-      it 'doesn not fabricate an object' do
+      it 'does not fabricate an object' do
         is_expected.to be_nil
       end
     end
diff --git a/spec/lib/gitlab/ci/config/entry/reports_spec.rb b/spec/lib/gitlab/ci/config/entry/reports_spec.rb
index 8c6c91d919e..2c12a88dedb 100644
--- a/spec/lib/gitlab/ci/config/entry/reports_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/reports_spec.rb
@@ -37,6 +37,7 @@ describe Gitlab::Ci::Config::Entry::Reports do
         :junit | 'junit.xml'
         :codequality | 'gl-code-quality-report.json'
         :sast | 'gl-sast-report.json'
+        :secret_detection | 'gl-secret-detection-report.json'
         :dependency_scanning | 'gl-dependency-scanning-report.json'
         :container_scanning | 'gl-container-scanning-report.json'
         :dast | 'gl-dast-report.json'
diff --git a/spec/lib/gitlab/ci/config/entry/retry_spec.rb b/spec/lib/gitlab/ci/config/entry/retry_spec.rb
index bb3c0b0004d..67253c71f6b 100644
--- a/spec/lib/gitlab/ci/config/entry/retry_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/retry_spec.rb
@@ -94,7 +94,7 @@ describe Gitlab::Ci::Config::Entry::Retry do
         # sure this is catched, check explicitly that all of the documented
         # values are valid. If they are not it means the documentation and this
         # array must be updated.
-        RETRY_WHEN_IN_DOCUMENTATION = %w[
+        retry_when_in_documentation = %w[
           always
           unknown_failure
           script_failure
@@ -111,7 +111,7 @@ describe Gitlab::Ci::Config::Entry::Retry do
           data_integrity_failure
         ].freeze
 
-        RETRY_WHEN_IN_DOCUMENTATION.each do |reason|
+        retry_when_in_documentation.each do |reason|
           context "with when from documentation `#{reason}`" do
             let(:when) { reason }
 
diff --git a/spec/lib/gitlab/ci/parsers/terraform/tfplan_spec.rb b/spec/lib/gitlab/ci/parsers/terraform/tfplan_spec.rb
index 19cd75e586c..fec27c0f31a 100644
--- a/spec/lib/gitlab/ci/parsers/terraform/tfplan_spec.rb
+++ b/spec/lib/gitlab/ci/parsers/terraform/tfplan_spec.rb
@@ -8,7 +8,7 @@ describe Gitlab::Ci::Parsers::Terraform::Tfplan do
 
     let(:reports) { Gitlab::Ci::Reports::TerraformReports.new }
 
-    context 'when data is tfplan.json' do
+    context 'when data is invalid' do
       context 'when there is no data' do
         it 'raises an error' do
           plan = '{}'
@@ -19,31 +19,67 @@ describe Gitlab::Ci::Parsers::Terraform::Tfplan do
         end
       end
 
-      context 'when there is data' do
-        it 'parses JSON and returns a report' do
-          plan = '{ "create": 0, "update": 1, "delete": 0 }'
+      context 'when data is not a JSON file' do
+        it 'raises an error' do
+          plan = { 'create' => 0, 'update' => 1, 'delete' => 0 }.to_s
 
-          expect { subject.parse!(plan, reports, artifact: artifact) }.not_to raise_error
+          expect { subject.parse!(plan, reports, artifact: artifact) }.to raise_error(
+            described_class::TfplanParserError
+          )
+        end
+      end
 
-          expect(reports.plans).to match(
-            a_hash_including(
-              'tfplan.json' => a_hash_including(
-                'create' => 0,
-                'update' => 1,
-                'delete' => 0
-              )
-            )
+      context 'when JSON is missing a required key' do
+        it 'raises an error' do
+          plan = '{ "wrong_key": 1 }'
+
+          expect { subject.parse!(plan, reports, artifact: artifact) }.to raise_error(
+            described_class::TfplanParserError
           )
         end
       end
     end
 
-    context 'when data is not tfplan.json' do
-      it 'raises an error' do
-        plan = { 'create' => 0, 'update' => 1, 'delete' => 0 }.to_s
+    context 'when data is valid' do
+      it 'parses JSON and returns a report' do
+        plan = '{ "create": 0, "update": 1, "delete": 0 }'
+
+        expect { subject.parse!(plan, reports, artifact: artifact) }.not_to raise_error
 
-        expect { subject.parse!(plan, reports, artifact: artifact) }.to raise_error(
-          described_class::TfplanParserError
+        reports.plans.each do |key, hash_value|
+          expect(hash_value.keys).to match_array(%w[create delete job_name job_path update])
+        end
+
+        expect(reports.plans).to match(
+          a_hash_including(
+            artifact.job.id.to_s => a_hash_including(
+              'create' => 0,
+              'update' => 1,
+              'delete' => 0,
+              'job_name' => artifact.job.options.dig(:artifacts, :name).to_s
+            )
+          )
+        )
+      end
+
+      it 'parses JSON when extra keys are present' do
+        plan = '{ "create": 0, "update": 1, "delete": 0, "extra_key": 4 }'
+
+        expect { subject.parse!(plan, reports, artifact: artifact) }.not_to raise_error
+
+        reports.plans.each do |key, hash_value|
+          expect(hash_value.keys).to match_array(%w[create delete job_name job_path update])
+        end
+
+        expect(reports.plans).to match(
+          a_hash_including(
+            artifact.job.id.to_s => a_hash_including(
+              'create' => 0,
+              'update' => 1,
+              'delete' => 0,
+              'job_name' => artifact.job.options.dig(:artifacts, :name).to_s
+            )
+          )
         )
       end
     end
diff --git a/spec/lib/gitlab/ci/pipeline/chain/seed_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/seed_spec.rb
index aa54f19b26c..1e1d5c2a724 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/seed_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/seed_spec.rb
@@ -39,6 +39,10 @@ describe Gitlab::Ci::Pipeline::Chain::Seed do
       expect(pipeline.iid).to be_present
     end
 
+    it 'ensures ci_ref' do
+      expect(pipeline.ci_ref).to be_present
+    end
+
     it 'sets the seeds in the command object' do
       expect(command.stage_seeds).to all(be_a Gitlab::Ci::Pipeline::Seed::Base)
       expect(command.stage_seeds.count).to eq 1
diff --git a/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb
index f82e49f9323..ea04862ed74 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb
@@ -56,11 +56,24 @@ describe Gitlab::Ci::Pipeline::Chain::Sequence do
     end
 
     it 'adds sequence duration to duration histogram' do
-      allow(command).to receive(:duration_histogram).and_return(histogram)
+      allow(command.metrics)
+        .to receive(:pipeline_creation_duration_histogram)
+        .and_return(histogram)
 
       subject.build!
 
       expect(histogram).to have_received(:observe)
     end
+
+    it 'records pipeline size by pipeline source in a histogram' do
+      allow(command.metrics)
+        .to receive(:pipeline_size_histogram)
+        .and_return(histogram)
+
+      subject.build!
+
+      expect(histogram).to have_received(:observe)
+        .with({ source: 'push' }, 0)
+    end
   end
 end
diff --git a/spec/lib/gitlab/ci/pipeline/seed/build/cache_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/build/cache_spec.rb
index fe19244659f..f5b43b5aeab 100644
--- a/spec/lib/gitlab/ci/pipeline/seed/build/cache_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/seed/build/cache_spec.rb
@@ -134,7 +134,7 @@ describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
           it_behaves_like 'foo/bar directory key'
         end
 
-        context 'with directories ending in slash star' do
+        context 'with directories ending in slash star', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/222356' do
           let(:files) { ['foo/bar/*'] }
 
           it_behaves_like 'foo/bar directory key'
diff --git a/spec/lib/gitlab/ci/reports/terraform_reports_spec.rb b/spec/lib/gitlab/ci/reports/terraform_reports_spec.rb
index 061029299ac..bfab30543ed 100644
--- a/spec/lib/gitlab/ci/reports/terraform_reports_spec.rb
+++ b/spec/lib/gitlab/ci/reports/terraform_reports_spec.rb
@@ -10,23 +10,23 @@ describe Gitlab::Ci::Reports::TerraformReports do
   describe '#add_plan' do
     context 'when providing two unique plans' do
       it 'returns two plans' do
-        subject.add_plan('a/tfplan.json', { 'create' => 0, 'update' => 1, 'delete' => 0 })
-        subject.add_plan('b/tfplan.json', { 'create' => 0, 'update' => 1, 'delete' => 0 })
+        subject.add_plan('123', { 'create' => 1, 'update' => 2, 'delete' => 3 })
+        subject.add_plan('456', { 'create' => 4, 'update' => 5, 'delete' => 6 })
 
         expect(subject.plans).to eq({
-          'a/tfplan.json' => { 'create' => 0, 'update' => 1, 'delete' => 0 },
-          'b/tfplan.json' => { 'create' => 0, 'update' => 1, 'delete' => 0 }
+          '123' => { 'create' => 1, 'update' => 2, 'delete' => 3 },
+          '456' => { 'create' => 4, 'update' => 5, 'delete' => 6 }
         })
       end
     end
 
     context 'when providing the same plan twice' do
       it 'returns the last added plan' do
-        subject.add_plan('tfplan.json', { 'create' => 0, 'update' => 0, 'delete' => 0 })
-        subject.add_plan('tfplan.json', { 'create' => 0, 'update' => 1, 'delete' => 0 })
+        subject.add_plan('123', { 'create' => 0, 'update' => 0, 'delete' => 0 })
+        subject.add_plan('123', { 'create' => 1, 'update' => 2, 'delete' => 3 })
 
         expect(subject.plans).to eq({
-          'tfplan.json' => { 'create' => 0, 'update' => 1, 'delete' => 0 }
+          '123' => { 'create' => 1, 'update' => 2, 'delete' => 3 }
         })
       end
     end
diff --git a/spec/lib/gitlab/ci/status/bridge/factory_spec.rb b/spec/lib/gitlab/ci/status/bridge/factory_spec.rb
index 1f417781988..6c67864855d 100644
--- a/spec/lib/gitlab/ci/status/bridge/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/bridge/factory_spec.rb
@@ -59,12 +59,13 @@ describe Gitlab::Ci::Status::Bridge::Factory do
 
     context 'failed with downstream_pipeline_creation_failed' do
       before do
+        bridge.options = { downstream_errors: ['No stages / jobs for this pipeline.', 'other error'] }
         bridge.failure_reason = 'downstream_pipeline_creation_failed'
       end
 
       it 'fabricates correct status_tooltip' do
         expect(status.status_tooltip).to eq(
-          "#{s_('CiStatusText|failed')} - (downstream pipeline can not be created)"
+          "#{s_('CiStatusText|failed')} - (downstream pipeline can not be created, No stages / jobs for this pipeline., other error)"
         )
       end
     end
diff --git a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
index b0113b00ef0..bdcbfed918f 100644
--- a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
@@ -31,7 +31,7 @@ describe Gitlab::Ci::Status::Stage::PlayManual do
 
     subject { play_manual.action_path }
 
-    it { is_expected.to eq("/#{pipeline.project.full_path}/pipelines/#{pipeline.id}/stages/#{stage.name}/play_manual") }
+    it { is_expected.to eq("/#{pipeline.project.full_path}/-/pipelines/#{pipeline.id}/stages/#{stage.name}/play_manual") }
   end
 
   describe '#action_method' do
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index c93bb901981..1668149d8f5 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -1388,7 +1388,7 @@ module Gitlab
         let(:processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(config)) }
         let(:config) do
           {
-            stages: ["build", "test", "release"], # rubocop:disable Style/WordArray
+            stages: %w[build test release],
             release: {
               stage: "release",
               only: ["tags"],
diff --git a/spec/lib/gitlab/cleanup/orphan_lfs_file_references_spec.rb b/spec/lib/gitlab/cleanup/orphan_lfs_file_references_spec.rb
new file mode 100644
index 00000000000..01cc0b30784
--- /dev/null
+++ b/spec/lib/gitlab/cleanup/orphan_lfs_file_references_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Cleanup::OrphanLfsFileReferences do
+  let(:null_logger) { Logger.new('/dev/null') }
+  let(:project) { create(:project, :repository, lfs_enabled: true) }
+  let(:lfs_object) { create(:lfs_object) }
+
+  let!(:invalid_reference) { create(:lfs_objects_project, project: project, lfs_object: lfs_object) }
+
+  before do
+    allow(null_logger).to receive(:info)
+
+    allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
+
+    # Create a valid reference
+    oid = project.repository.gitaly_blob_client.get_all_lfs_pointers.first.lfs_oid
+    lfs_object2 = create(:lfs_object, oid: oid)
+    create(:lfs_objects_project, project: project, lfs_object: lfs_object2)
+  end
+
+  context 'dry run' do
+    it 'prints messages and does not delete references' do
+      expect(null_logger).to receive(:info).with("[DRY RUN] Looking for orphan LFS files for project #{project.name_with_namespace}")
+      expect(null_logger).to receive(:info).with("[DRY RUN] Found invalid references: 1")
+
+      expect { described_class.new(project, logger: null_logger).run! }
+        .not_to change { project.lfs_objects.count }
+    end
+  end
+
+  context 'regular run' do
+    it 'prints messages and deletes invalid reference' do
+      expect(null_logger).to receive(:info).with("Looking for orphan LFS files for project #{project.name_with_namespace}")
+      expect(null_logger).to receive(:info).with("Removed invalid references: 1")
+      expect(ProjectCacheWorker).to receive(:perform_async).with(project.id, [], [:lfs_objects_size])
+
+      expect { described_class.new(project, logger: null_logger, dry_run: false).run! }
+        .to change { project.lfs_objects.count }.from(2).to(1)
+
+      expect(LfsObjectsProject.exists?(invalid_reference.id)).to be_falsey
+    end
+  end
+end
diff --git a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb
index b8ac8c5b95c..864529a6bf6 100644
--- a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb
+++ b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb
@@ -5,7 +5,9 @@ require 'spec_helper'
 # For easier debugging set `PUMA_DEBUG=1`
 
 describe Gitlab::Cluster::Mixins::PumaCluster do
-  PUMA_STARTUP_TIMEOUT = 30
+  before do
+    stub_const('PUMA_STARTUP_TIMEOUT', 30)
+  end
 
   context 'when running Puma in Cluster-mode' do
     using RSpec::Parameterized::TableSyntax
diff --git a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb
index ebe019924d5..3965eb722a0 100644
--- a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb
+++ b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb
@@ -5,7 +5,9 @@ require 'spec_helper'
 # For easier debugging set `UNICORN_DEBUG=1`
 
 describe Gitlab::Cluster::Mixins::UnicornHttpServer do
-  UNICORN_STARTUP_TIMEOUT = 30
+  before do
+    stub_const('UNICORN_STARTUP_TIMEOUT', 30)
+  end
 
   context 'when running Unicorn' do
     using RSpec::Parameterized::TableSyntax
diff --git a/spec/lib/gitlab/code_navigation_path_spec.rb b/spec/lib/gitlab/code_navigation_path_spec.rb
index 938a2f821fd..07d4dfba622 100644
--- a/spec/lib/gitlab/code_navigation_path_spec.rb
+++ b/spec/lib/gitlab/code_navigation_path_spec.rb
@@ -12,12 +12,25 @@ describe Gitlab::CodeNavigationPath do
 
     let(:commit_sha) { sha }
     let(:path) { 'lib/app.rb' }
+    let(:lsif_path) { "/#{project.full_path}/-/jobs/#{job.id}/artifacts/raw/lsif/#{path}.json?file_type=lsif" }
 
     subject { described_class.new(project, commit_sha).full_json_path_for(path) }
 
+    before do
+      stub_feature_flags(code_navigation: project)
+    end
+
     context 'when a pipeline exist for a sha' do
       it 'returns path to a file in the artifact' do
-        expect(subject).to eq("/#{project.full_path}/-/jobs/#{job.id}/artifacts/raw/lsif/#{path}.json?file_type=lsif")
+        expect(subject).to eq(lsif_path)
+      end
+
+      context 'when passed commit sha is nil' do
+        let(:commit_sha) { nil }
+
+        it 'returns path to a file in the artifact' do
+          expect(subject).to eq(lsif_path)
+        end
       end
     end
 
@@ -25,7 +38,7 @@ describe Gitlab::CodeNavigationPath do
       let(:commit_sha) { project.commit.id }
 
       it 'returns path to a file in the artifact' do
-        expect(subject).to eq("/#{project.full_path}/-/jobs/#{job.id}/artifacts/raw/lsif/#{path}.json?file_type=lsif")
+        expect(subject).to eq(lsif_path)
       end
     end
 
diff --git a/spec/lib/gitlab/config/entry/factory_spec.rb b/spec/lib/gitlab/config/entry/factory_spec.rb
index a614ef56a78..81ca5f2cba1 100644
--- a/spec/lib/gitlab/config/entry/factory_spec.rb
+++ b/spec/lib/gitlab/config/entry/factory_spec.rb
@@ -4,11 +4,14 @@ require 'spec_helper'
 
 describe Gitlab::Config::Entry::Factory do
   describe '#create!' do
-    class Script < Gitlab::Config::Entry::Node
-      include Gitlab::Config::Entry::Validatable
+    before do
+      stub_const('Script', Class.new(Gitlab::Config::Entry::Node))
+      Script.class_eval do
+        include Gitlab::Config::Entry::Validatable
 
-      validations do
-        validates :config, array_of_strings: true
+        validations do
+          validates :config, array_of_strings: true
+        end
       end
     end
 
diff --git a/spec/lib/gitlab/config/loader/yaml_spec.rb b/spec/lib/gitlab/config/loader/yaml_spec.rb
index a52c1c362e1..623fe927233 100644
--- a/spec/lib/gitlab/config/loader/yaml_spec.rb
+++ b/spec/lib/gitlab/config/loader/yaml_spec.rb
@@ -5,6 +5,16 @@ require 'spec_helper'
 describe Gitlab::Config::Loader::Yaml do
   let(:loader) { described_class.new(yml) }
 
+  let(:yml) do
+    <<~YAML
+    image: 'ruby:2.7'
+    texts:
+      nested_key: 'value1'
+      more_text:
+        more_nested_key: 'value2'
+    YAML
+  end
+
   context 'when yaml syntax is correct' do
     let(:yml) { 'image: ruby:2.7' }
 
@@ -61,6 +71,15 @@ describe Gitlab::Config::Loader::Yaml do
         expect(loader).not_to be_valid
       end
     end
+
+    describe '#load_raw!' do
+      it 'raises error' do
+        expect { loader.load_raw! }.to raise_error(
+          Gitlab::Config::Loader::FormatError,
+          'Invalid configuration format'
+        )
+      end
+    end
   end
 
   # Prevent Billion Laughs attack: https://gitlab.com/gitlab-org/gitlab-foss/issues/56018
@@ -123,4 +142,32 @@ describe Gitlab::Config::Loader::Yaml do
       end
     end
   end
+
+  describe '#load_raw!' do
+    it 'loads keys as strings' do
+      expect(loader.load_raw!).to eq(
+        'image' => 'ruby:2.7',
+        'texts' => {
+          'nested_key' => 'value1',
+          'more_text' => {
+            'more_nested_key' => 'value2'
+          }
+        }
+      )
+    end
+  end
+
+  describe '#load!' do
+    it 'symbolizes keys' do
+      expect(loader.load!).to eq(
+        image: 'ruby:2.7',
+        texts: {
+          nested_key: 'value1',
+          more_text: {
+            more_nested_key: 'value2'
+          }
+        }
+      )
+    end
+  end
 end
diff --git a/spec/lib/gitlab/contributions_calendar_spec.rb b/spec/lib/gitlab/contributions_calendar_spec.rb
index 1154f029a8d..97742a3e815 100644
--- a/spec/lib/gitlab/contributions_calendar_spec.rb
+++ b/spec/lib/gitlab/contributions_calendar_spec.rb
@@ -42,7 +42,7 @@ describe Gitlab::ContributionsCalendar do
     described_class.new(contributor, current_user)
   end
 
-  def create_event(project, day, hour = 0, action = Event::CREATED, target_symbol = :issue)
+  def create_event(project, day, hour = 0, action = :created, target_symbol = :issue)
     @targets ||= {}
     @targets[project] ||= create(target_symbol, project: project, author: contributor)
 
@@ -77,14 +77,14 @@ describe Gitlab::ContributionsCalendar do
     end
 
     it "counts the diff notes on merge request" do
-      create_event(public_project, today, 0, Event::COMMENTED, :diff_note_on_merge_request)
+      create_event(public_project, today, 0, :commented, :diff_note_on_merge_request)
 
       expect(calendar(contributor).activity_dates[today]).to eq(1)
     end
 
     it "counts the discussions on merge requests and issues" do
-      create_event(public_project, today, 0, Event::COMMENTED, :discussion_note_on_merge_request)
-      create_event(public_project, today, 2, Event::COMMENTED, :discussion_note_on_issue)
+      create_event(public_project, today, 0, :commented, :discussion_note_on_merge_request)
+      create_event(public_project, today, 2, :commented, :discussion_note_on_issue)
 
       expect(calendar(contributor).activity_dates[today]).to eq(2)
     end
diff --git a/spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb b/spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb
index a86278871ff..ccc99017e37 100644
--- a/spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb
@@ -14,19 +14,29 @@ describe Gitlab::CycleAnalytics::StageSummary do
   let(:stage_summary) { described_class.new(project, options).data }
 
   describe "#new_issues" do
-    subject { stage_summary.first[:value] }
+    subject { stage_summary.first }
 
-    it "finds the number of issues created after the 'from date'" do
-      Timecop.freeze(5.days.ago) { create(:issue, project: project) }
-      Timecop.freeze(5.days.from_now) { create(:issue, project: project) }
+    context 'when from date is given' do
+      before do
+        Timecop.freeze(5.days.ago) { create(:issue, project: project) }
+        Timecop.freeze(5.days.from_now) { create(:issue, project: project) }
+      end
 
-      expect(subject).to eq('1')
+      it "finds the number of issues created after the 'from date'" do
+        expect(subject[:value]).to eq('1')
+      end
+
+      it 'returns the localized title' do
+        Gitlab::I18n.with_locale(:ru) do
+          expect(subject[:title]).to eq(n_('New Issue', 'New Issues', 1))
+        end
+      end
     end
 
     it "doesn't find issues from other projects" do
       Timecop.freeze(5.days.from_now) { create(:issue, project: create(:project)) }
 
-      expect(subject).to eq('-')
+      expect(subject[:value]).to eq('-')
     end
 
     context 'when `to` parameter is given' do
@@ -38,38 +48,48 @@ describe Gitlab::CycleAnalytics::StageSummary do
       it "doesn't find any record" do
         options[:to] = Time.now
 
-        expect(subject).to eq('-')
+        expect(subject[:value]).to eq('-')
       end
 
       it "finds records created between `from` and `to` range" do
         options[:from] = 10.days.ago
         options[:to] = 10.days.from_now
 
-        expect(subject).to eq('2')
+        expect(subject[:value]).to eq('2')
       end
     end
   end
 
   describe "#commits" do
-    subject { stage_summary.second[:value] }
+    subject { stage_summary.second }
+
+    context 'when from date is given' do
+      before do
+        Timecop.freeze(5.days.ago) { create_commit("Test message", project, user, 'master') }
+        Timecop.freeze(5.days.from_now) { create_commit("Test message", project, user, 'master') }
+      end
 
-    it "finds the number of commits created after the 'from date'" do
-      Timecop.freeze(5.days.ago) { create_commit("Test message", project, user, 'master') }
-      Timecop.freeze(5.days.from_now) { create_commit("Test message", project, user, 'master') }
+      it "finds the number of commits created after the 'from date'" do
+        expect(subject[:value]).to eq('1')
+      end
 
-      expect(subject).to eq('1')
+      it 'returns the localized title' do
+        Gitlab::I18n.with_locale(:ru) do
+          expect(subject[:title]).to eq(n_('Commit', 'Commits', 1))
+        end
+      end
     end
 
     it "doesn't find commits from other projects" do
       Timecop.freeze(5.days.from_now) { create_commit("Test message", create(:project, :repository), user, 'master') }
 
-      expect(subject).to eq('-')
+      expect(subject[:value]).to eq('-')
     end
 
     it "finds a large (> 100) number of commits if present" do
       Timecop.freeze(5.days.from_now) { create_commit("Test message", project, user, 'master', count: 100) }
 
-      expect(subject).to eq('100')
+      expect(subject[:value]).to eq('100')
     end
 
     context 'when `to` parameter is given' do
@@ -81,14 +101,14 @@ describe Gitlab::CycleAnalytics::StageSummary do
       it "doesn't find any record" do
         options[:to] = Time.now
 
-        expect(subject).to eq('-')
+        expect(subject[:value]).to eq('-')
       end
 
       it "finds records created between `from` and `to` range" do
         options[:from] = 10.days.ago
         options[:to] = 10.days.from_now
 
-        expect(subject).to eq('2')
+        expect(subject[:value]).to eq('2')
       end
     end
 
@@ -112,13 +132,23 @@ describe Gitlab::CycleAnalytics::StageSummary do
   end
 
   describe "#deploys" do
-    subject { stage_summary.third[:value] }
+    subject { stage_summary.third }
 
-    it "finds the number of deploys made created after the 'from date'" do
-      Timecop.freeze(5.days.ago) { create(:deployment, :success, project: project) }
-      Timecop.freeze(5.days.from_now) { create(:deployment, :success, project: project) }
+    context 'when from date is given' do
+      before do
+        Timecop.freeze(5.days.ago) { create(:deployment, :success, project: project) }
+        Timecop.freeze(5.days.from_now) { create(:deployment, :success, project: project) }
+      end
+
+      it "finds the number of deploys made created after the 'from date'" do
+        expect(subject[:value]).to eq('1')
+      end
 
-      expect(subject).to eq('1')
+      it 'returns the localized title' do
+        Gitlab::I18n.with_locale(:ru) do
+          expect(subject[:title]).to eq(n_('Deploy', 'Deploys', 1))
+        end
+      end
     end
 
     it "doesn't find commits from other projects" do
@@ -126,7 +156,7 @@ describe Gitlab::CycleAnalytics::StageSummary do
         create(:deployment, :success, project: create(:project, :repository))
       end
 
-      expect(subject).to eq('-')
+      expect(subject[:value]).to eq('-')
     end
 
     context 'when `to` parameter is given' do
@@ -138,14 +168,14 @@ describe Gitlab::CycleAnalytics::StageSummary do
       it "doesn't find any record" do
         options[:to] = Time.now
 
-        expect(subject).to eq('-')
+        expect(subject[:value]).to eq('-')
       end
 
       it "finds records created between `from` and `to` range" do
         options[:from] = 10.days.ago
         options[:to] = 10.days.from_now
 
-        expect(subject).to eq('2')
+        expect(subject[:value]).to eq('2')
       end
     end
   end
diff --git a/spec/lib/gitlab/danger/changelog_spec.rb b/spec/lib/gitlab/danger/changelog_spec.rb
index 8929374fb87..130a4708cec 100644
--- a/spec/lib/gitlab/danger/changelog_spec.rb
+++ b/spec/lib/gitlab/danger/changelog_spec.rb
@@ -65,9 +65,7 @@ describe Gitlab::Danger::Changelog do
     context 'added files contain a changelog' do
       [
         'changelogs/unreleased/entry.yml',
-        'ee/changelogs/unreleased/entry.yml',
-        'changelogs/unreleased-ee/entry.yml',
-        'ee/changelogs/unreleased-ee/entry.yml'
+        'ee/changelogs/unreleased/entry.yml'
       ].each do |file_path|
         let(:added_files) { [file_path] }
 
diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb
index c2c881fd589..809064a540c 100644
--- a/spec/lib/gitlab/danger/helper_spec.rb
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -213,6 +213,7 @@ describe Gitlab::Danger::Helper do
       'generator_templates/foo' | :backend
       'vendor/languages.yml'    | :backend
       'vendor/licenses.csv'     | :backend
+      'file_hooks/examples/'    | :backend
 
       'Gemfile'        | :backend
       'Gemfile.lock'   | :backend
@@ -233,6 +234,7 @@ describe Gitlab::Danger::Helper do
       '.overcommit.yml.example'                               | :engineering_productivity
       '.editorconfig'                                         | :engineering_productivity
       'tooling/overcommit/foo'                                | :engineering_productivity
+      '.codeclimate.yml'                                      | :engineering_productivity
 
       'lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml'   | :backend
 
diff --git a/spec/lib/gitlab/danger/roulette_spec.rb b/spec/lib/gitlab/danger/roulette_spec.rb
index 4d41e2c45aa..b6148cd1407 100644
--- a/spec/lib/gitlab/danger/roulette_spec.rb
+++ b/spec/lib/gitlab/danger/roulette_spec.rb
@@ -6,40 +6,149 @@ require 'webmock/rspec'
 require 'gitlab/danger/roulette'
 
 describe Gitlab::Danger::Roulette do
+  let(:backend_maintainer) do
+    {
+      username: 'backend-maintainer',
+      name: 'Backend maintainer',
+      role: 'Backend engineer',
+      projects: { 'gitlab' => 'maintainer backend' }
+    }
+  end
+  let(:frontend_reviewer) do
+    {
+      username: 'frontend-reviewer',
+      name: 'Frontend reviewer',
+      role: 'Frontend engineer',
+      projects: { 'gitlab' => 'reviewer frontend' }
+    }
+  end
+  let(:frontend_maintainer) do
+    {
+      username: 'frontend-maintainer',
+      name: 'Frontend maintainer',
+      role: 'Frontend engineer',
+      projects: { 'gitlab' => "maintainer frontend" }
+    }
+  end
+  let(:software_engineer_in_test) do
+    {
+      username: 'software-engineer-in-test',
+      name: 'Software Engineer in Test',
+      role: 'Software Engineer in Test, Create:Source Code',
+      projects: {
+        'gitlab' => 'reviewer qa',
+        'gitlab-qa' => 'maintainer'
+      }
+    }
+  end
+  let(:engineering_productivity_reviewer) do
+    {
+      username: 'eng-prod-reviewer',
+      name: 'EP engineer',
+      role: 'Engineering Productivity',
+      projects: { 'gitlab' => 'reviewer backend' }
+    }
+  end
+
   let(:teammate_json) do
-    <<~JSON
     [
-      {
-        "username": "in-gitlab-ce",
-        "name": "CE maintainer",
-        "projects":{ "gitlab-ce": "maintainer backend" }
-      },
-      {
-        "username": "in-gitlab-ee",
-        "name": "EE reviewer",
-        "projects":{ "gitlab-ee": "reviewer frontend" }
-      }
-    ]
-    JSON
+      backend_maintainer,
+      frontend_maintainer,
+      frontend_reviewer,
+      software_engineer_in_test,
+      engineering_productivity_reviewer
+    ].to_json
   end
 
-  let(:ce_teammate_matcher) do
+  subject(:roulette) { Object.new.extend(described_class) }
+
+  def matching_teammate(person)
     satisfy do |teammate|
-      teammate.username == 'in-gitlab-ce' &&
-        teammate.name == 'CE maintainer' &&
-        teammate.projects == { 'gitlab-ce' => 'maintainer backend' }
+      teammate.username == person[:username] &&
+        teammate.name == person[:name] &&
+        teammate.role == person[:role] &&
+        teammate.projects == person[:projects]
     end
   end
 
-  let(:ee_teammate_matcher) do
-    satisfy do |teammate|
-      teammate.username == 'in-gitlab-ee' &&
-        teammate.name == 'EE reviewer' &&
-        teammate.projects == { 'gitlab-ee' => 'reviewer frontend' }
+  def matching_spin(category, reviewer: { username: nil }, maintainer: { username: nil }, optional: nil)
+    satisfy do |spin|
+      spin.category == category &&
+        spin.reviewer&.username == reviewer[:username] &&
+        spin.maintainer&.username == maintainer[:username] &&
+        spin.optional_role == optional
     end
   end
 
-  subject(:roulette) { Object.new.extend(described_class) }
+  describe '#spin' do
+    let!(:project) { 'gitlab' }
+    let!(:branch_name) { 'a-branch' }
+    let!(:mr_labels) { ['backend', 'devops::create'] }
+    let!(:author) { Gitlab::Danger::Teammate.new('username' => 'filipa') }
+
+    before do
+      [
+        backend_maintainer,
+        frontend_reviewer,
+        frontend_maintainer,
+        software_engineer_in_test,
+        engineering_productivity_reviewer
+      ].each do |person|
+        stub_person_status(instance_double(Gitlab::Danger::Teammate, username: person[:username]), message: 'making GitLab magic')
+      end
+
+      WebMock
+        .stub_request(:get, described_class::ROULETTE_DATA_URL)
+        .to_return(body: teammate_json)
+      allow(subject).to receive_message_chain(:gitlab, :mr_author).and_return(author.username)
+      allow(subject).to receive_message_chain(:gitlab, :mr_labels).and_return(mr_labels)
+    end
+
+    context 'when change contains backend category' do
+      it 'assigns backend reviewer and maintainer' do
+        categories = [:backend]
+        spins = subject.spin(project, categories, branch_name)
+
+        expect(spins).to contain_exactly(matching_spin(:backend, reviewer: engineering_productivity_reviewer, maintainer: backend_maintainer))
+      end
+    end
+
+    context 'when change contains frontend category' do
+      it 'assigns frontend reviewer and maintainer' do
+        categories = [:frontend]
+        spins = subject.spin(project, categories, branch_name)
+
+        expect(spins).to contain_exactly(matching_spin(:frontend, reviewer: frontend_reviewer, maintainer: frontend_maintainer))
+      end
+    end
+
+    context 'when change contains QA category' do
+      it 'assigns QA reviewer and sets optional QA maintainer' do
+        categories = [:qa]
+        spins = subject.spin(project, categories, branch_name)
+
+        expect(spins).to contain_exactly(matching_spin(:qa, reviewer: software_engineer_in_test, optional: :maintainer))
+      end
+    end
+
+    context 'when change contains Engineering Productivity category' do
+      it 'assigns Engineering Productivity reviewer and fallback to backend maintainer' do
+        categories = [:engineering_productivity]
+        spins = subject.spin(project, categories, branch_name)
+
+        expect(spins).to contain_exactly(matching_spin(:engineering_productivity, reviewer: engineering_productivity_reviewer, maintainer: backend_maintainer))
+      end
+    end
+
+    context 'when change contains test category' do
+      it 'assigns corresponding SET and sets optional test maintainer' do
+        categories = [:test]
+        spins = subject.spin(project, categories, branch_name)
+
+        expect(spins).to contain_exactly(matching_spin(:test, reviewer: software_engineer_in_test, optional: :maintainer))
+      end
+    end
+  end
 
   describe '#team' do
     subject(:team) { roulette.team }
@@ -76,7 +185,15 @@ describe Gitlab::Danger::Roulette do
       end
 
       it 'returns an array of teammates' do
-        is_expected.to contain_exactly(ce_teammate_matcher, ee_teammate_matcher)
+        expected_teammates = [
+          matching_teammate(backend_maintainer),
+          matching_teammate(frontend_reviewer),
+          matching_teammate(frontend_maintainer),
+          matching_teammate(software_engineer_in_test),
+          matching_teammate(engineering_productivity_reviewer)
+        ]
+
+        is_expected.to contain_exactly(*expected_teammates)
       end
 
       it 'memoizes the result' do
@@ -86,7 +203,7 @@ describe Gitlab::Danger::Roulette do
   end
 
   describe '#project_team' do
-    subject { roulette.project_team('gitlab-ce') }
+    subject { roulette.project_team('gitlab-qa') }
 
     before do
       WebMock
@@ -95,7 +212,7 @@ describe Gitlab::Danger::Roulette do
     end
 
     it 'filters team by project_name' do
-      is_expected.to contain_exactly(ce_teammate_matcher)
+      is_expected.to contain_exactly(matching_teammate(software_engineer_in_test))
     end
   end
 
@@ -136,15 +253,15 @@ describe Gitlab::Danger::Roulette do
     it 'excludes person with no capacity' do
       expect(subject.spin_for_person([no_capacity], random: Random.new)).to be_nil
     end
+  end
 
-    private
+  private
 
-    def stub_person_status(person, message: 'dummy message', emoji: 'unicorn')
-      body = { message: message, emoji: emoji }.to_json
+  def stub_person_status(person, message: 'dummy message', emoji: 'unicorn')
+    body = { message: message, emoji: emoji }.to_json
 
-      WebMock
-        .stub_request(:get, "https://gitlab.com/api/v4/users/#{person.username}/status")
-        .to_return(body: body)
-    end
+    WebMock
+      .stub_request(:get, "https://gitlab.com/api/v4/users/#{person.username}/status")
+      .to_return(body: body)
   end
 end
diff --git a/spec/lib/gitlab/data_builder/alert_spec.rb b/spec/lib/gitlab/data_builder/alert_spec.rb
new file mode 100644
index 00000000000..b881fb8139b
--- /dev/null
+++ b/spec/lib/gitlab/data_builder/alert_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::DataBuilder::Alert do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:alert) { create(:alert_management_alert, project: project) }
+
+  describe '.build' do
+    let_it_be(:data) { described_class.build(alert) }
+
+    it { expect(data).to be_a(Hash) }
+    it { expect(data[:object_kind]).to eq('alert') }
+
+    it 'contains the correct object attributes', :aggregate_failures do
+      object_attributes = data[:object_attributes]
+
+      expect(object_attributes[:title]).to eq(alert.title)
+      expect(object_attributes[:url]).to eq(Gitlab::Routing.url_helpers.details_project_alert_management_url(project, alert.iid))
+      expect(object_attributes[:severity]).to eq(alert.severity)
+      expect(object_attributes[:events]).to eq(alert.events)
+      expect(object_attributes[:status]).to eq(alert.status_name)
+      expect(object_attributes[:started_at]).to eq(alert.started_at)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/database/custom_structure_spec.rb b/spec/lib/gitlab/database/custom_structure_spec.rb
new file mode 100644
index 00000000000..f03b5ed0a7f
--- /dev/null
+++ b/spec/lib/gitlab/database/custom_structure_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Database::CustomStructure do
+  let_it_be(:structure) { described_class.new }
+  let_it_be(:filepath) { Rails.root.join(described_class::CUSTOM_DUMP_FILE) }
+  let_it_be(:file_header) do
+    <<~DATA
+      -- this file tracks custom GitLab data, such as foreign keys referencing partitioned tables
+      -- more details can be found in the issue: https://gitlab.com/gitlab-org/gitlab/-/issues/201872
+      SET search_path=public;
+    DATA
+  end
+
+  let(:io) { StringIO.new }
+
+  before do
+    allow(File).to receive(:open).with(filepath, anything).and_yield(io)
+  end
+
+  context 'when there are no partitioned_foreign_keys' do
+    it 'dumps a valid structure file' do
+      structure.dump
+
+      expect(io.string).to eq("#{file_header}\n")
+    end
+  end
+
+  context 'when there are partitioned_foreign_keys' do
+    let!(:first_fk) do
+      Gitlab::Database::PartitioningMigrationHelpers::PartitionedForeignKey.create(
+        cascade_delete: true, from_table: 'issues', from_column: 'project_id', to_table: 'projects', to_column: 'id')
+    end
+    let!(:second_fk) do
+      Gitlab::Database::PartitioningMigrationHelpers::PartitionedForeignKey.create(
+        cascade_delete: false, from_table: 'issues', from_column: 'moved_to_id', to_table: 'issues', to_column: 'id')
+    end
+
+    it 'dumps a file with the command to restore the current keys' do
+      structure.dump
+
+      expect(io.string).to eq(<<~DATA)
+        #{file_header}
+        COPY partitioned_foreign_keys (id, cascade_delete, from_table, from_column, to_table, to_column) FROM STDIN;
+        #{first_fk.id}\ttrue\tissues\tproject_id\tprojects\tid
+        #{second_fk.id}\tfalse\tissues\tmoved_to_id\tissues\tid
+        \\.
+      DATA
+
+      first_fk.destroy
+      io.truncate(0)
+      io.rewind
+
+      structure.dump
+
+      expect(io.string).to eq(<<~DATA)
+        #{file_header}
+        COPY partitioned_foreign_keys (id, cascade_delete, from_table, from_column, to_table, to_column) FROM STDIN;
+        #{second_fk.id}\tfalse\tissues\tmoved_to_id\tissues\tid
+        \\.
+      DATA
+    end
+  end
+end
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 203d39be22b..bed444ee7c7 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -1539,12 +1539,17 @@ describe Gitlab::Database::MigrationHelpers do
   end
 
   describe '#create_or_update_plan_limit' do
-    class self::Plan < ActiveRecord::Base
-      self.table_name = 'plans'
-    end
+    before do
+      stub_const('Plan', Class.new(ActiveRecord::Base))
+      stub_const('PlanLimits', Class.new(ActiveRecord::Base))
+
+      Plan.class_eval do
+        self.table_name = 'plans'
+      end
 
-    class self::PlanLimits < ActiveRecord::Base
-      self.table_name = 'plan_limits'
+      PlanLimits.class_eval do
+        self.table_name = 'plan_limits'
+      end
     end
 
     it 'properly escapes names' do
@@ -1560,28 +1565,28 @@ describe Gitlab::Database::MigrationHelpers do
     context 'when plan does not exist' do
       it 'does not create any plan limits' do
         expect { model.create_or_update_plan_limit('project_hooks', 'plan_name', 10) }
-          .not_to change { self.class::PlanLimits.count }
+          .not_to change { PlanLimits.count }
       end
     end
 
     context 'when plan does exist' do
-      let!(:plan) { self.class::Plan.create!(name: 'plan_name') }
+      let!(:plan) { Plan.create!(name: 'plan_name') }
 
       context 'when limit does not exist' do
         it 'inserts a new plan limits' do
           expect { model.create_or_update_plan_limit('project_hooks', 'plan_name', 10) }
-            .to change { self.class::PlanLimits.count }.by(1)
+            .to change { PlanLimits.count }.by(1)
 
-          expect(self.class::PlanLimits.pluck(:project_hooks)).to contain_exactly(10)
+          expect(PlanLimits.pluck(:project_hooks)).to contain_exactly(10)
         end
       end
 
       context 'when limit does exist' do
-        let!(:plan_limit) { self.class::PlanLimits.create!(plan_id: plan.id) }
+        let!(:plan_limit) { PlanLimits.create!(plan_id: plan.id) }
 
         it 'updates an existing plan limits' do
           expect { model.create_or_update_plan_limit('project_hooks', 'plan_name', 999) }
-            .not_to change { self.class::PlanLimits.count }
+            .not_to change { PlanLimits.count }
 
           expect(plan_limit.reload.project_hooks).to eq(999)
         end
@@ -1605,19 +1610,23 @@ describe Gitlab::Database::MigrationHelpers do
   describe '#backfill_iids' do
     include MigrationsHelpers
 
-    class self::Issue < ActiveRecord::Base
-      include AtomicInternalId
+    before do
+      stub_const('Issue', Class.new(ActiveRecord::Base))
+
+      Issue.class_eval do
+        include AtomicInternalId
 
-      self.table_name = 'issues'
-      self.inheritance_column = :_type_disabled
+        self.table_name = 'issues'
+        self.inheritance_column = :_type_disabled
 
-      belongs_to :project, class_name: "::Project"
+        belongs_to :project, class_name: "::Project"
 
-      has_internal_id :iid,
-        scope: :project,
-        init: ->(s) { s&.project&.issues&.maximum(:iid) },
-        backfill: true,
-        presence: false
+        has_internal_id :iid,
+          scope: :project,
+          init: ->(s) { s&.project&.issues&.maximum(:iid) },
+          backfill: true,
+          presence: false
+      end
     end
 
     let(:namespaces)     { table(:namespaces) }
@@ -1636,7 +1645,7 @@ describe Gitlab::Database::MigrationHelpers do
 
       model.backfill_iids('issues')
 
-      issue = self.class::Issue.create!(project_id: project.id)
+      issue = Issue.create!(project_id: project.id)
 
       expect(issue.iid).to eq(1)
     end
@@ -1647,7 +1656,7 @@ describe Gitlab::Database::MigrationHelpers do
 
       model.backfill_iids('issues')
 
-      issue_b = self.class::Issue.create!(project_id: project.id)
+      issue_b = Issue.create!(project_id: project.id)
 
       expect(issue_a.reload.iid).to eq(1)
       expect(issue_b.iid).to eq(2)
@@ -1662,8 +1671,8 @@ describe Gitlab::Database::MigrationHelpers do
 
       model.backfill_iids('issues')
 
-      issue_a = self.class::Issue.create!(project_id: project_a.id)
-      issue_b = self.class::Issue.create!(project_id: project_b.id)
+      issue_a = Issue.create!(project_id: project_a.id)
+      issue_b = Issue.create!(project_id: project_b.id)
 
       expect(issue_a.iid).to eq(2)
       expect(issue_b.iid).to eq(3)
@@ -1672,7 +1681,7 @@ describe Gitlab::Database::MigrationHelpers do
     context 'when the new code creates a row post deploy but before the migration runs' do
       it 'does not change the row iid' do
         project = setup
-        issue = self.class::Issue.create!(project_id: project.id)
+        issue = Issue.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
@@ -1683,7 +1692,7 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
@@ -1697,8 +1706,8 @@ describe Gitlab::Database::MigrationHelpers do
         project_b = setup
         issue_a = issues.create!(project_id: project_a.id)
         issue_b = issues.create!(project_id: project_b.id)
-        issue_c = self.class::Issue.create!(project_id: project_a.id)
-        issue_d = self.class::Issue.create!(project_id: project_b.id)
+        issue_c = Issue.create!(project_id: project_a.id)
+        issue_d = Issue.create!(project_id: project_b.id)
 
         model.backfill_iids('issues')
 
@@ -1712,12 +1721,12 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
-        issue_d = self.class::Issue.create!(project_id: project.id)
-        issue_e = self.class::Issue.create!(project_id: project.id)
+        issue_d = Issue.create!(project_id: project.id)
+        issue_e = Issue.create!(project_id: project.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(2)
@@ -1731,14 +1740,14 @@ describe Gitlab::Database::MigrationHelpers do
         project_b = setup
         issue_a = issues.create!(project_id: project_a.id)
         issue_b = issues.create!(project_id: project_b.id)
-        issue_c = self.class::Issue.create!(project_id: project_a.id)
-        issue_d = self.class::Issue.create!(project_id: project_b.id)
+        issue_c = Issue.create!(project_id: project_a.id)
+        issue_d = Issue.create!(project_id: project_b.id)
 
         model.backfill_iids('issues')
 
-        issue_e = self.class::Issue.create!(project_id: project_a.id)
-        issue_f = self.class::Issue.create!(project_id: project_b.id)
-        issue_g = self.class::Issue.create!(project_id: project_a.id)
+        issue_e = Issue.create!(project_id: project_a.id)
+        issue_f = Issue.create!(project_id: project_b.id)
+        issue_g = Issue.create!(project_id: project_a.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(1)
@@ -1754,7 +1763,7 @@ describe Gitlab::Database::MigrationHelpers do
       it 'backfills iids' do
         project = setup
         issue_a = issues.create!(project_id: project.id)
-        issue_b = self.class::Issue.create!(project_id: project.id)
+        issue_b = Issue.create!(project_id: project.id)
         issue_c = issues.create!(project_id: project.id)
 
         model.backfill_iids('issues')
@@ -1768,12 +1777,12 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_d = issues.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
-        issue_e = self.class::Issue.create!(project_id: project.id)
+        issue_e = Issue.create!(project_id: project.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(2)
@@ -1787,9 +1796,9 @@ describe Gitlab::Database::MigrationHelpers do
       it 'backfills iids' do
         project = setup
         issue_a = issues.create!(project_id: project.id)
-        issue_b = self.class::Issue.create!(project_id: project.id)
+        issue_b = Issue.create!(project_id: project.id)
         issue_c = issues.create!(project_id: project.id)
-        issue_d = self.class::Issue.create!(project_id: project.id)
+        issue_d = Issue.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
@@ -1803,13 +1812,13 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_d = issues.create!(project_id: project.id)
-        issue_e = self.class::Issue.create!(project_id: project.id)
+        issue_e = Issue.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
-        issue_f = self.class::Issue.create!(project_id: project.id)
+        issue_f = Issue.create!(project_id: project.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(2)
@@ -1825,7 +1834,7 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_c.delete
 
         model.backfill_iids('issues')
@@ -1838,12 +1847,12 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_c.delete
 
         model.backfill_iids('issues')
 
-        issue_d = self.class::Issue.create!(project_id: project.id)
+        issue_d = Issue.create!(project_id: project.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(2)
@@ -1856,7 +1865,7 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_c.delete
         issue_d = issues.create!(project_id: project.id)
 
@@ -1871,13 +1880,13 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_c.delete
         issue_d = issues.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
-        issue_e = self.class::Issue.create!(project_id: project.id)
+        issue_e = Issue.create!(project_id: project.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(2)
@@ -1891,9 +1900,9 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_c.delete
-        issue_d = self.class::Issue.create!(project_id: project.id)
+        issue_d = Issue.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
@@ -1906,13 +1915,13 @@ describe Gitlab::Database::MigrationHelpers do
         project = setup
         issue_a = issues.create!(project_id: project.id)
         issue_b = issues.create!(project_id: project.id)
-        issue_c = self.class::Issue.create!(project_id: project.id)
+        issue_c = Issue.create!(project_id: project.id)
         issue_c.delete
-        issue_d = self.class::Issue.create!(project_id: project.id)
+        issue_d = Issue.create!(project_id: project.id)
 
         model.backfill_iids('issues')
 
-        issue_e = self.class::Issue.create!(project_id: project.id)
+        issue_e = Issue.create!(project_id: project.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(2)
@@ -1929,7 +1938,7 @@ describe Gitlab::Database::MigrationHelpers do
 
         model.backfill_iids('issues')
 
-        issue_b = self.class::Issue.create!(project_id: project_b.id)
+        issue_b = Issue.create!(project_id: project_b.id)
 
         expect(issue_a.reload.iid).to eq(1)
         expect(issue_b.reload.iid).to eq(1)
@@ -2066,6 +2075,34 @@ describe Gitlab::Database::MigrationHelpers do
       allow(model).to receive(:check_constraint_exists?).and_return(false)
     end
 
+    context 'constraint name validation' do
+      it 'raises an error when too long' do
+        expect do
+          model.add_check_constraint(
+            :test_table,
+            'name IS NOT NULL',
+            'a' * (Gitlab::Database::MigrationHelpers::MAX_IDENTIFIER_NAME_LENGTH + 1)
+          )
+        end.to raise_error(RuntimeError)
+      end
+
+      it 'does not raise error when the length is acceptable' do
+        constraint_name = 'a' * Gitlab::Database::MigrationHelpers::MAX_IDENTIFIER_NAME_LENGTH
+
+        expect(model).to receive(:transaction_open?).and_return(false)
+        expect(model).to receive(:check_constraint_exists?).and_return(false)
+        expect(model).to receive(:with_lock_retries).and_call_original
+        expect(model).to receive(:execute).with(/ADD CONSTRAINT/)
+
+        model.add_check_constraint(
+          :test_table,
+          'name IS NOT NULL',
+          constraint_name,
+          validate: false
+        )
+      end
+    end
+
     context 'inside a transaction' do
       it 'raises an error' do
         expect(model).to receive(:transaction_open?).and_return(true)
diff --git a/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb b/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb
index 0f68201a153..dee1d7df1a9 100644
--- a/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb
+++ b/spec/lib/gitlab/database/obsolete_ignored_columns_spec.rb
@@ -3,39 +3,48 @@
 require 'spec_helper'
 
 describe Gitlab::Database::ObsoleteIgnoredColumns do
-  module Testing
+  before do
+    stub_const('Testing', Module.new)
+    stub_const('Testing::MyBase', Class.new(ActiveRecord::Base))
+    stub_const('SomeAbstract', Class.new(Testing::MyBase))
+    stub_const('Testing::B', Class.new(Testing::MyBase))
+    stub_const('Testing::A', Class.new(SomeAbstract))
+    stub_const('Testing::C', Class.new(Testing::MyBase))
+
     # Used a fixed date to prevent tests failing across date boundaries
-    REMOVE_DATE = Date.new(2019, 12, 16)
+    stub_const('REMOVE_DATE', Date.new(2019, 12, 16))
 
-    class MyBase < ApplicationRecord
-    end
+    Testing.module_eval do
+      Testing::MyBase.class_eval do
+      end
 
-    class SomeAbstract < MyBase
-      include IgnorableColumns
+      SomeAbstract.class_eval do
+        include IgnorableColumns
 
-      self.abstract_class = true
+        self.abstract_class = true
 
-      self.table_name = 'projects'
+        self.table_name = 'projects'
 
-      ignore_column :unused, remove_after: '2019-01-01', remove_with: '12.0'
-    end
+        ignore_column :unused, remove_after: '2019-01-01', remove_with: '12.0'
+      end
 
-    class B < MyBase
-      include IgnorableColumns
+      Testing::B.class_eval do
+        include IgnorableColumns
 
-      self.table_name = 'issues'
+        self.table_name = 'issues'
 
-      ignore_column :id, :other, remove_after: '2019-01-01', remove_with: '12.0'
-      ignore_column :not_used_but_still_ignored, remove_after: REMOVE_DATE.to_s, remove_with: '12.1'
-    end
+        ignore_column :id, :other, remove_after: '2019-01-01', remove_with: '12.0'
+        ignore_column :not_used_but_still_ignored, remove_after: REMOVE_DATE.to_s, remove_with: '12.1'
+      end
 
-    class A < SomeAbstract
-      ignore_column :also_unused, remove_after: '2019-02-01', remove_with: '12.1'
-      ignore_column :not_used_but_still_ignored, remove_after: REMOVE_DATE.to_s, remove_with: '12.1'
-    end
+      Testing::A.class_eval do
+        ignore_column :also_unused, remove_after: '2019-02-01', remove_with: '12.1'
+        ignore_column :not_used_but_still_ignored, remove_after: REMOVE_DATE.to_s, remove_with: '12.1'
+      end
 
-    class C < MyBase
-      self.table_name = 'users'
+      Testing::C.class_eval do
+        self.table_name = 'users'
+      end
     end
   end
 
@@ -43,7 +52,7 @@ describe Gitlab::Database::ObsoleteIgnoredColumns do
 
   describe '#execute' do
     it 'returns a list of class names and columns pairs' do
-      Timecop.freeze(Testing::REMOVE_DATE) do
+      Timecop.freeze(REMOVE_DATE) do
         expect(subject.execute).to eq([
           ['Testing::A', {
             'unused' => IgnorableColumns::ColumnIgnore.new(Date.parse('2019-01-01'), '12.0'),
diff --git a/spec/lib/gitlab/database/partitioning_migration_helpers_spec.rb b/spec/lib/gitlab/database/partitioning_migration_helpers/foreign_key_helpers_spec.rb
index 0e2fb047469..9cec77b434d 100644
--- a/spec/lib/gitlab/database/partitioning_migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/partitioning_migration_helpers/foreign_key_helpers_spec.rb
@@ -2,17 +2,21 @@
 
 require 'spec_helper'
 
-describe Gitlab::Database::PartitioningMigrationHelpers do
+describe Gitlab::Database::PartitioningMigrationHelpers::ForeignKeyHelpers do
+  include TriggerHelpers
+
   let(:model) do
     ActiveRecord::Migration.new.extend(described_class)
   end
   let_it_be(:connection) { ActiveRecord::Base.connection }
   let(:referenced_table) { :issues }
-  let(:function_name) { model.fk_function_name(referenced_table) }
-  let(:trigger_name) { model.fk_trigger_name(referenced_table) }
+  let(:function_name) { '_test_partitioned_foreign_keys_function' }
+  let(:trigger_name) { '_test_partitioned_foreign_keys_trigger' }
 
   before do
     allow(model).to receive(:puts)
+    allow(model).to receive(:fk_function_name).and_return(function_name)
+    allow(model).to receive(:fk_trigger_name).and_return(trigger_name)
   end
 
   describe 'adding a foreign key' do
@@ -25,7 +29,7 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
         model.add_partitioned_foreign_key :issue_assignees, referenced_table
 
         expect_function_to_contain(function_name, 'delete from issue_assignees where issue_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
       end
     end
 
@@ -41,7 +45,7 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
           expect_function_to_contain(function_name,
             'delete from issue_assignees where issue_id = old.id',
             'delete from epic_issues where issue_id = old.id')
-          expect_valid_function_trigger(trigger_name, function_name)
+          expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
         end
       end
 
@@ -57,7 +61,7 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
             expect_function_to_contain(function_name,
               'delete from issues where moved_to_id = old.id',
               'delete from issues where duplicated_to_id = old.id')
-            expect_valid_function_trigger(trigger_name, function_name)
+            expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
           end
         end
 
@@ -66,7 +70,7 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
             model.add_partitioned_foreign_key :issues, referenced_table, column: :moved_to_id
 
             expect_function_to_contain(function_name, 'delete from issues where moved_to_id = old.id')
-            expect_valid_function_trigger(trigger_name, function_name)
+            expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
           end
         end
       end
@@ -77,7 +81,7 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
         model.add_partitioned_foreign_key :issue_assignees, referenced_table, on_delete: :nullify
 
         expect_function_to_contain(function_name, 'update issue_assignees set issue_id = null where issue_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
       end
     end
 
@@ -86,7 +90,7 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
         model.add_partitioned_foreign_key :issues, referenced_table, column: :duplicated_to_id
 
         expect_function_to_contain(function_name, 'delete from issues where duplicated_to_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
       end
     end
 
@@ -97,7 +101,7 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
         model.add_partitioned_foreign_key :user_preferences, referenced_table, column: :user_id, primary_key: :user_id
 
         expect_function_to_contain(function_name, 'delete from user_preferences where user_id = old.user_id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
       end
     end
 
@@ -135,12 +139,12 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
         expect_function_to_contain(function_name,
           'delete from issue_assignees where issue_id = old.id',
           'delete from epic_issues where issue_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
 
         model.remove_partitioned_foreign_key :issue_assignees, referenced_table
 
         expect_function_to_contain(function_name, 'delete from epic_issues where issue_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
       end
     end
 
@@ -151,12 +155,12 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
 
       it 'removes the trigger function altogether' do
         expect_function_to_contain(function_name, 'delete from issue_assignees where issue_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
 
         model.remove_partitioned_foreign_key :issue_assignees, referenced_table
 
-        expect(find_function_def(function_name)).to be_nil
-        expect(find_trigger_def(trigger_name)).to be_nil
+        expect_function_not_to_exist(function_name)
+        expect_trigger_not_to_exist(referenced_table, trigger_name)
       end
     end
 
@@ -167,12 +171,12 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
 
       it 'ignores the invalid key and properly recreates the trigger function' do
         expect_function_to_contain(function_name, 'delete from issue_assignees where issue_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
 
         model.remove_partitioned_foreign_key :issues, referenced_table, column: :moved_to_id
 
         expect_function_to_contain(function_name, 'delete from issue_assignees where issue_id = old.id')
-        expect_valid_function_trigger(trigger_name, function_name)
+        expect_valid_function_trigger(referenced_table, trigger_name, function_name, after: 'delete')
       end
     end
 
@@ -186,45 +190,4 @@ describe Gitlab::Database::PartitioningMigrationHelpers do
       end
     end
   end
-
-  def expect_function_to_contain(name, *statements)
-    return_stmt, *body_stmts = parsed_function_statements(name).reverse
-
-    expect(return_stmt).to eq('return old')
-    expect(body_stmts).to contain_exactly(*statements)
-  end
-
-  def expect_valid_function_trigger(name, fn_name)
-    event, activation, definition = cleaned_trigger_def(name)
-
-    expect(event).to eq('delete')
-    expect(activation).to eq('after')
-    expect(definition).to eq("execute procedure #{fn_name}()")
-  end
-
-  def parsed_function_statements(name)
-    cleaned_definition = find_function_def(name)['fn_body'].downcase.gsub(/\s+/, ' ')
-    statements = cleaned_definition.sub(/\A\s*begin\s*(.*)\s*end\s*\Z/, "\\1")
-    statements.split(';').map! { |stmt| stmt.strip.presence }.compact!
-  end
-
-  def find_function_def(name)
-    connection.execute("select prosrc as fn_body from pg_proc where proname = '#{name}';").first
-  end
-
-  def cleaned_trigger_def(name)
-    find_trigger_def(name).values_at('event', 'activation', 'definition').map!(&:downcase)
-  end
-
-  def find_trigger_def(name)
-    connection.execute(<<~SQL).first
-      select
-        string_agg(event_manipulation, ',') as event,
-        action_timing as activation,
-        action_statement as definition
-      from information_schema.triggers
-      where trigger_name = '#{name}'
-      group by 2, 3
-    SQL
-  end
 end
diff --git a/spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb b/spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb
new file mode 100644
index 00000000000..586b57d2002
--- /dev/null
+++ b/spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb
@@ -0,0 +1,289 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Database::PartitioningMigrationHelpers::TableManagementHelpers do
+  include PartitioningHelpers
+  include TriggerHelpers
+
+  let(:migration) do
+    ActiveRecord::Migration.new.extend(described_class)
+  end
+
+  let_it_be(:connection) { ActiveRecord::Base.connection }
+  let(:template_table) { :audit_events }
+  let(:partitioned_table) { '_test_migration_partitioned_table' }
+  let(:function_name) { '_test_migration_function_name' }
+  let(:trigger_name) { '_test_migration_trigger_name' }
+  let(:partition_column) { 'created_at' }
+  let(:min_date) { Date.new(2019, 12) }
+  let(:max_date) { Date.new(2020, 3) }
+
+  before do
+    allow(migration).to receive(:puts)
+    allow(migration).to receive(:transaction_open?).and_return(false)
+    allow(migration).to receive(:partitioned_table_name).and_return(partitioned_table)
+    allow(migration).to receive(:sync_function_name).and_return(function_name)
+    allow(migration).to receive(:sync_trigger_name).and_return(trigger_name)
+    allow(migration).to receive(:assert_table_is_whitelisted)
+  end
+
+  describe '#partition_table_by_date' do
+    let(:partition_column) { 'created_at' }
+    let(:old_primary_key) { 'id' }
+    let(:new_primary_key) { [old_primary_key, partition_column] }
+
+    context 'when the table is not whitelisted' do
+      let(:template_table) { :this_table_is_not_whitelisted }
+
+      it 'raises an error' do
+        expect(migration).to receive(:assert_table_is_whitelisted).with(template_table).and_call_original
+
+        expect do
+          migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+        end.to raise_error(/#{template_table} is not whitelisted for use/)
+      end
+    end
+
+    context 'when run inside a transaction block' do
+      it 'raises an error' do
+        expect(migration).to receive(:transaction_open?).and_return(true)
+
+        expect do
+          migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+        end.to raise_error(/can not be run inside a transaction/)
+      end
+    end
+
+    context 'when the the max_date is less than the min_date' do
+      let(:max_date) { Time.utc(2019, 6) }
+
+      it 'raises an error' do
+        expect do
+          migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+        end.to raise_error(/max_date #{max_date} must be greater than min_date #{min_date}/)
+      end
+    end
+
+    context 'when the max_date is equal to the min_date' do
+      let(:max_date) { min_date }
+
+      it 'raises an error' do
+        expect do
+          migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+        end.to raise_error(/max_date #{max_date} must be greater than min_date #{min_date}/)
+      end
+    end
+
+    context 'when the given table does not have a primary key' do
+      let(:template_table) { :_partitioning_migration_helper_test_table }
+      let(:partition_column) { :some_field }
+
+      it 'raises an error' do
+        migration.create_table template_table, id: false do |t|
+          t.integer :id
+          t.datetime partition_column
+        end
+
+        expect do
+          migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+        end.to raise_error(/primary key not defined for #{template_table}/)
+      end
+    end
+
+    context 'when an invalid partition column is given' do
+      let(:partition_column) { :_this_is_not_real }
+
+      it 'raises an error' do
+        expect do
+          migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+        end.to raise_error(/partition column #{partition_column} does not exist/)
+      end
+    end
+
+    describe 'constructing the partitioned table' do
+      it 'creates a table partitioned by the proper column' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        expect(connection.table_exists?(partitioned_table)).to be(true)
+        expect(connection.primary_key(partitioned_table)).to eq(new_primary_key)
+
+        expect_table_partitioned_by(partitioned_table, [partition_column])
+      end
+
+      it 'changes the primary key datatype to bigint' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        pk_column = connection.columns(partitioned_table).find { |c| c.name == old_primary_key }
+
+        expect(pk_column.sql_type).to eq('bigint')
+      end
+
+      context 'with a non-integer primary key datatype' do
+        before do
+          connection.create_table :another_example, id: false do |t|
+            t.string :identifier, primary_key: true
+            t.timestamp :created_at
+          end
+        end
+
+        let(:template_table) { :another_example }
+        let(:old_primary_key) { 'identifier' }
+
+        it 'does not change the primary key datatype' do
+          migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+          original_pk_column = connection.columns(template_table).find { |c| c.name == old_primary_key }
+          pk_column = connection.columns(partitioned_table).find { |c| c.name == old_primary_key }
+
+          expect(pk_column).not_to be_nil
+          expect(pk_column).to eq(original_pk_column)
+        end
+      end
+
+      it 'removes the default from the primary key column' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        pk_column = connection.columns(partitioned_table).find { |c| c.name == old_primary_key }
+
+        expect(pk_column.default_function).to be_nil
+      end
+
+      it 'creates the partitioned table with the same non-key columns' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        copied_columns = filter_columns_by_name(connection.columns(partitioned_table), new_primary_key)
+        original_columns = filter_columns_by_name(connection.columns(template_table), new_primary_key)
+
+        expect(copied_columns).to match_array(original_columns)
+      end
+
+      it 'creates a partition spanning over each month in the range given' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        expect_range_partition_of("#{partitioned_table}_000000", partitioned_table, 'MINVALUE', "'2019-12-01 00:00:00'")
+        expect_range_partition_of("#{partitioned_table}_201912", partitioned_table, "'2019-12-01 00:00:00'", "'2020-01-01 00:00:00'")
+        expect_range_partition_of("#{partitioned_table}_202001", partitioned_table, "'2020-01-01 00:00:00'", "'2020-02-01 00:00:00'")
+        expect_range_partition_of("#{partitioned_table}_202002", partitioned_table, "'2020-02-01 00:00:00'", "'2020-03-01 00:00:00'")
+      end
+    end
+
+    describe 'keeping data in sync with the partitioned table' do
+      let(:template_table) { :todos }
+      let(:model) { Class.new(ActiveRecord::Base) }
+      let(:timestamp) { Time.utc(2019, 12, 1, 12).round }
+
+      before do
+        model.primary_key = :id
+        model.table_name = partitioned_table
+      end
+
+      it 'creates a trigger function on the original table' do
+        expect_function_not_to_exist(function_name)
+        expect_trigger_not_to_exist(template_table, trigger_name)
+
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        expect_function_to_exist(function_name)
+        expect_valid_function_trigger(template_table, trigger_name, function_name, after: %w[delete insert update])
+      end
+
+      it 'syncs inserts to the partitioned tables' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        expect(model.count).to eq(0)
+
+        first_todo = create(:todo, created_at: timestamp, updated_at: timestamp)
+        second_todo = create(:todo, created_at: timestamp, updated_at: timestamp)
+
+        expect(model.count).to eq(2)
+        expect(model.find(first_todo.id).attributes).to eq(first_todo.attributes)
+        expect(model.find(second_todo.id).attributes).to eq(second_todo.attributes)
+      end
+
+      it 'syncs updates to the partitioned tables' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        first_todo = create(:todo, :pending, commit_id: nil, created_at: timestamp, updated_at: timestamp)
+        second_todo = create(:todo, created_at: timestamp, updated_at: timestamp)
+
+        expect(model.count).to eq(2)
+
+        first_copy = model.find(first_todo.id)
+        second_copy = model.find(second_todo.id)
+
+        expect(first_copy.attributes).to eq(first_todo.attributes)
+        expect(second_copy.attributes).to eq(second_todo.attributes)
+
+        first_todo.update(state_event: 'done', commit_id: 'abc123', updated_at: timestamp + 1.second)
+
+        expect(model.count).to eq(2)
+        expect(first_copy.reload.attributes).to eq(first_todo.attributes)
+        expect(second_copy.reload.attributes).to eq(second_todo.attributes)
+      end
+
+      it 'syncs deletes to the partitioned tables' do
+        migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+        first_todo = create(:todo, created_at: timestamp, updated_at: timestamp)
+        second_todo = create(:todo, created_at: timestamp, updated_at: timestamp)
+
+        expect(model.count).to eq(2)
+
+        first_todo.destroy
+
+        expect(model.count).to eq(1)
+        expect(model.find_by_id(first_todo.id)).to be_nil
+        expect(model.find(second_todo.id).attributes).to eq(second_todo.attributes)
+      end
+    end
+  end
+
+  describe '#drop_partitioned_table_for' do
+    let(:expected_tables) do
+      %w[000000 201912 202001 202002].map { |suffix| "#{partitioned_table}_#{suffix}" }.unshift(partitioned_table)
+    end
+
+    context 'when the table is not whitelisted' do
+      let(:template_table) { :this_table_is_not_whitelisted }
+
+      it 'raises an error' do
+        expect(migration).to receive(:assert_table_is_whitelisted).with(template_table).and_call_original
+
+        expect do
+          migration.drop_partitioned_table_for template_table
+        end.to raise_error(/#{template_table} is not whitelisted for use/)
+      end
+    end
+
+    it 'drops the trigger syncing to the partitioned table' do
+      migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+      expect_function_to_exist(function_name)
+      expect_valid_function_trigger(template_table, trigger_name, function_name, after: %w[delete insert update])
+
+      migration.drop_partitioned_table_for template_table
+
+      expect_function_not_to_exist(function_name)
+      expect_trigger_not_to_exist(template_table, trigger_name)
+    end
+
+    it 'drops the partitioned copy and all partitions' do
+      migration.partition_table_by_date template_table, partition_column, min_date: min_date, max_date: max_date
+
+      expected_tables.each do |table|
+        expect(connection.table_exists?(table)).to be(true)
+      end
+
+      migration.drop_partitioned_table_for template_table
+
+      expected_tables.each do |table|
+        expect(connection.table_exists?(table)).to be(false)
+      end
+    end
+  end
+
+  def filter_columns_by_name(columns, names)
+    columns.reject { |c| names.include?(c.name) }
+  end
+end
diff --git a/spec/lib/gitlab/database/schema_cleaner_spec.rb b/spec/lib/gitlab/database/schema_cleaner_spec.rb
index ee9477156fb..adaeb85d52d 100644
--- a/spec/lib/gitlab/database/schema_cleaner_spec.rb
+++ b/spec/lib/gitlab/database/schema_cleaner_spec.rb
@@ -15,10 +15,6 @@ describe Gitlab::Database::SchemaCleaner do
     expect(subject).not_to include('COMMENT ON EXTENSION')
   end
 
-  it 'includes the plpgsql extension' do
-    expect(subject).to include('CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;')
-  end
-
   it 'sets the search_path' do
     expect(subject.split("\n").first).to eq('SET search_path=public;')
   end
diff --git a/spec/lib/gitlab/database/with_lock_retries_spec.rb b/spec/lib/gitlab/database/with_lock_retries_spec.rb
index 9c8c9749125..d7eee594631 100644
--- a/spec/lib/gitlab/database/with_lock_retries_spec.rb
+++ b/spec/lib/gitlab/database/with_lock_retries_spec.rb
@@ -35,9 +35,6 @@ describe Gitlab::Database::WithLockRetries do
     end
 
     context 'when lock retry is enabled' do
-      class ActiveRecordSecond < ActiveRecord::Base
-      end
-
       let(:lock_fiber) do
         Fiber.new do
           # Initiating a second DB connection for the lock
@@ -52,6 +49,8 @@ describe Gitlab::Database::WithLockRetries do
       end
 
       before do
+        stub_const('ActiveRecordSecond', Class.new(ActiveRecord::Base))
+
         lock_fiber.resume # start the transaction and lock the table
       end
 
diff --git a/spec/lib/gitlab/dependency_linker/go_mod_linker_spec.rb b/spec/lib/gitlab/dependency_linker/go_mod_linker_spec.rb
new file mode 100644
index 00000000000..769daa0b3a6
--- /dev/null
+++ b/spec/lib/gitlab/dependency_linker/go_mod_linker_spec.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::DependencyLinker::GoModLinker do
+  let(:file_name) { 'go.mod' }
+  let(:file_content) do
+    <<-CONTENT.strip_heredoc
+      module gitlab.com/gitlab-org/gitlab-workhorse
+
+      go 1.12
+
+      require (
+        github.com/BurntSushi/toml v0.3.1
+        github.com/FZambia/sentinel v1.0.0
+        github.com/alecthomas/chroma v0.7.3
+        github.com/dgrijalva/jwt-go v3.2.0+incompatible
+        github.com/getsentry/raven-go v0.1.2
+        github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721
+        github.com/golang/protobuf v1.3.2
+        github.com/gomodule/redigo v2.0.0+incompatible
+        github.com/gorilla/websocket v1.4.0
+        github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
+        github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+        github.com/jfbus/httprs v0.0.0-20190827093123-b0af8319bb15
+        github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d
+        github.com/prometheus/client_golang v1.0.0
+        github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1
+        github.com/sebest/xff v0.0.0-20160910043805-6c115e0ffa35
+        github.com/sirupsen/logrus v1.3.0
+        github.com/stretchr/testify v1.5.1
+        gitlab.com/gitlab-org/gitaly v1.74.0
+        gitlab.com/gitlab-org/labkit v0.0.0-20200520155818-96e583c57891
+        golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
+        golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
+        golang.org/x/tools v0.0.0-20200117161641-43d50277825c
+        google.golang.org/grpc v1.24.0
+        gopkg.in/yaml.v2 v2.2.8 // indirect
+        honnef.co/go/tools v0.0.1-2019.2.3
+      )
+    CONTENT
+  end
+
+  describe '.support?' do
+    it 'supports go.mod' do
+      expect(described_class.support?('go.mod')).to be_truthy
+    end
+
+    it 'does not support other files' do
+      expect(described_class.support?('go.mod.example')).to be_falsey
+    end
+  end
+
+  describe '#link' do
+    subject { Gitlab::Highlight.highlight(file_name, file_content) }
+
+    def link(name, url)
+      %{<a href="#{url}" rel="nofollow noreferrer noopener" target="_blank">#{name}</a>}
+    end
+
+    it 'links the module name' do
+      expect(subject).to include(link('gitlab.com/gitlab-org/gitlab-workhorse', 'https://pkg.go.dev/gitlab.com/gitlab-org/gitlab-workhorse'))
+    end
+
+    it 'links dependencies' do
+      expect(subject).to include(link('github.com/BurntSushi/toml', 'https://pkg.go.dev/github.com/BurntSushi/toml@v0.3.1'))
+      expect(subject).to include(link('github.com/FZambia/sentinel', 'https://pkg.go.dev/github.com/FZambia/sentinel@v1.0.0'))
+      expect(subject).to include(link('github.com/alecthomas/chroma', 'https://pkg.go.dev/github.com/alecthomas/chroma@v0.7.3'))
+      expect(subject).to include(link('github.com/dgrijalva/jwt-go', 'https://pkg.go.dev/github.com/dgrijalva/jwt-go@v3.2.0+incompatible'))
+      expect(subject).to include(link('github.com/getsentry/raven-go', 'https://pkg.go.dev/github.com/getsentry/raven-go@v0.1.2'))
+      expect(subject).to include(link('github.com/golang/gddo', 'https://pkg.go.dev/github.com/golang/gddo@v0.0.0-20190419222130-af0f2af80721'))
+      expect(subject).to include(link('github.com/golang/protobuf', 'https://pkg.go.dev/github.com/golang/protobuf@v1.3.2'))
+      expect(subject).to include(link('github.com/gomodule/redigo', 'https://pkg.go.dev/github.com/gomodule/redigo@v2.0.0+incompatible'))
+      expect(subject).to include(link('github.com/gorilla/websocket', 'https://pkg.go.dev/github.com/gorilla/websocket@v1.4.0'))
+      expect(subject).to include(link('github.com/grpc-ecosystem/go-grpc-middleware', 'https://pkg.go.dev/github.com/grpc-ecosystem/go-grpc-middleware@v1.0.0'))
+      expect(subject).to include(link('github.com/grpc-ecosystem/go-grpc-prometheus', 'https://pkg.go.dev/github.com/grpc-ecosystem/go-grpc-prometheus@v1.2.0'))
+      expect(subject).to include(link('github.com/jfbus/httprs', 'https://pkg.go.dev/github.com/jfbus/httprs@v0.0.0-20190827093123-b0af8319bb15'))
+      expect(subject).to include(link('github.com/jpillora/backoff', 'https://pkg.go.dev/github.com/jpillora/backoff@v0.0.0-20170918002102-8eab2debe79d'))
+      expect(subject).to include(link('github.com/prometheus/client_golang', 'https://pkg.go.dev/github.com/prometheus/client_golang@v1.0.0'))
+      expect(subject).to include(link('github.com/rafaeljusto/redigomock', 'https://pkg.go.dev/github.com/rafaeljusto/redigomock@v0.0.0-20190202135759-257e089e14a1'))
+      expect(subject).to include(link('github.com/sebest/xff', 'https://pkg.go.dev/github.com/sebest/xff@v0.0.0-20160910043805-6c115e0ffa35'))
+      expect(subject).to include(link('github.com/sirupsen/logrus', 'https://pkg.go.dev/github.com/sirupsen/logrus@v1.3.0'))
+      expect(subject).to include(link('github.com/stretchr/testify', 'https://pkg.go.dev/github.com/stretchr/testify@v1.5.1'))
+      expect(subject).to include(link('gitlab.com/gitlab-org/gitaly', 'https://pkg.go.dev/gitlab.com/gitlab-org/gitaly@v1.74.0'))
+      expect(subject).to include(link('gitlab.com/gitlab-org/labkit', 'https://pkg.go.dev/gitlab.com/gitlab-org/labkit@v0.0.0-20200520155818-96e583c57891'))
+      expect(subject).to include(link('golang.org/x/lint', 'https://pkg.go.dev/golang.org/x/lint@v0.0.0-20191125180803-fdd1cda4f05f'))
+      expect(subject).to include(link('golang.org/x/net', 'https://pkg.go.dev/golang.org/x/net@v0.0.0-20200114155413-6afb5195e5aa'))
+      expect(subject).to include(link('golang.org/x/tools', 'https://pkg.go.dev/golang.org/x/tools@v0.0.0-20200117161641-43d50277825c'))
+      expect(subject).to include(link('google.golang.org/grpc', 'https://pkg.go.dev/google.golang.org/grpc@v1.24.0'))
+      expect(subject).to include(link('gopkg.in/yaml.v2', 'https://pkg.go.dev/gopkg.in/yaml.v2@v2.2.8'))
+      expect(subject).to include(link('honnef.co/go/tools', 'https://pkg.go.dev/honnef.co/go/tools@v0.0.1-2019.2.3'))
+    end
+  end
+end
diff --git a/spec/lib/gitlab/dependency_linker/go_sum_linker_spec.rb b/spec/lib/gitlab/dependency_linker/go_sum_linker_spec.rb
new file mode 100644
index 00000000000..f5cb7809ad3
--- /dev/null
+++ b/spec/lib/gitlab/dependency_linker/go_sum_linker_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::DependencyLinker::GoSumLinker do
+  let(:file_name) { 'go.sum' }
+  let(:file_content) do
+    <<-CONTENT.strip_heredoc
+      github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+      github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+      github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+      github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+      github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
+      github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+      github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+      github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+      gitlab.com/go-utils/io v0.0.0-20190408212915-156add3f8f97 h1:9EKx8vX3kJzyj977yiWB8iIOXHyvbg8SmfOScw7OcN0=
+      gitlab.com/go-utils/io v0.0.0-20190408212915-156add3f8f97/go.mod h1:cF4ez5kIKPWU1BB1Z4qgu6dQkT3pvknXff8PSlGaNo8=
+      golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
+      golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+    CONTENT
+  end
+
+  describe '.support?' do
+    it 'supports go.sum' do
+      expect(described_class.support?('go.sum')).to be_truthy
+    end
+
+    it 'does not support other files' do
+      expect(described_class.support?('go.sum.example')).to be_falsey
+    end
+  end
+
+  describe '#link' do
+    subject { Gitlab::Highlight.highlight(file_name, file_content) }
+
+    def link(name, url)
+      %{<a href="#{url}" rel="nofollow noreferrer noopener" target="_blank">#{name}</a>}
+    end
+
+    it 'links modules' do
+      expect(subject).to include(link('github.com/davecgh/go-spew', 'https://pkg.go.dev/github.com/davecgh/go-spew@v1.1.0'))
+      expect(subject).to include(link('github.com/pmezard/go-difflib', 'https://pkg.go.dev/github.com/pmezard/go-difflib@v1.0.0'))
+      expect(subject).to include(link('github.com/stretchr/objx', 'https://pkg.go.dev/github.com/stretchr/objx@v0.1.0'))
+      expect(subject).to include(link('github.com/stretchr/testify', 'https://pkg.go.dev/github.com/stretchr/testify@v1.3.0'))
+      expect(subject).to include(link('gitlab.com/go-utils/io', 'https://pkg.go.dev/gitlab.com/go-utils/io@v0.0.0-20190408212915-156add3f8f97'))
+      expect(subject).to include(link('golang.org/x/xerrors', 'https://pkg.go.dev/golang.org/x/xerrors@v0.0.0-20190717185122-a985d3407aa7'))
+    end
+
+    it 'links checksums' do
+      expect(subject).to include(link('ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=', 'https://sum.golang.org/lookup/github.com/davecgh/go-spew@v1.1.0'))
+      expect(subject).to include(link('J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=', 'https://sum.golang.org/lookup/github.com/davecgh/go-spew@v1.1.0'))
+      expect(subject).to include(link('4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=', 'https://sum.golang.org/lookup/github.com/pmezard/go-difflib@v1.0.0'))
+      expect(subject).to include(link('iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=', 'https://sum.golang.org/lookup/github.com/pmezard/go-difflib@v1.0.0'))
+      expect(subject).to include(link('4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=', 'https://sum.golang.org/lookup/github.com/stretchr/objx@v0.1.0'))
+      expect(subject).to include(link('HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=', 'https://sum.golang.org/lookup/github.com/stretchr/objx@v0.1.0'))
+      expect(subject).to include(link('TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=', 'https://sum.golang.org/lookup/github.com/stretchr/testify@v1.3.0'))
+      expect(subject).to include(link('M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=', 'https://sum.golang.org/lookup/github.com/stretchr/testify@v1.3.0'))
+      expect(subject).to include(link('9EKx8vX3kJzyj977yiWB8iIOXHyvbg8SmfOScw7OcN0=', 'https://sum.golang.org/lookup/gitlab.com/go-utils/io@v0.0.0-20190408212915-156add3f8f97'))
+      expect(subject).to include(link('cF4ez5kIKPWU1BB1Z4qgu6dQkT3pvknXff8PSlGaNo8=', 'https://sum.golang.org/lookup/gitlab.com/go-utils/io@v0.0.0-20190408212915-156add3f8f97'))
+      expect(subject).to include(link('9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=', 'https://sum.golang.org/lookup/golang.org/x/xerrors@v0.0.0-20190717185122-a985d3407aa7'))
+      expect(subject).to include(link('I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=', 'https://sum.golang.org/lookup/golang.org/x/xerrors@v0.0.0-20190717185122-a985d3407aa7'))
+    end
+  end
+end
diff --git a/spec/lib/gitlab/dependency_linker_spec.rb b/spec/lib/gitlab/dependency_linker_spec.rb
index 570a994f520..acd4376615c 100644
--- a/spec/lib/gitlab/dependency_linker_spec.rb
+++ b/spec/lib/gitlab/dependency_linker_spec.rb
@@ -91,5 +91,21 @@ describe Gitlab::DependencyLinker do
 
       described_class.link(blob_name, nil, nil)
     end
+
+    it 'links using GoModLinker' do
+      blob_name = 'go.mod'
+
+      expect(described_class::GoModLinker).to receive(:link)
+
+      described_class.link(blob_name, nil, nil)
+    end
+
+    it 'links using GoSumLinker' do
+      blob_name = 'go.sum'
+
+      expect(described_class::GoSumLinker).to receive(:link)
+
+      described_class.link(blob_name, nil, nil)
+    end
   end
 end
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index d1592e60d3d..8dbedcf26b9 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -282,6 +282,18 @@ describe Gitlab::Diff::File do
     end
   end
 
+  describe '#file_hash' do
+    it 'returns a hash of file_path' do
+      expect(diff_file.file_hash).to eq(Digest::SHA1.hexdigest(diff_file.file_path))
+    end
+  end
+
+  describe '#file_identifier_hash' do
+    it 'returns a hash of file_identifier' do
+      expect(diff_file.file_identifier_hash).to eq(Digest::SHA1.hexdigest(diff_file.file_identifier))
+    end
+  end
+
   context 'diff file stats' do
     let(:diff_file) do
       described_class.new(diff,
diff --git a/spec/lib/gitlab/diff/formatters/image_formatter_spec.rb b/spec/lib/gitlab/diff/formatters/image_formatter_spec.rb
index edf30ffc56f..3f88f39ba92 100644
--- a/spec/lib/gitlab/diff/formatters/image_formatter_spec.rb
+++ b/spec/lib/gitlab/diff/formatters/image_formatter_spec.rb
@@ -10,6 +10,7 @@ describe Gitlab::Diff::Formatters::ImageFormatter do
       head_sha: 789,
       old_path: 'old_image.png',
       new_path: 'new_image.png',
+      file_identifier_hash: '777',
       position_type: 'image'
     }
   end
diff --git a/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb b/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
index fa129a20e58..50dd597c5a7 100644
--- a/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
+++ b/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
@@ -10,6 +10,7 @@ describe Gitlab::Diff::Formatters::TextFormatter do
       head_sha: 789,
       old_path: 'old_path.txt',
       new_path: 'new_path.txt',
+      file_identifier_hash: '777',
       line_range: nil
     }
   end
diff --git a/spec/lib/gitlab/diff/position_spec.rb b/spec/lib/gitlab/diff/position_spec.rb
index 10749ec024d..b32a2c59bb9 100644
--- a/spec/lib/gitlab/diff/position_spec.rb
+++ b/spec/lib/gitlab/diff/position_spec.rb
@@ -574,6 +574,86 @@ describe Gitlab::Diff::Position do
     end
   end
 
+  describe '#find_diff_file_from' do
+    context "position for a diff file that has changed from symlink to regular file" do
+      let(:commit) { project.commit("81e6355ce4e1544a3524b230952c12455de0777b") }
+
+      let(:old_symlink_file_identifier_hash) { "bfa430463f33619872d52a6b85ced59c973e42dc" }
+      let(:new_regular_file_identifier_hash) { "e25b60c2e5ffb977d2b1431b96c6f7800c3c3529" }
+      let(:file_identifier_hash) { new_regular_file_identifier_hash }
+
+      let(:args) do
+        {
+          file_identifier_hash: file_identifier_hash,
+          old_path: "symlink",
+          new_path: "symlink",
+          old_line: nil,
+          new_line: 1,
+          diff_refs: commit.diff_refs
+        }
+      end
+
+      let(:diffable) { commit.diff_refs.compare_in(project) }
+
+      subject(:diff_file) { described_class.new(args).find_diff_file_from(diffable) }
+
+      context 'when file_identifier_hash is disabled' do
+        before do
+          stub_feature_flags(file_identifier_hash: false)
+        end
+
+        it "returns the first diff file" do
+          expect(diff_file.file_identifier_hash).to eq(old_symlink_file_identifier_hash)
+        end
+      end
+
+      context 'when file_identifier_hash is enabled' do
+        before do
+          stub_feature_flags(file_identifier_hash: true)
+        end
+
+        context 'for new regular file' do
+          it "returns the correct diff file" do
+            expect(diff_file.file_identifier_hash).to eq(new_regular_file_identifier_hash)
+          end
+        end
+
+        context 'for old symlink file' do
+          let(:args) do
+            {
+              file_identifier_hash: old_symlink_file_identifier_hash,
+              old_path: "symlink",
+              new_path: "symlink",
+              old_line: 1,
+              new_line: nil,
+              diff_refs: commit.diff_refs
+            }
+          end
+
+          it "returns the correct diff file" do
+            expect(diff_file.file_identifier_hash).to eq(old_symlink_file_identifier_hash)
+          end
+        end
+
+        context 'when file_identifier_hash is missing' do
+          let(:file_identifier_hash) { nil }
+
+          it "returns the first diff file" do
+            expect(diff_file.file_identifier_hash).to eq(old_symlink_file_identifier_hash)
+          end
+        end
+
+        context 'when file_identifier_hash cannot be found' do
+          let(:file_identifier_hash) { "missingidentifier" }
+
+          it "returns nil" do
+            expect(diff_file).to be_nil
+          end
+        end
+      end
+    end
+  end
+
   describe '#==' do
     let(:commit) { project.commit("570e7b2abdd848b95f2f578043fc23bd6f6fd24d") }
 
diff --git a/spec/lib/gitlab/doctor/secrets_spec.rb b/spec/lib/gitlab/doctor/secrets_spec.rb
new file mode 100644
index 00000000000..f118519fd9f
--- /dev/null
+++ b/spec/lib/gitlab/doctor/secrets_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Doctor::Secrets do
+  let!(:user) { create(:user, otp_secret: "test") }
+  let!(:group) { create(:group, runners_token: "test") }
+  let(:logger) { double(:logger).as_null_object }
+
+  subject { described_class.new(logger).run! }
+
+  context 'when encrypted attributes are properly set' do
+    it 'detects decryptable secrets' do
+      expect(logger).to receive(:info).with(/User failures: 0/)
+      expect(logger).to receive(:info).with(/Group failures: 0/)
+
+      subject
+    end
+  end
+
+  context 'when attr_encrypted values are not decrypting' do
+    it 'marks undecryptable values as bad' do
+      user.encrypted_otp_secret = "invalid"
+      user.save!
+
+      expect(logger).to receive(:info).with(/User failures: 1/)
+
+      subject
+    end
+  end
+
+  context 'when TokenAuthenticatable values are not decrypting' do
+    it 'marks undecryptable values as bad' do
+      group.runners_token_encrypted = "invalid"
+      group.save!
+
+      expect(logger).to receive(:info).with(/Group failures: 1/)
+
+      subject
+    end
+  end
+end
diff --git a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
index 909a7618df4..af963e1b695 100644
--- a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb
@@ -65,16 +65,24 @@ describe Gitlab::Email::Handler::CreateNoteHandler do
         end
       end
 
-      context 'and current user can update noteable' do
-        before do
-          project.add_developer(user)
-        end
-
-        it 'does not raise an error' do
-          # One system note is created for the 'close' event
-          expect { receiver.execute }.to change { noteable.notes.count }.by(1)
-
-          expect(noteable.reload).to be_closed
+      [true, false].each do |state_tracking_enabled|
+        context "and current user can update noteable #{state_tracking_enabled ? 'enabled' : 'disabled'}" do
+          before do
+            stub_feature_flags(track_resource_state_change_events: state_tracking_enabled)
+
+            project.add_developer(user)
+          end
+
+          it 'does not raise an error' do
+            if state_tracking_enabled
+              expect { receiver.execute }.to change { noteable.resource_state_events.count }.by(1)
+            else
+              # One system note is created for the 'close' event
+              expect { receiver.execute }.to change { noteable.notes.count }.by(1)
+            end
+
+            expect(noteable.reload).to be_closed
+          end
         end
       end
     end
diff --git a/spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb b/spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb
new file mode 100644
index 00000000000..da7205c7f4f
--- /dev/null
+++ b/spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb
@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rspec-parameterized'
+
+RSpec.describe Gitlab::ErrorTracking::Processor::SidekiqProcessor do
+  after do
+    if described_class.instance_variable_defined?(:@permitted_arguments_for_worker)
+      described_class.remove_instance_variable(:@permitted_arguments_for_worker)
+    end
+  end
+
+  describe '.filter_arguments' do
+    it 'returns a lazy enumerator' do
+      filtered = described_class.filter_arguments([1, 'string'], 'TestWorker')
+
+      expect(filtered).to be_a(Enumerator::Lazy)
+      expect(filtered.to_a).to eq([1, described_class::FILTERED_STRING])
+    end
+
+    context 'arguments filtering' do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:klass, :expected) do
+        'UnknownWorker' | [1, described_class::FILTERED_STRING, described_class::FILTERED_STRING, described_class::FILTERED_STRING]
+        'NoPermittedArguments' | [1, described_class::FILTERED_STRING, described_class::FILTERED_STRING, described_class::FILTERED_STRING]
+        'OnePermittedArgument' | [1, 'string', described_class::FILTERED_STRING, described_class::FILTERED_STRING]
+        'AllPermittedArguments' | [1, 'string', [1, 2], { a: 1 }]
+      end
+
+      with_them do
+        before do
+          stub_const('NoPermittedArguments', double(loggable_arguments: []))
+          stub_const('OnePermittedArgument', double(loggable_arguments: [1]))
+          stub_const('AllPermittedArguments', double(loggable_arguments: [0, 1, 2, 3]))
+        end
+
+        it do
+          expect(described_class.filter_arguments([1, 'string', [1, 2], { a: 1 }], klass).to_a)
+            .to eq(expected)
+        end
+      end
+    end
+  end
+
+  describe '.permitted_arguments_for_worker' do
+    it 'returns the loggable_arguments for a worker class as a set' do
+      stub_const('TestWorker', double(loggable_arguments: [1, 1]))
+
+      expect(described_class.permitted_arguments_for_worker('TestWorker'))
+        .to eq([1].to_set)
+    end
+
+    it 'returns an empty set when the worker class does not exist' do
+      expect(described_class.permitted_arguments_for_worker('TestWorker'))
+        .to eq(Set.new)
+    end
+
+    it 'returns an empty set when the worker class does not respond to loggable_arguments' do
+      stub_const('TestWorker', 1)
+
+      expect(described_class.permitted_arguments_for_worker('TestWorker'))
+        .to eq(Set.new)
+    end
+
+    it 'returns an empty set when loggable_arguments cannot be converted to a set' do
+      stub_const('TestWorker', double(loggable_arguments: 1))
+
+      expect(described_class.permitted_arguments_for_worker('TestWorker'))
+        .to eq(Set.new)
+    end
+
+    it 'memoizes the results' do
+      worker_class = double
+
+      stub_const('TestWorker', worker_class)
+
+      expect(worker_class).to receive(:loggable_arguments).once.and_return([])
+
+      described_class.permitted_arguments_for_worker('TestWorker')
+      described_class.permitted_arguments_for_worker('TestWorker')
+    end
+  end
+
+  describe '.loggable_arguments' do
+    it 'filters and limits the arguments, then converts to strings' do
+      half_limit = Gitlab::Utils::LogLimitedArray::MAXIMUM_ARRAY_LENGTH / 2
+      args = [[1, 2], 'a' * half_limit, 'b' * half_limit, 'c' * half_limit, 'd']
+
+      stub_const('LoggableArguments', double(loggable_arguments: [0, 1, 3, 4]))
+
+      expect(described_class.loggable_arguments(args, 'LoggableArguments'))
+        .to eq(['[1, 2]', 'a' * half_limit, '[FILTERED]', '...'])
+    end
+  end
+
+  describe '#process' do
+    context 'when there is Sidekiq data' do
+      shared_examples 'Sidekiq arguments' do |args_in_job_hash: true|
+        let(:path) { [:extra, :sidekiq, args_in_job_hash ? :job : nil, 'args'].compact }
+        let(:args) { [1, 'string', { a: 1 }, [1, 2]] }
+
+        it 'only allows numeric arguments for an unknown worker' do
+          value = { 'args' => args, 'class' => 'UnknownWorker' }
+
+          value = { job: value } if args_in_job_hash
+
+          expect(subject.process(extra_sidekiq(value)).dig(*path))
+            .to eq([1, described_class::FILTERED_STRING, described_class::FILTERED_STRING, described_class::FILTERED_STRING])
+        end
+
+        it 'allows all argument types for a permitted worker' do
+          value = { 'args' => args, 'class' => 'PostReceive' }
+
+          value = { job: value } if args_in_job_hash
+
+          expect(subject.process(extra_sidekiq(value)).dig(*path))
+            .to eq(args)
+        end
+      end
+
+      context 'when processing via the default error handler' do
+        include_examples 'Sidekiq arguments', args_in_job_hash: true
+      end
+
+      context 'when processing via Gitlab::ErrorTracking' do
+        include_examples 'Sidekiq arguments', args_in_job_hash: false
+      end
+
+      it 'removes a jobstr field if present' do
+        value = {
+          job: { 'args' => [1] },
+          jobstr: { 'args' => [1] }.to_json
+        }
+
+        expect(subject.process(extra_sidekiq(value)))
+          .to eq(extra_sidekiq(value.except(:jobstr)))
+      end
+
+      it 'does nothing with no jobstr' do
+        value = { job: { 'args' => [1] } }
+
+        expect(subject.process(extra_sidekiq(value)))
+          .to eq(extra_sidekiq(value))
+      end
+    end
+
+    context 'when there is no Sidekiq data' do
+      it 'does nothing' do
+        value = {
+          request: {
+            method: 'POST',
+            data: { 'key' => 'value' }
+          }
+        }
+
+        expect(subject.process(value)).to eq(value)
+      end
+    end
+
+    def extra_sidekiq(hash)
+      { extra: { sidekiq: hash } }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/error_tracking_spec.rb b/spec/lib/gitlab/error_tracking_spec.rb
index 6764d48d14b..c40369f5965 100644
--- a/spec/lib/gitlab/error_tracking_spec.rb
+++ b/spec/lib/gitlab/error_tracking_spec.rb
@@ -2,6 +2,8 @@
 
 require 'spec_helper'
 
+require 'raven/transports/dummy'
+
 describe Gitlab::ErrorTracking do
   let(:exception) { RuntimeError.new('boom') }
   let(:issue_url) { 'http://gitlab.com/gitlab-org/gitlab-foss/issues/1' }
@@ -22,7 +24,9 @@ describe Gitlab::ErrorTracking do
     allow(described_class).to receive(:sentry_dsn).and_return(Gitlab.config.sentry.dsn)
     allow(Labkit::Correlation::CorrelationId).to receive(:current_id).and_return('cid')
 
-    described_class.configure
+    described_class.configure do |config|
+      config.encoding = 'json'
+    end
   end
 
   describe '.with_context' do
@@ -179,5 +183,29 @@ describe Gitlab::ErrorTracking do
         described_class.track_exception(exception, extra_info)
       end
     end
+
+    context 'with sidekiq args' do
+      it 'ensures extra.sidekiq.args is a string' do
+        extra = { sidekiq: { 'class' => 'PostReceive', 'args' => [1, { 'id' => 2, 'name' => 'hello' }, 'some-value', 'another-value'] } }
+
+        expect(Gitlab::ErrorTracking::Logger).to receive(:error).with(
+          hash_including({ 'extra.sidekiq' => { 'class' => 'PostReceive', 'args' => ['1', '{"id"=>2, "name"=>"hello"}', 'some-value', 'another-value'] } }))
+
+        described_class.track_exception(exception, extra)
+      end
+
+      it 'filters sensitive arguments before sending' do
+        extra = { sidekiq: { 'class' => 'UnknownWorker', 'args' => ['sensitive string', 1, 2] } }
+
+        expect(Gitlab::ErrorTracking::Logger).to receive(:error).with(
+          hash_including('extra.sidekiq' => { 'class' => 'UnknownWorker', 'args' => ['[FILTERED]', '1', '2'] }))
+
+        described_class.track_exception(exception, extra)
+
+        sentry_event = Gitlab::Json.parse(Raven.client.transport.events.last[1])
+
+        expect(sentry_event.dig('extra', 'sidekiq', 'args')).to eq(['[FILTERED]', 1, 2])
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/etag_caching/router_spec.rb b/spec/lib/gitlab/etag_caching/router_spec.rb
index b69e4668d61..d9eeb5b9a2b 100644
--- a/spec/lib/gitlab/etag_caching/router_spec.rb
+++ b/spec/lib/gitlab/etag_caching/router_spec.rb
@@ -23,7 +23,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'matches issue title endpoint' do
     result = described_class.match(
-      '/my-group/my-project/issues/123/realtime_changes'
+      '/my-group/my-project/-/issues/123/realtime_changes'
     )
 
     expect(result).to be_present
@@ -32,7 +32,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'matches with a project name that includes a suffix of create' do
     result = described_class.match(
-      '/group/test-create/issues/123/realtime_changes'
+      '/group/test-create/-/issues/123/realtime_changes'
     )
 
     expect(result).to be_present
@@ -41,7 +41,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'matches with a project name that includes a prefix of create' do
     result = described_class.match(
-      '/group/create-test/issues/123/realtime_changes'
+      '/group/create-test/-/issues/123/realtime_changes'
     )
 
     expect(result).to be_present
@@ -50,7 +50,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'matches project pipelines endpoint' do
     result = described_class.match(
-      '/my-group/my-project/pipelines.json'
+      '/my-group/my-project/-/pipelines.json'
     )
 
     expect(result).to be_present
@@ -95,7 +95,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'does not match blob with confusing name' do
     result = described_class.match(
-      '/my-group/my-project/blob/master/pipelines.json'
+      '/my-group/my-project/-/blob/master/pipelines.json'
     )
 
     expect(result).to be_blank
@@ -121,7 +121,7 @@ describe Gitlab::EtagCaching::Router do
 
   it 'matches pipeline#show endpoint' do
     result = described_class.match(
-      '/my-group/my-project/pipelines/2.json'
+      '/my-group/my-project/-/pipelines/2.json'
     )
 
     expect(result).to be_present
diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index 99442cb0ca6..f6e6c031624 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -11,7 +11,7 @@ describe Gitlab::Experimentation do
       }
     })
 
-    allow(Feature).to receive(:get).with(:test_experiment_experiment_percentage).and_return double(percentage_of_time_value: enabled_percentage)
+    Feature.enable_percentage_of_time(:test_experiment_experiment_percentage, enabled_percentage)
   end
 
   let(:environment) { Rails.env.test? }
diff --git a/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb b/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
index 0bf46217d60..7279399d1b8 100644
--- a/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
+++ b/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb
@@ -54,6 +54,14 @@ describe Gitlab::Gfm::UploadsRewriter do
           expect(new_paths).not_to include image_uploader.secret
           expect(new_paths).not_to include zip_uploader.secret
         end
+
+        it 'skips nil files do' do
+          allow_next_instance_of(UploaderFinder) do |finder|
+            allow(finder).to receive(:execute).and_return(nil)
+          end
+
+          expect(new_files).to be_empty
+        end
       end
     end
 
@@ -68,16 +76,6 @@ describe Gitlab::Gfm::UploadsRewriter do
       expect(moved_text.scan(/\A\[.*?\]/).count).to eq(1)
     end
 
-    context 'path traversal in file name' do
-      let(:text) do
-        "![a](/uploads/11111111111111111111111111111111/../../../../../../../../../../../../../../etc/passwd)"
-      end
-
-      it 'throw an error' do
-        expect { rewriter.rewrite(new_project) }.to raise_error(an_instance_of(StandardError).and(having_attributes(message: "Invalid path")))
-      end
-    end
-
     context "file are stored locally" do
       include_examples "files are accessible"
     end
diff --git a/spec/lib/gitlab/git/diff_collection_spec.rb b/spec/lib/gitlab/git/diff_collection_spec.rb
index 0d19d35bc52..6aa4f884d20 100644
--- a/spec/lib/gitlab/git/diff_collection_spec.rb
+++ b/spec/lib/gitlab/git/diff_collection_spec.rb
@@ -3,6 +3,31 @@
 require 'spec_helper'
 
 describe Gitlab::Git::DiffCollection, :seed_helper do
+  before do
+    stub_const('MutatingConstantIterator', Class.new)
+
+    MutatingConstantIterator.class_eval do
+      include Enumerable
+
+      def initialize(count, value)
+        @count = count
+        @value = value
+      end
+
+      def each
+        return enum_for(:each) unless block_given?
+
+        loop do
+          break if @count.zero?
+
+          # It is critical to decrement before yielding. We may never reach the lines after 'yield'.
+          @count -= 1
+          yield @value
+        end
+      end
+    end
+  end
+
   subject do
     Gitlab::Git::DiffCollection.new(
       iterator,
@@ -659,25 +684,4 @@ describe Gitlab::Git::DiffCollection, :seed_helper do
   def fake_diff(line_length, line_count)
     { 'diff' => "#{'a' * line_length}\n" * line_count }
   end
-
-  class MutatingConstantIterator
-    include Enumerable
-
-    def initialize(count, value)
-      @count = count
-      @value = value
-    end
-
-    def each
-      return enum_for(:each) unless block_given?
-
-      loop do
-        break if @count.zero?
-
-        # It is critical to decrement before yielding. We may never reach the lines after 'yield'.
-        @count -= 1
-        yield @value
-      end
-    end
-  end
 end
diff --git a/spec/lib/gitlab/git/diff_spec.rb b/spec/lib/gitlab/git/diff_spec.rb
index ac606da5cc1..ff54d7fbcd3 100644
--- a/spec/lib/gitlab/git/diff_spec.rb
+++ b/spec/lib/gitlab/git/diff_spec.rb
@@ -122,6 +122,36 @@ EOT
         end
       end
     end
+
+    context 'using a Gitaly::CommitDelta' do
+      let(:commit_delta) do
+        Gitaly::CommitDelta.new(
+          to_path: ".gitmodules",
+          from_path: ".gitmodules",
+          old_mode: 0100644,
+          new_mode: 0100644,
+          from_id: '357406f3075a57708d0163752905cc1576fceacc',
+          to_id: '8e5177d718c561d36efde08bad36b43687ee6bf0'
+        )
+      end
+      let(:diff) { described_class.new(commit_delta) }
+
+      it 'initializes the diff' do
+        expect(diff.to_hash).to eq(@raw_diff_hash.merge(diff: ''))
+      end
+
+      it 'is not too large' do
+        expect(diff).not_to be_too_large
+      end
+
+      it 'has an empty diff' do
+        expect(diff.diff).to be_empty
+      end
+
+      it 'is not a binary' do
+        expect(diff).not_to have_binary_notice
+      end
+    end
   end
 
   describe 'straight diffs' do
diff --git a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
index b396e5d22c3..8339006fe9f 100644
--- a/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
+++ b/spec/lib/gitlab/git/rugged_impl/use_rugged_spec.rb
@@ -8,7 +8,6 @@ describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do
   let(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
   let(:feature_flag_name) { 'feature-flag-name' }
-  let(:feature_flag) { Feature.get(feature_flag_name) }
   let(:temp_gitaly_metadata_file) { create_temporary_gitaly_metadata_file }
 
   before(:all) do
@@ -49,10 +48,6 @@ describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do
   end
 
   context 'when feature flag is not persisted' do
-    before do
-      allow(Feature).to receive(:persisted?).with(feature_flag).and_return(false)
-    end
-
     context 'when running puma with multiple threads' do
       before do
         allow(subject).to receive(:running_puma_with_multiple_threads?).and_return(true)
@@ -97,18 +92,15 @@ describe Gitlab::Git::RuggedImpl::UseRugged, :seed_helper do
   end
 
   context 'when feature flag is persisted' do
-    before do
-      allow(Feature).to receive(:persisted?).with(feature_flag).and_return(true)
-    end
-
     it 'returns false when the feature flag is off' do
-      allow(feature_flag).to receive(:enabled?).and_return(false)
+      Feature.disable(feature_flag_name)
 
       expect(subject.use_rugged?(repository, feature_flag_name)).to be_falsey
     end
 
     it "returns true when feature flag is on" do
-      allow(feature_flag).to receive(:enabled?).and_return(true)
+      Feature.enable(feature_flag_name)
+
       allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(false)
 
       expect(subject.use_rugged?(repository, feature_flag_name)).to be true
diff --git a/spec/lib/gitlab/git_access_project_spec.rb b/spec/lib/gitlab/git_access_project_spec.rb
new file mode 100644
index 00000000000..f7f7976ccb8
--- /dev/null
+++ b/spec/lib/gitlab/git_access_project_spec.rb
@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::GitAccessProject do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository) }
+  let(:actor) { user }
+  let(:project_path) { project.path }
+  let(:namespace_path) { project&.namespace&.path }
+  let(:protocol) { 'ssh' }
+  let(:authentication_abilities) { %i[read_project download_code push_code] }
+  let(:changes) { Gitlab::GitAccess::ANY }
+  let(:push_access_check) { access.check('git-receive-pack', changes) }
+  let(:pull_access_check) { access.check('git-upload-pack', changes) }
+
+  describe '#check_project_accessibility!' do
+    context 'when the project is nil' do
+      let(:project) { nil }
+      let(:project_path) { "new-project" }
+
+      context 'when user is allowed to create project in namespace' do
+        let(:namespace_path) { user.namespace.path }
+        let(:access) do
+          described_class.new(actor, nil,
+            protocol, authentication_abilities: authentication_abilities,
+            repository_path: project_path, namespace_path: namespace_path)
+        end
+
+        it 'blocks pull access with "not found"' do
+          expect { pull_access_check }.to raise_not_found
+        end
+
+        it 'allows push access' do
+          expect { push_access_check }.not_to raise_error
+        end
+      end
+
+      context 'when user is not allowed to create project in namespace' do
+        let(:user2) { create(:user) }
+        let(:namespace_path) { user2.namespace.path }
+        let(:access) do
+          described_class.new(actor, nil,
+            protocol, authentication_abilities: authentication_abilities,
+            repository_path: project_path, namespace_path: namespace_path)
+        end
+
+        it 'blocks push and pull with "not found"' do
+          aggregate_failures do
+            expect { pull_access_check }.to raise_not_found
+            expect { push_access_check }.to raise_not_found
+          end
+        end
+      end
+    end
+  end
+
+  describe '#ensure_project_on_push!' do
+    let(:access) do
+      described_class.new(actor, project,
+        protocol, authentication_abilities: authentication_abilities,
+        repository_path: project_path, namespace_path: namespace_path)
+    end
+
+    before do
+      allow(access).to receive(:changes).and_return(changes)
+    end
+
+    context 'when push' do
+      let(:cmd) { 'git-receive-pack' }
+
+      context 'when project does not exist' do
+        let(:project_path) { "nonexistent" }
+        let(:project) { nil }
+
+        context 'when changes is _any' do
+          let(:changes) { Gitlab::GitAccess::ANY }
+
+          context 'when authentication abilities include push code' do
+            let(:authentication_abilities) { [:push_code] }
+
+            context 'when user can create project in namespace' do
+              let(:namespace_path) { user.namespace.path }
+
+              it 'creates a new project' do
+                expect { access.send(:ensure_project_on_push!, cmd) }
+                  .to change { Project.count }.by(1)
+                  .and change { Project.where(namespace: user.namespace, name: project_path).count }.by(1)
+              end
+            end
+
+            context 'when user cannot create project in namespace' do
+              let(:user2) { create(:user) }
+              let(:namespace_path) { user2.namespace.path }
+
+              it 'does not create a new project' do
+                expect { access.send(:ensure_project_on_push!, cmd) }.not_to change { Project.count }
+              end
+            end
+          end
+
+          context 'when authentication abilities do not include push code' do
+            let(:authentication_abilities) { [] }
+
+            context 'when user can create project in namespace' do
+              let(:namespace_path) { user.namespace.path }
+
+              it 'does not create a new project' do
+                expect { access.send(:ensure_project_on_push!, cmd) }.not_to change { Project.count }
+              end
+            end
+          end
+        end
+
+        context 'when check contains actual changes' do
+          let(:changes) { "#{Gitlab::Git::BLANK_SHA} 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/new_branch" }
+
+          it 'does not create a new project' do
+            expect { access.send(:ensure_project_on_push!, cmd) }.not_to change { Project.count }
+          end
+        end
+      end
+
+      context 'when project exists' do
+        let(:changes) { Gitlab::GitAccess::ANY }
+        let!(:project) { create(:project) }
+
+        it 'does not create a new project' do
+          expect { access.send(:ensure_project_on_push!, cmd) }.not_to change { Project.count }
+        end
+      end
+
+      context 'when deploy key is used' do
+        let(:key) { create(:deploy_key, user: user) }
+        let(:actor) { key }
+        let(:project_path) { "nonexistent" }
+        let(:project) { nil }
+        let(:namespace_path) { user.namespace.path }
+        let(:changes) { Gitlab::GitAccess::ANY }
+
+        it 'does not create a new project' do
+          expect { access.send(:ensure_project_on_push!, cmd) }.not_to change { Project.count }
+        end
+      end
+    end
+
+    context 'when pull' do
+      let(:cmd) { 'git-upload-pack' }
+      let(:changes) { Gitlab::GitAccess::ANY }
+
+      context 'when project does not exist' do
+        let(:project_path) { "new-project" }
+        let(:namespace_path) { user.namespace.path }
+        let(:project) { nil }
+
+        it 'does not create a new project' do
+          expect { access.send(:ensure_project_on_push!, cmd) }.not_to change { Project.count }
+        end
+      end
+    end
+  end
+
+  def raise_not_found
+    raise_error(Gitlab::GitAccess::NotFoundError, Gitlab::GitAccess::ERROR_MESSAGES[:project_not_found])
+  end
+end
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index a29c56c598f..7c09fc5cc79 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -10,7 +10,7 @@ describe Gitlab::GitAccess do
 
   let(:actor) { user }
   let(:project) { create(:project, :repository) }
-  let(:project_path) { project.path }
+  let(:project_path) { project&.path }
   let(:namespace_path) { project&.namespace&.path }
   let(:protocol) { 'ssh' }
   let(:authentication_abilities) { %i[read_project download_code push_code] }
@@ -89,13 +89,14 @@ describe Gitlab::GitAccess do
       end
     end
 
-    context 'when namespace does not exist' do
+    context 'when namespace and project are nil' do
+      let(:project) { nil }
       let(:namespace_path) { nil }
 
       it 'does not allow push and pull access' do
         aggregate_failures do
-          expect { push_access_check }.to raise_not_found
-          expect { pull_access_check }.to raise_not_found
+          expect { push_access_check }.to raise_namespace_not_found
+          expect { pull_access_check }.to raise_namespace_not_found
         end
       end
     end
@@ -227,6 +228,7 @@ describe Gitlab::GitAccess do
     context 'when the project is nil' do
       let(:project) { nil }
       let(:project_path) { "new-project" }
+      let(:namespace_path) { user.namespace.path }
 
       it 'blocks push and pull with "not found"' do
         aggregate_failures do
@@ -234,42 +236,6 @@ describe Gitlab::GitAccess do
           expect { push_access_check }.to raise_not_found
         end
       end
-
-      context 'when user is allowed to create project in namespace' do
-        let(:namespace_path) { user.namespace.path }
-        let(:access) do
-          described_class.new(actor, nil,
-            protocol, authentication_abilities: authentication_abilities,
-                      repository_path: project_path, namespace_path: namespace_path,
-                      redirected_path: redirected_path)
-        end
-
-        it 'blocks pull access with "not found"' do
-          expect { pull_access_check }.to raise_not_found
-        end
-
-        it 'allows push access' do
-          expect { push_access_check }.not_to raise_error
-        end
-      end
-
-      context 'when user is not allowed to create project in namespace' do
-        let(:user2) { create(:user) }
-        let(:namespace_path) { user2.namespace.path }
-        let(:access) do
-          described_class.new(actor, nil,
-            protocol, authentication_abilities: authentication_abilities,
-                      repository_path: project_path, namespace_path: namespace_path,
-                      redirected_path: redirected_path)
-        end
-
-        it 'blocks push and pull with "not found"' do
-          aggregate_failures do
-            expect { pull_access_check }.to raise_not_found
-            expect { push_access_check }.to raise_not_found
-          end
-        end
-      end
     end
   end
 
@@ -449,106 +415,6 @@ describe Gitlab::GitAccess do
     end
   end
 
-  describe '#ensure_project_on_push!' do
-    let(:access) do
-      described_class.new(actor, project,
-        protocol, authentication_abilities: authentication_abilities,
-                  repository_path: project_path, namespace_path: namespace_path,
-                  redirected_path: redirected_path)
-    end
-
-    context 'when push' do
-      let(:cmd) { 'git-receive-pack' }
-
-      context 'when project does not exist' do
-        let(:project_path) { "nonexistent" }
-        let(:project) { nil }
-
-        context 'when changes is _any' do
-          let(:changes) { Gitlab::GitAccess::ANY }
-
-          context 'when authentication abilities include push code' do
-            let(:authentication_abilities) { [:push_code] }
-
-            context 'when user can create project in namespace' do
-              let(:namespace_path) { user.namespace.path }
-
-              it 'creates a new project' do
-                expect { access.send(:ensure_project_on_push!, cmd, changes) }.to change { Project.count }.by(1)
-              end
-            end
-
-            context 'when user cannot create project in namespace' do
-              let(:user2) { create(:user) }
-              let(:namespace_path) { user2.namespace.path }
-
-              it 'does not create a new project' do
-                expect { access.send(:ensure_project_on_push!, cmd, changes) }.not_to change { Project.count }
-              end
-            end
-          end
-
-          context 'when authentication abilities do not include push code' do
-            let(:authentication_abilities) { [] }
-
-            context 'when user can create project in namespace' do
-              let(:namespace_path) { user.namespace.path }
-
-              it 'does not create a new project' do
-                expect { access.send(:ensure_project_on_push!, cmd, changes) }.not_to change { Project.count }
-              end
-            end
-          end
-        end
-
-        context 'when check contains actual changes' do
-          let(:changes) { "#{Gitlab::Git::BLANK_SHA} 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/new_branch" }
-
-          it 'does not create a new project' do
-            expect { access.send(:ensure_project_on_push!, cmd, changes) }.not_to change { Project.count }
-          end
-        end
-      end
-
-      context 'when project exists' do
-        let(:changes) { Gitlab::GitAccess::ANY }
-        let!(:project) { create(:project) }
-
-        it 'does not create a new project' do
-          expect { access.send(:ensure_project_on_push!, cmd, changes) }.not_to change { Project.count }
-        end
-      end
-
-      context 'when deploy key is used' do
-        let(:key) { create(:deploy_key, user: user) }
-        let(:actor) { key }
-        let(:project_path) { "nonexistent" }
-        let(:project) { nil }
-        let(:namespace_path) { user.namespace.path }
-        let(:changes) { Gitlab::GitAccess::ANY }
-
-        it 'does not create a new project' do
-          expect { access.send(:ensure_project_on_push!, cmd, changes) }.not_to change { Project.count }
-        end
-      end
-    end
-
-    context 'when pull' do
-      let(:cmd) { 'git-upload-pack' }
-      let(:changes) { Gitlab::GitAccess::ANY }
-
-      context 'when project does not exist' do
-        let(:project_path) { "new-project" }
-        let(:namespace_path) { user.namespace.path }
-        let(:project) { nil }
-
-        it 'does not create a new project' do
-          expect { access.send(:ensure_project_on_push!, cmd, changes) }.not_to change { Project.count }
-        end
-      end
-    end
-  end
-
   describe '#check_download_access!' do
     it 'allows maintainers to pull' do
       project.add_maintainer(user)
@@ -1219,6 +1085,10 @@ describe Gitlab::GitAccess do
     raise_error(Gitlab::GitAccess::NotFoundError, Gitlab::GitAccess::ERROR_MESSAGES[:project_not_found])
   end
 
+  def raise_namespace_not_found
+    raise_error(Gitlab::GitAccess::NotFoundError, Gitlab::GitAccess::ERROR_MESSAGES[:namespace_not_found])
+  end
+
   def build_authentication_abilities
     [
       :read_project,
diff --git a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
index 00182983418..29a5ef0d2fc 100644
--- a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
@@ -124,15 +124,20 @@ describe Gitlab::GitalyClient::CommitService do
     let(:left_commit_id) { 'master' }
     let(:right_commit_id) { 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660' }
 
-    it 'sends an RPC request' do
+    it 'sends an RPC request and returns the stats' do
       request = Gitaly::DiffStatsRequest.new(repository: repository_message,
                                              left_commit_id: left_commit_id,
                                              right_commit_id: right_commit_id)
 
+      diff_stat_response = Gitaly::DiffStatsResponse.new(
+        stats: [{ additions: 1, deletions: 2, path: 'test' }])
+
       expect_any_instance_of(Gitaly::DiffService::Stub).to receive(:diff_stats)
-        .with(request, kind_of(Hash)).and_return([])
+        .with(request, kind_of(Hash)).and_return([diff_stat_response])
+
+      returned_value = described_class.new(repository).diff_stats(left_commit_id, right_commit_id)
 
-      described_class.new(repository).diff_stats(left_commit_id, right_commit_id)
+      expect(returned_value).to eq(diff_stat_response.stats)
     end
   end
 
@@ -321,4 +326,59 @@ describe Gitlab::GitalyClient::CommitService do
       client.find_commits(order: 'default', author: "Billy Baggins <bilbo@shire.com>")
     end
   end
+
+  describe '#commits_by_message' do
+    shared_examples 'a CommitsByMessageRequest' do
+      let(:commits) { create_list(:gitaly_commit, 2) }
+
+      before do
+        request = Gitaly::CommitsByMessageRequest.new(
+          repository: repository_message,
+          query: query,
+          revision: (options[:revision] || '').dup.force_encoding(Encoding::ASCII_8BIT),
+          path: (options[:path] || '').dup.force_encoding(Encoding::ASCII_8BIT),
+          limit: (options[:limit] || 1000).to_i,
+          offset: (options[:offset] || 0).to_i
+        )
+
+        allow_any_instance_of(Gitaly::CommitService::Stub)
+          .to receive(:commits_by_message)
+          .with(request, kind_of(Hash))
+          .and_return([Gitaly::CommitsByMessageResponse.new(commits: commits)])
+      end
+
+      it 'sends an RPC request with the correct payload' do
+        expect(client.commits_by_message(query, options)).to match_array(wrap_commits(commits))
+      end
+    end
+
+    let(:query) { 'Add a feature' }
+    let(:options) { {} }
+
+    context 'when only the query is provided' do
+      include_examples 'a CommitsByMessageRequest'
+    end
+
+    context 'when all arguments are provided' do
+      let(:options) { { revision: 'feature-branch', path: 'foo.txt', limit: 10, offset: 20 } }
+
+      include_examples 'a CommitsByMessageRequest'
+    end
+
+    context 'when limit and offset are not integers' do
+      let(:options) { { limit: '10', offset: '60' } }
+
+      include_examples 'a CommitsByMessageRequest'
+    end
+
+    context 'when revision and path contain non-ASCII characters' do
+      let(:options) { { revision: "branch\u011F", path: "foo/\u011F.txt" } }
+
+      include_examples 'a CommitsByMessageRequest'
+    end
+
+    def wrap_commits(commits)
+      commits.map { |commit| Gitlab::Git::Commit.new(repository, commit) }
+    end
+  end
 end
diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb
index 2c6aee58326..c2b989c2fdc 100644
--- a/spec/lib/gitlab/gitaly_client_spec.rb
+++ b/spec/lib/gitlab/gitaly_client_spec.rb
@@ -21,10 +21,10 @@ describe Gitlab::GitalyClient do
 
   describe '.query_time', :request_store do
     it 'increments query times' do
-      subject.query_time += 0.451
-      subject.query_time += 0.322
+      subject.add_query_time(0.4510004)
+      subject.add_query_time(0.3220004)
 
-      expect(subject.query_time).to eq(0.773)
+      expect(subject.query_time).to eq(0.773001)
     end
   end
 
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
index e2d810d5ddc..526a5589743 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
@@ -154,9 +154,11 @@ describe Gitlab::GithubImport::Importer::PullRequestsImporter do
         .to receive(:fetch_remote)
         .with('github', forced: false)
 
-      expect(Rails.logger)
-        .to receive(:info)
-        .with(an_instance_of(String))
+      expect_next_instance_of(Gitlab::Import::Logger) do |logger|
+        expect(logger)
+          .to receive(:info)
+          .with(an_instance_of(Hash))
+      end
 
       expect(importer.repository_updates_counter)
         .to receive(:increment)
diff --git a/spec/lib/gitlab/gl_repository/identifier_spec.rb b/spec/lib/gitlab/gl_repository/identifier_spec.rb
new file mode 100644
index 00000000000..c36f296702e
--- /dev/null
+++ b/spec/lib/gitlab/gl_repository/identifier_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::GlRepository::Identifier do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:personal_snippet) { create(:personal_snippet, author: project.owner) }
+  let_it_be(:project_snippet) { create(:project_snippet, project: project, author: project.owner) }
+
+  describe 'project repository' do
+    it_behaves_like 'parsing gl_repository identifier' do
+      let(:record_id) { project.id }
+      let(:identifier) { "project-#{record_id}" }
+      let(:expected_container) { project }
+      let(:expected_type) { Gitlab::GlRepository::PROJECT }
+    end
+  end
+
+  describe 'wiki' do
+    it_behaves_like 'parsing gl_repository identifier' do
+      let(:record_id) { project.id }
+      let(:identifier) { "wiki-#{record_id}" }
+      let(:expected_container) { project }
+      let(:expected_type) { Gitlab::GlRepository::WIKI }
+    end
+  end
+
+  describe 'snippet' do
+    context 'when PersonalSnippet' do
+      it_behaves_like 'parsing gl_repository identifier' do
+        let(:record_id) { personal_snippet.id }
+        let(:identifier) { "snippet-#{record_id}" }
+        let(:expected_container) { personal_snippet }
+        let(:expected_type) { Gitlab::GlRepository::SNIPPET }
+      end
+    end
+
+    context 'when ProjectSnippet' do
+      it_behaves_like 'parsing gl_repository identifier' do
+        let(:record_id) { project_snippet.id }
+        let(:identifier) { "snippet-#{record_id}" }
+        let(:expected_container) { project_snippet }
+        let(:expected_type) { Gitlab::GlRepository::SNIPPET }
+      end
+    end
+  end
+
+  describe 'design' do
+    it_behaves_like 'parsing gl_repository identifier' do
+      let(:record_id) { project.id }
+      let(:identifier) { "design-#{project.id}" }
+      let(:expected_container) { project }
+      let(:expected_type) { Gitlab::GlRepository::DESIGN }
+    end
+  end
+
+  describe 'incorrect format' do
+    def expect_error_raised_for(identifier)
+      expect { described_class.new(identifier) }.to raise_error(ArgumentError)
+    end
+
+    it 'raises error for incorrect id' do
+      expect_error_raised_for('wiki-noid')
+    end
+
+    it 'raises error for incorrect type' do
+      expect_error_raised_for('foo-2')
+    end
+
+    it 'raises error for incorrect three-segment container' do
+      expect_error_raised_for('snippet-2-wiki')
+    end
+
+    it 'raises error for one segment' do
+      expect_error_raised_for('snippet')
+    end
+
+    it 'raises error for more than three segments' do
+      expect_error_raised_for('project-1-wiki-bar')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/gl_repository/repo_type_spec.rb b/spec/lib/gitlab/gl_repository/repo_type_spec.rb
index bf6df55b71e..f5270104d2f 100644
--- a/spec/lib/gitlab/gl_repository/repo_type_spec.rb
+++ b/spec/lib/gitlab/gl_repository/repo_type_spec.rb
@@ -13,7 +13,7 @@ describe Gitlab::GlRepository::RepoType do
 
   describe Gitlab::GlRepository::PROJECT do
     it_behaves_like 'a repo type' do
-      let(:expected_id) { project.id.to_s }
+      let(:expected_id) { project.id }
       let(:expected_identifier) { "project-#{expected_id}" }
       let(:expected_suffix) { '' }
       let(:expected_container) { project }
@@ -42,7 +42,7 @@ describe Gitlab::GlRepository::RepoType do
 
   describe Gitlab::GlRepository::WIKI do
     it_behaves_like 'a repo type' do
-      let(:expected_id) { project.id.to_s }
+      let(:expected_id) { project.id }
       let(:expected_identifier) { "wiki-#{expected_id}" }
       let(:expected_suffix) { '.wiki' }
       let(:expected_container) { project }
@@ -72,7 +72,7 @@ describe Gitlab::GlRepository::RepoType do
   describe Gitlab::GlRepository::SNIPPET do
     context 'when PersonalSnippet' do
       it_behaves_like 'a repo type' do
-        let(:expected_id) { personal_snippet.id.to_s }
+        let(:expected_id) { personal_snippet.id }
         let(:expected_identifier) { "snippet-#{expected_id}" }
         let(:expected_suffix) { '' }
         let(:expected_repository) { personal_snippet.repository }
@@ -101,7 +101,7 @@ describe Gitlab::GlRepository::RepoType do
 
     context 'when ProjectSnippet' do
       it_behaves_like 'a repo type' do
-        let(:expected_id) { project_snippet.id.to_s }
+        let(:expected_id) { project_snippet.id }
         let(:expected_identifier) { "snippet-#{expected_id}" }
         let(:expected_suffix) { '' }
         let(:expected_repository) { project_snippet.repository }
@@ -131,7 +131,7 @@ describe Gitlab::GlRepository::RepoType do
   describe Gitlab::GlRepository::DESIGN do
     it_behaves_like 'a repo type' do
       let(:expected_identifier) { "design-#{project.id}" }
-      let(:expected_id) { project.id.to_s }
+      let(:expected_id) { project.id }
       let(:expected_suffix) { '.design' }
       let(:expected_repository) { project.design_repository }
       let(:expected_container) { project }
diff --git a/spec/lib/gitlab/gl_repository_spec.rb b/spec/lib/gitlab/gl_repository_spec.rb
index 5f5244b7116..413540b4db8 100644
--- a/spec/lib/gitlab/gl_repository_spec.rb
+++ b/spec/lib/gitlab/gl_repository_spec.rb
@@ -11,7 +11,7 @@ describe ::Gitlab::GlRepository do
       expect(described_class.parse("project-#{project.id}")).to eq([project, project, Gitlab::GlRepository::PROJECT])
     end
 
-    it 'parses a wiki gl_repository' do
+    it 'parses a project wiki gl_repository' do
       expect(described_class.parse("wiki-#{project.id}")).to eq([project, project, Gitlab::GlRepository::WIKI])
     end
 
diff --git a/spec/lib/gitlab/gon_helper_spec.rb b/spec/lib/gitlab/gon_helper_spec.rb
index 1ff2334bacf..7b0e0d01257 100644
--- a/spec/lib/gitlab/gon_helper_spec.rb
+++ b/spec/lib/gitlab/gon_helper_spec.rb
@@ -12,21 +12,19 @@ describe Gitlab::GonHelper do
   describe '#push_frontend_feature_flag' do
     it 'pushes a feature flag to the frontend' do
       gon = instance_double('gon')
+      thing = stub_feature_flag_gate('thing')
+
+      stub_feature_flags(my_feature_flag: thing)
 
       allow(helper)
         .to receive(:gon)
         .and_return(gon)
 
-      expect(Feature)
-        .to receive(:enabled?)
-        .with(:my_feature_flag, 10)
-        .and_return(true)
-
       expect(gon)
         .to receive(:push)
         .with({ features: { 'myFeatureFlag' => true } }, true)
 
-      helper.push_frontend_feature_flag(:my_feature_flag, 10)
+      helper.push_frontend_feature_flag(:my_feature_flag, thing)
     end
   end
 
diff --git a/spec/lib/gitlab/graphql/pagination/filterable_array_connection_spec.rb b/spec/lib/gitlab/graphql/pagination/filterable_array_connection_spec.rb
deleted file mode 100644
index c82e3ad3019..00000000000
--- a/spec/lib/gitlab/graphql/pagination/filterable_array_connection_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Gitlab::Graphql::Pagination::FilterableArrayConnection do
-  let(:callback) { proc { |nodes| nodes } }
-  let(:all_nodes) { Gitlab::Graphql::FilterableArray.new(callback, 1, 2, 3, 4, 5) }
-  let(:arguments) { {} }
-
-  subject(:connection) do
-    described_class.new(all_nodes, { max_page_size: 3 }.merge(arguments))
-  end
-
-  describe '#nodes' do
-    let(:paged_nodes) { subject.nodes }
-
-    it_behaves_like 'connection with paged nodes' do
-      let(:paged_nodes_size) { 3 }
-    end
-
-    context 'when callback filters some nodes' do
-      let(:callback) { proc { |nodes| nodes[1..-1] } }
-
-      it 'does not return filtered elements' do
-        expect(subject.nodes).to contain_exactly(all_nodes[1], all_nodes[2])
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb b/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
index ba77bc95bb5..ed728444b17 100644
--- a/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
+++ b/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
@@ -9,14 +9,6 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
   let(:schema) { GraphQL::Schema.define(query: query_type, mutation: nil)}
   let(:context) { GraphQL::Query::Context.new(query: OpenStruct.new(schema: schema), values: nil, object: nil) }
 
-  before do
-    stub_const('NoPrimaryKey', Class.new(ActiveRecord::Base))
-    NoPrimaryKey.class_eval do
-      self.table_name  = 'no_primary_key'
-      self.primary_key = nil
-    end
-  end
-
   subject(:connection) do
     described_class.new(nodes, { context: context, max_page_size: 3 }.merge(arguments))
   end
@@ -41,7 +33,7 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
       let(:nodes) { Project.order(:updated_at) }
 
       it 'returns the encoded value of the order' do
-        expect(decoded_cursor(cursor)).to include('updated_at' => project.updated_at.to_s)
+        expect(decoded_cursor(cursor)).to include('updated_at' => project.updated_at.strftime('%Y-%m-%d %H:%M:%S.%N %Z'))
       end
 
       it 'includes the :id even when not specified in the order' do
@@ -53,7 +45,7 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
       let(:nodes) { Project.order(:updated_at).order(:created_at) }
 
       it 'returns the encoded value of the order' do
-        expect(decoded_cursor(cursor)).to include('updated_at' => project.updated_at.to_s)
+        expect(decoded_cursor(cursor)).to include('updated_at' => project.updated_at.strftime('%Y-%m-%d %H:%M:%S.%N %Z'))
       end
     end
 
@@ -61,7 +53,7 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
       let(:nodes) { Project.order(Arel.sql('projects.updated_at IS NULL')).order(:updated_at).order(:id) }
 
       it 'returns the encoded value of the order' do
-        expect(decoded_cursor(cursor)).to include('updated_at' => project.updated_at.to_s)
+        expect(decoded_cursor(cursor)).to include('updated_at' => project.updated_at.strftime('%Y-%m-%d %H:%M:%S.%N %Z'))
       end
     end
   end
@@ -303,6 +295,14 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
     end
 
     context 'when there is no primary key' do
+      before do
+        stub_const('NoPrimaryKey', Class.new(ActiveRecord::Base))
+        NoPrimaryKey.class_eval do
+          self.table_name  = 'no_primary_key'
+          self.primary_key = nil
+        end
+      end
+
       let(:nodes) { NoPrimaryKey.all }
 
       it 'raises an error' do
@@ -311,4 +311,96 @@ describe Gitlab::Graphql::Pagination::Keyset::Connection do
       end
     end
   end
+
+  describe '#has_previous_page and #has_next_page' do
+    # using a list of 5 items with a max_page of 3
+    let_it_be(:project_list) { create_list(:project, 5) }
+    let_it_be(:nodes) { Project.order(:id) }
+
+    context 'when default query' do
+      let(:arguments) { {} }
+
+      it 'has no previous, but a next' do
+        expect(subject.has_previous_page).to be_falsey
+        expect(subject.has_next_page).to be_truthy
+      end
+    end
+
+    context 'when before is first item' do
+      let(:arguments) { { before: encoded_cursor(project_list.first) } }
+
+      it 'has no previous, but a next' do
+        expect(subject.has_previous_page).to be_falsey
+        expect(subject.has_next_page).to be_truthy
+      end
+    end
+
+    describe 'using `before`' do
+      context 'when before is the last item' do
+        let(:arguments) { { before: encoded_cursor(project_list.last) } }
+
+        it 'has no previous, but a next' do
+          expect(subject.has_previous_page).to be_falsey
+          expect(subject.has_next_page).to be_truthy
+        end
+      end
+
+      context 'when before and last specified' do
+        let(:arguments) { { before: encoded_cursor(project_list.last), last: 2 } }
+
+        it 'has a previous and a next' do
+          expect(subject.has_previous_page).to be_truthy
+          expect(subject.has_next_page).to be_truthy
+        end
+      end
+
+      context 'when before and last does not request all remaining nodes' do
+        let(:arguments) { { before: encoded_cursor(project_list.last), last: 2 } }
+
+        it 'has a previous and a next' do
+          expect(subject.has_previous_page).to be_truthy
+          expect(subject.has_next_page).to be_truthy
+        end
+      end
+
+      context 'when before and last does request all remaining nodes' do
+        let(:arguments) { { before: encoded_cursor(project_list[1]), last: 3 } }
+
+        it 'has a previous and a next' do
+          expect(subject.has_previous_page).to be_falsey
+          expect(subject.has_next_page).to be_truthy
+          expect(subject.nodes).to eq [project_list[0]]
+        end
+      end
+    end
+
+    describe 'using `after`' do
+      context 'when after is the first item' do
+        let(:arguments) { { after: encoded_cursor(project_list.first) } }
+
+        it 'has a previous, and a next' do
+          expect(subject.has_previous_page).to be_truthy
+          expect(subject.has_next_page).to be_truthy
+        end
+      end
+
+      context 'when after and first specified' do
+        let(:arguments) { { after: encoded_cursor(project_list.first), first: 2 } }
+
+        it 'has a previous and a next' do
+          expect(subject.has_previous_page).to be_truthy
+          expect(subject.has_next_page).to be_truthy
+        end
+      end
+
+      context 'when before and last does request all remaining nodes' do
+        let(:arguments) { { after: encoded_cursor(project_list[2]), last: 3 } }
+
+        it 'has a previous but no next' do
+          expect(subject.has_previous_page).to be_truthy
+          expect(subject.has_next_page).to be_falsey
+        end
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/import/merge_request_creator_spec.rb b/spec/lib/gitlab/import/merge_request_creator_spec.rb
index ff2c3032dbf..48a57f9b251 100644
--- a/spec/lib/gitlab/import/merge_request_creator_spec.rb
+++ b/spec/lib/gitlab/import/merge_request_creator_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::Import::MergeRequestCreator do
 
       it 'updates the data' do
         commits_count = commits.count
-        merge_request.merge_request_diffs.destroy_all # rubocop: disable DestroyAll
+        merge_request.merge_request_diffs.destroy_all # rubocop: disable Cop/DestroyAll
 
         expect(merge_request.merge_request_diffs.count).to eq(0)
 
diff --git a/spec/lib/gitlab/import/set_async_jid_spec.rb b/spec/lib/gitlab/import/set_async_jid_spec.rb
index f1ae23a4a6a..d2933cfd371 100644
--- a/spec/lib/gitlab/import/set_async_jid_spec.rb
+++ b/spec/lib/gitlab/import/set_async_jid_spec.rb
@@ -8,7 +8,7 @@ describe Gitlab::Import::SetAsyncJid do
     it 'sets the JID in Redis' do
       expect(Gitlab::SidekiqStatus)
         .to receive(:set)
-              .with("async-import/project-import-state/#{project.id}", StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+              .with("async-import/project-import-state/#{project.id}", Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
               .and_call_original
 
       described_class.set_jid(project.import_state)
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index c78b4501310..ef9321dc1fc 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -179,10 +179,12 @@ merge_request_context_commits:
 ci_pipelines:
 - project
 - user
+- ci_ref
 - stages
 - statuses
 - latest_statuses_ordered_by_stage
 - builds
+- bridges
 - processables
 - trigger_requests
 - variables
@@ -195,7 +197,7 @@ ci_pipelines:
 - cancelable_statuses
 - manual_actions
 - scheduled_actions
-- artifacts
+- downloadable_artifacts
 - pipeline_schedule
 - merge_requests_as_head_pipeline
 - merge_request
@@ -220,6 +222,11 @@ ci_pipelines:
 - pipeline_config
 - security_scans
 - daily_build_group_report_results
+- latest_builds
+- daily_report_results
+ci_refs:
+- project
+- ci_pipelines
 pipeline_variables:
 - pipeline
 stages:
@@ -236,6 +243,7 @@ statuses:
 - stage
 - user
 - auto_canceled_by
+- needs
 variables:
 - project
 triggers:
@@ -417,6 +425,7 @@ project:
 - deploy_tokens
 - settings
 - ci_cd_settings
+- project_settings
 - import_export_upload
 - repository_languages
 - pool_repository
@@ -479,6 +488,7 @@ project:
 - upstream_project_subscriptions
 - downstream_project_subscriptions
 - service_desk_setting
+- security_setting
 - import_failures
 - container_expiration_policy
 - resource_groups
@@ -494,6 +504,7 @@ project:
 - repository_storage_moves
 - freeze_periods
 - webex_teams_service
+- build_report_results
 award_emoji:
 - awardable
 - user
@@ -579,6 +590,7 @@ boards:
 - board_assignee
 - assignee
 - labels
+- user_preferences
 lists:
 - user
 - milestone
@@ -596,6 +608,7 @@ design: &design
 - versions
 - notes
 - user_mentions
+- events
 designs: *design
 actions:
 - design
diff --git a/spec/lib/gitlab/import_export/attributes_permitter_spec.rb b/spec/lib/gitlab/import_export/attributes_permitter_spec.rb
new file mode 100644
index 00000000000..d6217811b9c
--- /dev/null
+++ b/spec/lib/gitlab/import_export/attributes_permitter_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::ImportExport::AttributesPermitter do
+  let(:yml_config) do
+    <<-EOF
+      tree:
+        project:
+          - labels:
+            - :priorities
+          - milestones:
+            - events:
+              - :push_event_payload
+
+      included_attributes:
+        labels:
+          - :title
+          - :description
+
+      methods:
+        labels:
+          - :type
+    EOF
+  end
+
+  let(:file) { Tempfile.new(%w(import_export .yml)) }
+  let(:config_hash) { Gitlab::ImportExport::Config.new(config: file.path).to_h }
+
+  before do
+    file.write(yml_config)
+    file.rewind
+  end
+
+  after do
+    file.close
+    file.unlink
+  end
+
+  subject { described_class.new(config: config_hash) }
+
+  describe '#permitted_attributes' do
+    it 'builds permitted attributes hash' do
+      expect(subject.permitted_attributes).to match(
+        a_hash_including(
+          project: [:labels, :milestones],
+          labels: [:priorities, :title, :description, :type],
+          events: [:push_event_payload],
+          milestones: [:events],
+          priorities: [],
+          push_event_payload: []
+        )
+      )
+    end
+  end
+
+  describe '#permit' do
+    let(:unfiltered_hash) do
+      {
+        title: 'Title',
+        description: 'Description',
+        undesired_attribute: 'Undesired Attribute',
+        another_attribute: 'Another Attribute'
+      }
+    end
+
+    it 'only allows permitted attributes' do
+      expect(subject.permit(:labels, unfiltered_hash)).to eq(title: 'Title', description: 'Description')
+    end
+  end
+
+  describe '#permitted_attributes_for' do
+    it 'returns an array of permitted attributes for a relation' do
+      expect(subject.permitted_attributes_for(:labels)).to contain_exactly(:title, :description, :type, :priorities)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/import_test_coverage_spec.rb b/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
index 038b95809b4..c5a7327332e 100644
--- a/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
+++ b/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
@@ -10,61 +10,66 @@ require 'spec_helper'
 describe 'Test coverage of the Project Import' do
   include ConfigurationHelper
 
-  # `MUTED_RELATIONS` is a technical debt.
+  # `muted_relations` is a technical debt.
   # This list expected to be empty or used as a workround
   # in case this spec blocks an important urgent MR.
   # It is also expected that adding a relation in the list should lead to
   # opening a follow-up issue to fix this.
-  MUTED_RELATIONS = %w[
-    project.milestones.events.push_event_payload
-    project.issues.events
-    project.issues.events.push_event_payload
-    project.issues.notes.events
-    project.issues.notes.events.push_event_payload
-    project.issues.milestone.events.push_event_payload
-    project.issues.issue_milestones
-    project.issues.issue_milestones.milestone
-    project.issues.resource_label_events.label.priorities
-    project.issues.designs.notes
-    project.issues.designs.notes.author
-    project.issues.designs.notes.events
-    project.issues.designs.notes.events.push_event_payload
-    project.merge_requests.metrics
-    project.merge_requests.notes.events.push_event_payload
-    project.merge_requests.events.push_event_payload
-    project.merge_requests.timelogs
-    project.merge_requests.label_links
-    project.merge_requests.label_links.label
-    project.merge_requests.label_links.label.priorities
-    project.merge_requests.milestone
-    project.merge_requests.milestone.events
-    project.merge_requests.milestone.events.push_event_payload
-    project.merge_requests.merge_request_milestones
-    project.merge_requests.merge_request_milestones.milestone
-    project.merge_requests.resource_label_events.label
-    project.merge_requests.resource_label_events.label.priorities
-    project.ci_pipelines.notes.events
-    project.ci_pipelines.notes.events.push_event_payload
-    project.protected_branches.unprotect_access_levels
-    project.prometheus_metrics
-    project.metrics_setting
-    project.boards.lists.label.priorities
-    project.service_desk_setting
-  ].freeze
+  let(:muted_relations) do
+    %w[
+      project.milestones.events.push_event_payload
+      project.issues.events
+      project.issues.events.push_event_payload
+      project.issues.notes.events
+      project.issues.notes.events.push_event_payload
+      project.issues.milestone.events.push_event_payload
+      project.issues.issue_milestones
+      project.issues.issue_milestones.milestone
+      project.issues.resource_label_events.label.priorities
+      project.issues.designs.notes
+      project.issues.designs.notes.author
+      project.issues.designs.notes.events
+      project.issues.designs.notes.events.push_event_payload
+      project.merge_requests.metrics
+      project.merge_requests.notes.events.push_event_payload
+      project.merge_requests.events.push_event_payload
+      project.merge_requests.timelogs
+      project.merge_requests.label_links
+      project.merge_requests.label_links.label
+      project.merge_requests.label_links.label.priorities
+      project.merge_requests.milestone
+      project.merge_requests.milestone.events
+      project.merge_requests.milestone.events.push_event_payload
+      project.merge_requests.merge_request_milestones
+      project.merge_requests.merge_request_milestones.milestone
+      project.merge_requests.resource_label_events.label
+      project.merge_requests.resource_label_events.label.priorities
+      project.ci_pipelines.notes.events
+      project.ci_pipelines.notes.events.push_event_payload
+      project.protected_branches.unprotect_access_levels
+      project.prometheus_metrics
+      project.metrics_setting
+      project.boards.lists.label.priorities
+      project.service_desk_setting
+      project.security_setting
+    ].freeze
+  end
 
   # A list of JSON fixture files we use to test Import.
   # Most of the relations are present in `complex/project.json`
   # which is our main fixture.
-  PROJECT_JSON_FIXTURES = [
-    'spec/fixtures/lib/gitlab/import_export/complex/project.json',
-    'spec/fixtures/lib/gitlab/import_export/group/project.json',
-    'spec/fixtures/lib/gitlab/import_export/light/project.json',
-    'spec/fixtures/lib/gitlab/import_export/milestone-iid/project.json',
-    'spec/fixtures/lib/gitlab/import_export/designs/project.json'
-  ].freeze
+  let(:project_json_fixtures) do
+    [
+      'spec/fixtures/lib/gitlab/import_export/complex/project.json',
+      'spec/fixtures/lib/gitlab/import_export/group/project.json',
+      'spec/fixtures/lib/gitlab/import_export/light/project.json',
+      'spec/fixtures/lib/gitlab/import_export/milestone-iid/project.json',
+      'spec/fixtures/lib/gitlab/import_export/designs/project.json'
+    ].freeze
+  end
 
   it 'ensures that all imported/exported relations are present in test JSONs' do
-    not_tested_relations = (relations_from_config - tested_relations) - MUTED_RELATIONS
+    not_tested_relations = (relations_from_config - tested_relations) - muted_relations
 
     expect(not_tested_relations).to be_empty, failure_message(not_tested_relations)
   end
@@ -76,7 +81,7 @@ describe 'Test coverage of the Project Import' do
   end
 
   def tested_relations
-    PROJECT_JSON_FIXTURES.flat_map(&method(:relations_from_json)).to_set
+    project_json_fixtures.flat_map(&method(:relations_from_json)).to_set
   end
 
   def relations_from_json(json_file)
@@ -106,7 +111,7 @@ describe 'Test coverage of the Project Import' do
       These relations seem to be added recenty and
       they expected to be covered in our Import specs: #{not_tested_relations}.
 
-      To do that, expand one of the files listed in `PROJECT_JSON_FIXTURES`
+      To do that, expand one of the files listed in `project_json_fixtures`
       (or expand the list if you consider adding a new fixture file).
 
       After that, add a new spec into
@@ -114,7 +119,7 @@ describe 'Test coverage of the Project Import' do
       to check that the relation is being imported correctly.
 
       In case the spec breaks the master or there is a sense of urgency,
-      you could include the relations into the `MUTED_RELATIONS` list.
+      you could include the relations into the `muted_relations` list.
 
       Muting relations is considered to be a temporary solution, so please
       open a follow-up issue and try to fix that when it is possible.
diff --git a/spec/lib/gitlab/import_export/importer_spec.rb b/spec/lib/gitlab/import_export/importer_spec.rb
index 60179146416..494f7e3a00d 100644
--- a/spec/lib/gitlab/import_export/importer_spec.rb
+++ b/spec/lib/gitlab/import_export/importer_spec.rb
@@ -18,6 +18,7 @@ describe Gitlab::ImportExport::Importer do
 
     FileUtils.mkdir_p(shared.export_path)
     ImportExportUpload.create(project: project, import_file: import_file)
+    allow(FileUtils).to receive(:rm_rf).and_call_original
   end
 
   after do
@@ -78,6 +79,13 @@ describe Gitlab::ImportExport::Importer do
         expect(project.import_export_upload.import_file&.file).to be_nil
       end
 
+      it 'removes tmp files' do
+        importer.execute
+
+        expect(FileUtils).to have_received(:rm_rf).with(shared.base_path)
+        expect(Dir.exist?(shared.base_path)).to eq(false)
+      end
+
       it 'sets the correct visibility_level when visibility level is a string' do
         project.create_or_update_import_data(
           data: { override_params: { visibility_level: Gitlab::VisibilityLevel::PRIVATE.to_s } }
@@ -89,6 +97,49 @@ describe Gitlab::ImportExport::Importer do
       end
     end
 
+    context 'when import fails' do
+      let(:error_message) { 'foo' }
+
+      shared_examples 'removes any non migrated snippet' do
+        specify do
+          create_list(:project_snippet, 2, project: project)
+          snippet_with_repo = create(:project_snippet, :repository, project: project)
+
+          expect { importer.execute }.to change(Snippet, :count).by(-2).and(raise_error(Projects::ImportService::Error))
+
+          expect(snippet_with_repo.reload).to be_present
+        end
+      end
+
+      context 'when there is a graceful error' do
+        before do
+          allow_next_instance_of(Gitlab::ImportExport::AvatarRestorer) do |instance|
+            allow(instance).to receive(:avatar_export_file).and_raise(StandardError, error_message)
+          end
+        end
+
+        it 'raises and exception' do
+          expect { importer.execute }.to raise_error(Projects::ImportService::Error, error_message)
+        end
+
+        it_behaves_like 'removes any non migrated snippet'
+      end
+
+      context 'when an unexpected exception is raised' do
+        before do
+          allow_next_instance_of(Gitlab::ImportExport::AvatarRestorer) do |instance|
+            allow(instance).to receive(:restore).and_raise(StandardError, error_message)
+          end
+        end
+
+        it 'captures it and raises the Projects::ImportService::Error exception' do
+          expect { importer.execute }.to raise_error(Projects::ImportService::Error, error_message)
+        end
+
+        it_behaves_like 'removes any non migrated snippet'
+      end
+    end
+
     context 'when project successfully restored' do
       context "with a project in a user's namespace" do
         let!(:existing_project) { create(:project, namespace: user.namespace) }
diff --git a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
index 076f454895f..30f8280fda3 100644
--- a/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
+++ b/spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb
@@ -95,4 +95,26 @@ describe Gitlab::ImportExport::JSON::StreamingSerializer do
       end
     end
   end
+
+  describe '.batch_size' do
+    context 'when export_reduce_relation_batch_size feature flag is enabled' do
+      before do
+        stub_feature_flags(export_reduce_relation_batch_size: true)
+      end
+
+      it 'returns 20' do
+        expect(described_class.batch_size(exportable)).to eq(described_class::SMALLER_BATCH_SIZE)
+      end
+    end
+
+    context 'when export_reduce_relation_batch_size feature flag is disabled' do
+      before do
+        stub_feature_flags(export_reduce_relation_batch_size: false)
+      end
+
+      it 'returns default batch size' do
+        expect(described_class.batch_size(exportable)).to eq(described_class::BATCH_SIZE)
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb b/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb
index 958865f52a0..6562aa5b8a6 100644
--- a/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/legacy_relation_tree_saver_spec.rb
@@ -8,17 +8,35 @@ describe Gitlab::ImportExport::LegacyRelationTreeSaver do
   let(:tree) { {} }
 
   describe '#serialize' do
-    let(:serializer) { instance_double(Gitlab::ImportExport::FastHashSerializer) }
+    shared_examples 'FastHashSerializer with batch size' do |batch_size|
+      let(:serializer) { instance_double(Gitlab::ImportExport::FastHashSerializer) }
 
-    it 'uses FastHashSerializer' do
-      expect(Gitlab::ImportExport::FastHashSerializer)
-        .to receive(:new)
-        .with(exportable, tree)
-        .and_return(serializer)
+      it 'uses FastHashSerializer' do
+        expect(Gitlab::ImportExport::FastHashSerializer)
+          .to receive(:new)
+          .with(exportable, tree, batch_size: batch_size)
+          .and_return(serializer)
 
-      expect(serializer).to receive(:execute)
+        expect(serializer).to receive(:execute)
 
-      relation_tree_saver.serialize(exportable, tree)
+        relation_tree_saver.serialize(exportable, tree)
+      end
+    end
+
+    context 'when export_reduce_relation_batch_size feature flag is enabled' do
+      before do
+        stub_feature_flags(export_reduce_relation_batch_size: true)
+      end
+
+      include_examples 'FastHashSerializer with batch size', Gitlab::ImportExport::JSON::StreamingSerializer::SMALLER_BATCH_SIZE
+    end
+
+    context 'when export_reduce_relation_batch_size feature flag is disabled' do
+      before do
+        stub_feature_flags(export_reduce_relation_batch_size: false)
+      end
+
+      include_examples 'FastHashSerializer with batch size', Gitlab::ImportExport::JSON::StreamingSerializer::BATCH_SIZE
     end
   end
 end
diff --git a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
index 175da623c1b..3339129cb8f 100644
--- a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
@@ -18,6 +18,22 @@ describe Gitlab::ImportExport::Project::RelationFactory do
                            excluded_keys: excluded_keys)
   end
 
+  before do
+    # Mocks an ActiveRecordish object with the dodgy columns
+    stub_const('FooModel', Class.new)
+    FooModel.class_eval do
+      include ActiveModel::Model
+
+      def initialize(params = {})
+        params.each { |key, value| send("#{key}=", value) }
+      end
+
+      def values
+        instance_variables.map { |ivar| instance_variable_get(ivar) }
+      end
+    end
+  end
+
   context 'hook object' do
     let(:relation_sym) { :hooks }
     let(:id) { 999 }
@@ -83,19 +99,6 @@ describe Gitlab::ImportExport::Project::RelationFactory do
     end
   end
 
-  # Mocks an ActiveRecordish object with the dodgy columns
-  class FooModel
-    include ActiveModel::Model
-
-    def initialize(params = {})
-      params.each { |key, value| send("#{key}=", value) }
-    end
-
-    def values
-      instance_variables.map { |ivar| instance_variable_get(ivar) }
-    end
-  end
-
   context 'merge_request object' do
     let(:relation_sym) { :merge_requests }
 
@@ -208,11 +211,12 @@ describe Gitlab::ImportExport::Project::RelationFactory do
       }
     end
 
-    class HazardousFooModel < FooModel
-      attr_accessor :service_id, :moved_to_id, :namespace_id, :ci_id, :random_project_id, :random_id, :milestone_id, :project_id
-    end
-
     before do
+      stub_const('HazardousFooModel', Class.new(FooModel))
+      HazardousFooModel.class_eval do
+        attr_accessor :service_id, :moved_to_id, :namespace_id, :ci_id, :random_project_id, :random_id, :milestone_id, :project_id
+      end
+
       allow(HazardousFooModel).to receive(:reflect_on_association).and_return(nil)
     end
 
@@ -246,11 +250,12 @@ describe Gitlab::ImportExport::Project::RelationFactory do
       Gitlab::ImportExport::Project::RelationFactory::PROJECT_REFERENCES.map { |ref| { ref => 99 } }.inject(:merge)
     end
 
-    class ProjectFooModel < FooModel
-      attr_accessor(*Gitlab::ImportExport::Project::RelationFactory::PROJECT_REFERENCES)
-    end
-
     before do
+      stub_const('ProjectFooModel', Class.new(FooModel))
+      ProjectFooModel.class_eval do
+        attr_accessor(*Gitlab::ImportExport::Project::RelationFactory::PROJECT_REFERENCES)
+      end
+
       allow(ProjectFooModel).to receive(:reflect_on_association).and_return(nil)
     end
 
diff --git a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
index 58589a7bbbe..867dc37c5c5 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -26,7 +26,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer do
           @project = create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project')
           @shared = @project.import_export_shared
 
-          allow(Feature).to receive(:enabled?) { true }
+          stub_all_feature_flags
           stub_feature_flags(project_import_ndjson: ndjson_enabled)
 
           setup_import_export_config('complex')
diff --git a/spec/lib/gitlab/import_export/project/tree_saver_spec.rb b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
index b9bfe253f10..533d1097928 100644
--- a/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
@@ -29,7 +29,7 @@ describe Gitlab::ImportExport::Project::TreeSaver do
 
       before_all do
         RSpec::Mocks.with_temporary_scope do
-          allow(Feature).to receive(:enabled?) { true }
+          stub_all_feature_flags
           stub_feature_flags(project_export_as_ndjson: ndjson_enabled)
 
           project.add_maintainer(user)
diff --git a/spec/lib/gitlab/import_export/repo_restorer_spec.rb b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
index a61d966bdfa..d5839589633 100644
--- a/spec/lib/gitlab/import_export/repo_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
@@ -13,11 +13,8 @@ describe Gitlab::ImportExport::RepoRestorer do
     let(:shared) { project.import_export_shared }
     let(:bundler) { Gitlab::ImportExport::RepoSaver.new(project: project_with_repo, shared: shared) }
     let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
-    let(:restorer) do
-      described_class.new(path_to_bundle: bundle_path,
-                          shared: shared,
-                          project: project)
-    end
+
+    subject { described_class.new(path_to_bundle: bundle_path, shared: shared, project: project) }
 
     before do
       allow_next_instance_of(Gitlab::ImportExport) do |instance|
@@ -36,7 +33,25 @@ describe Gitlab::ImportExport::RepoRestorer do
     end
 
     it 'restores the repo successfully' do
-      expect(restorer.restore).to be_truthy
+      expect(subject.restore).to be_truthy
+    end
+
+    context 'when the repository creation fails' do
+      before do
+        allow_next_instance_of(Repositories::DestroyService) do |instance|
+          expect(instance).to receive(:execute).and_call_original
+        end
+      end
+
+      it 'logs the error' do
+        allow(project.repository)
+          .to receive(:create_from_bundle)
+          .and_raise('9:CreateRepositoryFromBundle: target directory is non-empty')
+
+        expect(shared).to receive(:error).and_call_original
+
+        expect(subject.restore).to be_falsey
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index c29a85ce624..0d112bfdb2a 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -144,6 +144,7 @@ Releases::Link:
 - url
 - name
 - filepath
+- link_type
 - created_at
 - updated_at
 ProjectMember:
@@ -471,6 +472,7 @@ Service:
 - properties
 - template
 - instance
+- alert_events
 - push_events
 - issues_events
 - commit_events
@@ -701,6 +703,8 @@ Badge:
 - type
 ProjectCiCdSetting:
 - group_runners_enabled
+ProjectSetting:
+- allow_merge_on_skipped_pipeline
 ProtectedEnvironment:
 - id
 - project_id
@@ -749,6 +753,7 @@ ProjectMetricsSetting:
 - external_dashboard_url
 - created_at
 - updated_at
+- dashboard_timezone
 Board:
 - id
 - project_id
@@ -861,3 +866,11 @@ SystemNoteMetadata:
   - action
   - created_at
   - updated_at
+ProjectSecuritySetting:
+  - project_id
+  - auto_fix_container_scanning
+  - auto_fix_dast
+  - auto_fix_dependency_scanning
+  - auto_fix_sast
+  - created_at
+  - updated_at
diff --git a/spec/lib/gitlab/import_export/saver_spec.rb b/spec/lib/gitlab/import_export/saver_spec.rb
index a59cf7a1260..18e9d7da32d 100644
--- a/spec/lib/gitlab/import_export/saver_spec.rb
+++ b/spec/lib/gitlab/import_export/saver_spec.rb
@@ -5,18 +5,21 @@ require 'fileutils'
 
 describe Gitlab::ImportExport::Saver do
   let!(:project) { create(:project, :public, name: 'project') }
-  let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
+  let(:base_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
+  let(:export_path) { "#{base_path}/project_tree_saver_spec/export" }
   let(:shared) { project.import_export_shared }
 
   subject { described_class.new(exportable: project, shared: shared) }
 
   before do
+    allow(shared).to receive(:base_path).and_return(base_path)
     allow_next_instance_of(Gitlab::ImportExport) do |instance|
       allow(instance).to receive(:storage_path).and_return(export_path)
     end
 
     FileUtils.mkdir_p(shared.export_path)
     FileUtils.touch("#{shared.export_path}/tmp.bundle")
+    allow(FileUtils).to receive(:rm_rf).and_call_original
   end
 
   after do
@@ -31,4 +34,11 @@ describe Gitlab::ImportExport::Saver do
     expect(ImportExportUpload.find_by(project: project).export_file.url)
       .to match(%r[\/uploads\/-\/system\/import_export_upload\/export_file.*])
   end
+
+  it 'removes tmp files' do
+    subject.save
+
+    expect(FileUtils).to have_received(:rm_rf).with(base_path)
+    expect(Dir.exist?(base_path)).to eq(false)
+  end
 end
diff --git a/spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb b/spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb
index 3ce950d6a64..779b65e33d8 100644
--- a/spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb
@@ -25,16 +25,24 @@ describe Gitlab::ImportExport::SnippetRepoRestorer do
       expect(snippet.repository_exists?).to be_falsey
 
       aggregate_failures do
-        expect(restorer.restore).to be_truthy
-
-        expect(snippet.repository_exists?).to be_truthy
-        expect(snippet.snippet_repository).not_to be_nil
+        expect do
+          expect(restorer.restore).to be_truthy
+        end.to change { SnippetRepository.count }.by(1)
 
         blob = snippet.repository.blob_at('HEAD', snippet.file_name)
         expect(blob).not_to be_nil
         expect(blob.data).to eq(snippet.content)
       end
     end
+
+    context 'when the repository creation fails' do
+      it 'returns false' do
+        allow_any_instance_of(Gitlab::BackgroundMigration::BackfillSnippetRepositories).to receive(:perform_by_ids).and_return(nil)
+
+        expect(restorer.restore).to be false
+        expect(shared.errors.first).to match(/Error creating repository for snippet/)
+      end
+    end
   end
 
   context 'when the snippet does not have a bundle file path' do
diff --git a/spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb b/spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb
index 242f6f6b58c..fdae259c2f1 100644
--- a/spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb
@@ -8,43 +8,92 @@ describe Gitlab::ImportExport::SnippetsRepoRestorer do
   describe 'bundle a snippet Git repo' do
     let_it_be(:user) { create(:user) }
     let_it_be(:project) { create(:project, namespace: user.namespace) }
-    let_it_be(:snippet_with_repo) { create(:project_snippet, :repository, project: project, author: user) }
-    let_it_be(:snippet_without_repo) { create(:project_snippet, project: project, author: user) }
 
+    let!(:snippet1) { create(:project_snippet, project: project, author: user) }
+    let!(:snippet2) { create(:project_snippet, project: project, author: user) }
     let(:shared) { project.import_export_shared }
     let(:exporter) { Gitlab::ImportExport::SnippetsRepoSaver.new(current_user: user, project: project, shared: shared) }
     let(:bundle_dir) { ::Gitlab::ImportExport.snippets_repo_bundle_path(shared.export_path) }
+    let(:service) { instance_double(Gitlab::ImportExport::SnippetRepoRestorer) }
     let(:restorer) do
       described_class.new(user: user,
                           shared: shared,
                           project: project)
     end
-    let(:service) { instance_double(Gitlab::ImportExport::SnippetRepoRestorer) }
-
-    before do
-      exporter.save
-    end
 
     after do
       FileUtils.rm_rf(shared.export_path)
     end
 
-    it 'calls SnippetRepoRestorer per each snippet with the bundle path' do
-      allow(service).to receive(:restore).and_return(true)
+    shared_examples 'imports snippet repositories' do
+      before do
+        snippet1.snippet_repository&.delete
+        snippet1.repository.remove
+
+        snippet2.snippet_repository&.delete
+        snippet2.repository.remove
+      end
+
+      specify do
+        expect(snippet1.repository_exists?).to be false
+        expect(snippet2.repository_exists?).to be false
+
+        expect(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet1, path_to_bundle: bundle_path(snippet1))).and_call_original
+        expect(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet2, path_to_bundle: bundle_path(snippet2))).and_call_original
+        expect(restorer.restore).to be_truthy
+
+        snippet1.repository.expire_exists_cache
+        snippet2.repository.expire_exists_cache
+
+        expect(snippet1.blobs).not_to be_empty
+        expect(snippet2.blobs).not_to be_empty
+      end
+    end
+
+    context 'when export has no snippet repository bundle' do
+      before do
+        expect(Dir.exist?(bundle_dir)).to be false
+      end
+
+      it_behaves_like 'imports snippet repositories'
+    end
+
+    context 'when export has snippet repository bundles and snippets without them' do
+      let!(:snippet1) { create(:project_snippet, :repository, project: project, author: user) }
+      let!(:snippet2) { create(:project_snippet, project: project, author: user) }
 
-      expect(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet_with_repo, path_to_bundle: bundle_path(snippet_with_repo))).and_return(service)
-      expect(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet_without_repo, path_to_bundle: bundle_path(snippet_without_repo))).and_return(service)
+      before do
+        exporter.save
 
-      expect(restorer.restore).to be_truthy
+        expect(File.exist?(bundle_path(snippet1))).to be true
+        expect(File.exist?(bundle_path(snippet2))).to be false
+      end
+
+      it_behaves_like 'imports snippet repositories'
     end
 
-    context 'when one snippet cannot be saved' do
-      it 'returns false and do not process other snippets' do
-        allow(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet_with_repo)).and_return(service)
+    context 'when export has only snippet bundles' do
+      let!(:snippet1) { create(:project_snippet, :repository, project: project, author: user) }
+      let!(:snippet2) { create(:project_snippet, :repository, project: project, author: user) }
+
+      before do
+        exporter.save
+
+        expect(File.exist?(bundle_path(snippet1))).to be true
+        expect(File.exist?(bundle_path(snippet2))).to be true
+      end
+
+      it_behaves_like 'imports snippet repositories'
+    end
+
+    context 'when any of the snippet repositories cannot be created' do
+      it 'continues processing other snippets and returns false' do
+        allow(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet1)).and_return(service)
         allow(service).to receive(:restore).and_return(false)
 
-        expect(Gitlab::ImportExport::SnippetRepoRestorer).not_to receive(:new).with(hash_including(snippet: snippet_without_repo))
-        expect(restorer.restore).to be_falsey
+        expect(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet2)).and_call_original
+
+        expect(restorer.restore).to be false
       end
     end
 
diff --git a/spec/lib/gitlab/instrumentation/redis_base_spec.rb b/spec/lib/gitlab/instrumentation/redis_base_spec.rb
new file mode 100644
index 00000000000..5ea8f00114e
--- /dev/null
+++ b/spec/lib/gitlab/instrumentation/redis_base_spec.rb
@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Instrumentation::RedisBase, :request_store do
+  let(:instrumentation_class_a) do
+    stub_const('InstanceA', Class.new(described_class))
+  end
+
+  let(:instrumentation_class_b) do
+    stub_const('InstanceB', Class.new(described_class))
+  end
+
+  describe '.storage_key' do
+    it 'returns the class name with underscore' do
+      expect(instrumentation_class_a.storage_key).to eq('instance_a')
+      expect(instrumentation_class_b.storage_key).to eq('instance_b')
+    end
+  end
+
+  describe '.known_payload_keys' do
+    it 'returns generated payload keys' do
+      expect(instrumentation_class_a.known_payload_keys).to eq([:redis_instance_a_calls,
+                                                                :redis_instance_a_duration_s,
+                                                                :redis_instance_a_read_bytes,
+                                                                :redis_instance_a_write_bytes])
+    end
+
+    it 'does not call calculation methods' do
+      expect(instrumentation_class_a).not_to receive(:get_request_count)
+      expect(instrumentation_class_a).not_to receive(:query_time)
+      expect(instrumentation_class_a).not_to receive(:read_bytes)
+      expect(instrumentation_class_a).not_to receive(:write_bytes)
+
+      instrumentation_class_a.known_payload_keys
+    end
+  end
+
+  describe '.payload' do
+    it 'returns values that are higher than 0' do
+      allow(instrumentation_class_a).to receive(:get_request_count) { 1 }
+      allow(instrumentation_class_a).to receive(:query_time) { 0.1 }
+      allow(instrumentation_class_a).to receive(:read_bytes) { 0.0 }
+      allow(instrumentation_class_a).to receive(:write_bytes) { 123 }
+
+      expected_payload = {
+        redis_instance_a_calls: 1,
+        redis_instance_a_write_bytes: 123,
+        redis_instance_a_duration_s: 0.1
+      }
+
+      expect(instrumentation_class_a.payload).to eq(expected_payload)
+    end
+  end
+
+  describe '.add_duration' do
+    it 'does not lose precision while adding' do
+      precision = 1.0 / (10**::Gitlab::InstrumentationHelper::DURATION_PRECISION)
+      2.times { instrumentation_class_a.add_duration(0.4 * precision) }
+
+      # 2 * 0.4 should be 0.8 and get rounded to 1
+      expect(instrumentation_class_a.query_time).to eq(1 * precision)
+    end
+
+    context 'storage key overlapping' do
+      it 'keys do not overlap across storages' do
+        instrumentation_class_a.add_duration(0.4)
+        instrumentation_class_b.add_duration(0.5)
+
+        expect(instrumentation_class_a.query_time).to eq(0.4)
+        expect(instrumentation_class_b.query_time).to eq(0.5)
+      end
+    end
+  end
+
+  describe '.increment_request_count' do
+    context 'storage key overlapping' do
+      it 'keys do not overlap across storages' do
+        3.times { instrumentation_class_a.increment_request_count }
+        2.times { instrumentation_class_b.increment_request_count }
+
+        expect(instrumentation_class_a.get_request_count).to eq(3)
+        expect(instrumentation_class_b.get_request_count).to eq(2)
+      end
+    end
+  end
+
+  describe '.increment_write_bytes' do
+    context 'storage key overlapping' do
+      it 'keys do not overlap across storages' do
+        2.times do
+          instrumentation_class_a.increment_write_bytes(42)
+          instrumentation_class_b.increment_write_bytes(77)
+        end
+
+        expect(instrumentation_class_a.write_bytes).to eq(42 * 2)
+        expect(instrumentation_class_b.write_bytes).to eq(77 * 2)
+      end
+    end
+  end
+
+  describe '.increment_read_bytes' do
+    context 'storage key overlapping' do
+      it 'keys do not overlap across storages' do
+        2.times do
+          instrumentation_class_a.increment_read_bytes(42)
+          instrumentation_class_b.increment_read_bytes(77)
+        end
+
+        expect(instrumentation_class_a.read_bytes).to eq(42 * 2)
+        expect(instrumentation_class_b.read_bytes).to eq(77 * 2)
+      end
+    end
+  end
+
+  describe '.add_call_details' do
+    before do
+      allow(Gitlab::PerformanceBar).to receive(:enabled_for_request?) { true }
+    end
+
+    context 'storage key overlapping' do
+      it 'keys do not overlap across storages' do
+        2.times do
+          instrumentation_class_a.add_call_details(0.3, [:set])
+          instrumentation_class_b.add_call_details(0.4, [:set])
+        end
+
+        expect(instrumentation_class_a.detail_store).to match(
+          [
+            a_hash_including(cmd: :set, duration: 0.3, backtrace: an_instance_of(Array)),
+            a_hash_including(cmd: :set, duration: 0.3, backtrace: an_instance_of(Array))
+          ]
+        )
+
+        expect(instrumentation_class_b.detail_store).to match(
+          [
+            a_hash_including(cmd: :set, duration: 0.4, backtrace: an_instance_of(Array)),
+            a_hash_including(cmd: :set, duration: 0.4, backtrace: an_instance_of(Array))
+          ]
+        )
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb b/spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb
new file mode 100644
index 00000000000..25506d63091
--- /dev/null
+++ b/spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rspec-parameterized'
+
+describe Gitlab::Instrumentation::RedisInterceptor, :clean_gitlab_redis_shared_state, :request_store do
+  using RSpec::Parameterized::TableSyntax
+
+  describe 'read and write' do
+    where(:setup, :command, :expect_write, :expect_read) do
+      # The response is 'OK', the request size is the combined size of array
+      # elements. Exercise counting of a status reply.
+      [] | [:set, 'foo', 'bar'] | 3 + 3 + 3 | 2
+
+      # The response is 1001, so 4 bytes. Exercise counting an integer reply.
+      [[:set, 'foobar', 1000]] | [:incr, 'foobar'] | 4 + 6 | 4
+
+      # Exercise counting empty multi bulk reply
+      [] | [:hgetall, 'foobar'] | 7 + 6 | 0
+
+      # Hgetall response length is combined length of keys and values in the
+      # hash. Exercises counting of a multi bulk reply
+      [[:hset, 'myhash', 'field', 'hello world']] | [:hgetall, 'myhash'] | 7 + 6 | 5 + 11
+
+      # Exercise counting of a bulk reply
+      [[:set, 'foo', 'bar' * 100]] | [:get, 'foo'] | 3 + 3 | 3 * 100
+
+      # Nested array response: ['123456-89', ['foo', 'bar']]
+      [[:xadd, 'mystream', '123456-89', 'foo', 'bar']] | [:xrange, 'mystream', '-', '+'] | 6 + 8 + 1 + 1 | 9 + 3 + 3
+    end
+
+    with_them do
+      it 'counts bytes read and written' do
+        Gitlab::Redis::SharedState.with do |redis|
+          setup.each { |cmd| redis.call(cmd) }
+          RequestStore.clear!
+          redis.call(command)
+        end
+
+        expect(Gitlab::Instrumentation::Redis.read_bytes).to eq(expect_read)
+        expect(Gitlab::Instrumentation::Redis.write_bytes).to eq(expect_write)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/instrumentation/redis_spec.rb b/spec/lib/gitlab/instrumentation/redis_spec.rb
new file mode 100644
index 00000000000..8311c4f5bbb
--- /dev/null
+++ b/spec/lib/gitlab/instrumentation/redis_spec.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Instrumentation::Redis do
+  def stub_storages(method, value)
+    described_class::STORAGES.each do |storage|
+      allow(storage).to receive(method) { value }
+    end
+  end
+
+  shared_examples 'aggregation of redis storage data' do |method|
+    describe "#{method} sum" do
+      it "sums data from all Redis storages" do
+        amount = 0.3
+
+        stub_storages(method, amount)
+
+        expect(described_class.public_send(method)).to eq(described_class::STORAGES.size * amount)
+      end
+    end
+  end
+
+  it_behaves_like 'aggregation of redis storage data', :get_request_count
+  it_behaves_like 'aggregation of redis storage data', :query_time
+  it_behaves_like 'aggregation of redis storage data', :read_bytes
+  it_behaves_like 'aggregation of redis storage data', :write_bytes
+
+  describe '.known_payload_keys' do
+    it 'returns all known payload keys' do
+      expected_keys = [
+        :redis_calls,
+        :redis_duration_s,
+        :redis_read_bytes,
+        :redis_write_bytes,
+        :redis_action_cable_calls,
+        :redis_action_cable_duration_s,
+        :redis_action_cable_read_bytes,
+        :redis_action_cable_write_bytes,
+        :redis_cache_calls,
+        :redis_cache_duration_s,
+        :redis_cache_read_bytes,
+        :redis_cache_write_bytes,
+        :redis_queues_calls,
+        :redis_queues_duration_s,
+        :redis_queues_read_bytes,
+        :redis_queues_write_bytes,
+        :redis_shared_state_calls,
+        :redis_shared_state_duration_s,
+        :redis_shared_state_read_bytes,
+        :redis_shared_state_write_bytes
+      ]
+
+      expect(described_class.known_payload_keys).to eq(expected_keys)
+    end
+
+    it 'does not call storage calculation methods' do
+      described_class::STORAGES.each do |storage|
+        expect(storage).not_to receive(:get_request_count)
+        expect(storage).not_to receive(:query_time)
+        expect(storage).not_to receive(:read_bytes)
+        expect(storage).not_to receive(:write_bytes)
+      end
+
+      described_class.known_payload_keys
+    end
+  end
+
+  describe '.payload', :request_store do
+    before do
+      Gitlab::Redis::Cache.with { |redis| redis.set('cache-test', 321) }
+      Gitlab::Redis::SharedState.with { |redis| redis.set('shared-state-test', 123) }
+    end
+
+    it 'returns payload filtering out zeroed values' do
+      expected_payload = {
+        # Aggregated results
+        redis_calls: 2,
+        redis_duration_s: be >= 0,
+        redis_read_bytes: be >= 0,
+        redis_write_bytes: be >= 0,
+
+        # Cache results
+        redis_cache_calls: 1,
+        redis_cache_duration_s: be >= 0,
+        redis_cache_read_bytes: be >= 0,
+        redis_cache_write_bytes: be >= 0,
+
+        # Shared state results
+        redis_shared_state_calls: 1,
+        redis_shared_state_duration_s: be >= 0,
+        redis_shared_state_read_bytes: be >= 0,
+        redis_shared_state_write_bytes: be >= 0
+      }
+
+      expect(described_class.payload).to include(expected_payload)
+      expect(described_class.payload.keys).to match_array(expected_payload.keys)
+    end
+  end
+
+  describe '.detail_store' do
+    it 'returns a flat array of detail stores with the storage name added to each item' do
+      details_row = { cmd: 'GET foo', duration: 1 }
+
+      stub_storages(:detail_store, [details_row])
+
+      expect(described_class.detail_store)
+        .to contain_exactly(details_row.merge(storage: 'ActionCable'),
+                            details_row.merge(storage: 'Cache'),
+                            details_row.merge(storage: 'Queues'),
+                            details_row.merge(storage: 'SharedState'))
+    end
+  end
+end
diff --git a/spec/lib/gitlab/instrumentation_helper_spec.rb b/spec/lib/gitlab/instrumentation_helper_spec.rb
index fdb842dac0f..15d377a16fc 100644
--- a/spec/lib/gitlab/instrumentation_helper_spec.rb
+++ b/spec/lib/gitlab/instrumentation_helper_spec.rb
@@ -6,6 +6,41 @@ require 'rspec-parameterized'
 describe Gitlab::InstrumentationHelper do
   using RSpec::Parameterized::TableSyntax
 
+  describe '.keys' do
+    it 'returns all available payload keys' do
+      expected_keys = [
+        :gitaly_calls,
+        :gitaly_duration_s,
+        :rugged_calls,
+        :rugged_duration_s,
+        :elasticsearch_calls,
+        :elasticsearch_duration_s,
+        :redis_calls,
+        :redis_duration_s,
+        :redis_read_bytes,
+        :redis_write_bytes,
+        :redis_action_cable_calls,
+        :redis_action_cable_duration_s,
+        :redis_action_cable_read_bytes,
+        :redis_action_cable_write_bytes,
+        :redis_cache_calls,
+        :redis_cache_duration_s,
+        :redis_cache_read_bytes,
+        :redis_cache_write_bytes,
+        :redis_queues_calls,
+        :redis_queues_duration_s,
+        :redis_queues_read_bytes,
+        :redis_queues_write_bytes,
+        :redis_shared_state_calls,
+        :redis_shared_state_duration_s,
+        :redis_shared_state_read_bytes,
+        :redis_shared_state_write_bytes
+      ]
+
+      expect(described_class.keys).to eq(expected_keys)
+    end
+  end
+
   describe '.add_instrumentation_data', :request_store do
     let(:payload) { {} }
 
@@ -34,12 +69,30 @@ describe Gitlab::InstrumentationHelper do
 
     context 'when Redis calls are made' do
       it 'adds Redis data and omits Gitaly data' do
-        Gitlab::Redis::Cache.with { |redis| redis.get('test-instrumentation') }
+        Gitlab::Redis::Cache.with { |redis| redis.set('test-cache', 123) }
+        Gitlab::Redis::Queues.with { |redis| redis.set('test-queues', 321) }
 
         subject
 
-        expect(payload[:redis_calls]).to eq(1)
+        # Aggregated payload
+        expect(payload[:redis_calls]).to eq(2)
         expect(payload[:redis_duration_s]).to be >= 0
+        expect(payload[:redis_read_bytes]).to be >= 0
+        expect(payload[:redis_write_bytes]).to be >= 0
+
+        # Shared state payload
+        expect(payload[:redis_queues_calls]).to eq(1)
+        expect(payload[:redis_queues_duration_s]).to be >= 0
+        expect(payload[:redis_queues_read_bytes]).to be >= 0
+        expect(payload[:redis_queues_write_bytes]).to be >= 0
+
+        # Cache payload
+        expect(payload[:redis_cache_calls]).to eq(1)
+        expect(payload[:redis_cache_duration_s]).to be >= 0
+        expect(payload[:redis_cache_read_bytes]).to be >= 0
+        expect(payload[:redis_cache_write_bytes]).to be >= 0
+
+        # Gitaly
         expect(payload[:gitaly_calls]).to be_nil
         expect(payload[:gitaly_duration]).to be_nil
       end
diff --git a/spec/lib/gitlab/issuable_metadata_spec.rb b/spec/lib/gitlab/issuable_metadata_spec.rb
index 7632bc3060a..1920cecfc29 100644
--- a/spec/lib/gitlab/issuable_metadata_spec.rb
+++ b/spec/lib/gitlab/issuable_metadata_spec.rb
@@ -6,14 +6,12 @@ describe Gitlab::IssuableMetadata do
   let(:user)     { create(:user) }
   let!(:project) { create(:project, :public, :repository, creator: user, namespace: user.namespace) }
 
-  subject { Class.new { include Gitlab::IssuableMetadata }.new }
-
   it 'returns an empty Hash if an empty collection is provided' do
-    expect(subject.issuable_meta_data(Issue.none, 'Issue', user)).to eq({})
+    expect(described_class.new(user, Issue.none).data).to eq({})
   end
 
   it 'raises an error when given a collection with no limit' do
-    expect { subject.issuable_meta_data(Issue.all, 'Issue', user) }.to raise_error(/must have a limit/)
+    expect { described_class.new(user, Issue.all) }.to raise_error(/must have a limit/)
   end
 
   context 'issues' do
@@ -25,7 +23,7 @@ describe Gitlab::IssuableMetadata do
     let!(:closing_issues) { create(:merge_requests_closing_issues, issue: issue, merge_request: merge_request) }
 
     it 'aggregates stats on issues' do
-      data = subject.issuable_meta_data(Issue.all.limit(10), 'Issue', user)
+      data = described_class.new(user, Issue.all.limit(10)).data
 
       expect(data.count).to eq(2)
       expect(data[issue.id].upvotes).to eq(1)
@@ -48,7 +46,7 @@ describe Gitlab::IssuableMetadata do
     let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
 
     it 'aggregates stats on merge requests' do
-      data = subject.issuable_meta_data(MergeRequest.all.limit(10), 'MergeRequest', user)
+      data = described_class.new(user, MergeRequest.all.limit(10)).data
 
       expect(data.count).to eq(2)
       expect(data[merge_request.id].upvotes).to eq(1)
diff --git a/spec/lib/gitlab/jira_import/base_importer_spec.rb b/spec/lib/gitlab/jira_import/base_importer_spec.rb
index ecaf3def589..cda491393e8 100644
--- a/spec/lib/gitlab/jira_import/base_importer_spec.rb
+++ b/spec/lib/gitlab/jira_import/base_importer_spec.rb
@@ -8,27 +8,13 @@ describe Gitlab::JiraImport::BaseImporter do
   let(:project) { create(:project) }
 
   describe 'with any inheriting class' do
-    context 'when an error is returned from the project validation' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-
-        allow(project).to receive(:validate_jira_import_settings!)
-          .and_raise(Projects::ImportService::Error, 'Jira import feature is disabled.')
-      end
-
-      it 'raises exception' do
-        expect { described_class.new(project) }.to raise_error(Projects::ImportService::Error, 'Jira import feature is disabled.')
-      end
-    end
-
     context 'when project validation is ok' do
       let!(:jira_service) { create(:jira_service, project: project) }
 
       before do
-        stub_feature_flags(jira_issue_import: true)
         stub_jira_service_test
 
-        allow(project).to receive(:validate_jira_import_settings!)
+        allow(Gitlab::JiraImport).to receive(:validate_project_settings!)
       end
 
       context 'when Jira service exists' do
diff --git a/spec/lib/gitlab/jira_import/issues_importer_spec.rb b/spec/lib/gitlab/jira_import/issues_importer_spec.rb
index 6cf06c20e19..0d790f49450 100644
--- a/spec/lib/gitlab/jira_import/issues_importer_spec.rb
+++ b/spec/lib/gitlab/jira_import/issues_importer_spec.rb
@@ -14,7 +14,6 @@ describe Gitlab::JiraImport::IssuesImporter do
   subject { described_class.new(project) }
 
   before do
-    stub_feature_flags(jira_issue_import: true)
     stub_jira_service_test
   end
 
@@ -39,15 +38,22 @@ describe Gitlab::JiraImport::IssuesImporter do
     end
 
     context 'with results returned' do
-      JiraIssue = Struct.new(:id)
-      let_it_be(:jira_issues) { [JiraIssue.new(1), JiraIssue.new(2)] }
+      jira_issue = Struct.new(:id)
+      let_it_be(:jira_issues) { [jira_issue.new(1), jira_issue.new(2)] }
 
-      def mock_issue_serializer(count)
+      def mock_issue_serializer(count, raise_exception_on_even_mocks: false)
         serializer = instance_double(Gitlab::JiraImport::IssueSerializer, execute: { key: 'data' })
+        next_iid = project.issues.maximum(:iid).to_i
 
         count.times do |i|
-          expect(Gitlab::JiraImport::IssueSerializer).to receive(:new)
-            .with(project, jira_issues[i], current_user.id, { iid: i + 1 }).and_return(serializer)
+          if raise_exception_on_even_mocks && i.even?
+            expect(Gitlab::JiraImport::IssueSerializer).to receive(:new)
+             .with(project, jira_issues[i], current_user.id, { iid: next_iid + 1 }).and_raise('Some error')
+          else
+            next_iid += 1
+            expect(Gitlab::JiraImport::IssueSerializer).to receive(:new)
+              .with(project, jira_issues[i], current_user.id, { iid: next_iid }).and_return(serializer)
+          end
         end
       end
 
@@ -70,21 +76,22 @@ describe Gitlab::JiraImport::IssuesImporter do
         end
       end
 
-      context 'when there is more than one page of results' do
+      context 'when importing some issue raises an exception' do
         before do
-          stub_const("#{described_class.name}::BATCH_SIZE", 2)
+          stub_const("#{described_class.name}::BATCH_SIZE", 3)
         end
 
-        it 'schedules 3 import jobs' do
+        it 'schedules 2 import jobs' do
           expect(subject).to receive(:fetch_issues).with(0).and_return([jira_issues[0], jira_issues[1]])
-          expect(Gitlab::JiraImport::ImportIssueWorker).to receive(:perform_async).twice.times
-          expect(Gitlab::Cache::Import::Caching).to receive(:set_add).twice.times.and_call_original
-          expect(Gitlab::Cache::Import::Caching).to receive(:set_includes?).twice.times.and_call_original
-          mock_issue_serializer(2)
+          expect(Gitlab::JiraImport::ImportIssueWorker).to receive(:perform_async).once
+          expect(Gitlab::Cache::Import::Caching).to receive(:set_add).once.and_call_original
+          expect(Gitlab::Cache::Import::Caching).to receive(:set_includes?).twice.and_call_original
+          expect(Gitlab::ErrorTracking).to receive(:track_exception).once
+          mock_issue_serializer(2, raise_exception_on_even_mocks: true)
 
           job_waiter = subject.execute
 
-          expect(job_waiter.jobs_remaining).to eq(2)
+          expect(job_waiter.jobs_remaining).to eq(1)
           expect(Gitlab::JiraImport.get_issues_next_start_at(project.id)).to eq(2)
         end
       end
diff --git a/spec/lib/gitlab/jira_import/labels_importer_spec.rb b/spec/lib/gitlab/jira_import/labels_importer_spec.rb
index 67eb541d376..19661ff4e73 100644
--- a/spec/lib/gitlab/jira_import/labels_importer_spec.rb
+++ b/spec/lib/gitlab/jira_import/labels_importer_spec.rb
@@ -15,7 +15,6 @@ describe Gitlab::JiraImport::LabelsImporter do
   subject { importer.execute }
 
   before do
-    stub_feature_flags(jira_issue_import: true)
     stub_const('Gitlab::JiraImport::LabelsImporter::MAX_LABELS', 2)
   end
 
diff --git a/spec/lib/gitlab/jira_import_spec.rb b/spec/lib/gitlab/jira_import_spec.rb
index c5c3d6ef4b9..5b95891c97e 100644
--- a/spec/lib/gitlab/jira_import_spec.rb
+++ b/spec/lib/gitlab/jira_import_spec.rb
@@ -5,9 +5,109 @@ require 'spec_helper'
 describe Gitlab::JiraImport do
   let(:project_id) { 321 }
 
+  describe '.validate_project_settings!' do
+    include JiraServiceHelper
+
+    let_it_be(:project, reload: true) { create(:project) }
+    let(:additional_params) { {} }
+
+    subject { described_class.validate_project_settings!(project, additional_params) }
+
+    shared_examples 'raise Jira import error' do |message|
+      it 'returns error' do
+        expect { subject }.to raise_error(Projects::ImportService::Error, message)
+      end
+    end
+
+    shared_examples 'jira configuration base checks' do
+      context 'with configuration_check set to false' do
+        before do
+          additional_params[:configuration_check] = false
+        end
+
+        it 'does not raise Jira integration error' do
+          expect { subject }.not_to raise_error
+        end
+      end
+
+      context 'when Jira service was not setup' do
+        it_behaves_like 'raise Jira import error', 'Jira integration not configured.'
+      end
+
+      context 'when Jira service exists' do
+        let!(:jira_service) { create(:jira_service, project: project, active: true) }
+
+        context 'when Jira connection is not valid' do
+          before do
+            WebMock.stub_request(:get, 'https://jira.example.com/rest/api/2/serverInfo')
+              .to_raise(JIRA::HTTPError.new(double(message: 'Some failure.')))
+          end
+
+          it_behaves_like 'raise Jira import error', 'Unable to connect to the Jira instance. Please check your Jira integration configuration.'
+        end
+      end
+    end
+
+    before do
+      stub_jira_service_test
+    end
+
+    context 'without user param' do
+      it_behaves_like 'jira configuration base checks'
+
+      context 'when jira connection is valid' do
+        let!(:jira_service) { create(:jira_service, project: project, active: true) }
+
+        it 'does not return any error' do
+          expect { subject }.not_to raise_error
+        end
+      end
+    end
+
+    context 'with user param provided' do
+      let_it_be(:user) { create(:user) }
+
+      let(:additional_params) { { user: user } }
+
+      context 'when user has permission to run import' do
+        before do
+          project.add_maintainer(user)
+        end
+
+        it_behaves_like 'jira configuration base checks'
+
+        context 'when jira service is configured' do
+          let!(:jira_service) { create(:jira_service, project: project, active: true) }
+
+          context 'when issues feature is disabled' do
+            let_it_be(:project, reload: true) { create(:project, :issues_disabled) }
+
+            it_behaves_like 'raise Jira import error', 'Cannot import because issues are not available in this project.'
+          end
+
+          context 'when everything is ok' do
+            it 'does not return any error' do
+              expect { subject }.not_to raise_error
+            end
+          end
+        end
+      end
+
+      context 'when user does not have permissions to run the import' do
+        before do
+          create(:jira_service, project: project, active: true)
+
+          project.add_developer(user)
+        end
+
+        it_behaves_like 'raise Jira import error', 'You do not have permissions to run the import.'
+      end
+    end
+  end
+
   describe '.jira_issue_cache_key' do
     it 'returns cache key for Jira issue imported to given project' do
-      expect(described_class.jira_issue_cache_key(project_id, 'DEMO-123')).to eq("jira-import/items-mapper/#{project_id}/issues/DEMO-123")
+      expect(described_class.jira_item_cache_key(project_id, 'DEMO-123', :issues)).to eq("jira-import/items-mapper/#{project_id}/issues/DEMO-123")
     end
   end
 
@@ -44,6 +144,29 @@ describe Gitlab::JiraImport do
     end
   end
 
+  describe '.cache_users_mapping', :clean_gitlab_redis_cache do
+    let(:data) { { 'user1' => '456', 'user234' => '23' } }
+
+    it 'stores the data correctly' do
+      described_class.cache_users_mapping(project_id, data)
+
+      expect(Gitlab::Cache::Import::Caching.read("jira-import/items-mapper/#{project_id}/users/user1")).to eq('456')
+      expect(Gitlab::Cache::Import::Caching.read("jira-import/items-mapper/#{project_id}/users/user234")).to eq('23')
+    end
+  end
+
+  describe '.get_user_mapping', :clean_gitlab_redis_cache do
+    it 'reads the data correctly' do
+      Gitlab::Cache::Import::Caching.write("jira-import/items-mapper/#{project_id}/users/user-123", '456')
+
+      expect(described_class.get_user_mapping(project_id, 'user-123')).to eq(456)
+    end
+
+    it 'returns nil if value not found' do
+      expect(described_class.get_user_mapping(project_id, 'user-123')).to be_nil
+    end
+  end
+
   describe '.store_issues_next_started_at', :clean_gitlab_redis_cache do
     it 'stores nil value' do
       described_class.store_issues_next_started_at(project_id, nil)
diff --git a/spec/lib/gitlab/kubernetes/helm/api_spec.rb b/spec/lib/gitlab/kubernetes/helm/api_spec.rb
index 1f925fd45af..0e4179d5887 100644
--- a/spec/lib/gitlab/kubernetes/helm/api_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/api_spec.rb
@@ -17,7 +17,8 @@ describe Gitlab::Kubernetes::Helm::API do
       name: application_name,
       chart: 'chart-name',
       rbac: rbac,
-      files: files
+      files: files,
+      local_tiller_enabled: true
     )
   end
 
@@ -142,7 +143,7 @@ describe Gitlab::Kubernetes::Helm::API do
     end
 
     context 'with a service account' do
-      let(:command) { Gitlab::Kubernetes::Helm::InitCommand.new(name: application_name, files: files, rbac: rbac) }
+      let(:command) { Gitlab::Kubernetes::Helm::InitCommand.new(name: application_name, files: files, rbac: rbac, local_tiller_enabled: true) }
 
       context 'rbac-enabled cluster' do
         let(:rbac) { true }
diff --git a/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb
index 2a4a911cf38..f9bcb8abdb1 100644
--- a/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/base_command_spec.rb
@@ -11,25 +11,14 @@ describe Gitlab::Kubernetes::Helm::BaseCommand do
   let(:rbac) { false }
 
   let(:test_class) do
-    Class.new do
-      include Gitlab::Kubernetes::Helm::BaseCommand
-
+    Class.new(Gitlab::Kubernetes::Helm::BaseCommand) do
       def initialize(rbac)
-        @rbac = rbac
-      end
-
-      def name
-        "test-class-name"
-      end
-
-      def rbac?
-        @rbac
-      end
-
-      def files
-        {
-          some: 'value'
-        }
+        super(
+          name: 'test-class-name',
+          rbac: rbac,
+          files: { some: 'value' },
+          local_tiller_enabled: false
+        )
       end
     end
   end
diff --git a/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb
index 95d60c18d56..2bf8b294821 100644
--- a/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb
@@ -3,11 +3,12 @@
 require 'spec_helper'
 
 describe Gitlab::Kubernetes::Helm::DeleteCommand do
-  subject(:delete_command) { described_class.new(name: app_name, rbac: rbac, files: files) }
+  subject(:delete_command) { described_class.new(name: app_name, rbac: rbac, files: files, local_tiller_enabled: local_tiller_enabled) }
 
   let(:app_name) { 'app-name' }
   let(:rbac) { true }
   let(:files) { {} }
+  let(:local_tiller_enabled) { true }
 
   it_behaves_like 'helm command generator' do
     let(:commands) do
@@ -21,9 +22,7 @@ describe Gitlab::Kubernetes::Helm::DeleteCommand do
   end
 
   context 'tillerless feature disabled' do
-    before do
-      stub_feature_flags(managed_apps_local_tiller: false)
-    end
+    let(:local_tiller_enabled) { false }
 
     it_behaves_like 'helm command generator' do
       let(:commands) do
diff --git a/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb
index 05d9b63d12b..61b8eb30b42 100644
--- a/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/init_command_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::Kubernetes::Helm::InitCommand do
-  subject(:init_command) { described_class.new(name: application.name, files: files, rbac: rbac) }
+  subject(:init_command) { described_class.new(name: application.name, files: files, rbac: rbac, local_tiller_enabled: false) }
 
   let(:application) { create(:clusters_applications_helm) }
   let(:rbac) { false }
diff --git a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
index abd29e97505..6fc91300f5b 100644
--- a/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
@@ -12,7 +12,8 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
       version: version,
       repository: repository,
       preinstall: preinstall,
-      postinstall: postinstall
+      postinstall: postinstall,
+      local_tiller_enabled: local_tiller_enabled
     )
   end
 
@@ -22,6 +23,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
   let(:version) { '1.2.3' }
   let(:preinstall) { nil }
   let(:postinstall) { nil }
+  let(:local_tiller_enabled) { true }
 
   it_behaves_like 'helm command generator' do
     let(:commands) do
@@ -51,9 +53,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
   end
 
   context 'tillerless feature disabled' do
-    before do
-      stub_feature_flags(managed_apps_local_tiller: false)
-    end
+    let(:local_tiller_enabled) { false }
 
     let(:tls_flags) do
       <<~EOS.squish
diff --git a/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb
index eee842fa7d6..8d965a25f84 100644
--- a/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/patch_command_spec.rb
@@ -7,6 +7,7 @@ describe Gitlab::Kubernetes::Helm::PatchCommand do
   let(:repository) { 'https://repository.example.com' }
   let(:rbac) { false }
   let(:version) { '1.2.3' }
+  let(:local_tiller_enabled) { true }
 
   subject(:patch_command) do
     described_class.new(
@@ -15,14 +16,13 @@ describe Gitlab::Kubernetes::Helm::PatchCommand do
       rbac: rbac,
       files: files,
       version: version,
-      repository: repository
+      repository: repository,
+      local_tiller_enabled: local_tiller_enabled
     )
   end
 
   context 'when local tiller feature is disabled' do
-    before do
-      stub_feature_flags(managed_apps_local_tiller: false)
-    end
+    let(:local_tiller_enabled) { false }
 
     let(:tls_flags) do
       <<~EOS.squish
diff --git a/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb
index 981bb4e4abf..3773c428713 100644
--- a/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/reset_command_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::Kubernetes::Helm::ResetCommand do
-  subject(:reset_command) { described_class.new(name: name, rbac: rbac, files: files) }
+  subject(:reset_command) { described_class.new(name: name, rbac: rbac, files: files, local_tiller_enabled: false) }
 
   let(:rbac) { true }
   let(:name) { 'helm' }
diff --git a/spec/lib/gitlab/kubernetes/network_policy_spec.rb b/spec/lib/gitlab/kubernetes/network_policy_spec.rb
index f23d215a9a1..5a920d78436 100644
--- a/spec/lib/gitlab/kubernetes/network_policy_spec.rb
+++ b/spec/lib/gitlab/kubernetes/network_policy_spec.rb
@@ -39,28 +39,30 @@ describe Gitlab::Kubernetes::NetworkPolicy do
 
   describe '.from_yaml' do
     let(:manifest) do
-      <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: example-name
-  namespace: example-namespace
-spec:
-  podSelector:
-    matchLabels:
-      role: db
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - namespaceSelector:
-        matchLabels:
-          project: myproject
+      <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        metadata:
+          name: example-name
+          namespace: example-namespace
+          labels:
+            app: foo
+        spec:
+          podSelector:
+            matchLabels:
+              role: db
+          policyTypes:
+          - Ingress
+          ingress:
+          - from:
+            - namespaceSelector:
+                matchLabels:
+                  project: myproject
       POLICY
     end
     let(:resource) do
       ::Kubeclient::Resource.new(
-        metadata: { name: name, namespace: namespace },
+        metadata: { name: name, namespace: namespace, labels: { app: 'foo' } },
         spec: { podSelector: pod_selector, policyTypes: %w(Ingress), ingress: ingress, egress: nil }
       )
     end
@@ -83,20 +85,20 @@ spec:
 
     context 'with manifest without metadata' do
       let(:manifest) do
-        <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-spec:
-  podSelector:
-    matchLabels:
-      role: db
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - namespaceSelector:
-        matchLabels:
-          project: myproject
+        <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        spec:
+          podSelector:
+            matchLabels:
+              role: db
+          policyTypes:
+          - Ingress
+          ingress:
+          - from:
+            - namespaceSelector:
+                matchLabels:
+                  project: myproject
         POLICY
       end
 
@@ -105,12 +107,12 @@ spec:
 
     context 'with manifest without spec' do
       let(:manifest) do
-        <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: example-name
-  namespace: example-namespace
+        <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        metadata:
+          name: example-name
+          namespace: example-namespace
         POLICY
       end
 
@@ -119,24 +121,24 @@ metadata:
 
     context 'with disallowed class' do
       let(:manifest) do
-        <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: example-name
-  namespace: example-namespace
-  creationTimestamp: 2020-04-14T00:08:30Z
-spec:
-  podSelector:
-    matchLabels:
-      role: db
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - namespaceSelector:
-        matchLabels:
-          project: myproject
+        <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        metadata:
+          name: example-name
+          namespace: example-namespace
+          creationTimestamp: 2020-04-14T00:08:30Z
+        spec:
+          podSelector:
+            matchLabels:
+              role: db
+          policyTypes:
+          - Ingress
+          ingress:
+          - from:
+            - namespaceSelector:
+                matchLabels:
+                  project: myproject
         POLICY
       end
 
@@ -147,13 +149,16 @@ spec:
   describe '.from_resource' do
     let(:resource) do
       ::Kubeclient::Resource.new(
-        metadata: { name: name, namespace: namespace, creationTimestamp: '2020-04-14T00:08:30Z', resourceVersion: '4990' },
+        metadata: {
+          name: name, namespace: namespace, creationTimestamp: '2020-04-14T00:08:30Z',
+          labels: { app: 'foo' }, resourceVersion: '4990'
+        },
         spec: { podSelector: pod_selector, policyTypes: %w(Ingress), ingress: ingress, egress: nil }
       )
     end
     let(:generated_resource) do
       ::Kubeclient::Resource.new(
-        metadata: { name: name, namespace: namespace },
+        metadata: { name: name, namespace: namespace, labels: { app: 'foo' } },
         spec: { podSelector: pod_selector, policyTypes: %w(Ingress), ingress: ingress, egress: nil }
       )
     end
@@ -213,7 +218,9 @@ spec:
             metadata: { name: name, namespace: namespace },
             spec: { podSelector: pod_selector, policyTypes: %w(Ingress Egress), ingress: ingress, egress: egress }
           }.deep_stringify_keys
-        )
+        ),
+        is_autodevops: false,
+        is_enabled: true
       }
     end
 
@@ -221,4 +228,167 @@ spec:
 
     it { is_expected.to eq(json_policy) }
   end
+
+  describe '#autodevops?' do
+    subject { policy.autodevops? }
+
+    let(:chart) { nil }
+    let(:policy) do
+      described_class.new(
+        name: name,
+        namespace: namespace,
+        labels: { chart: chart },
+        pod_selector: pod_selector,
+        ingress: ingress
+      )
+    end
+
+    it { is_expected.to be false }
+
+    context 'with non-autodevops chart' do
+      let(:chart) { 'foo' }
+
+      it { is_expected.to be false }
+    end
+
+    context 'with autodevops chart' do
+      let(:chart) { 'auto-deploy-app-0.6.0' }
+
+      it { is_expected.to be true }
+    end
+  end
+
+  describe '#enabled?' do
+    subject { policy.enabled? }
+
+    let(:pod_selector) { nil }
+    let(:policy) do
+      described_class.new(
+        name: name,
+        namespace: namespace,
+        pod_selector: pod_selector,
+        ingress: ingress
+      )
+    end
+
+    it { is_expected.to be true }
+
+    context 'with empty pod_selector' do
+      let(:pod_selector) { {} }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with nil matchLabels in pod_selector' do
+      let(:pod_selector) { { matchLabels: nil } }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with empty matchLabels in pod_selector' do
+      let(:pod_selector) { { matchLabels: {} } }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with disabled_by label in matchLabels in pod_selector' do
+      let(:pod_selector) do
+        { matchLabels: { Gitlab::Kubernetes::NetworkPolicy::DISABLED_BY_LABEL => 'gitlab' } }
+      end
+
+      it { is_expected.to be false }
+    end
+  end
+
+  describe '#enable' do
+    subject { policy.enabled? }
+
+    let(:pod_selector) { nil }
+    let(:policy) do
+      described_class.new(
+        name: name,
+        namespace: namespace,
+        pod_selector: pod_selector,
+        ingress: ingress
+      )
+    end
+
+    before do
+      policy.enable
+    end
+
+    it { is_expected.to be true }
+
+    context 'with empty pod_selector' do
+      let(:pod_selector) { {} }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with nil matchLabels in pod_selector' do
+      let(:pod_selector) { { matchLabels: nil } }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with empty matchLabels in pod_selector' do
+      let(:pod_selector) { { matchLabels: {} } }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with disabled_by label in matchLabels in pod_selector' do
+      let(:pod_selector) do
+        { matchLabels: { Gitlab::Kubernetes::NetworkPolicy::DISABLED_BY_LABEL => 'gitlab' } }
+      end
+
+      it { is_expected.to be true }
+    end
+  end
+
+  describe '#disable' do
+    subject { policy.enabled? }
+
+    let(:pod_selector) { nil }
+    let(:policy) do
+      described_class.new(
+        name: name,
+        namespace: namespace,
+        pod_selector: pod_selector,
+        ingress: ingress
+      )
+    end
+
+    before do
+      policy.disable
+    end
+
+    it { is_expected.to be false }
+
+    context 'with empty pod_selector' do
+      let(:pod_selector) { {} }
+
+      it { is_expected.to be false }
+    end
+
+    context 'with nil matchLabels in pod_selector' do
+      let(:pod_selector) { { matchLabels: nil } }
+
+      it { is_expected.to be false }
+    end
+
+    context 'with empty matchLabels in pod_selector' do
+      let(:pod_selector) { { matchLabels: {} } }
+
+      it { is_expected.to be false }
+    end
+
+    context 'with disabled_by label in matchLabels in pod_selector' do
+      let(:pod_selector) do
+        { matchLabels: { Gitlab::Kubernetes::NetworkPolicy::DISABLED_BY_LABEL => 'gitlab' } }
+      end
+
+      it { is_expected.to be false }
+    end
+  end
 end
diff --git a/spec/lib/gitlab/lfs_token_spec.rb b/spec/lib/gitlab/lfs_token_spec.rb
index b2fd7bdd307..58a3767b242 100644
--- a/spec/lib/gitlab/lfs_token_spec.rb
+++ b/spec/lib/gitlab/lfs_token_spec.rb
@@ -3,6 +3,13 @@
 require 'spec_helper'
 
 describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
+  let_it_be(:user)       { create(:user) }
+  let_it_be(:project)    { create(:project) }
+  let_it_be(:deploy_key) { create(:deploy_key) }
+
+  let(:actor)     { user }
+  let(:lfs_token) { described_class.new(actor) }
+
   describe '#token' do
     shared_examples 'a valid LFS token' do
       it 'returns a computed token' do
@@ -10,14 +17,11 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
 
         expect(token).not_to be_nil
         expect(token).to be_a String
-        expect(described_class.new(actor).token_valid?(token)).to be_truthy
+        expect(described_class.new(actor).token_valid?(token)).to be true
       end
     end
 
     context 'when the actor is a user' do
-      let(:actor) { create(:user, username: 'test_user_lfs_1') }
-      let(:lfs_token) { described_class.new(actor) }
-
       it_behaves_like 'a valid LFS token'
 
       it 'returns the correct username' do
@@ -30,9 +34,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
     end
 
     context 'when the actor is a key' do
-      let(:user) { create(:user, username: 'test_user_lfs_2') }
-      let(:actor) { create(:key, user: user) }
-      let(:lfs_token) { described_class.new(actor) }
+      let_it_be(:actor) { create(:key, user: user) }
 
       it_behaves_like 'a valid LFS token'
 
@@ -46,10 +48,8 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
     end
 
     context 'when the actor is a deploy key' do
+      let(:actor) { deploy_key }
       let(:actor_id) { 1 }
-      let(:actor) { create(:deploy_key) }
-      let(:project) { create(:project) }
-      let(:lfs_token) { described_class.new(actor) }
 
       before do
         allow(actor).to receive(:id).and_return(actor_id)
@@ -74,45 +74,45 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
   end
 
   describe '#token_valid?' do
-    let(:actor) { create(:user, username: 'test_user_lfs_1') }
-    let(:lfs_token) { described_class.new(actor) }
-
     context 'where the token is invalid' do
       context "because it's junk" do
         it 'returns false' do
-          expect(lfs_token.token_valid?('junk')).to be_falsey
+          expect(lfs_token.token_valid?('junk')).to be false
         end
       end
 
       context "because it's been fiddled with" do
         it 'returns false' do
           fiddled_token = lfs_token.token.tap { |token| token[0] = 'E' }
-          expect(lfs_token.token_valid?(fiddled_token)).to be_falsey
+
+          expect(lfs_token.token_valid?(fiddled_token)).to be false
         end
       end
 
-      context "because it was generated with a different secret" do
+      context 'because it was generated with a different secret' do
         it 'returns false' do
           different_actor = create(:user, username: 'test_user_lfs_2')
           different_secret_token = described_class.new(different_actor).token
-          expect(lfs_token.token_valid?(different_secret_token)).to be_falsey
+
+          expect(lfs_token.token_valid?(different_secret_token)).to be false
         end
       end
 
       context "because it's expired" do
         it 'returns false' do
           expired_token = lfs_token.token
-          # Needs to be at least 1860 seconds, because the default expiry is
-          # 1800 seconds with an additional 60 second leeway.
-          Timecop.freeze(Time.now + 1865) do
-            expect(lfs_token.token_valid?(expired_token)).to be_falsey
+
+          # Needs to be at least LfsToken::DEFAULT_EXPIRE_TIME + 60 seconds
+          # in order to check whether it is valid 1 minute after it has expired
+          Timecop.freeze(Time.now + described_class::DEFAULT_EXPIRE_TIME + 60) do
+            expect(lfs_token.token_valid?(expired_token)).to be false
           end
         end
       end
 
       context 'where the token is valid' do
         it 'returns true' do
-          expect(lfs_token.token_valid?(lfs_token.token)).to be_truthy
+          expect(lfs_token.token_valid?(lfs_token.token)).to be true
         end
       end
 
@@ -121,7 +121,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
           let(:actor) { create(:user, :blocked) }
 
           it 'returns false' do
-            expect(lfs_token.token_valid?(lfs_token.token)).to be_falsey
+            expect(lfs_token.token_valid?(lfs_token.token)).to be false
           end
         end
 
@@ -129,7 +129,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
           let(:actor) { create(:user, password_expires_at: 1.minute.ago) }
 
           it 'returns false' do
-            expect(lfs_token.token_valid?(lfs_token.token)).to be_falsey
+            expect(lfs_token.token_valid?(lfs_token.token)).to be false
           end
         end
       end
@@ -143,7 +143,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
           let(:actor) { create(:user, :blocked) }
 
           it 'returns false' do
-            expect(lfs_token.token_valid?(lfs_token.token)).to be_falsey
+            expect(lfs_token.token_valid?(lfs_token.token)).to be false
           end
         end
 
@@ -151,7 +151,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
           let(:actor) { create(:user, password_expires_at: 1.minute.ago) }
 
           it 'returns true' do
-            expect(lfs_token.token_valid?(lfs_token.token)).to be_truthy
+            expect(lfs_token.token_valid?(lfs_token.token)).to be true
           end
         end
       end
@@ -159,27 +159,21 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
   end
 
   describe '#deploy_key_pushable?' do
-    let(:lfs_token) { described_class.new(actor) }
-
     context 'when actor is not a DeployKey' do
-      let(:actor) { create(:user) }
-      let(:project) { create(:project) }
-
       it 'returns false' do
-        expect(lfs_token.deploy_key_pushable?(project)).to be_falsey
+        expect(lfs_token.deploy_key_pushable?(project)).to be false
       end
     end
 
     context 'when actor is a DeployKey' do
-      let(:deploy_keys_project) { create(:deploy_keys_project, can_push: can_push) }
-      let(:project) { deploy_keys_project.project }
+      let(:deploy_keys_project) { create(:deploy_keys_project, project: project, can_push: can_push) }
       let(:actor) { deploy_keys_project.deploy_key }
 
       context 'but the DeployKey cannot push to the project' do
         let(:can_push) { false }
 
         it 'returns false' do
-          expect(lfs_token.deploy_key_pushable?(project)).to be_falsey
+          expect(lfs_token.deploy_key_pushable?(project)).to be false
         end
       end
 
@@ -187,27 +181,23 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
         let(:can_push) { true }
 
         it 'returns true' do
-          expect(lfs_token.deploy_key_pushable?(project)).to be_truthy
+          expect(lfs_token.deploy_key_pushable?(project)).to be true
         end
       end
     end
   end
 
   describe '#type' do
-    let(:lfs_token) { described_class.new(actor) }
-
     context 'when actor is not a User' do
-      let(:actor) { create(:deploy_key) }
+      let(:actor) { deploy_key }
 
-      it 'returns false' do
+      it 'returns :lfs_deploy_token type' do
         expect(lfs_token.type).to eq(:lfs_deploy_token)
       end
     end
 
     context 'when actor is a User' do
-      let(:actor) { create(:user) }
-
-      it 'returns false' do
+      it 'returns :lfs_token type' do
         expect(lfs_token.type).to eq(:lfs_token)
       end
     end
@@ -215,8 +205,6 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
 
   describe '#authentication_payload' do
     it 'returns a Hash designed for gitlab-shell' do
-      actor = create(:user)
-      lfs_token = described_class.new(actor)
       repo_http_path = 'http://localhost/user/repo.git'
       authentication_payload = lfs_token.authentication_payload(repo_http_path)
 
diff --git a/spec/lib/gitlab/lograge/custom_options_spec.rb b/spec/lib/gitlab/lograge/custom_options_spec.rb
index 7ae8baa31b5..ebf150d21ef 100644
--- a/spec/lib/gitlab/lograge/custom_options_spec.rb
+++ b/spec/lib/gitlab/lograge/custom_options_spec.rb
@@ -13,21 +13,16 @@ describe Gitlab::Lograge::CustomOptions do
       }
     end
 
-    let(:event) do
-      ActiveSupport::Notifications::Event.new(
-        'test',
-        1,
-        2,
-        'transaction_id',
-        {
-          params: params,
-          user_id: 'test',
-          cf_ray: SecureRandom.hex,
-          cf_request_id: SecureRandom.hex,
-          metadata: { 'meta.user' => 'jane.doe' }
-        }
-      )
+    let(:event_payload) do
+      {
+        params: params,
+        user_id: 'test',
+        cf_ray: SecureRandom.hex,
+        cf_request_id: SecureRandom.hex,
+        metadata: { 'meta.user' => 'jane.doe' }
+      }
     end
+    let(:event) { ActiveSupport::Notifications::Event.new('test', 1, 2, 'transaction_id', event_payload) }
 
     subject { described_class.call(event) }
 
@@ -49,6 +44,18 @@ describe Gitlab::Lograge::CustomOptions do
       end
     end
 
+    context 'with transaction' do
+      let(:transaction) { Gitlab::Metrics::WebTransaction.new({}) }
+
+      before do
+        allow(Gitlab::Metrics::Transaction).to receive(:current).and_return(transaction)
+      end
+
+      it 'adds db counters' do
+        expect(subject).to include(:db_count, :db_write_count, :db_cached_count)
+      end
+    end
+
     it 'adds the user id' do
       expect(subject[:user_id]).to eq('test')
     end
@@ -63,19 +70,23 @@ describe Gitlab::Lograge::CustomOptions do
     end
 
     context 'when metadata is missing' do
-      let(:event) do
-        ActiveSupport::Notifications::Event.new(
-          'test',
-          1,
-          2,
-          'transaction_id',
-          { params: {} }
-        )
-      end
+      let(:event_payload) { { params: {} } }
 
       it 'does not break' do
         expect { subject }.not_to raise_error
       end
     end
+
+    context 'when correlation_id is overriden' do
+      let(:correlation_id_key) { Labkit::Correlation::CorrelationId::LOG_KEY }
+
+      before do
+        event_payload[correlation_id_key] = '123456'
+      end
+
+      it 'sets the overriden value' do
+        expect(subject[correlation_id_key]).to eq('123456')
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/looping_batcher_spec.rb b/spec/lib/gitlab/looping_batcher_spec.rb
deleted file mode 100644
index b03e969c1e7..00000000000
--- a/spec/lib/gitlab/looping_batcher_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Gitlab::LoopingBatcher, :use_clean_rails_memory_store_caching do
-  describe '#next_range!' do
-    let(:model_class) { LfsObject }
-    let(:key) { 'looping_batcher_spec' }
-    let(:batch_size) { 2 }
-
-    subject { described_class.new(model_class, key: key, batch_size: batch_size).next_range! }
-
-    context 'when there are no records' do
-      it { is_expected.to be_nil }
-    end
-
-    context 'when there are records' do
-      let!(:records) { create_list(model_class.underscore, 3) }
-
-      context 'when it has never been called before' do
-        it { is_expected.to be_a Range }
-
-        it 'starts from the beginning' do
-          expect(subject.first).to eq(1)
-        end
-
-        it 'ends at a full batch' do
-          expect(subject.last).to eq(records.second.id)
-        end
-
-        context 'when the batch size is greater than the number of records' do
-          let(:batch_size) { 5 }
-
-          it 'ends at the last ID' do
-            expect(subject.last).to eq(records.last.id)
-          end
-        end
-      end
-
-      context 'when it was called before' do
-        context 'when the previous batch included the end of the table' do
-          before do
-            described_class.new(model_class, key: key, batch_size: model_class.count).next_range!
-          end
-
-          it 'starts from the beginning' do
-            expect(subject).to eq(1..records.second.id)
-          end
-        end
-
-        context 'when the previous batch did not include the end of the table' do
-          before do
-            described_class.new(model_class, key: key, batch_size: model_class.count - 1).next_range!
-          end
-
-          it 'starts after the previous batch' do
-            expect(subject).to eq(records.last.id..records.last.id)
-          end
-        end
-
-        context 'if cache is cleared' do
-          it 'starts from the beginning' do
-            Rails.cache.clear
-
-            expect(subject).to eq(1..records.second.id)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/metrics/dashboard/finder_spec.rb b/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
index d772b0c7a5f..2703339d89c 100644
--- a/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/finder_spec.rb
@@ -142,7 +142,7 @@ describe Gitlab::Metrics::Dashboard::Finder, :use_clean_rails_memory_store_cachi
 
   describe '.find_all_paths' do
     let(:all_dashboard_paths) { described_class.find_all_paths(project) }
-    let(:system_dashboard) { { path: system_dashboard_path, display_name: 'Default', default: true, system_dashboard: true } }
+    let(:system_dashboard) { { path: system_dashboard_path, display_name: 'Default dashboard', default: true, system_dashboard: true } }
 
     it 'includes only the system dashboard by default' do
       expect(all_dashboard_paths).to eq([system_dashboard])
@@ -163,7 +163,7 @@ describe Gitlab::Metrics::Dashboard::Finder, :use_clean_rails_memory_store_cachi
       let(:self_monitoring_dashboard) do
         {
           path: self_monitoring_dashboard_path,
-          display_name: 'Default',
+          display_name: 'Default dashboard',
           default: true,
           system_dashboard: false
         }
diff --git a/spec/lib/gitlab/metrics/dashboard/processor_spec.rb b/spec/lib/gitlab/metrics/dashboard/processor_spec.rb
index b2fca0b5954..7250cefb9ff 100644
--- a/spec/lib/gitlab/metrics/dashboard/processor_spec.rb
+++ b/spec/lib/gitlab/metrics/dashboard/processor_spec.rb
@@ -16,7 +16,8 @@ describe Gitlab::Metrics::Dashboard::Processor do
         Gitlab::Metrics::Dashboard::Stages::EndpointInserter,
         Gitlab::Metrics::Dashboard::Stages::Sorter,
         Gitlab::Metrics::Dashboard::Stages::AlertsInserter,
-        Gitlab::Metrics::Dashboard::Stages::PanelIdsInserter
+        Gitlab::Metrics::Dashboard::Stages::PanelIdsInserter,
+        Gitlab::Metrics::Dashboard::Stages::UrlValidator
       ]
     end
 
@@ -201,6 +202,27 @@ describe Gitlab::Metrics::Dashboard::Processor do
 
       it_behaves_like 'errors with message', 'Each "metric" must define one of :query or :query_range'
     end
+
+    describe 'validating links' do
+      context 'when the links contain a blocked url' do
+        let(:dashboard_yml_links) do
+          [{ 'url' => 'http://1.1.1.1.1' }, { 'url' => 'https://gitlab.com' }]
+        end
+
+        let(:expected) do
+          [{ url: '' }, { url: 'https://gitlab.com' }]
+        end
+
+        before do
+          stub_env('RSPEC_ALLOW_INVALID_URLS', 'false')
+          dashboard_yml['links'] = dashboard_yml_links
+        end
+
+        it 'replaces the blocked url with an empty string' do
+          expect(dashboard[:links]).to eq(expected)
+        end
+      end
+    end
   end
 
   private
diff --git a/spec/lib/gitlab/metrics/elasticsearch_rack_middleware_spec.rb b/spec/lib/gitlab/metrics/elasticsearch_rack_middleware_spec.rb
new file mode 100644
index 00000000000..305768ef060
--- /dev/null
+++ b/spec/lib/gitlab/metrics/elasticsearch_rack_middleware_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Metrics::ElasticsearchRackMiddleware do
+  let(:app) { double(:app, call: 'app call result') }
+  let(:middleware) { described_class.new(app) }
+  let(:env) { {} }
+  let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
+
+  describe '#call' do
+    let(:counter) { instance_double(Prometheus::Client::Counter, increment: nil) }
+    let(:histogram) { instance_double(Prometheus::Client::Histogram, observe: nil) }
+    let(:elasticsearch_query_time) { 0.1 }
+    let(:elasticsearch_requests_count) { 2 }
+
+    before do
+      allow(Gitlab::Instrumentation::ElasticsearchTransport).to receive(:query_time) { elasticsearch_query_time }
+      allow(Gitlab::Instrumentation::ElasticsearchTransport).to receive(:get_request_count) { elasticsearch_requests_count }
+
+      allow(Gitlab::Metrics).to receive(:counter)
+        .with(:http_elasticsearch_requests_total,
+              an_instance_of(String),
+              Gitlab::Metrics::Transaction::BASE_LABELS)
+        .and_return(counter)
+
+      allow(Gitlab::Metrics).to receive(:histogram)
+        .with(:http_elasticsearch_requests_duration_seconds,
+              an_instance_of(String),
+              Gitlab::Metrics::Transaction::BASE_LABELS,
+              described_class::HISTOGRAM_BUCKETS)
+        .and_return(histogram)
+
+      allow(Gitlab::Metrics).to receive(:current_transaction).and_return(transaction)
+    end
+
+    it 'calls the app' do
+      expect(middleware.call(env)).to eq('app call result')
+    end
+
+    it 'records elasticsearch metrics' do
+      expect(counter).to receive(:increment).with(transaction.labels, elasticsearch_requests_count)
+      expect(histogram).to receive(:observe).with(transaction.labels, elasticsearch_query_time)
+
+      middleware.call(env)
+    end
+
+    it 'records elasticsearch metrics if an error is raised' do
+      expect(counter).to receive(:increment).with(transaction.labels, elasticsearch_requests_count)
+      expect(histogram).to receive(:observe).with(transaction.labels, elasticsearch_query_time)
+
+      allow(app).to receive(:call).with(env).and_raise(StandardError)
+
+      expect { middleware.call(env) }.to raise_error(StandardError)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/metrics/method_call_spec.rb b/spec/lib/gitlab/metrics/method_call_spec.rb
index 229db67ec88..035d875258c 100644
--- a/spec/lib/gitlab/metrics/method_call_spec.rb
+++ b/spec/lib/gitlab/metrics/method_call_spec.rb
@@ -26,7 +26,7 @@ describe Gitlab::Metrics::MethodCall do
 
       context 'prometheus instrumentation is enabled' do
         before do
-          Feature.get(:prometheus_metrics_method_instrumentation).enable
+          stub_feature_flags(prometheus_metrics_method_instrumentation: true)
         end
 
         around do |example|
@@ -50,7 +50,7 @@ describe Gitlab::Metrics::MethodCall do
 
       context 'prometheus instrumentation is disabled' do
         before do
-          Feature.get(:prometheus_metrics_method_instrumentation).disable
+          stub_feature_flags(prometheus_metrics_method_instrumentation: false)
         end
 
         it 'observes using NullMetric' do
diff --git a/spec/lib/gitlab/metrics/methods_spec.rb b/spec/lib/gitlab/metrics/methods_spec.rb
index bca94deb1d8..5cf8db55142 100644
--- a/spec/lib/gitlab/metrics/methods_spec.rb
+++ b/spec/lib/gitlab/metrics/methods_spec.rb
@@ -104,7 +104,7 @@ describe Gitlab::Metrics::Methods do
 
         context 'when feature is enabled' do
           before do
-            Feature.get(feature_name).enable
+            stub_feature_flags(feature_name => true)
           end
 
           it "initializes #{metric_type} metric" do
@@ -118,7 +118,7 @@ describe Gitlab::Metrics::Methods do
 
         context 'when feature is disabled' do
           before do
-            Feature.get(feature_name).disable
+            stub_feature_flags(feature_name => false)
           end
 
           it "returns NullMetric" do
diff --git a/spec/lib/gitlab/metrics/redis_rack_middleware_spec.rb b/spec/lib/gitlab/metrics/redis_rack_middleware_spec.rb
new file mode 100644
index 00000000000..f2f36ccad20
--- /dev/null
+++ b/spec/lib/gitlab/metrics/redis_rack_middleware_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Metrics::RedisRackMiddleware do
+  let(:app) { double(:app) }
+  let(:middleware) { described_class.new(app) }
+  let(:env) { {} }
+  let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
+
+  before do
+    allow(app).to receive(:call).with(env).and_return('wub wub')
+  end
+
+  describe '#call' do
+    let(:counter) { double(Prometheus::Client::Counter, increment: nil) }
+    let(:histogram) { double(Prometheus::Client::Histogram, observe: nil) }
+    let(:redis_query_time) { 0.1 }
+    let(:redis_requests_count) { 2 }
+
+    before do
+      allow(Gitlab::Instrumentation::Redis).to receive(:query_time) { redis_query_time }
+      allow(Gitlab::Instrumentation::Redis).to receive(:get_request_count) { redis_requests_count }
+
+      allow(Gitlab::Metrics).to receive(:counter)
+        .with(:http_redis_requests_total,
+              an_instance_of(String),
+              Gitlab::Metrics::Transaction::BASE_LABELS)
+        .and_return(counter)
+
+      allow(Gitlab::Metrics).to receive(:histogram)
+        .with(:http_redis_requests_duration_seconds,
+              an_instance_of(String),
+              Gitlab::Metrics::Transaction::BASE_LABELS,
+              Gitlab::Instrumentation::Redis::QUERY_TIME_BUCKETS)
+        .and_return(histogram)
+
+      allow(Gitlab::Metrics).to receive(:current_transaction).and_return(transaction)
+    end
+
+    it 'calls the app' do
+      expect(middleware.call(env)).to eq('wub wub')
+    end
+
+    it 'records redis metrics' do
+      expect(counter).to receive(:increment).with(transaction.labels, redis_requests_count)
+      expect(histogram).to receive(:observe).with(transaction.labels, redis_query_time)
+
+      middleware.call(env)
+    end
+
+    it 'records redis metrics if an error is raised' do
+      expect(counter).to receive(:increment).with(transaction.labels, redis_requests_count)
+      expect(histogram).to receive(:observe).with(transaction.labels, redis_query_time)
+
+      allow(app).to receive(:call).with(env).and_raise(StandardError)
+
+      expect { middleware.call(env) }.to raise_error(StandardError)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/metrics/samplers/database_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/database_sampler_spec.rb
index fdf3b5bd045..087a0bfbac5 100644
--- a/spec/lib/gitlab/metrics/samplers/database_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/database_sampler_spec.rb
@@ -3,7 +3,17 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Samplers::DatabaseSampler do
-  subject { described_class.new(described_class::SAMPLING_INTERVAL_SECONDS) }
+  subject { described_class.new }
+
+  describe '#interval' do
+    it 'samples every five seconds by default' do
+      expect(subject.interval).to eq(5)
+    end
+
+    it 'samples at other intervals if requested' do
+      expect(described_class.new(11).interval).to eq(11)
+    end
+  end
 
   describe '#sample' do
     before do
diff --git a/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
index 1097d26c320..df63f2ebe28 100644
--- a/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Samplers::PumaSampler do
-  subject { described_class.new(5) }
+  subject { described_class.new }
 
   let(:null_metric) { double('null_metric', set: nil, observe: nil) }
 
@@ -11,6 +11,16 @@ describe Gitlab::Metrics::Samplers::PumaSampler do
     allow(Gitlab::Metrics::NullMetric).to receive(:instance).and_return(null_metric)
   end
 
+  describe '#interval' do
+    it 'samples every five seconds by default' do
+      expect(subject.interval).to eq(5)
+    end
+
+    it 'samples at other intervals if requested' do
+      expect(described_class.new(11).interval).to eq(11)
+    end
+  end
+
   describe '#sample' do
     before do
       expect(subject).to receive(:puma_stats).and_return(puma_stats)
diff --git a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
index ead650a27f0..9fc8dd10922 100644
--- a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Samplers::RubySampler do
-  let(:sampler) { described_class.new(5) }
+  let(:sampler) { described_class.new }
   let(:null_metric) { double('null_metric', set: nil, observe: nil) }
 
   before do
@@ -18,6 +18,16 @@ describe Gitlab::Metrics::Samplers::RubySampler do
     end
   end
 
+  describe '#interval' do
+    it 'samples every sixty seconds by default' do
+      expect(subject.interval).to eq(60)
+    end
+
+    it 'samples at other intervals if requested' do
+      expect(described_class.new(11).interval).to eq(11)
+    end
+  end
+
   describe '#sample' do
     it 'adds a metric containing the process resident memory bytes' do
       expect(Gitlab::Metrics::System).to receive(:memory_usage_rss).and_return(9000)
diff --git a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
index 67336cf83e6..ea9e8fa6795 100644
--- a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
+++ b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
@@ -10,17 +10,19 @@ describe Gitlab::Metrics::SidekiqMiddleware do
     it 'tracks the transaction' do
       worker = double(:worker, class: double(:class, name: 'TestWorker'))
 
-      expect(Gitlab::Metrics::BackgroundTransaction).to receive(:new)
-        .with(worker.class)
-        .and_call_original
+      expect_next_instance_of(Gitlab::Metrics::BackgroundTransaction) do |transaction|
+        expect(transaction).to receive(:set).with(:sidekiq_queue_duration, instance_of(Float))
+        expect(transaction).to receive(:increment).with(:db_count, 1)
+      end
 
-      expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:set)
-        .with(:sidekiq_queue_duration, instance_of(Float))
+      middleware.call(worker, message, :test) do
+        ActiveRecord::Base.connection.execute('SELECT pg_sleep(0.1);')
+      end
 
-      middleware.call(worker, message, :test) { nil }
+      expect(message).to include(:db_count, :db_write_count, :db_cached_count)
     end
 
-    it 'tracks the transaction (for messages without `enqueued_at`)' do
+    it 'tracks the transaction (for messages without `enqueued_at`)', :aggregate_failures do
       worker = double(:worker, class: double(:class, name: 'TestWorker'))
 
       expect(Gitlab::Metrics::BackgroundTransaction).to receive(:new)
@@ -33,7 +35,7 @@ describe Gitlab::Metrics::SidekiqMiddleware do
       middleware.call(worker, {}, :test) { nil }
     end
 
-    it 'tracks any raised exceptions' do
+    it 'tracks any raised exceptions', :aggregate_failures do
       worker = double(:worker, class: double(:class, name: 'TestWorker'))
 
       expect_any_instance_of(Gitlab::Metrics::Transaction)
@@ -44,6 +46,8 @@ describe Gitlab::Metrics::SidekiqMiddleware do
 
       expect { middleware.call(worker, message, :test) }
         .to raise_error(RuntimeError)
+
+      expect(message).to include(:db_count, :db_write_count, :db_cached_count)
     end
   end
 end
diff --git a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
index 1624cea8bda..a78d048908d 100644
--- a/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
+++ b/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
@@ -6,10 +6,15 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
   let(:env) { {} }
   let(:transaction) { Gitlab::Metrics::WebTransaction.new(env) }
   let(:subscriber)  { described_class.new }
+  let(:payload) { { sql: 'SELECT * FROM users WHERE id = 10' } }
 
   let(:event) do
-    double(:event, duration: 2,
-                   payload:  { sql: 'SELECT * FROM users WHERE id = 10' })
+    double(
+      :event,
+      name: 'sql.active_record',
+      duration: 2,
+      payload:  payload
+    )
   end
 
   describe '#sql' do
@@ -23,6 +28,63 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
     end
 
     describe 'with a current transaction' do
+      shared_examples 'read only query' do
+        it 'increments only db count value' do
+          allow(subscriber).to receive(:current_transaction)
+                                  .at_least(:once)
+                                  .and_return(transaction)
+
+          expect(transaction).to receive(:increment)
+                                   .with(:db_count, 1)
+
+          expect(transaction).not_to receive(:increment)
+                                       .with(:db_cached_count, 1)
+
+          expect(transaction).not_to receive(:increment)
+                                       .with(:db_write_count, 1)
+
+          subscriber.sql(event)
+        end
+      end
+
+      shared_examples 'write query' do
+        it 'increments db_write_count and db_count value' do
+          expect(subscriber).to receive(:current_transaction)
+                                  .at_least(:once)
+                                  .and_return(transaction)
+
+          expect(transaction).to receive(:increment)
+                                   .with(:db_count, 1)
+
+          expect(transaction).not_to receive(:increment)
+                                       .with(:db_cached_count, 1)
+
+          expect(transaction).to receive(:increment)
+                                       .with(:db_write_count, 1)
+
+          subscriber.sql(event)
+        end
+      end
+
+      shared_examples 'cached query' do
+        it 'increments db_cached_count and db_count value' do
+          expect(subscriber).to receive(:current_transaction)
+                                  .at_least(:once)
+                                  .and_return(transaction)
+
+          expect(transaction).to receive(:increment)
+                                   .with(:db_count, 1)
+
+          expect(transaction).to receive(:increment)
+                                       .with(:db_cached_count, 1)
+
+          expect(transaction).not_to receive(:increment)
+                                   .with(:db_write_count, 1)
+
+          subscriber.sql(event)
+        end
+      end
+
       it 'observes sql_duration metric' do
         expect(subscriber).to receive(:current_transaction)
                                 .at_least(:once)
@@ -31,18 +93,66 @@ describe Gitlab::Metrics::Subscribers::ActiveRecord do
         subscriber.sql(event)
       end
 
-      it 'increments the :sql_duration value' do
-        expect(subscriber).to receive(:current_transaction)
-          .at_least(:once)
-          .and_return(transaction)
+      it_behaves_like 'read only query'
+
+      context 'with select for update sql event' do
+        let(:payload) { { sql: 'SELECT * FROM users WHERE id = 10 FOR UPDATE' } }
 
-        expect(transaction).to receive(:increment)
-          .with(:sql_duration, 2, false)
+        it_behaves_like 'write query'
+      end
 
-        expect(transaction).to receive(:increment)
-          .with(:sql_count, 1, false)
+      context 'with common table expression' do
+        context 'with insert' do
+          let(:payload) { { sql: 'WITH archived_rows AS (SELECT * FROM users WHERE archived = true) INSERT INTO products_log SELECT * FROM archived_rows' } }
 
-        subscriber.sql(event)
+          it_behaves_like 'write query'
+        end
+
+        context 'with only select' do
+          let(:payload) { { sql: 'WITH active_milestones AS (SELECT COUNT(*), state FROM milestones GROUP BY state) SELECT * FROM active_milestones' } }
+
+          it_behaves_like 'read only query'
+        end
+      end
+
+      context 'with delete sql event' do
+        let(:payload) { { sql: 'DELETE FROM users where id = 10' } }
+
+        it_behaves_like 'write query'
+      end
+
+      context 'with insert sql event' do
+        let(:payload) { { sql: 'INSERT INTO project_ci_cd_settings (project_id) SELECT id FROM projects' } }
+
+        it_behaves_like 'write query'
+      end
+
+      context 'with update sql event' do
+        let(:payload) { { sql: 'UPDATE users SET admin = true WHERE id = 10' } }
+
+        it_behaves_like 'write query'
+      end
+
+      context 'with cached payload ' do
+        let(:payload) do
+          {
+            sql: 'SELECT * FROM users WHERE id = 10',
+            cached: true
+          }
+        end
+
+        it_behaves_like 'cached query'
+      end
+
+      context 'with cached payload name' do
+        let(:payload) do
+          {
+           sql: 'SELECT * FROM users WHERE id = 10',
+           name: 'CACHE'
+          }
+        end
+
+        it_behaves_like 'cached query'
       end
 
       context 'events are internal to Rails or irrelevant' do
diff --git a/spec/lib/gitlab/metrics/transaction_spec.rb b/spec/lib/gitlab/metrics/transaction_spec.rb
index cf46fa3e91c..693ec3cb7e7 100644
--- a/spec/lib/gitlab/metrics/transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/transaction_spec.rb
@@ -65,18 +65,16 @@ describe Gitlab::Metrics::Transaction do
   describe '#add_event' do
     let(:prometheus_metric) { instance_double(Prometheus::Client::Counter, increment: nil) }
 
-    before do
-      allow(described_class).to receive(:transaction_metric).and_return(prometheus_metric)
-    end
-
     it 'adds a metric' do
       expect(prometheus_metric).to receive(:increment)
+      expect(described_class).to receive(:fetch_metric).with(:counter, :gitlab_transaction_event_meow_total).and_return(prometheus_metric)
 
       transaction.add_event(:meow)
     end
 
     it 'allows tracking of custom tags' do
       expect(prometheus_metric).to receive(:increment).with(hash_including(animal: "dog"))
+      expect(described_class).to receive(:fetch_metric).with(:counter, :gitlab_transaction_event_bau_total).and_return(prometheus_metric)
 
       transaction.add_event(:bau, animal: 'dog')
     end
@@ -84,6 +82,7 @@ describe Gitlab::Metrics::Transaction do
     context 'with sensitive tags' do
       before do
         transaction.add_event(:baubau, **sensitive_tags.merge(sane: 'yes'))
+        allow(described_class).to receive(:transaction_metric).and_return(prometheus_metric)
       end
 
       it 'filters tags' do
@@ -93,4 +92,37 @@ describe Gitlab::Metrics::Transaction do
       end
     end
   end
+
+  describe '#increment' do
+    let(:prometheus_metric) { instance_double(Prometheus::Client::Counter, increment: nil) }
+
+    it 'adds a metric' do
+      expect(prometheus_metric).to receive(:increment).with(hash_including(:action, :controller), 1)
+      expect(described_class).to receive(:fetch_metric).with(:counter, :gitlab_transaction_meow_total).and_return(prometheus_metric)
+
+      transaction.increment(:meow, 1)
+    end
+  end
+
+  describe '#set' do
+    let(:prometheus_metric) { instance_double(Prometheus::Client::Gauge, set: nil) }
+
+    it 'adds a metric' do
+      expect(prometheus_metric).to receive(:set).with(hash_including(:action, :controller), 1)
+      expect(described_class).to receive(:fetch_metric).with(:gauge, :gitlab_transaction_meow_total).and_return(prometheus_metric)
+
+      transaction.set(:meow, 1)
+    end
+  end
+
+  describe '#get' do
+    let(:prometheus_metric) { instance_double(Prometheus::Client::Counter, get: nil) }
+
+    it 'gets a metric' do
+      expect(described_class).to receive(:fetch_metric).with(:counter, :gitlab_transaction_meow_total).and_return(prometheus_metric)
+      expect(prometheus_metric).to receive(:get)
+
+      transaction.get(:meow, :counter)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/middleware/handle_ip_spoof_attack_error_spec.rb b/spec/lib/gitlab/middleware/handle_ip_spoof_attack_error_spec.rb
new file mode 100644
index 00000000000..ccfc5e93887
--- /dev/null
+++ b/spec/lib/gitlab/middleware/handle_ip_spoof_attack_error_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Middleware::HandleIpSpoofAttackError do
+  let(:spoof_error) { ActionDispatch::RemoteIp::IpSpoofAttackError.new('sensitive') }
+  let(:standard_error) { StandardError.new('error') }
+  let(:app) { -> (env) { env.is_a?(Exception) ? raise(env) : env } }
+
+  subject(:middleware) { described_class.new(app) }
+
+  it 'passes through the response from a valid upstream' do
+    expect(middleware.call(:response)).to eq(:response)
+  end
+
+  it 'translates an ActionDispatch::IpSpoofAttackError to a 400 response' do
+    expect(middleware.call(spoof_error))
+      .to eq([400, { 'Content-Type' => 'text/plain' }, ['Bad Request']])
+  end
+
+  it 'passes through the exception raised by an invalid upstream' do
+    expect { middleware.call(standard_error) }.to raise_error(standard_error)
+  end
+end
diff --git a/spec/lib/gitlab/monitor/demo_projects_spec.rb b/spec/lib/gitlab/monitor/demo_projects_spec.rb
new file mode 100644
index 00000000000..92024a3f9c1
--- /dev/null
+++ b/spec/lib/gitlab/monitor/demo_projects_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Monitor::DemoProjects do
+  describe '#primary_keys' do
+    subject { described_class.primary_keys }
+
+    it 'fetches primary_keys when on gitlab.com' do
+      allow(Gitlab).to receive(:com?).and_return(true)
+      allow(Gitlab).to receive(:staging?).and_return(false)
+
+      expect(subject).to eq(Gitlab::Monitor::DemoProjects::DOT_COM_IDS)
+    end
+
+    it 'fetches primary_keys when on staging' do
+      allow(Gitlab).to receive(:com?).and_return(true)
+      allow(Gitlab).to receive(:staging?).and_return(true)
+
+      expect(subject).to eq(Gitlab::Monitor::DemoProjects::STAGING_IDS)
+    end
+
+    it 'fetches all keys when in the dev or test env' do
+      project = create(:project)
+      allow(Gitlab).to receive(:dev_or_test_env?).and_return(true)
+
+      expect(subject).to eq([project.id])
+    end
+
+    it 'falls back on empty array' do
+      stub_config_setting(url: 'https://helloworld')
+      allow(Gitlab).to receive(:dev_or_test_env?).and_return(false)
+
+      expect(subject).to eq([])
+    end
+  end
+end
diff --git a/spec/lib/gitlab/no_cache_headers_spec.rb b/spec/lib/gitlab/no_cache_headers_spec.rb
index f011b55006e..c7a73f0e2dc 100644
--- a/spec/lib/gitlab/no_cache_headers_spec.rb
+++ b/spec/lib/gitlab/no_cache_headers_spec.rb
@@ -3,8 +3,11 @@
 require 'spec_helper'
 
 describe Gitlab::NoCacheHeaders do
-  class NoCacheTester
-    include Gitlab::NoCacheHeaders
+  before do
+    stub_const('NoCacheTester', Class.new)
+    NoCacheTester.class_eval do
+      include Gitlab::NoCacheHeaders
+    end
   end
 
   describe "#no_cache_headers" do
diff --git a/spec/lib/gitlab/pagination/keyset/request_context_spec.rb b/spec/lib/gitlab/pagination/keyset/request_context_spec.rb
index 6cd5ccc3c19..d6d5340f38b 100644
--- a/spec/lib/gitlab/pagination/keyset/request_context_spec.rb
+++ b/spec/lib/gitlab/pagination/keyset/request_context_spec.rb
@@ -60,9 +60,7 @@ describe Gitlab::Pagination::Keyset::RequestContext do
     it 'sets Links header with same host/path as the original request' do
       orig_uri = URI.parse(request_context.request.url)
 
-      expect(request_context).to receive(:header) do |name, header|
-        expect(name).to eq('Links')
-
+      expect(request_context).to receive(:header).twice do |name, header|
         first_link, _ = /<([^>]+)>; rel="next"/.match(header).captures
 
         uri = URI.parse(first_link)
@@ -77,9 +75,7 @@ describe Gitlab::Pagination::Keyset::RequestContext do
     it 'sets Links header with a link to the next page' do
       orig_uri = URI.parse(request_context.request.url)
 
-      expect(request_context).to receive(:header) do |name, header|
-        expect(name).to eq('Links')
-
+      expect(request_context).to receive(:header).twice do |name, header|
         first_link, _ = /<([^>]+)>; rel="next"/.match(header).captures
 
         query = CGI.parse(URI.parse(first_link).query)
@@ -97,9 +93,7 @@ describe Gitlab::Pagination::Keyset::RequestContext do
       it 'sets Links header with a link to the next page' do
         orig_uri = URI.parse(request_context.request.url)
 
-        expect(request_context).to receive(:header) do |name, header|
-          expect(name).to eq('Links')
-
+        expect(request_context).to receive(:header).twice do |name, header|
           first_link, _ = /<([^>]+)>; rel="next"/.match(header).captures
 
           query = CGI.parse(URI.parse(first_link).query)
diff --git a/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb b/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb
index 5f0e1f40231..b1c7f73489d 100644
--- a/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb
+++ b/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb
@@ -7,7 +7,7 @@ describe Gitlab::Patch::ActionDispatchJourneyFormatter do
   let(:project) { create(:project, namespace: group) }
   let(:pipeline) { create(:ci_empty_pipeline, project: project) }
   let(:url) { Gitlab::Routing.url_helpers.project_pipeline_url(project, pipeline) }
-  let(:expected_path) { "#{project.full_path}/pipelines/#{pipeline.id}" }
+  let(:expected_path) { "#{project.full_path}/-/pipelines/#{pipeline.id}" }
 
   context 'custom implementation of #missing_keys' do
     before do
diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index 50b045c6aad..ac506c49100 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -3,6 +3,11 @@
 require 'spec_helper'
 
 describe Gitlab::PathRegex do
+  let(:starting_with_namespace) { %r{^/\*namespace_id/:(project_)?id} }
+  let(:non_param_parts) { %r{[^:*][a-z\-_/]*} }
+  let(:any_other_path_part) { %r{[a-z\-_/:]*} }
+  let(:wildcard_segment) { /\*/ }
+
   # Pass in a full path to remove the format segment:
   # `/ci/lint(.:format)` -> `/ci/lint`
   def without_format(path)
@@ -14,7 +19,7 @@ describe Gitlab::PathRegex do
   # `/*namespace_id/:project_id/builds/artifacts/*ref_name_and_path`
   #    -> 'builds/artifacts'
   def path_before_wildcard(path)
-    path = path.gsub(STARTING_WITH_NAMESPACE, "")
+    path = path.gsub(starting_with_namespace, "")
     path_segments = path.split('/').reject(&:empty?)
     wildcard_index = path_segments.index { |segment| parameter?(segment) }
 
@@ -121,13 +126,9 @@ describe Gitlab::PathRegex do
   # - Followed by one or more path-parts not starting with `:` or `*`
   # - Followed by a path-part that includes a wildcard parameter `*`
   # At the time of writing these routes match: http://rubular.com/r/Rv2pDE5Dvw
-  STARTING_WITH_NAMESPACE = %r{^/\*namespace_id/:(project_)?id}.freeze
-  NON_PARAM_PARTS = %r{[^:*][a-z\-_/]*}.freeze
-  ANY_OTHER_PATH_PART = %r{[a-z\-_/:]*}.freeze
-  WILDCARD_SEGMENT = /\*/.freeze
   let(:namespaced_wildcard_routes) do
     routes_without_format.select do |p|
-      p =~ %r{#{STARTING_WITH_NAMESPACE}/#{NON_PARAM_PARTS}/#{ANY_OTHER_PATH_PART}#{WILDCARD_SEGMENT}}
+      p =~ %r{#{starting_with_namespace}/#{non_param_parts}/#{any_other_path_part}#{wildcard_segment}}
     end
   end
 
@@ -145,16 +146,14 @@ describe Gitlab::PathRegex do
     end.uniq
   end
 
-  STARTING_WITH_GROUP = %r{^/groups/\*(group_)?id/}.freeze
+  let(:starting_with_group) { %r{^/groups/\*(group_)?id/} }
   let(:group_routes) do
-    routes_without_format.select do |path|
-      path =~ STARTING_WITH_GROUP
-    end
+    routes_without_format.grep(starting_with_group)
   end
 
   let(:paths_after_group_id) do
     group_routes.map do |route|
-      route.gsub(STARTING_WITH_GROUP, '').split('/').first
+      route.gsub(starting_with_group, '').split('/').first
     end.uniq
   end
 
diff --git a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb
index b2a63e4f026..4935ef1bd90 100644
--- a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb
@@ -66,7 +66,7 @@ describe Gitlab::PhabricatorImport::Cache::Map, :clean_gitlab_redis_cache do
       end
 
       expect(set_data).to eq({ classname: 'Issue', database_id: issue.id.to_s })
-      expect(ttl).to be_within(1.second).of(StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+      expect(ttl).to be_within(1.second).of(Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
     end
   end
 
diff --git a/spec/lib/gitlab/process_memory_cache/helper_spec.rb b/spec/lib/gitlab/process_memory_cache/helper_spec.rb
new file mode 100644
index 00000000000..890642b1d5e
--- /dev/null
+++ b/spec/lib/gitlab/process_memory_cache/helper_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::ProcessMemoryCache::Helper, :use_clean_rails_memory_store_caching do
+  let(:minimal_test_class) do
+    Class.new do
+      include Gitlab::ProcessMemoryCache::Helper
+
+      def cached_content
+        fetch_memory_cache(:cached_content_instance_key) { expensive_computation }
+      end
+
+      def clear_cached_content
+        invalidate_memory_cache(:cached_content_instance_key)
+      end
+    end
+  end
+
+  before do
+    stub_const("MinimalTestClass", minimal_test_class)
+  end
+
+  subject { MinimalTestClass.new }
+
+  describe '.fetch_memory_cache' do
+    it 'memoizes the result' do
+      is_expected.to receive(:expensive_computation).once.and_return(1)
+
+      2.times do
+        expect(subject.cached_content).to eq(1)
+      end
+    end
+
+    it 'resets the cache when the shared key is missing', :aggregate_failures do
+      expect(Rails.cache).to receive(:read).with(:cached_content_instance_key).twice.and_return(nil)
+      is_expected.to receive(:expensive_computation).thrice.and_return(1, 2, 3)
+
+      3.times do |index|
+        expect(subject.cached_content).to eq(index + 1)
+      end
+    end
+  end
+
+  describe '.invalidate_memory_cache' do
+    it 'invalidates the cache' do
+      is_expected.to receive(:expensive_computation).twice.and_return(1, 2)
+
+      expect { subject.clear_cached_content }.to change { subject.cached_content }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/project_search_results_spec.rb b/spec/lib/gitlab/project_search_results_spec.rb
index 64f80b5d736..aa52949ed60 100644
--- a/spec/lib/gitlab/project_search_results_spec.rb
+++ b/spec/lib/gitlab/project_search_results_spec.rb
@@ -34,7 +34,7 @@ describe Gitlab::ProjectSearchResults do
       'blobs'      | :limited_blobs_count    | max_limited_count
       'notes'      | :limited_notes_count    | max_limited_count
       'wiki_blobs' | :wiki_blobs_count       | '1234'
-      'commits'    | :commits_count          | '1234'
+      'commits'    | :commits_count          | max_limited_count
       'projects'   | :limited_projects_count | max_limited_count
       'unknown'    | nil                     | nil
     end
@@ -386,6 +386,19 @@ describe Gitlab::ProjectSearchResults do
     end
   end
 
+  describe '#commits_count' do
+    let(:project) { create(:project, :public, :repository) }
+
+    it 'limits the number of commits requested' do
+      expect(project.repository)
+        .to receive(:find_commits_by_message)
+        .with(anything, anything, anything, described_class::COUNT_LIMIT)
+        .and_call_original
+
+      described_class.new(user, project, '.').commits_count
+    end
+  end
+
   # Examples for commit access level test
   #
   # params:
@@ -452,6 +465,54 @@ describe Gitlab::ProjectSearchResults do
   end
 
   describe 'commit search' do
+    context 'pagination' do
+      let(:project) { create(:project, :public, :repository) }
+
+      it 'returns the correct results for each page' do
+        expect(results_page(1)).to contain_exactly(commit('b83d6e391c22777fca1ed3012fce84f633d7fed0'))
+
+        expect(results_page(2)).to contain_exactly(commit('498214de67004b1da3d820901307bed2a68a8ef6'))
+
+        expect(results_page(3)).to contain_exactly(commit('1b12f15a11fc6e62177bef08f47bc7b5ce50b141'))
+      end
+
+      it 'returns the correct number of pages' do
+        expect(results_page(1).total_pages).to eq(project.repository.commit_count)
+      end
+
+      context 'limiting requested commits' do
+        context 'on page 1' do
+          it "limits to #{described_class::COUNT_LIMIT}" do
+            expect(project.repository)
+              .to receive(:find_commits_by_message)
+              .with(anything, anything, anything, described_class::COUNT_LIMIT)
+              .and_call_original
+
+            results_page(1)
+          end
+        end
+
+        context 'on subsequent pages' do
+          it "limits to #{described_class::COUNT_LIMIT} plus page offset" do
+            expect(project.repository)
+              .to receive(:find_commits_by_message)
+              .with(anything, anything, anything, described_class::COUNT_LIMIT + 1)
+              .and_call_original
+
+            results_page(2)
+          end
+        end
+      end
+
+      def results_page(page)
+        described_class.new(user, project, '.').objects('commits', per_page: 1, page: page)
+      end
+
+      def commit(hash)
+        project.repository.commit(hash)
+      end
+    end
+
     context 'by commit message' do
       let(:project) { create(:project, :public, :repository) }
       let(:commit) { project.repository.commit('59e29889be61e6e0e5e223bfa9ac2721d31605b8') }
@@ -469,6 +530,18 @@ describe Gitlab::ProjectSearchResults do
         expect(commits).to be_empty
       end
 
+      context 'when repository_ref is provided' do
+        let(:message) { 'Feature added' }
+        let(:repository_ref) { 'feature' }
+
+        it 'searches in the specified ref' do
+          commits = described_class.new(user, project, message, repository_ref).objects('commits')
+
+          # This commit is unique to the feature branch
+          expect(commits).to contain_exactly(project.repository.commit('0b4bc9a49b562e85de7cc9e834518ea6828729b9'))
+        end
+      end
+
       it_behaves_like 'access restricted commits' do
         let(:search_phrase) { message }
         let(:commit) { project.repository.commit('59e29889be61e6e0e5e223bfa9ac2721d31605b8') }
diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb
index aa18a1a843c..35f79042df0 100644
--- a/spec/lib/gitlab/project_template_spec.rb
+++ b/spec/lib/gitlab/project_template_spec.rb
@@ -4,34 +4,17 @@ require 'spec_helper'
 
 describe Gitlab::ProjectTemplate do
   describe '.all' do
-    it 'returns a all templates' do
-      expected = [
-        described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'),
-        described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'),
-        described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'),
-        described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go template for use with iOS Swift apps.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'),
-        described_class.new('dotnetcore', '.NET Core', 'A .NET Core console application template, customizable for any .NET Core project', 'https://gitlab.com/gitlab-org/project-templates/dotnetcore'),
-        described_class.new('android', 'Android', 'A ready-to-go template for use with Android apps.', 'https://gitlab.com/gitlab-org/project-templates/android'),
-        described_class.new('gomicro', 'Go Micro', 'Go Micro is a framework for micro service development.', 'https://gitlab.com/gitlab-org/project-templates/go-micro'),
-        described_class.new('gatsby', 'Pages/Gatsby', 'Everything you need to get started using a Gatsby site.', 'https://gitlab.com/pages/gatsby'),
-        described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'),
-        described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'),
-        described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'),
-        described_class.new('gitbook', 'Pages/GitBook', 'Everything you need to get started using a GitBook Pages site.', 'https://gitlab.com/pages/gitbook'),
-        described_class.new('hexo', 'Pages/Hexo', 'Everything you need to get started using a Hexo Pages site.', 'https://gitlab.com/pages/hexo'),
-        described_class.new('sse_middleman', 'Static Site Editor/Middleman', _('Middleman project with Static Site Editor support'), 'https://gitlab.com/gitlab-org/project-templates/static-site-editor-middleman'),
-        described_class.new('nfhugo', 'Netlify/Hugo', _('A Hugo site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfhugo'),
-        described_class.new('nfjekyll', 'Netlify/Jekyll', _('A Jekyll site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfjekyll'),
-        described_class.new('nfplainhtml', 'Netlify/Plain HTML', _('A plain HTML site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfplain-html'),
-        described_class.new('nfgitbook', 'Netlify/GitBook', _('A GitBook site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfgitbook'),
-        described_class.new('nfhexo', 'Netlify/Hexo', _('A Hexo site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfhexo'),
-        described_class.new('salesforcedx', 'SalesforceDX', _('A project boilerplate for Salesforce App development with Salesforce Developer tools.'), 'https://gitlab.com/gitlab-org/project-templates/salesforcedx'),
-        described_class.new('serverless_framework', 'Serverless Framework/JS', _('A basic page and serverless function that uses AWS Lambda, AWS API Gateway, and GitLab Pages'), 'https://gitlab.com/gitlab-org/project-templates/serverless-framework', 'illustrations/logos/serverless_framework.svg'),
-        described_class.new('cluster_management', 'GitLab Cluster Management', _('An example project for managing Kubernetes clusters integrated with GitLab.'), 'https://gitlab.com/gitlab-org/project-templates/cluster-management')
+    it 'returns all templates' do
+      expected = %w[
+        rails spring express iosswift dotnetcore android
+        gomicro gatsby hugo jekyll plainhtml gitbook
+        hexo sse_middleman nfhugo nfjekyll nfplainhtml
+        nfgitbook nfhexo salesforcedx serverless_framework
+        cluster_management
       ]
 
       expect(described_class.all).to be_an(Array)
-      expect(described_class.all).to eq(expected)
+      expect(described_class.all.map(&:name)).to match_array(expected)
     end
   end
 
diff --git a/spec/lib/gitlab/prometheus/query_variables_spec.rb b/spec/lib/gitlab/prometheus/query_variables_spec.rb
index d8f8a2b7e7c..7dfa4de35d6 100644
--- a/spec/lib/gitlab/prometheus/query_variables_spec.rb
+++ b/spec/lib/gitlab/prometheus/query_variables_spec.rb
@@ -7,8 +7,9 @@ describe Gitlab::Prometheus::QueryVariables do
     let(:project) { environment.project }
     let(:environment) { create(:environment) }
     let(:slug) { environment.slug }
+    let(:params) { {} }
 
-    subject { described_class.call(environment) }
+    subject { described_class.call(environment, params) }
 
     it { is_expected.to include(ci_environment_slug: slug) }
     it { is_expected.to include(ci_project_name: project.name) }
@@ -53,5 +54,42 @@ describe Gitlab::Prometheus::QueryVariables do
         it { is_expected.to include(kube_namespace: kube_namespace) }
       end
     end
+
+    context '__range' do
+      context 'when start_time and end_time are present' do
+        let(:params) do
+          {
+            start_time: Time.rfc3339('2020-05-29T07:23:05.008Z'),
+            end_time: Time.rfc3339('2020-05-29T15:23:05.008Z')
+          }
+        end
+
+        it { is_expected.to include(__range: "#{8.hours.to_i}s") }
+      end
+
+      context 'when start_time and end_time are not present' do
+        it { is_expected.to include(__range: nil) }
+      end
+
+      context 'when end_time is not present' do
+        let(:params) do
+          {
+            start_time: Time.rfc3339('2020-05-29T07:23:05.008Z')
+          }
+        end
+
+        it { is_expected.to include(__range: nil) }
+      end
+
+      context 'when start_time is not present' do
+        let(:params) do
+          {
+            end_time: Time.rfc3339('2020-05-29T07:23:05.008Z')
+          }
+        end
+
+        it { is_expected.to include(__range: nil) }
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/prometheus_client_spec.rb b/spec/lib/gitlab/prometheus_client_spec.rb
index 4ff53b50a50..749192e5795 100644
--- a/spec/lib/gitlab/prometheus_client_spec.rb
+++ b/spec/lib/gitlab/prometheus_client_spec.rb
@@ -171,6 +171,58 @@ describe Gitlab::PrometheusClient do
     end
   end
 
+  describe '#aggregate' do
+    let(:query) { 'avg (metric) by (job)' }
+    let(:prometheus_response) do
+      {
+        "status": "success",
+        "data": {
+          "resultType": "vector",
+          "result": [
+            {
+              "metric": { "job" => "gitlab-rails" },
+              "value": [1488758662.506, "1"]
+            },
+            {
+              "metric": { "job" => "gitlab-sidekiq" },
+              "value": [1488758662.506, "2"]
+            }
+          ]
+        }
+      }
+    end
+    let(:query_url) { prometheus_query_with_time_url(query, Time.now.utc) }
+
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    context 'when request returns vector results' do
+      it 'returns data from the API call grouped by labels' do
+        req_stub = stub_prometheus_request(query_url, body: prometheus_response)
+
+        expect(subject.aggregate(query)).to eq({
+          { "job" => "gitlab-rails" } => 1,
+          { "job" => "gitlab-sidekiq" } => 2
+        })
+        expect(req_stub).to have_been_requested
+      end
+    end
+
+    context 'when request returns no data' do
+      it 'returns {}' do
+        req_stub = stub_prometheus_request(query_url, body: prometheus_empty_body('vector'))
+
+        expect(subject.aggregate(query)).to eq({})
+        expect(req_stub).to have_been_requested
+      end
+    end
+
+    it_behaves_like 'failure response' do
+      let(:execute_query) { subject.aggregate(query) }
+    end
+  end
+
   describe '#series' do
     let(:query_url) { prometheus_series_url('series_name', 'other_service') }
 
diff --git a/spec/lib/gitlab/redis/wrapper_spec.rb b/spec/lib/gitlab/redis/wrapper_spec.rb
index e4cc42130db..51a36eb062c 100644
--- a/spec/lib/gitlab/redis/wrapper_spec.rb
+++ b/spec/lib/gitlab/redis/wrapper_spec.rb
@@ -18,7 +18,21 @@ describe Gitlab::Redis::Wrapper do
   let(:config_env_variable_url) {"TEST_GITLAB_REDIS_URL"}
   let(:class_redis_url) { Gitlab::Redis::Wrapper::DEFAULT_REDIS_URL }
 
-  include_examples "redis_shared_examples"
+  include_examples "redis_shared_examples" do
+    before do
+      allow(described_class).to receive(:instrumentation_class) do
+        ::Gitlab::Instrumentation::Redis::Cache
+      end
+    end
+  end
+
+  describe '.instrumentation_class' do
+    it 'raises a NotImplementedError' do
+      expect(described_class).to receive(:instrumentation_class).and_call_original
+
+      expect { described_class.instrumentation_class }.to raise_error(NotImplementedError)
+    end
+  end
 
   describe '.config_file_path' do
     it 'returns the absolute path to the configuration file' do
diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb
index 8ea591c6f74..dd16f3c6035 100644
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
@@ -204,7 +204,7 @@ describe Gitlab::ReferenceExtractor do
                                       issue]
       end
 
-      it 'returns only Jira issues if the internal one does not exists' do
+      it 'returns only Jira issues if the internal one does not exist' do
         subject.analyze("JIRA-123 and FOOBAR-4567 and ##{non_existing_record_iid}")
         expect(subject.issues).to eq [ExternalIssue.new('JIRA-123', project),
                                       ExternalIssue.new('FOOBAR-4567', project)]
@@ -236,7 +236,7 @@ describe Gitlab::ReferenceExtractor do
         expect(subject.issues).to eq([issue])
       end
 
-      it 'does not return any issue if the internal one does not exists' do
+      it 'does not return any issue if the internal one does not exist' do
         subject.analyze("JIRA-123 and FOOBAR-4567 and #999")
         expect(subject.issues).to be_empty
       end
@@ -296,7 +296,7 @@ describe Gitlab::ReferenceExtractor do
     end
 
     it 'returns all supported prefixes' do
-      expect(prefixes.keys.uniq).to match_array(%w(@ # ~ % ! $ &))
+      expect(prefixes.keys.uniq).to match_array(%w(@ # ~ % ! $ & *iteration:))
     end
 
     it 'does not allow one prefix for multiple referables if not allowed specificly' do
diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb
index 9e596400904..2f220272651 100644
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 
 describe Gitlab::Regex do
   shared_examples_for 'project/group name regex' do
@@ -163,4 +163,136 @@ describe Gitlab::Regex do
     it { is_expected.not_to match('-foo-') }
     it { is_expected.not_to match('foo/bar') }
   end
+
+  describe '.conan_file_name_regex' do
+    subject { described_class.conan_file_name_regex }
+
+    it { is_expected.to match('conanfile.py') }
+    it { is_expected.to match('conan_package.tgz') }
+    it { is_expected.not_to match('foo.txt') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.conan_package_reference_regex' do
+    subject { described_class.conan_package_reference_regex }
+
+    it { is_expected.to match('123456789') }
+    it { is_expected.to match('asdf1234') }
+    it { is_expected.not_to match('@foo') }
+    it { is_expected.not_to match('0/pack+age/1@1/0') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.conan_revision_regex' do
+    subject { described_class.conan_revision_regex }
+
+    it { is_expected.to match('0') }
+    it { is_expected.not_to match('foo') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.conan_recipe_component_regex' do
+    subject { described_class.conan_recipe_component_regex }
+
+    let(:fifty_one_characters) { 'f_a' * 17}
+
+    it { is_expected.to match('foobar') }
+    it { is_expected.to match('foo_bar') }
+    it { is_expected.to match('foo+bar') }
+    it { is_expected.to match('_foo+bar-baz+1.0') }
+    it { is_expected.to match('1.0.0') }
+    it { is_expected.not_to match('-foo_bar') }
+    it { is_expected.not_to match('+foo_bar') }
+    it { is_expected.not_to match('.foo_bar') }
+    it { is_expected.not_to match('foo@bar') }
+    it { is_expected.not_to match('foo/bar') }
+    it { is_expected.not_to match('!!()()') }
+    it { is_expected.not_to match(fifty_one_characters) }
+  end
+
+  describe '.package_name_regex' do
+    subject { described_class.package_name_regex }
+
+    it { is_expected.to match('123') }
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('foo/bar') }
+    it { is_expected.to match('@foo/bar') }
+    it { is_expected.to match('com/mycompany/app/my-app') }
+    it { is_expected.to match('my-package/1.0.0@my+project+path/beta') }
+    it { is_expected.not_to match('my-package/1.0.0@@@@@my+project+path/beta') }
+    it { is_expected.not_to match('$foo/bar') }
+    it { is_expected.not_to match('@foo/@/bar') }
+    it { is_expected.not_to match('@@foo/bar') }
+    it { is_expected.not_to match('my package name') }
+    it { is_expected.not_to match('!!()()') }
+    it { is_expected.not_to match("..\n..\foo") }
+  end
+
+  describe '.maven_file_name_regex' do
+    subject { described_class.maven_file_name_regex }
+
+    it { is_expected.to match('123') }
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('foo+bar-2_0.pom') }
+    it { is_expected.to match('foo.bar.baz-2.0-20190901.47283-1.jar') }
+    it { is_expected.to match('maven-metadata.xml') }
+    it { is_expected.to match('1.0-SNAPSHOT') }
+    it { is_expected.not_to match('../../foo') }
+    it { is_expected.not_to match('..\..\foo') }
+    it { is_expected.not_to match('%2f%2e%2e%2f%2essh%2fauthorized_keys') }
+    it { is_expected.not_to match('$foo/bar') }
+    it { is_expected.not_to match('my file name') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.maven_path_regex' do
+    subject { described_class.maven_path_regex }
+
+    it { is_expected.to match('123') }
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('foo/bar') }
+    it { is_expected.to match('@foo/bar') }
+    it { is_expected.to match('com/mycompany/app/my-app') }
+    it { is_expected.to match('com/mycompany/app/my-app/1.0-SNAPSHOT') }
+    it { is_expected.to match('com/mycompany/app/my-app/1.0-SNAPSHOT+debian64') }
+    it { is_expected.not_to match('com/mycompany/app/my+app/1.0-SNAPSHOT') }
+    it { is_expected.not_to match('$foo/bar') }
+    it { is_expected.not_to match('@foo/@/bar') }
+    it { is_expected.not_to match('my package name') }
+    it { is_expected.not_to match('!!()()') }
+  end
+
+  describe '.semver_regex' do
+    subject { described_class.semver_regex }
+
+    it { is_expected.to match('1.2.3') }
+    it { is_expected.to match('1.2.3-beta') }
+    it { is_expected.to match('1.2.3-alpha.3') }
+    it { is_expected.not_to match('1') }
+    it { is_expected.not_to match('1.2') }
+    it { is_expected.not_to match('1./2.3') }
+    it { is_expected.not_to match('../../../../../1.2.3') }
+    it { is_expected.not_to match('%2e%2e%2f1.2.3') }
+  end
+
+  describe '.go_package_regex' do
+    subject { described_class.go_package_regex }
+
+    it { is_expected.to match('example.com') }
+    it { is_expected.to match('example.com/foo') }
+    it { is_expected.to match('example.com/foo/bar') }
+    it { is_expected.to match('example.com/foo/bar/baz') }
+    it { is_expected.to match('tl.dr.foo.bar.baz') }
+  end
+
+  describe '.unbounded_semver_regex' do
+    subject { described_class.unbounded_semver_regex }
+
+    it { is_expected.to match('1.2.3') }
+    it { is_expected.to match('1.2.3-beta') }
+    it { is_expected.to match('1.2.3-alpha.3') }
+    it { is_expected.not_to match('1') }
+    it { is_expected.not_to match('1.2') }
+    it { is_expected.not_to match('1./2.3') }
+  end
 end
diff --git a/spec/lib/gitlab/routing_spec.rb b/spec/lib/gitlab/routing_spec.rb
index 965564cb83b..5446d6559fe 100644
--- a/spec/lib/gitlab/routing_spec.rb
+++ b/spec/lib/gitlab/routing_spec.rb
@@ -22,4 +22,25 @@ describe Gitlab::Routing do
       expect(subject).to respond_to(:namespace_project_path)
     end
   end
+
+  describe Gitlab::Routing::LegacyRedirector do
+    subject { described_class.new(:wikis) }
+
+    let(:request) { double(:request, path: path, query_string: '') }
+    let(:path) { '/gitlab-org/gitlab-test/wikis/home' }
+
+    it 'returns "-" scoped url' do
+      expect(subject.call({}, request)).to eq('/gitlab-org/gitlab-test/-/wikis/home')
+    end
+
+    context 'invalid uri characters' do
+      let(:path) { '/gitlab-org/gitlab-test/wikis/home[' }
+
+      it 'raises error' do
+        expect do
+          subject.call({}, request)
+        end.to raise_error(ActionController::RoutingError)
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/rugged_instrumentation_spec.rb b/spec/lib/gitlab/rugged_instrumentation_spec.rb
index 64c0ce1b65e..d6f3fb9be55 100644
--- a/spec/lib/gitlab/rugged_instrumentation_spec.rb
+++ b/spec/lib/gitlab/rugged_instrumentation_spec.rb
@@ -7,10 +7,10 @@ describe Gitlab::RuggedInstrumentation, :request_store do
 
   describe '.query_time' do
     it 'increments query times' do
-      subject.query_time += 0.451
-      subject.query_time += 0.322
+      subject.add_query_time(0.4510004)
+      subject.add_query_time(0.3220004)
 
-      expect(subject.query_time).to be_within(0.001).of(0.773)
+      expect(subject.query_time).to eq(0.773001)
       expect(subject.query_time_ms).to eq(773.0)
     end
   end
diff --git a/spec/lib/gitlab/search_context/builder_spec.rb b/spec/lib/gitlab/search_context/builder_spec.rb
new file mode 100644
index 00000000000..1707b54b273
--- /dev/null
+++ b/spec/lib/gitlab/search_context/builder_spec.rb
@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::SearchContext::Builder, type: :controller do
+  controller(ApplicationController) { }
+
+  subject(:builder) { described_class.new(controller.view_context) }
+
+  shared_examples "has a fluid interface" do
+    it { is_expected.to be_instance_of(described_class) }
+  end
+
+  def expected_project_metadata(project)
+    return {} if project.nil?
+
+    a_hash_including(project_path: project.path,
+                     name: project.name,
+                     issues_path: a_string_including("/issues"),
+                     mr_path: a_string_including("/merge_requests"),
+                     issues_disabled: !project.issues_enabled?)
+  end
+
+  def expected_group_metadata(group)
+    return {} if group.nil?
+
+    a_hash_including(group_path: group.path,
+                     name: group.name,
+                     issues_path: a_string_including("/issues"),
+                     mr_path: a_string_including("/merge_requests"))
+  end
+
+  def expected_search_url(project, group)
+    if project
+      search_path(project_id: project.id)
+    elsif group
+      search_path(group_id: group.id)
+    else
+      search_path
+    end
+  end
+
+  def be_search_context(project: nil, group: nil, snippets: [], ref: nil)
+    group = project ? project.group : group
+    snippets.compact!
+    ref = ref
+
+    have_attributes(
+      project: project,
+      group: group,
+      ref: ref,
+      snippets: snippets,
+      project_metadata: expected_project_metadata(project),
+      group_metadata: expected_group_metadata(group),
+      search_url: expected_search_url(project, group)
+    )
+  end
+
+  describe '#with_project' do
+    let(:project) { create(:project) }
+
+    subject { builder.with_project(project) }
+
+    it_behaves_like "has a fluid interface"
+
+    describe '#build!' do
+      subject(:context) { builder.with_project(project).build! }
+
+      context 'when a project is not owned by a group' do
+        it { is_expected.to be_for_project }
+        it { is_expected.to be_search_context(project: project) }
+      end
+
+      context 'when a project is owned by a group' do
+        let(:project) { create(:project, group: create(:group)) }
+
+        it 'delegates to `#with_group`' do
+          expect(builder).to receive(:with_group).with(project.group)
+          expect(context).to be
+        end
+
+        it { is_expected.to be_search_context(project: project, group: project.group) }
+      end
+    end
+  end
+
+  describe '#with_snippet' do
+    context 'when there is a single snippet' do
+      let(:snippet) { create(:snippet) }
+
+      subject { builder.with_snippet(snippet) }
+
+      it_behaves_like "has a fluid interface"
+
+      describe '#build!' do
+        subject(:context) { builder.with_snippet(snippet).build! }
+
+        it { is_expected.to be_for_snippet }
+        it { is_expected.to be_search_context(snippets: [snippet]) }
+      end
+    end
+
+    context 'when there are multiple snippets' do
+      let(:snippets) { create_list(:snippet, 3) }
+
+      describe '#build!' do
+        subject(:context) do
+          snippets.each(&builder.method(:with_snippet))
+          builder.build!
+        end
+
+        it { is_expected.to be_for_snippet }
+        it { is_expected.to be_search_context(snippets: snippets) }
+      end
+    end
+  end
+
+  describe '#with_group' do
+    let(:group) { create(:group) }
+
+    subject { builder.with_group(group) }
+
+    it_behaves_like "has a fluid interface"
+
+    describe '#build!' do
+      subject(:context) { builder.with_group(group).build! }
+
+      it { is_expected.to be_for_group }
+      it { is_expected.to be_search_context(group: group) }
+    end
+  end
+
+  describe '#with_ref' do
+    let(:ref) { Gitlab::Git::EMPTY_TREE_ID }
+
+    subject { builder.with_ref(ref) }
+
+    it_behaves_like "has a fluid interface"
+
+    describe '#build!' do
+      subject(:context) { builder.with_ref(ref).build! }
+
+      it { is_expected.to be_search_context(ref: ref) }
+    end
+  end
+
+  describe '#build!' do
+    subject(:context) { builder.build! }
+
+    it { is_expected.to be_a(Gitlab::SearchContext) }
+  end
+end
diff --git a/spec/lib/gitlab/search_context/controller_concern_spec.rb b/spec/lib/gitlab/search_context/controller_concern_spec.rb
new file mode 100644
index 00000000000..16784cafb76
--- /dev/null
+++ b/spec/lib/gitlab/search_context/controller_concern_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::SearchContext::ControllerConcern, type: :controller do
+  controller(ApplicationController) do
+    include Gitlab::SearchContext::ControllerConcern
+  end
+
+  let(:project) { nil }
+  let(:group) { nil }
+  let(:snippet) { nil }
+  let(:snippets) { [] }
+  let(:ref) { nil }
+
+  let(:builder) { Gitlab::SearchContext::Builder.new(controller.view_context) }
+
+  subject(:search_context) { controller.search_context }
+
+  def weak_assign(ivar, value)
+    return if value.nil?
+
+    controller.instance_variable_set(ivar.to_sym, value)
+  end
+
+  before do
+    weak_assign(:@project, project)
+    weak_assign(:@group, group)
+    weak_assign(:@ref, ref)
+    weak_assign(:@snippet, snippet)
+    weak_assign(:@snippets, snippets)
+
+    allow(Gitlab::SearchContext::Builder).to receive(:new).and_return(builder)
+  end
+
+  shared_examples 'has the proper context' do
+    it :aggregate_failures do
+      expected_group = project ? project.group : group
+      expected_snippets = [snippet, *snippets].compact
+
+      expect(builder).to receive(:with_project).with(project).and_call_original if project
+      expect(builder).to receive(:with_group).with(expected_group).and_call_original if expected_group
+      expect(builder).to receive(:with_ref).with(ref).and_call_original if ref
+      expected_snippets.each do |snippet|
+        expect(builder).to receive(:with_snippet).with(snippet).and_call_original
+      end
+
+      is_expected.to be_a(Gitlab::SearchContext)
+    end
+  end
+
+  context 'exposing @project' do
+    let(:project) { create(:project) }
+
+    it_behaves_like 'has the proper context'
+
+    context 'when the project is owned by a group' do
+      let(:project) { create(:project, group: create(:group)) }
+
+      it_behaves_like 'has the proper context'
+    end
+  end
+
+  context 'exposing @group' do
+    let(:group) { create(:group) }
+
+    it_behaves_like 'has the proper context'
+  end
+
+  context 'exposing @snippet, @snippets' do
+    let(:snippet) { create(:snippet) }
+    let(:snippets) { create_list(:snippet, 3) }
+
+    it_behaves_like 'has the proper context'
+  end
+
+  context 'exposing @ref' do
+    let(:ref) { Gitlab::Git::EMPTY_TREE_ID }
+
+    it_behaves_like 'has the proper context'
+  end
+end
diff --git a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb
index 80e8da58f23..7a8aba2d396 100644
--- a/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb
+++ b/spec/lib/gitlab/sidekiq_config/cli_methods_spec.rb
@@ -76,7 +76,12 @@ describe Gitlab::SidekiqConfig::CliMethods do
 
   describe '.expand_queues' do
     let(:worker_queues) do
-      ['cronjob:stuck_import_jobs', 'cronjob:stuck_merge_jobs', 'post_receive']
+      [
+        'cronjob:import_stuck_project_import_jobs',
+        'cronjob:jira_import_stuck_jira_import_jobs',
+        'cronjob:stuck_merge_jobs',
+        'post_receive'
+      ]
     end
 
     it 'defaults the value of the second argument to .worker_queues' do
@@ -88,12 +93,22 @@ describe Gitlab::SidekiqConfig::CliMethods do
       allow(described_class).to receive(:worker_queues).and_return(worker_queues)
 
       expect(described_class.expand_queues(['cronjob']))
-        .to contain_exactly('cronjob', 'cronjob:stuck_import_jobs', 'cronjob:stuck_merge_jobs')
+        .to contain_exactly(
+          'cronjob',
+          'cronjob:import_stuck_project_import_jobs',
+          'cronjob:jira_import_stuck_jira_import_jobs',
+          'cronjob:stuck_merge_jobs'
+        )
     end
 
     it 'expands queue namespaces to concrete queue names' do
       expect(described_class.expand_queues(['cronjob'], worker_queues))
-        .to contain_exactly('cronjob', 'cronjob:stuck_import_jobs', 'cronjob:stuck_merge_jobs')
+        .to contain_exactly(
+          'cronjob',
+          'cronjob:import_stuck_project_import_jobs',
+          'cronjob:jira_import_stuck_jira_import_jobs',
+          'cronjob:stuck_merge_jobs'
+        )
     end
 
     it 'lets concrete queue names pass through' do
@@ -117,28 +132,32 @@ describe Gitlab::SidekiqConfig::CliMethods do
           feature_category: :category_a,
           has_external_dependencies: false,
           urgency: :low,
-          resource_boundary: :cpu
+          resource_boundary: :cpu,
+          tags: [:no_disk_io, :git_access]
         },
         {
           name: 'a:2',
           feature_category: :category_a,
           has_external_dependencies: false,
           urgency: :high,
-          resource_boundary: :none
+          resource_boundary: :none,
+          tags: [:git_access]
         },
         {
           name: 'b',
           feature_category: :category_b,
           has_external_dependencies: true,
           urgency: :high,
-          resource_boundary: :memory
+          resource_boundary: :memory,
+          tags: [:no_disk_io]
         },
         {
           name: 'c',
           feature_category: :category_c,
           has_external_dependencies: false,
           urgency: :throttled,
-          resource_boundary: :memory
+          resource_boundary: :memory,
+          tags: []
         }
       ]
     end
@@ -177,6 +196,18 @@ describe Gitlab::SidekiqConfig::CliMethods do
         'resource_boundary=memory|resource_boundary=cpu' | %w(a b c)
         'resource_boundary!=memory,cpu' | %w(a:2)
 
+        # tags
+        'tags=no_disk_io' | %w(a b)
+        'tags=no_disk_io,git_access' | %w(a a:2 b)
+        'tags=no_disk_io|tags=git_access' | %w(a a:2 b)
+        'tags=no_disk_io&tags=git_access' | %w(a)
+        'tags!=no_disk_io' | %w(a:2 c)
+        'tags!=no_disk_io,git_access' | %w(c)
+        'tags=unknown_tag' | []
+        'tags!=no_disk_io' | %w(a:2 c)
+        'tags!=no_disk_io,git_access' | %w(c)
+        'tags!=unknown_tag' | %w(a a:2 b c)
+
         # combinations
         'feature_category=category_a&urgency=high' | %w(a:2)
         'feature_category=category_a&urgency=high|feature_category=category_c' | %w(a:2 c)
diff --git a/spec/lib/gitlab/sidekiq_config/worker_spec.rb b/spec/lib/gitlab/sidekiq_config/worker_spec.rb
index 817755e3507..00343a0264d 100644
--- a/spec/lib/gitlab/sidekiq_config/worker_spec.rb
+++ b/spec/lib/gitlab/sidekiq_config/worker_spec.rb
@@ -13,7 +13,8 @@ describe Gitlab::SidekiqConfig::Worker do
       get_worker_resource_boundary: attributes[:resource_boundary],
       get_urgency: attributes[:urgency],
       worker_has_external_dependencies?: attributes[:has_external_dependencies],
-      idempotent?: attributes[:idempotent]
+      idempotent?: attributes[:idempotent],
+      get_tags: attributes[:tags]
     )
 
     described_class.new(inner_worker, ee: false)
@@ -91,7 +92,8 @@ describe Gitlab::SidekiqConfig::Worker do
         urgency: :low,
         resource_boundary: :memory,
         weight: 2,
-        idempotent: true
+        idempotent: true,
+        tags: []
       }
 
       attributes_b = {
@@ -100,7 +102,8 @@ describe Gitlab::SidekiqConfig::Worker do
         urgency: :high,
         resource_boundary: :unknown,
         weight: 3,
-        idempotent: false
+        idempotent: false,
+        tags: [:no_disk_io]
       }
 
       worker_a = create_worker(queue: 'a', **attributes_a)
diff --git a/spec/lib/gitlab/sidekiq_config_spec.rb b/spec/lib/gitlab/sidekiq_config_spec.rb
index 85de1d029c3..66744d07aaa 100644
--- a/spec/lib/gitlab/sidekiq_config_spec.rb
+++ b/spec/lib/gitlab/sidekiq_config_spec.rb
@@ -18,7 +18,8 @@ describe Gitlab::SidekiqConfig do
 
       expect(queues).to include('post_receive')
       expect(queues).to include('merge')
-      expect(queues).to include('cronjob:stuck_import_jobs')
+      expect(queues).to include('cronjob:import_stuck_project_import_jobs')
+      expect(queues).to include('cronjob:jira_import_stuck_jira_import_jobs')
       expect(queues).to include('mailers')
       expect(queues).to include('default')
     end
diff --git a/spec/lib/gitlab/sidekiq_logging/json_formatter_spec.rb b/spec/lib/gitlab/sidekiq_logging/json_formatter_spec.rb
index 283140d7fdf..10354147cf9 100644
--- a/spec/lib/gitlab/sidekiq_logging/json_formatter_spec.rb
+++ b/spec/lib/gitlab/sidekiq_logging/json_formatter_spec.rb
@@ -14,6 +14,7 @@ describe Gitlab::SidekiqLogging::JSONFormatter do
     let(:hash_input) do
       {
         foo: 1,
+        'class' => 'PostReceive',
         'bar' => 'test',
         'created_at' => timestamp,
         'enqueued_at' => timestamp,
@@ -42,21 +43,47 @@ describe Gitlab::SidekiqLogging::JSONFormatter do
       expect(subject).to eq(expected_output)
     end
 
-    context 'when the job args are bigger than the maximum allowed' do
-      it 'keeps args from the front until they exceed the limit' do
-        half_limit = Gitlab::Utils::LogLimitedArray::MAXIMUM_ARRAY_LENGTH / 2
-        hash_input['args'] = [1, 2, 'a' * half_limit, 'b' * half_limit, 3]
+    it 'removes jobstr from the hash' do
+      hash_input[:jobstr] = 'job string'
 
-        expected_args = hash_input['args'].take(3).map(&:to_s) + ['...']
+      expect(subject).not_to include('jobstr')
+    end
 
-        expect(subject['args']).to eq(expected_args)
-      end
+    it 'does not modify the input hash' do
+      input = { 'args' => [1, 'string'] }
+
+      output = Gitlab::Json.parse(described_class.new.call('INFO', now, 'my program', input))
+
+      expect(input['args']).to eq([1, 'string'])
+      expect(output['args']).to eq(['1', '[FILTERED]'])
     end
 
-    it 'properly flattens arguments to a String' do
-      hash_input['args'] = [1, "test", 2, { 'test' => 1 }]
+    context 'job arguments' do
+      context 'when the arguments are bigger than the maximum allowed' do
+        it 'keeps args from the front until they exceed the limit' do
+          half_limit = Gitlab::Utils::LogLimitedArray::MAXIMUM_ARRAY_LENGTH / 2
+          hash_input['args'] = [1, 2, 'a' * half_limit, 'b' * half_limit, 3]
+
+          expected_args = hash_input['args'].take(3).map(&:to_s) + ['...']
+
+          expect(subject['args']).to eq(expected_args)
+        end
+      end
+
+      context 'when the job has non-integer arguments' do
+        it 'only allows permitted non-integer arguments through' do
+          hash_input['args'] = [1, 'foo', 'bar']
+          hash_input['class'] = 'WebHookWorker'
 
-      expect(subject['args']).to eq(["1", "test", "2", %({"test"=>1})])
+          expect(subject['args']).to eq(['1', '[FILTERED]', 'bar'])
+        end
+      end
+
+      it 'properly flattens arguments to a String' do
+        hash_input['args'] = [1, "test", 2, { 'test' => 1 }]
+
+        expect(subject['args']).to eq(["1", "test", "2", %({"test"=>1})])
+      end
     end
 
     context 'when the job has a non-integer value for retry' do
diff --git a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
index a4bbb51baae..a456f814e78 100644
--- a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
+++ b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb
@@ -21,7 +21,10 @@ describe Gitlab::SidekiqLogging::StructuredLogger do
         "correlation_id" => 'cid',
         "error_message" => "wrong number of arguments (2 for 3)",
         "error_class" => "ArgumentError",
-        "error_backtrace" => []
+        "error_backtrace" => [],
+        "db_count" => 1,
+        "db_write_count" => 0,
+        "db_cached_count" => 0
       }
     end
 
@@ -197,7 +200,10 @@ describe Gitlab::SidekiqLogging::StructuredLogger do
 
       let(:expected_end_payload_with_db) do
         expected_end_payload.merge(
-          'db_duration_s' => a_value >= 0.1
+          'db_duration_s' => a_value >= 0.1,
+          'db_count' => 1,
+          'db_cached_count' => 0,
+          'db_write_count' => 0
         )
       end
 
diff --git a/spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb b/spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb
index 5f80ef9538a..1d45b70ec3e 100644
--- a/spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/client_metrics_spec.rb
@@ -47,8 +47,11 @@ describe Gitlab::SidekiqMiddleware::ClientMetrics do
     end
 
     context "when workers are not attributed" do
-      class TestNonAttributedWorker
-        include Sidekiq::Worker
+      before do
+        stub_const('TestNonAttributedWorker', Class.new)
+        TestNonAttributedWorker.class_eval do
+          include Sidekiq::Worker
+        end
       end
 
       it_behaves_like "a metrics client middleware" do
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb
index 9c7f6638913..a1e4cbb1e31 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb
@@ -31,14 +31,51 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::Client, :clean_gitlab_redis_q
       expect(job3['duplicate-of']).to eq(job1['jid'])
     end
 
-    it "does not mark a job that's scheduled in the future as a duplicate" do
-      TestDeduplicationWorker.perform_async('args1')
-      TestDeduplicationWorker.perform_at(1.day.from_now, 'args1')
-      TestDeduplicationWorker.perform_in(3.hours, 'args1')
+    context 'without scheduled deduplication' do
+      it "does not mark a job that's scheduled in the future as a duplicate" do
+        TestDeduplicationWorker.perform_async('args1')
+        TestDeduplicationWorker.perform_at(1.day.from_now, 'args1')
+        TestDeduplicationWorker.perform_in(3.hours, 'args1')
 
-      duplicates = TestDeduplicationWorker.jobs.map { |job| job['duplicate-of'] }
+        duplicates = TestDeduplicationWorker.jobs.map { |job| job['duplicate-of'] }
 
-      expect(duplicates).to all(be_nil)
+        expect(duplicates).to all(be_nil)
+      end
+    end
+
+    context 'with scheduled deduplication' do
+      let(:scheduled_worker_class) do
+        Class.new do
+          def self.name
+            'TestDeduplicationWorker'
+          end
+
+          include ApplicationWorker
+
+          deduplicate :until_executing, including_scheduled: true
+
+          def perform(*args)
+          end
+        end
+      end
+
+      before do
+        stub_const('TestDeduplicationWorker', scheduled_worker_class)
+      end
+
+      it 'adds a correct duplicate tag to the jobs', :aggregate_failures do
+        TestDeduplicationWorker.perform_async('args1')
+        TestDeduplicationWorker.perform_at(1.day.from_now, 'args1')
+        TestDeduplicationWorker.perform_in(3.hours, 'args1')
+        TestDeduplicationWorker.perform_in(3.hours, 'args2')
+
+        job1, job2, job3, job4 = TestDeduplicationWorker.jobs
+
+        expect(job1['duplicate-of']).to be_nil
+        expect(job2['duplicate-of']).to eq(job1['jid'])
+        expect(job3['duplicate-of']).to eq(job1['jid'])
+        expect(job4['duplicate-of']).to be_nil
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
index 929df0a7ffb..13c86563be7 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
@@ -93,6 +93,25 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob, :clean_gitlab_r
     end
   end
 
+  describe '#scheduled?' do
+    it 'returns false for non-scheduled jobs' do
+      expect(duplicate_job.scheduled?).to be(false)
+    end
+
+    context 'scheduled jobs' do
+      let(:job) do
+        { 'class' => 'AuthorizedProjectsWorker',
+          'args' => [1],
+          'jid' => '123',
+          'at' => 42 }
+      end
+
+      it 'returns true' do
+        expect(duplicate_job.scheduled?).to be(true)
+      end
+    end
+  end
+
   describe '#duplicate?' do
     it "raises an error if the check wasn't performed" do
       expect { duplicate_job.duplicate? }.to raise_error /Call `#check!` first/
@@ -112,28 +131,23 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob, :clean_gitlab_r
     end
   end
 
-  describe 'droppable?' do
-    where(:idempotent, :duplicate, :prevent_deduplication) do
-      # [true, false].repeated_permutation(3)
-      [[true, true, true],
-       [true, true, false],
-       [true, false, true],
-       [true, false, false],
-       [false, true, true],
-       [false, true, false],
-       [false, false, true],
-       [false, false, false]]
+  describe '#droppable?' do
+    where(:idempotent, :prevent_deduplication) do
+      # [true, false].repeated_permutation(2)
+      [[true, true],
+       [true, false],
+       [false, true],
+       [false, false]]
     end
 
     with_them do
       before do
         allow(AuthorizedProjectsWorker).to receive(:idempotent?).and_return(idempotent)
-        allow(duplicate_job).to receive(:duplicate?).and_return(duplicate)
         stub_feature_flags("disable_#{queue}_deduplication" => prevent_deduplication)
       end
 
       it 'is droppable when all conditions are met' do
-        if idempotent && duplicate && !prevent_deduplication
+        if idempotent && !prevent_deduplication
           expect(duplicate_job).to be_droppable
         else
           expect(duplicate_job).not_to be_droppable
@@ -142,6 +156,31 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob, :clean_gitlab_r
     end
   end
 
+  describe '#scheduled_at' do
+    let(:scheduled_at) { 42 }
+    let(:job) do
+      { 'class' => 'AuthorizedProjectsWorker',
+        'args' => [1],
+        'jid' => '123',
+        'at' => scheduled_at }
+    end
+
+    it 'returns when the job is scheduled at' do
+      expect(duplicate_job.scheduled_at).to eq(scheduled_at)
+    end
+  end
+
+  describe '#options' do
+    let(:worker_options) { { foo: true } }
+
+    it 'returns worker options' do
+      allow(AuthorizedProjectsWorker).to(
+        receive(:get_deduplication_options).and_return(worker_options))
+
+      expect(duplicate_job.options).to eq(worker_options)
+    end
+  end
+
   def set_idempotency_key(key, value = '1')
     Sidekiq.redis { |r| r.set(key, value) }
   end
diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executing_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executing_spec.rb
index 31b51260ebd..eb8b0a951a8 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executing_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executing_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'fast_spec_helper'
+require 'timecop'
 
 describe Gitlab::SidekiqMiddleware::DuplicateJobs::Strategies::UntilExecuting do
   let(:fake_duplicate_job) do
@@ -15,28 +16,90 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::Strategies::UntilExecuting do
     end
 
     it 'checks for duplicates before yielding' do
-      expect(fake_duplicate_job).to receive(:check!).ordered.and_return('a jid')
+      expect(fake_duplicate_job).to receive(:scheduled?).twice.ordered.and_return(false)
+      expect(fake_duplicate_job).to(
+        receive(:check!)
+          .with(Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob::DUPLICATE_KEY_TTL)
+          .ordered
+          .and_return('a jid'))
       expect(fake_duplicate_job).to receive(:duplicate?).ordered.and_return(false)
-      expect(fake_duplicate_job).to receive(:droppable?).ordered.and_return(false)
 
       expect { |b| strategy.schedule({}, &b) }.to yield_control
     end
 
-    it 'adds the jid of the existing job to the job hash' do
-      allow(fake_duplicate_job).to receive(:check!).and_return('the jid')
-      allow(fake_duplicate_job).to receive(:droppable?).and_return(true)
-      job_hash = {}
+    it 'checks worker options for scheduled jobs' do
+      expect(fake_duplicate_job).to receive(:scheduled?).ordered.and_return(true)
+      expect(fake_duplicate_job).to receive(:options).ordered.and_return({})
+      expect(fake_duplicate_job).not_to receive(:check!)
 
-      expect(fake_duplicate_job).to receive(:duplicate?).and_return(true)
-      expect(fake_duplicate_job).to receive(:existing_jid).and_return('the jid')
+      expect { |b| strategy.schedule({}, &b) }.to yield_control
+    end
+
+    context 'job marking' do
+      it 'adds the jid of the existing job to the job hash' do
+        allow(fake_duplicate_job).to receive(:scheduled?).and_return(false)
+        allow(fake_duplicate_job).to receive(:check!).and_return('the jid')
+        allow(fake_duplicate_job).to receive(:droppable?).and_return(true)
+        job_hash = {}
 
-      strategy.schedule(job_hash) {}
+        expect(fake_duplicate_job).to receive(:duplicate?).and_return(true)
+        expect(fake_duplicate_job).to receive(:existing_jid).and_return('the jid')
 
-      expect(job_hash).to include('duplicate-of' => 'the jid')
+        strategy.schedule(job_hash) {}
+
+        expect(job_hash).to include('duplicate-of' => 'the jid')
+      end
+
+      context 'scheduled jobs' do
+        let(:time_diff) { 1.minute }
+
+        context 'scheduled in the past' do
+          it 'adds the jid of the existing job to the job hash' do
+            allow(fake_duplicate_job).to receive(:scheduled?).twice.and_return(true)
+            allow(fake_duplicate_job).to receive(:scheduled_at).and_return(Time.now - time_diff)
+            allow(fake_duplicate_job).to receive(:options).and_return({ including_scheduled: true })
+            allow(fake_duplicate_job).to(
+              receive(:check!)
+                .with(Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob::DUPLICATE_KEY_TTL)
+                .and_return('the jid'))
+            allow(fake_duplicate_job).to receive(:droppable?).and_return(true)
+            job_hash = {}
+
+            expect(fake_duplicate_job).to receive(:duplicate?).and_return(true)
+            expect(fake_duplicate_job).to receive(:existing_jid).and_return('the jid')
+
+            strategy.schedule(job_hash) {}
+
+            expect(job_hash).to include('duplicate-of' => 'the jid')
+          end
+        end
+
+        context 'scheduled in the future' do
+          it 'adds the jid of the existing job to the job hash' do
+            Timecop.freeze do
+              allow(fake_duplicate_job).to receive(:scheduled?).twice.and_return(true)
+              allow(fake_duplicate_job).to receive(:scheduled_at).and_return(Time.now + time_diff)
+              allow(fake_duplicate_job).to receive(:options).and_return({ including_scheduled: true })
+              allow(fake_duplicate_job).to(
+                receive(:check!).with(time_diff.to_i).and_return('the jid'))
+              allow(fake_duplicate_job).to receive(:droppable?).and_return(true)
+              job_hash = {}
+
+              expect(fake_duplicate_job).to receive(:duplicate?).and_return(true)
+              expect(fake_duplicate_job).to receive(:existing_jid).and_return('the jid')
+
+              strategy.schedule(job_hash) {}
+
+              expect(job_hash).to include('duplicate-of' => 'the jid')
+            end
+          end
+        end
+      end
     end
 
     context "when the job is droppable" do
       before do
+        allow(fake_duplicate_job).to receive(:scheduled?).and_return(false)
         allow(fake_duplicate_job).to receive(:check!).and_return('the jid')
         allow(fake_duplicate_job).to receive(:duplicate?).and_return(true)
         allow(fake_duplicate_job).to receive(:existing_jid).and_return('the jid')
@@ -52,7 +115,7 @@ describe Gitlab::SidekiqMiddleware::DuplicateJobs::Strategies::UntilExecuting do
         expect(schedule_result).to be(false)
       end
 
-      it 'logs that the job wass dropped' do
+      it 'logs that the job was dropped' do
         fake_logger = instance_double(Gitlab::SidekiqLogging::DeduplicationLogger)
 
         expect(Gitlab::SidekiqLogging::DeduplicationLogger).to receive(:instance).and_return(fake_logger)
diff --git a/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
index 3214bd758e7..4b7baea25e8 100644
--- a/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb
@@ -31,7 +31,11 @@ describe Gitlab::SidekiqMiddleware::ServerMetrics do
         let(:gitaly_seconds_metric) { double('gitaly seconds metric') }
         let(:failed_total_metric) { double('failed total metric') }
         let(:retried_total_metric) { double('retried total metric') }
+        let(:redis_requests_total) { double('redis calls total metric') }
         let(:running_jobs_metric) { double('running jobs metric') }
+        let(:redis_seconds_metric) { double('redis seconds metric') }
+        let(:elasticsearch_seconds_metric) { double('elasticsearch seconds metric') }
+        let(:elasticsearch_requests_total) { double('elasticsearch calls total metric') }
 
         before do
           allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_jobs_queue_duration_seconds, anything, anything, anything).and_return(queue_duration_seconds)
@@ -39,8 +43,12 @@ describe Gitlab::SidekiqMiddleware::ServerMetrics do
           allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_jobs_cpu_seconds, anything, anything, anything).and_return(user_execution_seconds_metric)
           allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_jobs_db_seconds, anything, anything, anything).and_return(db_seconds_metric)
           allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_jobs_gitaly_seconds, anything, anything, anything).and_return(gitaly_seconds_metric)
+          allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_redis_requests_duration_seconds, anything, anything, anything).and_return(redis_seconds_metric)
+          allow(Gitlab::Metrics).to receive(:histogram).with(:sidekiq_elasticsearch_requests_duration_seconds, anything, anything, anything).and_return(elasticsearch_seconds_metric)
           allow(Gitlab::Metrics).to receive(:counter).with(:sidekiq_jobs_failed_total, anything).and_return(failed_total_metric)
           allow(Gitlab::Metrics).to receive(:counter).with(:sidekiq_jobs_retried_total, anything).and_return(retried_total_metric)
+          allow(Gitlab::Metrics).to receive(:counter).with(:sidekiq_redis_requests_total, anything).and_return(redis_requests_total)
+          allow(Gitlab::Metrics).to receive(:counter).with(:sidekiq_elasticsearch_requests_total, anything).and_return(elasticsearch_requests_total)
           allow(Gitlab::Metrics).to receive(:gauge).with(:sidekiq_running_jobs, anything, {}, :all).and_return(running_jobs_metric)
           allow(Gitlab::Metrics).to receive(:gauge).with(:sidekiq_concurrency, anything, {}, :all).and_return(concurrency_metric)
 
@@ -69,21 +77,35 @@ describe Gitlab::SidekiqMiddleware::ServerMetrics do
           let(:db_duration) { 3 }
           let(:gitaly_duration) { 4 }
 
+          let(:redis_calls) { 2 }
+          let(:redis_duration) { 0.01 }
+
+          let(:elasticsearch_calls) { 8 }
+          let(:elasticsearch_duration) { 0.54 }
+
           before do
             allow(subject).to receive(:get_thread_cputime).and_return(thread_cputime_before, thread_cputime_after)
             allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(monotonic_time_before, monotonic_time_after)
             allow(Gitlab::InstrumentationHelper).to receive(:queue_duration_for_job).with(job).and_return(queue_duration_for_job)
             allow(ActiveRecord::LogSubscriber).to receive(:runtime).and_return(db_duration * 1000)
-            allow(subject).to receive(:get_gitaly_time).and_return(gitaly_duration)
-
-            expect(running_jobs_metric).to receive(:increment).with(labels, 1)
-            expect(running_jobs_metric).to receive(:increment).with(labels, -1)
 
-            expect(queue_duration_seconds).to receive(:observe).with(labels, queue_duration_for_job) if queue_duration_for_job
-            expect(user_execution_seconds_metric).to receive(:observe).with(labels_with_job_status, thread_cputime_duration)
-            expect(db_seconds_metric).to receive(:observe).with(labels_with_job_status, db_duration)
-            expect(gitaly_seconds_metric).to receive(:observe).with(labels_with_job_status, gitaly_duration)
-            expect(completion_seconds_metric).to receive(:observe).with(labels_with_job_status, monotonic_time_duration)
+            job[:gitaly_duration_s] = gitaly_duration
+            job[:redis_calls] = redis_calls
+            job[:redis_duration_s] = redis_duration
+
+            job[:elasticsearch_calls] = elasticsearch_calls
+            job[:elasticsearch_duration_s] = elasticsearch_duration
+
+            allow(running_jobs_metric).to receive(:increment)
+            allow(redis_requests_total).to receive(:increment)
+            allow(elasticsearch_requests_total).to receive(:increment)
+            allow(queue_duration_seconds).to receive(:observe)
+            allow(user_execution_seconds_metric).to receive(:observe)
+            allow(db_seconds_metric).to receive(:observe)
+            allow(gitaly_seconds_metric).to receive(:observe)
+            allow(completion_seconds_metric).to receive(:observe)
+            allow(redis_seconds_metric).to receive(:observe)
+            allow(elasticsearch_seconds_metric).to receive(:observe)
           end
 
           it 'yields block' do
@@ -91,6 +113,18 @@ describe Gitlab::SidekiqMiddleware::ServerMetrics do
           end
 
           it 'sets queue specific metrics' do
+            expect(running_jobs_metric).to receive(:increment).with(labels, -1)
+            expect(running_jobs_metric).to receive(:increment).with(labels, 1)
+            expect(queue_duration_seconds).to receive(:observe).with(labels, queue_duration_for_job) if queue_duration_for_job
+            expect(user_execution_seconds_metric).to receive(:observe).with(labels_with_job_status, thread_cputime_duration)
+            expect(db_seconds_metric).to receive(:observe).with(labels_with_job_status, db_duration)
+            expect(gitaly_seconds_metric).to receive(:observe).with(labels_with_job_status, gitaly_duration)
+            expect(completion_seconds_metric).to receive(:observe).with(labels_with_job_status, monotonic_time_duration)
+            expect(redis_seconds_metric).to receive(:observe).with(labels_with_job_status, redis_duration)
+            expect(elasticsearch_seconds_metric).to receive(:observe).with(labels_with_job_status, elasticsearch_duration)
+            expect(redis_requests_total).to receive(:increment).with(labels_with_job_status, redis_calls)
+            expect(elasticsearch_requests_total).to receive(:increment).with(labels_with_job_status, elasticsearch_calls)
+
             subject.call(worker, job, :test) { nil }
           end
 
@@ -144,9 +178,13 @@ describe Gitlab::SidekiqMiddleware::ServerMetrics do
     end
 
     context "when workers are not attributed" do
-      class TestNonAttributedWorker
-        include Sidekiq::Worker
+      before do
+        stub_const('TestNonAttributedWorker', Class.new)
+        TestNonAttributedWorker.class_eval do
+          include Sidekiq::Worker
+        end
       end
+
       let(:worker) { TestNonAttributedWorker.new }
       let(:labels) { default_labels.merge(urgency: "") }
 
diff --git a/spec/lib/gitlab/sidekiq_middleware_spec.rb b/spec/lib/gitlab/sidekiq_middleware_spec.rb
index 6fe61fb42a5..5ca0abeb132 100644
--- a/spec/lib/gitlab/sidekiq_middleware_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware_spec.rb
@@ -13,7 +13,7 @@ describe Gitlab::SidekiqMiddleware do
 
       def perform(_arg)
         Gitlab::SafeRequestStore['gitaly_call_actual'] = 1
-        Gitlab::GitalyClient.query_time = 5
+        Gitlab::SafeRequestStore[:gitaly_query_time] = 5
       end
     end
   end
diff --git a/spec/lib/gitlab/sidekiq_versioning/manager_spec.rb b/spec/lib/gitlab/sidekiq_versioning/manager_spec.rb
index 2aa7d1fd6d8..a528ce201a2 100644
--- a/spec/lib/gitlab/sidekiq_versioning/manager_spec.rb
+++ b/spec/lib/gitlab/sidekiq_versioning/manager_spec.rb
@@ -16,7 +16,8 @@ describe Gitlab::SidekiqVersioning::Manager do
       expect(queues).to include('post_receive')
       expect(queues).to include('repository_fork')
       expect(queues).to include('cronjob')
-      expect(queues).to include('cronjob:stuck_import_jobs')
+      expect(queues).to include('cronjob:import_stuck_project_import_jobs')
+      expect(queues).to include('cronjob:jira_import_stuck_jira_import_jobs')
       expect(queues).to include('cronjob:stuck_merge_jobs')
       expect(queues).to include('unknown')
     end
diff --git a/spec/lib/gitlab/sourcegraph_spec.rb b/spec/lib/gitlab/sourcegraph_spec.rb
index e081ae32175..ef4008960a9 100644
--- a/spec/lib/gitlab/sourcegraph_spec.rb
+++ b/spec/lib/gitlab/sourcegraph_spec.rb
@@ -7,7 +7,7 @@ describe Gitlab::Sourcegraph do
   let(:feature_scope) { true }
 
   before do
-    Feature.enable(:sourcegraph, feature_scope)
+    stub_feature_flags(sourcegraph: feature_scope)
   end
 
   describe '.feature_conditional?' do
diff --git a/spec/lib/gitlab/suggestions/commit_message_spec.rb b/spec/lib/gitlab/suggestions/commit_message_spec.rb
new file mode 100644
index 00000000000..0774fc80528
--- /dev/null
+++ b/spec/lib/gitlab/suggestions/commit_message_spec.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Suggestions::CommitMessage do
+  def create_suggestion(file_path, new_line, to_content)
+    position = Gitlab::Diff::Position.new(old_path: file_path,
+                                          new_path: file_path,
+                                          old_line: nil,
+                                          new_line: new_line,
+                                          diff_refs: merge_request.diff_refs)
+
+    diff_note = create(:diff_note_on_merge_request,
+                       noteable: merge_request,
+                       position: position,
+                       project: project)
+
+    create(:suggestion,
+           :content_from_repo,
+           note: diff_note,
+           to_content: to_content)
+  end
+
+  let_it_be(:user) do
+    create(:user, :commit_email, name: 'Test User', username: 'test.user')
+  end
+
+  let_it_be(:project) do
+    create(:project, :repository, path: 'project-1', name: 'Project_1')
+  end
+
+  let_it_be(:merge_request) do
+    create(:merge_request, source_project: project, target_project: project)
+  end
+
+  let_it_be(:suggestion_set) do
+    suggestion1 = create_suggestion('files/ruby/popen.rb', 9, '*** SUGGESTION 1 ***')
+    suggestion2 = create_suggestion('files/ruby/popen.rb', 13, '*** SUGGESTION 2 ***')
+    suggestion3 = create_suggestion('files/ruby/regex.rb', 22, '*** SUGGESTION 3 ***')
+
+    Gitlab::Suggestions::SuggestionSet.new([suggestion1, suggestion2, suggestion3])
+  end
+
+  describe '#message' do
+    before do
+      # Updating the suggestion_commit_message on a project shared across specs
+      # avoids recreating the repository for each spec.
+      project.update!(suggestion_commit_message: message)
+    end
+
+    context 'when a custom commit message is not specified' do
+      let(:expected_message) { 'Apply 3 suggestion(s) to 2 file(s)' }
+
+      context 'and is nil' do
+        let(:message) { nil }
+
+        it 'uses the default commit message' do
+          expect(described_class
+                   .new(user, suggestion_set)
+                   .message).to eq(expected_message)
+        end
+      end
+
+      context 'and is an empty string' do
+        let(:message) { '' }
+
+        it 'uses the default commit message' do
+          expect(described_class
+                   .new(user, suggestion_set)
+                   .message).to eq(expected_message)
+        end
+      end
+    end
+
+    context 'is specified and includes all placeholders' do
+      let(:message) do
+        '*** %{branch_name} %{files_count} %{file_paths} %{project_name} %{project_path} %{user_full_name} %{username} %{suggestions_count} ***'
+      end
+
+      it 'generates a custom commit message' do
+        expect(Gitlab::Suggestions::CommitMessage
+                 .new(user, suggestion_set)
+                 .message).to eq('*** master 2 files/ruby/popen.rb, files/ruby/regex.rb Project_1 project-1 Test User test.user 3 ***')
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/suggestions/file_suggestion_spec.rb b/spec/lib/gitlab/suggestions/file_suggestion_spec.rb
new file mode 100644
index 00000000000..6fbbad017c5
--- /dev/null
+++ b/spec/lib/gitlab/suggestions/file_suggestion_spec.rb
@@ -0,0 +1,241 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Suggestions::FileSuggestion do
+  def create_suggestion(new_line, to_content)
+    position = Gitlab::Diff::Position.new(old_path: file_path,
+                                          new_path: file_path,
+                                          old_line: nil,
+                                          new_line: new_line,
+                                          diff_refs: merge_request.diff_refs)
+
+    diff_note = create(:diff_note_on_merge_request,
+                       noteable: merge_request,
+                       position: position,
+                       project: project)
+
+    create(:suggestion,
+           :content_from_repo,
+           note: diff_note,
+           to_content: to_content)
+  end
+
+  let_it_be(:user) { create(:user) }
+
+  let_it_be(:file_path) { 'files/ruby/popen.rb'}
+
+  let_it_be(:project) { create(:project, :repository) }
+
+  let_it_be(:merge_request) do
+    create(:merge_request, source_project: project, target_project: project)
+  end
+
+  let_it_be(:suggestion1) do
+    create_suggestion(9, "      *** SUGGESTION 1 ***\n")
+  end
+
+  let_it_be(:suggestion2) do
+    create_suggestion(15, "      *** SUGGESTION 2 ***\n")
+  end
+
+  let(:file_suggestion) { described_class.new }
+
+  describe '#add_suggestion' do
+    it 'succeeds when adding a suggestion for the same file as the original' do
+      file_suggestion.add_suggestion(suggestion1)
+
+      expect { file_suggestion.add_suggestion(suggestion2) }.not_to raise_error
+    end
+
+    it 'raises an error when adding a suggestion for a different file' do
+      allow(suggestion2)
+        .to(receive_message_chain(:diff_file, :file_path)
+        .and_return('path/to/different/file'))
+
+      file_suggestion.add_suggestion(suggestion1)
+
+      expect { file_suggestion.add_suggestion(suggestion2) }.to(
+        raise_error(described_class::SuggestionForDifferentFileError)
+      )
+    end
+  end
+
+  describe '#line_conflict' do
+    def stub_suggestions(line_index_spans)
+      fake_suggestions = line_index_spans.map do |span|
+        double("Suggestion",
+               from_line_index: span[:from_line_index],
+               to_line_index: span[:to_line_index])
+      end
+
+      allow(file_suggestion).to(receive(:suggestions).and_return(fake_suggestions))
+    end
+
+    context 'when line ranges do not overlap' do
+      it 'return false' do
+        stub_suggestions(
+          [
+            {
+              from_line_index: 0,
+              to_line_index: 10
+            },
+            {
+              from_line_index: 11,
+              to_line_index: 20
+            }
+          ]
+        )
+
+        expect(file_suggestion.line_conflict?).to be(false)
+      end
+    end
+
+    context 'when line ranges are identical' do
+      it 'returns true' do
+        stub_suggestions(
+          [
+            {
+              from_line_index: 0,
+              to_line_index: 10
+            },
+            {
+              from_line_index: 0,
+              to_line_index: 10
+            }
+          ]
+        )
+
+        expect(file_suggestion.line_conflict?).to be(true)
+      end
+    end
+
+    context 'when one range starts, and the other ends, on the same line' do
+      it 'returns true' do
+        stub_suggestions(
+          [
+            {
+              from_line_index: 0,
+              to_line_index: 10
+            },
+            {
+              from_line_index: 10,
+              to_line_index: 20
+            }
+          ]
+        )
+
+        expect(file_suggestion.line_conflict?).to be(true)
+      end
+    end
+
+    context 'when one line range contains the other' do
+      it 'returns true' do
+        stub_suggestions(
+          [
+            {
+              from_line_index: 0,
+              to_line_index: 10
+            },
+            {
+              from_line_index: 5,
+              to_line_index: 7
+            }
+          ]
+        )
+
+        expect(file_suggestion.line_conflict?).to be(true)
+      end
+    end
+
+    context 'when line ranges overlap' do
+      it 'returns true' do
+        stub_suggestions(
+          [
+            {
+              from_line_index: 0,
+              to_line_index: 10
+            },
+            {
+              from_line_index: 8,
+              to_line_index: 15
+            }
+          ]
+        )
+
+        expect(file_suggestion.line_conflict?).to be(true)
+      end
+    end
+
+    context 'when no suggestions have been added' do
+      it 'returns false' do
+        expect(file_suggestion.line_conflict?).to be(false)
+      end
+    end
+  end
+
+  describe '#new_content' do
+    it 'returns a blob with the suggestions applied to it' do
+      file_suggestion.add_suggestion(suggestion1)
+      file_suggestion.add_suggestion(suggestion2)
+
+      expected_content = <<-CONTENT.strip_heredoc
+        require 'fileutils'
+        require 'open3'
+
+        module Popen
+          extend self
+
+          def popen(cmd, path=nil)
+            unless cmd.is_a?(Array)
+              *** SUGGESTION 1 ***
+            end
+
+            path ||= Dir.pwd
+
+            vars = {
+              *** SUGGESTION 2 ***
+            }
+
+            options = {
+              chdir: path
+            }
+
+            unless File.directory?(path)
+              FileUtils.mkdir_p(path)
+            end
+
+            @cmd_output = ""
+            @cmd_status = 0
+
+            Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
+              @cmd_output << stdout.read
+              @cmd_output << stderr.read
+              @cmd_status = wait_thr.value.exitstatus
+            end
+
+            return @cmd_output, @cmd_status
+          end
+        end
+      CONTENT
+
+      expect(file_suggestion.new_content).to eq(expected_content)
+    end
+
+    it 'returns an empty string when no suggestions have been added' do
+      expect(file_suggestion.new_content).to eq('')
+    end
+  end
+
+  describe '#file_path' do
+    it 'returns the path of the file associated with the suggestions' do
+      file_suggestion.add_suggestion(suggestion1)
+
+      expect(file_suggestion.file_path).to eq(file_path)
+    end
+
+    it 'returns nil if no suggestions have been added' do
+      expect(file_suggestion.file_path).to be(nil)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/suggestions/suggestion_set_spec.rb b/spec/lib/gitlab/suggestions/suggestion_set_spec.rb
new file mode 100644
index 00000000000..8c61e6c42a6
--- /dev/null
+++ b/spec/lib/gitlab/suggestions/suggestion_set_spec.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Suggestions::SuggestionSet do
+  def create_suggestion(file_path, new_line, to_content)
+    position = Gitlab::Diff::Position.new(old_path: file_path,
+                                          new_path: file_path,
+                                          old_line: nil,
+                                          new_line: new_line,
+                                          diff_refs: merge_request.diff_refs)
+
+    diff_note = create(:diff_note_on_merge_request,
+                       noteable: merge_request,
+                       position: position,
+                       project: project)
+
+    create(:suggestion,
+           :content_from_repo,
+           note: diff_note,
+           to_content: to_content)
+  end
+
+  let_it_be(:user) { create(:user) }
+
+  let_it_be(:project) { create(:project, :repository) }
+
+  let_it_be(:merge_request) do
+    create(:merge_request, source_project: project, target_project: project)
+  end
+
+  let_it_be(:suggestion) { create(:suggestion)}
+
+  let_it_be(:suggestion2) do
+    create_suggestion('files/ruby/popen.rb', 13, "*** SUGGESTION 2 ***")
+  end
+
+  let_it_be(:suggestion3) do
+    create_suggestion('files/ruby/regex.rb', 22, "*** SUGGESTION 3 ***")
+  end
+
+  let_it_be(:unappliable_suggestion) { create(:suggestion, :unappliable) }
+
+  let(:suggestion_set) { described_class.new([suggestion]) }
+
+  describe '#project' do
+    it 'returns the project associated with the suggestions' do
+      expected_project = suggestion.project
+
+      expect(suggestion_set.project).to be(expected_project)
+    end
+  end
+
+  describe '#branch' do
+    it 'returns the branch associated with the suggestions' do
+      expected_branch = suggestion.branch
+
+      expect(suggestion_set.branch).to be(expected_branch)
+    end
+  end
+
+  describe '#valid?' do
+    it 'returns true if no errors are found' do
+      expect(suggestion_set.valid?).to be(true)
+    end
+
+    it 'returns false if an error is found' do
+      suggestion_set = described_class.new([unappliable_suggestion])
+
+      expect(suggestion_set.valid?).to be(false)
+    end
+  end
+
+  describe '#error_message' do
+    it 'returns an error message if an error is found' do
+      suggestion_set = described_class.new([unappliable_suggestion])
+
+      expect(suggestion_set.error_message).to be_a(String)
+    end
+
+    it 'returns nil if no errors are found' do
+      expect(suggestion_set.error_message).to be(nil)
+    end
+  end
+
+  describe '#actions' do
+    it 'returns an array of hashes with proper key/value pairs' do
+      first_action = suggestion_set.actions.first
+
+      file_path, file_suggestion = suggestion_set
+                                     .send(:suggestions_per_file).first
+
+      expect(first_action[:action]).to be('update')
+      expect(first_action[:file_path]).to eq(file_path)
+      expect(first_action[:content]).to eq(file_suggestion.new_content)
+    end
+  end
+
+  describe '#file_paths' do
+    it 'returns an array of unique file paths associated with the suggestions' do
+      suggestion_set = described_class.new([suggestion, suggestion2, suggestion3])
+
+      expected_paths = %w(files/ruby/popen.rb files/ruby/regex.rb)
+
+      actual_paths = suggestion_set.file_paths
+
+      expect(actual_paths.sort).to eq(expected_paths)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/tracking_spec.rb b/spec/lib/gitlab/tracking_spec.rb
index 2e65f98a085..82828c2dcce 100644
--- a/spec/lib/gitlab/tracking_spec.rb
+++ b/spec/lib/gitlab/tracking_spec.rb
@@ -27,14 +27,13 @@ describe Gitlab::Tracking do
       expect(subject.snowplow_options(nil)).to match(expected_fields)
     end
 
-    it 'enables features using feature flags' do
-      stub_feature_flags(additional_snowplow_tracking: :__group__)
-      addition_feature_fields = {
+    it 'when feature flag is disabled' do
+      stub_feature_flags(additional_snowplow_tracking: false)
+
+      expect(subject.snowplow_options(nil)).to include(
         formTracking: false,
         linkClickTracking: false
-      }
-
-      expect(subject.snowplow_options(:_group_)).to include(addition_feature_fields)
+      )
     end
   end
 
diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb
index 66826bcb3b1..e91d17bfbe8 100644
--- a/spec/lib/gitlab/url_builder_spec.rb
+++ b/spec/lib/gitlab/url_builder_spec.rb
@@ -96,6 +96,38 @@ describe Gitlab::UrlBuilder do
       end
     end
 
+    context 'when passing a Wiki' do
+      let(:wiki) { build_stubbed(:project_wiki) }
+
+      describe '#wiki_url' do
+        it 'uses the default collection action' do
+          url = subject.wiki_url(wiki)
+
+          expect(url).to eq "#{Gitlab.config.gitlab.url}/#{wiki.project.full_path}/-/wikis/home"
+        end
+
+        it 'supports a custom collection action' do
+          url = subject.wiki_url(wiki, action: :pages)
+
+          expect(url).to eq "#{Gitlab.config.gitlab.url}/#{wiki.project.full_path}/-/wikis/pages"
+        end
+      end
+
+      describe '#wiki_page_url' do
+        it 'uses the default member action' do
+          url = subject.wiki_page_url(wiki, 'foo')
+
+          expect(url).to eq "#{Gitlab.config.gitlab.url}/#{wiki.project.full_path}/-/wikis/foo"
+        end
+
+        it 'supports a custom member action' do
+          url = subject.wiki_page_url(wiki, 'foo', action: :edit)
+
+          expect(url).to eq "#{Gitlab.config.gitlab.url}/#{wiki.project.full_path}/-/wikis/foo/edit"
+        end
+      end
+    end
+
     context 'when passing a DesignManagement::Design' do
       let(:design) { build_stubbed(:design) }
 
diff --git a/spec/lib/gitlab/usage_data_concerns/topology_spec.rb b/spec/lib/gitlab/usage_data_concerns/topology_spec.rb
new file mode 100644
index 00000000000..0428900690c
--- /dev/null
+++ b/spec/lib/gitlab/usage_data_concerns/topology_spec.rb
@@ -0,0 +1,220 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::UsageDataConcerns::Topology do
+  include UsageDataHelpers
+
+  describe '#topology_usage_data' do
+    subject { Class.new.extend(described_class).topology_usage_data }
+
+    before do
+      # this pins down time shifts when benchmarking durations
+      allow(Process).to receive(:clock_gettime).and_return(0)
+    end
+
+    context 'when embedded Prometheus server is enabled' do
+      before do
+        expect(Gitlab::Prometheus::Internal).to receive(:prometheus_enabled?).and_return(true)
+        expect(Gitlab::Prometheus::Internal).to receive(:uri).and_return('http://prom:9090')
+      end
+
+      it 'contains a topology element' do
+        allow_prometheus_queries
+
+        expect(subject).to have_key(:topology)
+      end
+
+      context 'tracking node metrics' do
+        it 'contains node level metrics for each instance' do
+          expect_prometheus_api_to(
+            receive_node_memory_query,
+            receive_node_cpu_count_query,
+            receive_node_service_memory_query,
+            receive_node_service_process_count_query
+          )
+
+          expect(subject[:topology]).to eq({
+            duration_s: 0,
+            nodes: [
+              {
+                node_memory_total_bytes: 512,
+                node_cpus: 8,
+                node_services: [
+                  {
+                    name: 'web',
+                    process_count: 10,
+                    process_memory_rss: 300,
+                    process_memory_uss: 301,
+                    process_memory_pss: 302
+                  },
+                  {
+                    name: 'sidekiq',
+                    process_count: 5,
+                    process_memory_rss: 303
+                  }
+                ]
+              },
+              {
+                node_memory_total_bytes: 1024,
+                node_cpus: 16,
+                node_services: [
+                  {
+                    name: 'sidekiq',
+                    process_count: 15,
+                    process_memory_rss: 400,
+                    process_memory_pss: 401
+                  },
+                  {
+                    name: 'redis',
+                    process_count: 1,
+                    process_memory_rss: 402
+                  }
+                ]
+              }
+            ]
+          })
+        end
+      end
+
+      context 'and some node memory metrics are missing' do
+        it 'removes the respective entries' do
+          expect_prometheus_api_to(
+            receive_node_memory_query(result: []),
+            receive_node_cpu_count_query,
+            receive_node_service_memory_query,
+            receive_node_service_process_count_query
+          )
+
+          keys = subject[:topology][:nodes].flat_map(&:keys)
+          expect(keys).not_to include(:node_memory_total_bytes)
+          expect(keys).to include(:node_cpus, :node_services)
+        end
+      end
+
+      context 'and no results are found' do
+        it 'does not report anything' do
+          expect_prometheus_api_to receive(:aggregate).at_least(:once).and_return({})
+
+          expect(subject[:topology]).to eq({
+            duration_s: 0,
+            nodes: []
+          })
+        end
+      end
+
+      context 'and a connection error is raised' do
+        it 'does not report anything' do
+          expect_prometheus_api_to receive(:aggregate).and_raise('Connection failed')
+
+          expect(subject[:topology]).to eq({ duration_s: 0 })
+        end
+      end
+    end
+
+    context 'when embedded Prometheus server is disabled' do
+      it 'does not report anything' do
+        expect(Gitlab::Prometheus::Internal).to receive(:prometheus_enabled?).and_return(false)
+
+        expect(subject[:topology]).to eq({ duration_s: 0 })
+      end
+    end
+  end
+
+  def receive_node_memory_query(result: nil)
+    receive(:query)
+      .with(/node_memory_MemTotal_bytes/, an_instance_of(Hash))
+      .and_return(result || [
+        {
+          'metric' => { 'instance' => 'instance1:8080' },
+          'value' => [1000, '512']
+        },
+        {
+          'metric' => { 'instance' => 'instance2:8090' },
+          'value' => [1000, '1024']
+        }
+      ])
+  end
+
+  def receive_node_cpu_count_query(result: nil)
+    receive(:query)
+      .with(/node_cpu_seconds_total/, an_instance_of(Hash))
+      .and_return(result || [
+        {
+          'metric' => { 'instance' => 'instance2:8090' },
+          'value' => [1000, '16']
+        },
+        {
+          'metric' => { 'instance' => 'instance1:8080' },
+          'value' => [1000, '8']
+        }
+      ])
+  end
+
+  def receive_node_service_memory_query(result: nil)
+    receive(:query)
+      .with(/process_.+_memory_bytes/, an_instance_of(Hash))
+      .and_return(result || [
+        # instance 1: runs Puma + a small Sidekiq
+        {
+          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails', '__name__' => 'ruby_process_resident_memory_bytes' },
+          'value' =>  [1000, '300']
+        },
+        {
+          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails', '__name__' => 'ruby_process_unique_memory_bytes' },
+          'value' => [1000, '301']
+        },
+        {
+          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails', '__name__' => 'ruby_process_proportional_memory_bytes' },
+          'value' => [1000, '302']
+        },
+        {
+          'metric' => { 'instance' => 'instance1:8090', 'job' => 'gitlab-sidekiq', '__name__' => 'ruby_process_resident_memory_bytes' },
+          'value' => [1000, '303']
+        },
+        # instance 2: runs a dedicated Sidekiq + Redis (which uses a different metric name)
+        {
+          'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq', '__name__' => 'ruby_process_resident_memory_bytes' },
+          'value' => [1000, '400']
+        },
+        {
+          'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq', '__name__' => 'ruby_process_proportional_memory_bytes' },
+          'value' => [1000, '401']
+        },
+        {
+          'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis', '__name__' => 'process_resident_memory_bytes' },
+          'value' => [1000, '402']
+        }
+      ])
+  end
+
+  def receive_node_service_process_count_query(result: nil)
+    receive(:query)
+      .with(/process_start_time_seconds/, an_instance_of(Hash))
+      .and_return(result || [
+        # instance 1
+        {
+          'metric' => { 'instance' => 'instance1:8080', 'job' => 'gitlab-rails' },
+          'value' => [1000, '10']
+        },
+        {
+          'metric' => { 'instance' => 'instance1:8090', 'job' => 'gitlab-sidekiq' },
+          'value' => [1000, '5']
+        },
+        # instance 2
+        {
+          'metric' => { 'instance' => 'instance2:8090', 'job' => 'gitlab-sidekiq' },
+          'value' => [1000, '15']
+        },
+        {
+          'metric' => { 'instance' => 'instance2:9121', 'job' => 'redis' },
+          'value' => [1000, '1']
+        },
+        # unknown service => should be stripped out
+        {
+          'metric' => { 'instance' => 'instance2:9000', 'job' => 'not-a-gitlab-service' },
+          'value' => [1000, '42']
+        }
+      ])
+  end
+end
diff --git a/spec/lib/gitlab/usage_data_counters/search_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/search_counter_spec.rb
index 50a9f980dc7..35b0f9a67f4 100644
--- a/spec/lib/gitlab/usage_data_counters/search_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/search_counter_spec.rb
@@ -3,11 +3,21 @@
 require 'spec_helper'
 
 describe Gitlab::UsageDataCounters::SearchCounter, :clean_gitlab_redis_shared_state do
-  it 'increments counter and return the total count' do
-    expect(described_class.total_navbar_searches_count).to eq(0)
+  shared_examples_for 'usage counter with totals' do |counter|
+    it 'increments counter and returns total count' do
+      expect(described_class.read(counter)).to eq(0)
 
-    2.times { described_class.increment_navbar_searches_count }
+      2.times { described_class.count(counter) }
 
-    expect(described_class.total_navbar_searches_count).to eq(2)
+      expect(described_class.read(counter)).to eq(2)
+    end
+  end
+
+  context 'all_searches counter' do
+    it_behaves_like 'usage counter with totals', :all_searches
+  end
+
+  context 'navbar_searches counter' do
+    it_behaves_like 'usage counter with totals', :navbar_searches
   end
 end
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 9c6aab10083..31176999333 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -6,637 +6,600 @@ describe Gitlab::UsageData, :aggregate_failures do
   include UsageDataHelpers
 
   before do
-    allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
-
+    stub_usage_data_connections
     stub_object_store_settings
   end
 
-  shared_examples "usage data execution" do
-    describe '#data' do
-      let!(:ud) { build(:usage_data) }
-
-      before do
-        allow(described_class).to receive(:grafana_embed_usage_data).and_return(2)
+  describe '#uncached_data' do
+    it 'ensures recorded_at is set before any other usage data calculation' do
+      %i(alt_usage_data redis_usage_data distinct_count count).each do |method|
+        expect(described_class).not_to receive(method)
       end
+      expect(described_class).to receive(:recorded_at).and_raise(Exception.new('Stopped calculating recorded_at'))
 
-      subject { described_class.data }
+      expect { described_class.uncached_data }.to raise_error('Stopped calculating recorded_at')
+    end
+  end
 
-      it 'gathers usage data' do
-        expect(subject.keys).to include(*UsageDataHelpers::USAGE_DATA_KEYS)
-      end
+  describe '#data' do
+    let!(:ud) { build(:usage_data) }
 
-      it 'gathers usage counts' do
-        count_data = subject[:counts]
+    before do
+      allow(described_class).to receive(:grafana_embed_usage_data).and_return(2)
+    end
 
-        expect(count_data[:boards]).to eq(1)
-        expect(count_data[:projects]).to eq(4)
-        expect(count_data.values_at(*UsageDataHelpers::SMAU_KEYS)).to all(be_an(Integer))
-        expect(count_data.keys).to include(*UsageDataHelpers::COUNTS_KEYS)
-        expect(UsageDataHelpers::COUNTS_KEYS - count_data.keys).to be_empty
-      end
+    subject { described_class.data }
 
-      it 'gathers projects data correctly' do
-        count_data = subject[:counts]
-
-        expect(count_data[:projects]).to eq(4)
-        expect(count_data[:projects_asana_active]).to eq(0)
-        expect(count_data[:projects_prometheus_active]).to eq(1)
-        expect(count_data[:projects_jira_active]).to eq(4)
-        expect(count_data[:projects_jira_server_active]).to eq(2)
-        expect(count_data[:projects_jira_cloud_active]).to eq(2)
-        expect(count_data[:jira_imports_projects_count]).to eq(2)
-        expect(count_data[:jira_imports_total_imported_count]).to eq(3)
-        expect(count_data[:jira_imports_total_imported_issues_count]).to eq(13)
-        expect(count_data[:projects_slack_notifications_active]).to eq(2)
-        expect(count_data[:projects_slack_slash_active]).to eq(1)
-        expect(count_data[:projects_slack_active]).to eq(2)
-        expect(count_data[:projects_slack_slash_commands_active]).to eq(1)
-        expect(count_data[:projects_custom_issue_tracker_active]).to eq(1)
-        expect(count_data[:projects_mattermost_active]).to eq(0)
-        expect(count_data[:projects_with_repositories_enabled]).to eq(3)
-        expect(count_data[:projects_with_error_tracking_enabled]).to eq(1)
-        expect(count_data[:projects_with_alerts_service_enabled]).to eq(1)
-        expect(count_data[:projects_with_prometheus_alerts]).to eq(2)
-        expect(count_data[:issues_created_from_gitlab_error_tracking_ui]).to eq(1)
-        expect(count_data[:issues_with_associated_zoom_link]).to eq(2)
-        expect(count_data[:issues_using_zoom_quick_actions]).to eq(3)
-        expect(count_data[:issues_with_embedded_grafana_charts_approx]).to eq(2)
-        expect(count_data[:incident_issues]).to eq(4)
-        expect(count_data[:issues_created_gitlab_alerts]).to eq(1)
-        expect(count_data[:alert_bot_incident_issues]).to eq(4)
-        expect(count_data[:incident_labeled_issues]).to eq(3)
-
-        expect(count_data[:clusters_enabled]).to eq(6)
-        expect(count_data[:project_clusters_enabled]).to eq(4)
-        expect(count_data[:group_clusters_enabled]).to eq(1)
-        expect(count_data[:instance_clusters_enabled]).to eq(1)
-        expect(count_data[:clusters_disabled]).to eq(3)
-        expect(count_data[:project_clusters_disabled]).to eq(1)
-        expect(count_data[:group_clusters_disabled]).to eq(1)
-        expect(count_data[:instance_clusters_disabled]).to eq(1)
-        expect(count_data[:clusters_platforms_eks]).to eq(1)
-        expect(count_data[:clusters_platforms_gke]).to eq(1)
-        expect(count_data[:clusters_platforms_user]).to eq(1)
-        expect(count_data[:clusters_applications_helm]).to eq(1)
-        expect(count_data[:clusters_applications_ingress]).to eq(1)
-        expect(count_data[:clusters_applications_cert_managers]).to eq(1)
-        expect(count_data[:clusters_applications_crossplane]).to eq(1)
-        expect(count_data[:clusters_applications_prometheus]).to eq(1)
-        expect(count_data[:clusters_applications_runner]).to eq(1)
-        expect(count_data[:clusters_applications_knative]).to eq(1)
-        expect(count_data[:clusters_applications_elastic_stack]).to eq(1)
-        expect(count_data[:grafana_integrated_projects]).to eq(2)
-        expect(count_data[:clusters_applications_jupyter]).to eq(1)
-        expect(count_data[:clusters_management_project]).to eq(1)
-      end
+    it 'gathers usage data' do
+      expect(subject.keys).to include(*UsageDataHelpers::USAGE_DATA_KEYS)
+    end
 
-      it 'gathers object store usage correctly' do
-        expect(subject[:object_store]).to eq(
-          { artifacts: { enabled: true, object_store: { enabled: true, direct_upload: true, background_upload: false, provider: "AWS" } },
-           external_diffs: { enabled: false },
-           lfs: { enabled: true, object_store: { enabled: false, direct_upload: true, background_upload: false, provider: "AWS" } },
-           uploads: { enabled: nil, object_store: { enabled: false, direct_upload: true, background_upload: false, provider: "AWS" } },
-           packages: { enabled: true, object_store: { enabled: false, direct_upload: false, background_upload: true, provider: "AWS" } } }
-        )
-      end
+    it 'gathers usage counts' do
+      count_data = subject[:counts]
 
-      context 'with existing container expiration policies' do
-        let_it_be(:disabled) { create(:container_expiration_policy, enabled: false) }
-        let_it_be(:enabled) { create(:container_expiration_policy, enabled: true) }
+      expect(count_data[:boards]).to eq(1)
+      expect(count_data[:projects]).to eq(4)
+      expect(count_data.values_at(*UsageDataHelpers::SMAU_KEYS)).to all(be_an(Integer))
+      expect(count_data.keys).to include(*UsageDataHelpers::COUNTS_KEYS)
+      expect(UsageDataHelpers::COUNTS_KEYS - count_data.keys).to be_empty
+    end
 
-        %i[keep_n cadence older_than].each do |attribute|
-          ContainerExpirationPolicy.send("#{attribute}_options").keys.each do |value|
-            let_it_be("container_expiration_policy_with_#{attribute}_set_to_#{value}") { create(:container_expiration_policy, attribute => value) }
-          end
-        end
+    it 'gathers projects data correctly' do
+      count_data = subject[:counts]
+
+      expect(count_data[:projects]).to eq(4)
+      expect(count_data[:projects_asana_active]).to eq(0)
+      expect(count_data[:projects_prometheus_active]).to eq(1)
+      expect(count_data[:projects_jira_active]).to eq(4)
+      expect(count_data[:projects_jira_server_active]).to eq(2)
+      expect(count_data[:projects_jira_cloud_active]).to eq(2)
+      expect(count_data[:jira_imports_projects_count]).to eq(2)
+      expect(count_data[:jira_imports_total_imported_count]).to eq(3)
+      expect(count_data[:jira_imports_total_imported_issues_count]).to eq(13)
+      expect(count_data[:projects_slack_notifications_active]).to eq(2)
+      expect(count_data[:projects_slack_slash_active]).to eq(1)
+      expect(count_data[:projects_slack_active]).to eq(2)
+      expect(count_data[:projects_slack_slash_commands_active]).to eq(1)
+      expect(count_data[:projects_custom_issue_tracker_active]).to eq(1)
+      expect(count_data[:projects_mattermost_active]).to eq(0)
+      expect(count_data[:projects_with_repositories_enabled]).to eq(3)
+      expect(count_data[:projects_with_error_tracking_enabled]).to eq(1)
+      expect(count_data[:projects_with_alerts_service_enabled]).to eq(1)
+      expect(count_data[:projects_with_prometheus_alerts]).to eq(2)
+      expect(count_data[:projects_with_terraform_reports]).to eq(2)
+      expect(count_data[:projects_with_terraform_states]).to eq(2)
+      expect(count_data[:terraform_reports]).to eq(6)
+      expect(count_data[:terraform_states]).to eq(3)
+      expect(count_data[:issues_created_from_gitlab_error_tracking_ui]).to eq(1)
+      expect(count_data[:issues_with_associated_zoom_link]).to eq(2)
+      expect(count_data[:issues_using_zoom_quick_actions]).to eq(3)
+      expect(count_data[:issues_with_embedded_grafana_charts_approx]).to eq(2)
+      expect(count_data[:incident_issues]).to eq(4)
+      expect(count_data[:issues_created_gitlab_alerts]).to eq(1)
+      expect(count_data[:issues_created_from_alerts]).to eq(3)
+      expect(count_data[:issues_created_manually_from_alerts]).to eq(1)
+      expect(count_data[:alert_bot_incident_issues]).to eq(4)
+      expect(count_data[:incident_labeled_issues]).to eq(3)
+
+      expect(count_data[:clusters_enabled]).to eq(6)
+      expect(count_data[:project_clusters_enabled]).to eq(4)
+      expect(count_data[:group_clusters_enabled]).to eq(1)
+      expect(count_data[:instance_clusters_enabled]).to eq(1)
+      expect(count_data[:clusters_disabled]).to eq(3)
+      expect(count_data[:project_clusters_disabled]).to eq(1)
+      expect(count_data[:group_clusters_disabled]).to eq(1)
+      expect(count_data[:instance_clusters_disabled]).to eq(1)
+      expect(count_data[:clusters_platforms_eks]).to eq(1)
+      expect(count_data[:clusters_platforms_gke]).to eq(1)
+      expect(count_data[:clusters_platforms_user]).to eq(1)
+      expect(count_data[:clusters_applications_helm]).to eq(1)
+      expect(count_data[:clusters_applications_ingress]).to eq(1)
+      expect(count_data[:clusters_applications_cert_managers]).to eq(1)
+      expect(count_data[:clusters_applications_crossplane]).to eq(1)
+      expect(count_data[:clusters_applications_prometheus]).to eq(1)
+      expect(count_data[:clusters_applications_runner]).to eq(1)
+      expect(count_data[:clusters_applications_knative]).to eq(1)
+      expect(count_data[:clusters_applications_elastic_stack]).to eq(1)
+      expect(count_data[:grafana_integrated_projects]).to eq(2)
+      expect(count_data[:clusters_applications_jupyter]).to eq(1)
+      expect(count_data[:clusters_management_project]).to eq(1)
+    end
+
+    it 'gathers object store usage correctly' do
+      expect(subject[:object_store]).to eq(
+        { artifacts: { enabled: true, object_store: { enabled: true, direct_upload: true, background_upload: false, provider: "AWS" } },
+         external_diffs: { enabled: false },
+         lfs: { enabled: true, object_store: { enabled: false, direct_upload: true, background_upload: false, provider: "AWS" } },
+         uploads: { enabled: nil, object_store: { enabled: false, direct_upload: true, background_upload: false, provider: "AWS" } },
+         packages: { enabled: true, object_store: { enabled: false, direct_upload: false, background_upload: true, provider: "AWS" } } }
+      )
+    end
+
+    it 'gathers topology data' do
+      expect(subject.keys).to include(:topology)
+    end
+
+    context 'with existing container expiration policies' do
+      let_it_be(:disabled) { create(:container_expiration_policy, enabled: false) }
+      let_it_be(:enabled) { create(:container_expiration_policy, enabled: true) }
 
-        let(:inactive_policies) { ::ContainerExpirationPolicy.where(enabled: false) }
-        let(:active_policies) { ::ContainerExpirationPolicy.active }
-
-        subject { described_class.data[:counts] }
-
-        it 'gathers usage data' do
-          expect(subject[:projects_with_expiration_policy_enabled]).to eq 20
-          expect(subject[:projects_with_expiration_policy_disabled]).to eq 1
-
-          expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_unset]).to eq 14
-          expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_1]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_5]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_10]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_25]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_50]).to eq 1
-
-          expect(subject[:projects_with_expiration_policy_enabled_with_older_than_unset]).to eq 16
-          expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_7d]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_14d]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_30d]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_90d]).to eq 1
-
-          expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_1d]).to eq 12
-          expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_7d]).to eq 5
-          expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_14d]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_1month]).to eq 1
-          expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_3month]).to eq 1
+      %i[keep_n cadence older_than].each do |attribute|
+        ContainerExpirationPolicy.send("#{attribute}_options").keys.each do |value|
+          let_it_be("container_expiration_policy_with_#{attribute}_set_to_#{value}") { create(:container_expiration_policy, attribute => value) }
         end
       end
 
-      it 'works when queries time out' do
-        allow_any_instance_of(ActiveRecord::Relation)
-          .to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
+      let_it_be('container_expiration_policy_with_keep_n_set_to_null') { create(:container_expiration_policy, keep_n: nil) }
+      let_it_be('container_expiration_policy_with_older_than_set_to_null') { create(:container_expiration_policy, older_than: nil) }
 
-        expect { subject }.not_to raise_error
-      end
+      let(:inactive_policies) { ::ContainerExpirationPolicy.where(enabled: false) }
+      let(:active_policies) { ::ContainerExpirationPolicy.active }
 
-      it 'jira usage works when queries time out' do
-        allow_any_instance_of(ActiveRecord::Relation)
-          .to receive(:find_in_batches).and_raise(ActiveRecord::StatementInvalid.new(''))
+      subject { described_class.data[:counts] }
 
-        expect { described_class.jira_usage }.not_to raise_error
+      it 'gathers usage data' do
+        expect(subject[:projects_with_expiration_policy_enabled]).to eq 22
+        expect(subject[:projects_with_expiration_policy_disabled]).to eq 1
+
+        expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_unset]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_1]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_5]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_10]).to eq 16
+        expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_25]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_keep_n_set_to_50]).to eq 1
+
+        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_unset]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_7d]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_14d]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_30d]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_older_than_set_to_90d]).to eq 18
+
+        expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_1d]).to eq 18
+        expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_7d]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_14d]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_1month]).to eq 1
+        expect(subject[:projects_with_expiration_policy_enabled_with_cadence_set_to_3month]).to eq 1
       end
     end
 
-    describe '#usage_data_counters' do
-      subject { described_class.usage_data_counters }
+    it 'works when queries time out' do
+      allow_any_instance_of(ActiveRecord::Relation)
+        .to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
 
-      it { is_expected.to all(respond_to :totals) }
-      it { is_expected.to all(respond_to :fallback_totals) }
+      expect { subject }.not_to raise_error
+    end
 
-      describe 'the results of calling #totals on all objects in the array' do
-        subject { described_class.usage_data_counters.map(&:totals) }
+    it 'jira usage works when queries time out' do
+      allow_any_instance_of(ActiveRecord::Relation)
+        .to receive(:find_in_batches).and_raise(ActiveRecord::StatementInvalid.new(''))
 
-        it { is_expected.to all(be_a Hash) }
-        it { is_expected.to all(have_attributes(keys: all(be_a Symbol), values: all(be_a Integer))) }
-      end
+      expect { described_class.jira_usage }.not_to raise_error
+    end
+  end
 
-      describe 'the results of calling #fallback_totals on all objects in the array' do
-        subject { described_class.usage_data_counters.map(&:fallback_totals) }
+  describe '#usage_data_counters' do
+    subject { described_class.usage_data_counters }
 
-        it { is_expected.to all(be_a Hash) }
-        it { is_expected.to all(have_attributes(keys: all(be_a Symbol), values: all(eq(-1)))) }
-      end
+    it { is_expected.to all(respond_to :totals) }
+    it { is_expected.to all(respond_to :fallback_totals) }
 
-      it 'does not have any conflicts' do
-        all_keys = subject.flat_map { |counter| counter.totals.keys }
+    describe 'the results of calling #totals on all objects in the array' do
+      subject { described_class.usage_data_counters.map(&:totals) }
 
-        expect(all_keys.size).to eq all_keys.to_set.size
-      end
+      it { is_expected.to all(be_a Hash) }
+      it { is_expected.to all(have_attributes(keys: all(be_a Symbol), values: all(be_a Integer))) }
     end
 
-    describe '#license_usage_data' do
-      subject { described_class.license_usage_data }
+    describe 'the results of calling #fallback_totals on all objects in the array' do
+      subject { described_class.usage_data_counters.map(&:fallback_totals) }
 
-      it 'gathers license data' do
-        expect(subject[:uuid]).to eq(Gitlab::CurrentSettings.uuid)
-        expect(subject[:version]).to eq(Gitlab::VERSION)
-        expect(subject[:installation_type]).to eq('gitlab-development-kit')
-        expect(subject[:active_user_count]).to eq(User.active.size)
-        expect(subject[:recorded_at]).to be_a(Time)
-      end
+      it { is_expected.to all(be_a Hash) }
+      it { is_expected.to all(have_attributes(keys: all(be_a Symbol), values: all(eq(-1)))) }
     end
 
-    describe '.recording_ce_finished_at' do
-      subject { described_class.recording_ce_finish_data }
+    it 'does not have any conflicts' do
+      all_keys = subject.flat_map { |counter| counter.totals.keys }
 
-      it 'gathers time ce recording finishes at' do
-        expect(subject[:recording_ce_finished_at]).to be_a(Time)
-      end
+      expect(all_keys.size).to eq all_keys.to_set.size
     end
+  end
 
-    context 'when not relying on database records' do
-      describe '#features_usage_data_ce' do
-        subject { described_class.features_usage_data_ce }
-
-        it 'gathers feature usage data' do
-          expect(subject[:mattermost_enabled]).to eq(Gitlab.config.mattermost.enabled)
-          expect(subject[:signup_enabled]).to eq(Gitlab::CurrentSettings.allow_signup?)
-          expect(subject[:ldap_enabled]).to eq(Gitlab.config.ldap.enabled)
-          expect(subject[:gravatar_enabled]).to eq(Gitlab::CurrentSettings.gravatar_enabled?)
-          expect(subject[:omniauth_enabled]).to eq(Gitlab::Auth.omniauth_enabled?)
-          expect(subject[:reply_by_email_enabled]).to eq(Gitlab::IncomingEmail.enabled?)
-          expect(subject[:container_registry_enabled]).to eq(Gitlab.config.registry.enabled)
-          expect(subject[:dependency_proxy_enabled]).to eq(Gitlab.config.dependency_proxy.enabled)
-          expect(subject[:gitlab_shared_runners_enabled]).to eq(Gitlab.config.gitlab_ci.shared_runners_enabled)
-          expect(subject[:web_ide_clientside_preview_enabled]).to eq(Gitlab::CurrentSettings.web_ide_clientside_preview_enabled?)
-          expect(subject[:grafana_link_enabled]).to eq(Gitlab::CurrentSettings.grafana_enabled?)
-        end
+  describe '#license_usage_data' do
+    subject { described_class.license_usage_data }
 
-        context 'with embedded grafana' do
-          it 'returns true when embedded grafana is enabled' do
-            stub_application_setting(grafana_enabled: true)
+    it 'gathers license data' do
+      expect(subject[:uuid]).to eq(Gitlab::CurrentSettings.uuid)
+      expect(subject[:version]).to eq(Gitlab::VERSION)
+      expect(subject[:installation_type]).to eq('gitlab-development-kit')
+      expect(subject[:active_user_count]).to eq(User.active.size)
+      expect(subject[:recorded_at]).to be_a(Time)
+    end
+  end
 
-            expect(subject[:grafana_link_enabled]).to eq(true)
-          end
+  describe '.recording_ce_finished_at' do
+    subject { described_class.recording_ce_finish_data }
+
+    it 'gathers time ce recording finishes at' do
+      expect(subject[:recording_ce_finished_at]).to be_a(Time)
+    end
+  end
 
-          it 'returns false when embedded grafana is disabled' do
-            stub_application_setting(grafana_enabled: false)
+  context 'when not relying on database records' do
+    describe '#features_usage_data_ce' do
+      subject { described_class.features_usage_data_ce }
+
+      it 'gathers feature usage data', :aggregate_failures do
+        expect(subject[:instance_auto_devops_enabled]).to eq(Gitlab::CurrentSettings.auto_devops_enabled?)
+        expect(subject[:mattermost_enabled]).to eq(Gitlab.config.mattermost.enabled)
+        expect(subject[:signup_enabled]).to eq(Gitlab::CurrentSettings.allow_signup?)
+        expect(subject[:ldap_enabled]).to eq(Gitlab.config.ldap.enabled)
+        expect(subject[:gravatar_enabled]).to eq(Gitlab::CurrentSettings.gravatar_enabled?)
+        expect(subject[:omniauth_enabled]).to eq(Gitlab::Auth.omniauth_enabled?)
+        expect(subject[:reply_by_email_enabled]).to eq(Gitlab::IncomingEmail.enabled?)
+        expect(subject[:container_registry_enabled]).to eq(Gitlab.config.registry.enabled)
+        expect(subject[:dependency_proxy_enabled]).to eq(Gitlab.config.dependency_proxy.enabled)
+        expect(subject[:gitlab_shared_runners_enabled]).to eq(Gitlab.config.gitlab_ci.shared_runners_enabled)
+        expect(subject[:web_ide_clientside_preview_enabled]).to eq(Gitlab::CurrentSettings.web_ide_clientside_preview_enabled?)
+        expect(subject[:grafana_link_enabled]).to eq(Gitlab::CurrentSettings.grafana_enabled?)
+      end
 
-            expect(subject[:grafana_link_enabled]).to eq(false)
-          end
+      context 'with embedded grafana' do
+        it 'returns true when embedded grafana is enabled' do
+          stub_application_setting(grafana_enabled: true)
+
+          expect(subject[:grafana_link_enabled]).to eq(true)
         end
-      end
 
-      describe '#components_usage_data' do
-        subject { described_class.components_usage_data }
-
-        it 'gathers components usage data' do
-          expect(Gitlab::UsageData).to receive(:app_server_type).and_return('server_type')
-          expect(subject[:app_server][:type]).to eq('server_type')
-          expect(subject[:gitlab_pages][:enabled]).to eq(Gitlab.config.pages.enabled)
-          expect(subject[:gitlab_pages][:version]).to eq(Gitlab::Pages::VERSION)
-          expect(subject[:git][:version]).to eq(Gitlab::Git.version)
-          expect(subject[:database][:adapter]).to eq(Gitlab::Database.adapter_name)
-          expect(subject[:database][:version]).to eq(Gitlab::Database.version)
-          expect(subject[:gitaly][:version]).to be_present
-          expect(subject[:gitaly][:servers]).to be >= 1
-          expect(subject[:gitaly][:filesystems]).to be_an(Array)
-          expect(subject[:gitaly][:filesystems].first).to be_a(String)
+        it 'returns false when embedded grafana is disabled' do
+          stub_application_setting(grafana_enabled: false)
+
+          expect(subject[:grafana_link_enabled]).to eq(false)
         end
       end
+    end
 
-      describe '#app_server_type' do
-        subject { described_class.app_server_type }
+    describe '#components_usage_data' do
+      subject { described_class.components_usage_data }
+
+      it 'gathers basic components usage data' do
+        stub_runtime(:puma)
+
+        expect(subject[:app_server][:type]).to eq('puma')
+        expect(subject[:gitlab_pages][:enabled]).to eq(Gitlab.config.pages.enabled)
+        expect(subject[:gitlab_pages][:version]).to eq(Gitlab::Pages::VERSION)
+        expect(subject[:git][:version]).to eq(Gitlab::Git.version)
+        expect(subject[:database][:adapter]).to eq(Gitlab::Database.adapter_name)
+        expect(subject[:database][:version]).to eq(Gitlab::Database.version)
+        expect(subject[:gitaly][:version]).to be_present
+        expect(subject[:gitaly][:servers]).to be >= 1
+        expect(subject[:gitaly][:clusters]).to be >= 0
+        expect(subject[:gitaly][:filesystems]).to be_an(Array)
+        expect(subject[:gitaly][:filesystems].first).to be_a(String)
+      end
 
-        it 'successfully identifies runtime and returns the identifier' do
-          expect(Gitlab::Runtime).to receive(:identify).and_return(:runtime_identifier)
+      def stub_runtime(runtime)
+        allow(Gitlab::Runtime).to receive(:identify).and_return(runtime)
+      end
+    end
 
-          is_expected.to eq('runtime_identifier')
-        end
+    describe '#app_server_type' do
+      subject { described_class.app_server_type }
 
-        context 'when runtime is not identified' do
-          let(:exception) { Gitlab::Runtime::IdentificationError.new('exception message from runtime identify') }
+      it 'successfully identifies runtime and returns the identifier' do
+        expect(Gitlab::Runtime).to receive(:identify).and_return(:runtime_identifier)
 
-          it 'logs the exception and returns unknown app server type' do
-            expect(Gitlab::Runtime).to receive(:identify).and_raise(exception)
+        is_expected.to eq('runtime_identifier')
+      end
 
-            expect(Gitlab::AppLogger).to receive(:error).with(exception.message)
-            expect(Gitlab::ErrorTracking).to receive(:track_exception).with(exception)
-            expect(subject).to eq('unknown_app_server_type')
-          end
+      context 'when runtime is not identified' do
+        let(:exception) { Gitlab::Runtime::IdentificationError.new('exception message from runtime identify') }
+
+        it 'logs the exception and returns unknown app server type' do
+          expect(Gitlab::Runtime).to receive(:identify).and_raise(exception)
+
+          expect(Gitlab::AppLogger).to receive(:error).with(exception.message)
+          expect(Gitlab::ErrorTracking).to receive(:track_exception).with(exception)
+          expect(subject).to eq('unknown_app_server_type')
         end
       end
+    end
 
-      describe '#object_store_config' do
-        let(:component) { 'lfs' }
+    describe '#object_store_config' do
+      let(:component) { 'lfs' }
 
-        subject { described_class.object_store_config(component) }
+      subject { described_class.object_store_config(component) }
 
-        context 'when object_store is not configured' do
-          it 'returns component enable status only' do
-            allow(Settings).to receive(:[]).with(component).and_return({ 'enabled' => false })
+      context 'when object_store is not configured' do
+        it 'returns component enable status only' do
+          allow(Settings).to receive(:[]).with(component).and_return({ 'enabled' => false })
 
-            expect(subject).to eq({ enabled: false })
-          end
+          expect(subject).to eq({ enabled: false })
         end
+      end
 
-        context 'when object_store is configured' do
-          it 'returns filtered object store config' do
-            allow(Settings).to receive(:[]).with(component)
-              .and_return(
+      context 'when object_store is configured' do
+        it 'returns filtered object store config' do
+          allow(Settings).to receive(:[]).with(component)
+            .and_return(
+              { 'enabled' => true,
+                'object_store' =>
                 { 'enabled' => true,
-                  'object_store' =>
-                  { 'enabled' => true,
-                    'remote_directory' => component,
-                    'direct_upload' => true,
-                    'connection' =>
-                  { 'provider' => 'AWS', 'aws_access_key_id' => 'minio', 'aws_secret_access_key' => 'gdk-minio', 'region' => 'gdk', 'endpoint' => 'http://127.0.0.1:9000', 'path_style' => true },
-                    'background_upload' => false,
-                    'proxy_download' => false } })
-
-            expect(subject).to eq(
-              { enabled: true, object_store: { enabled: true, direct_upload: true, background_upload: false, provider: "AWS" } })
-          end
+                  'remote_directory' => component,
+                  'direct_upload' => true,
+                  'connection' =>
+                { 'provider' => 'AWS', 'aws_access_key_id' => 'minio', 'aws_secret_access_key' => 'gdk-minio', 'region' => 'gdk', 'endpoint' => 'http://127.0.0.1:9000', 'path_style' => true },
+                  'background_upload' => false,
+                  'proxy_download' => false } })
+
+          expect(subject).to eq(
+            { enabled: true, object_store: { enabled: true, direct_upload: true, background_upload: false, provider: "AWS" } })
         end
+      end
 
-        context 'when retrieve component setting meets exception' do
-          it 'returns -1 for component enable status' do
-            allow(Settings).to receive(:[]).with(component).and_raise(StandardError)
+      context 'when retrieve component setting meets exception' do
+        it 'returns -1 for component enable status' do
+          allow(Settings).to receive(:[]).with(component).and_raise(StandardError)
 
-            expect(subject).to eq({ enabled: -1 })
-          end
+          expect(subject).to eq({ enabled: -1 })
         end
       end
+    end
 
-      describe '#object_store_usage_data' do
-        subject { described_class.object_store_usage_data }
-
-        it 'fetches object store config of five components' do
-          %w(artifacts external_diffs lfs uploads packages).each do |component|
-            expect(described_class).to receive(:object_store_config).with(component).and_return("#{component}_object_store_config")
-          end
+    describe '#object_store_usage_data' do
+      subject { described_class.object_store_usage_data }
 
-          expect(subject).to eq(
-            object_store: {
-              artifacts: 'artifacts_object_store_config',
-              external_diffs: 'external_diffs_object_store_config',
-              lfs: 'lfs_object_store_config',
-              uploads: 'uploads_object_store_config',
-              packages: 'packages_object_store_config'
-            })
+      it 'fetches object store config of five components' do
+        %w(artifacts external_diffs lfs uploads packages).each do |component|
+          expect(described_class).to receive(:object_store_config).with(component).and_return("#{component}_object_store_config")
         end
+
+        expect(subject).to eq(
+          object_store: {
+            artifacts: 'artifacts_object_store_config',
+            external_diffs: 'external_diffs_object_store_config',
+            lfs: 'lfs_object_store_config',
+            uploads: 'uploads_object_store_config',
+            packages: 'packages_object_store_config'
+          })
       end
+    end
 
-      describe '#cycle_analytics_usage_data' do
-        subject { described_class.cycle_analytics_usage_data }
+    describe '#cycle_analytics_usage_data' do
+      subject { described_class.cycle_analytics_usage_data }
 
-        it 'works when queries time out in new' do
-          allow(Gitlab::CycleAnalytics::UsageData)
-            .to receive(:new).and_raise(ActiveRecord::StatementInvalid.new(''))
+      it 'works when queries time out in new' do
+        allow(Gitlab::CycleAnalytics::UsageData)
+          .to receive(:new).and_raise(ActiveRecord::StatementInvalid.new(''))
 
-          expect { subject }.not_to raise_error
-        end
+        expect { subject }.not_to raise_error
+      end
 
-        it 'works when queries time out in to_json' do
-          allow_any_instance_of(Gitlab::CycleAnalytics::UsageData)
-            .to receive(:to_json).and_raise(ActiveRecord::StatementInvalid.new(''))
+      it 'works when queries time out in to_json' do
+        allow_any_instance_of(Gitlab::CycleAnalytics::UsageData)
+          .to receive(:to_json).and_raise(ActiveRecord::StatementInvalid.new(''))
 
-          expect { subject }.not_to raise_error
+        expect { subject }.not_to raise_error
+      end
+    end
+
+    describe '#ingress_modsecurity_usage' do
+      subject { described_class.ingress_modsecurity_usage }
+
+      let(:environment) { create(:environment) }
+      let(:project) { environment.project }
+      let(:environment_scope) { '*' }
+      let(:deployment) { create(:deployment, :success, environment: environment, project: project, cluster: cluster) }
+      let(:cluster) { create(:cluster, environment_scope: environment_scope, projects: [project]) }
+      let(:ingress_mode) { :modsecurity_blocking }
+      let!(:ingress) { create(:clusters_applications_ingress, ingress_mode, cluster: cluster) }
+
+      context 'when cluster is disabled' do
+        let(:cluster) { create(:cluster, :disabled, projects: [project]) }
+
+        it 'gathers ingress data' do
+          expect(subject[:ingress_modsecurity_logging]).to eq(0)
+          expect(subject[:ingress_modsecurity_blocking]).to eq(0)
+          expect(subject[:ingress_modsecurity_disabled]).to eq(0)
+          expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
         end
       end
 
-      describe '#ingress_modsecurity_usage' do
-        subject { described_class.ingress_modsecurity_usage }
+      context 'when deployment is unsuccessful' do
+        let!(:deployment) { create(:deployment, :failed, environment: environment, project: project, cluster: cluster) }
 
-        let(:environment) { create(:environment) }
-        let(:project) { environment.project }
-        let(:environment_scope) { '*' }
-        let(:deployment) { create(:deployment, :success, environment: environment, project: project, cluster: cluster) }
-        let(:cluster) { create(:cluster, environment_scope: environment_scope, projects: [project]) }
-        let(:ingress_mode) { :modsecurity_blocking }
-        let!(:ingress) { create(:clusters_applications_ingress, ingress_mode, cluster: cluster) }
+        it 'gathers ingress data' do
+          expect(subject[:ingress_modsecurity_logging]).to eq(0)
+          expect(subject[:ingress_modsecurity_blocking]).to eq(0)
+          expect(subject[:ingress_modsecurity_disabled]).to eq(0)
+          expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
+        end
+      end
 
-        context 'when cluster is disabled' do
-          let(:cluster) { create(:cluster, :disabled, projects: [project]) }
+      context 'when deployment is successful' do
+        let!(:deployment) { create(:deployment, :success, environment: environment, project: project, cluster: cluster) }
 
+        context 'when modsecurity is in blocking mode' do
           it 'gathers ingress data' do
             expect(subject[:ingress_modsecurity_logging]).to eq(0)
-            expect(subject[:ingress_modsecurity_blocking]).to eq(0)
+            expect(subject[:ingress_modsecurity_blocking]).to eq(1)
             expect(subject[:ingress_modsecurity_disabled]).to eq(0)
             expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
           end
         end
 
-        context 'when deployment is unsuccessful' do
-          let!(:deployment) { create(:deployment, :failed, environment: environment, project: project, cluster: cluster) }
+        context 'when modsecurity is in logging mode' do
+          let(:ingress_mode) { :modsecurity_logging }
 
           it 'gathers ingress data' do
-            expect(subject[:ingress_modsecurity_logging]).to eq(0)
+            expect(subject[:ingress_modsecurity_logging]).to eq(1)
             expect(subject[:ingress_modsecurity_blocking]).to eq(0)
             expect(subject[:ingress_modsecurity_disabled]).to eq(0)
             expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
           end
         end
 
-        context 'when deployment is successful' do
-          let!(:deployment) { create(:deployment, :success, environment: environment, project: project, cluster: cluster) }
+        context 'when modsecurity is disabled' do
+          let(:ingress_mode) { :modsecurity_disabled }
 
-          context 'when modsecurity is in blocking mode' do
-            it 'gathers ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(0)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(1)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(0)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
-            end
+          it 'gathers ingress data' do
+            expect(subject[:ingress_modsecurity_logging]).to eq(0)
+            expect(subject[:ingress_modsecurity_blocking]).to eq(0)
+            expect(subject[:ingress_modsecurity_disabled]).to eq(1)
+            expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
           end
+        end
 
-          context 'when modsecurity is in logging mode' do
-            let(:ingress_mode) { :modsecurity_logging }
+        context 'when modsecurity is not installed' do
+          let(:ingress_mode) { :modsecurity_not_installed }
 
-            it 'gathers ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(1)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(0)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(0)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
-            end
+          it 'gathers ingress data' do
+            expect(subject[:ingress_modsecurity_logging]).to eq(0)
+            expect(subject[:ingress_modsecurity_blocking]).to eq(0)
+            expect(subject[:ingress_modsecurity_disabled]).to eq(0)
+            expect(subject[:ingress_modsecurity_not_installed]).to eq(1)
           end
+        end
 
-          context 'when modsecurity is disabled' do
-            let(:ingress_mode) { :modsecurity_disabled }
+        context 'with multiple projects' do
+          let(:environment_2) { create(:environment) }
+          let(:project_2) { environment_2.project }
+          let(:cluster_2) { create(:cluster, environment_scope: environment_scope, projects: [project_2]) }
+          let!(:ingress_2) { create(:clusters_applications_ingress, :modsecurity_logging, cluster: cluster_2) }
+          let!(:deployment_2) { create(:deployment, :success, environment: environment_2, project: project_2, cluster: cluster_2) }
 
-            it 'gathers ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(0)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(0)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(1)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
-            end
+          it 'gathers non-duplicated ingress data' do
+            expect(subject[:ingress_modsecurity_logging]).to eq(1)
+            expect(subject[:ingress_modsecurity_blocking]).to eq(1)
+            expect(subject[:ingress_modsecurity_disabled]).to eq(0)
+            expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
           end
+        end
 
-          context 'when modsecurity is not installed' do
-            let(:ingress_mode) { :modsecurity_not_installed }
-
-            it 'gathers ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(0)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(0)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(0)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(1)
-            end
-          end
+        context 'with multiple deployments' do
+          let!(:deployment_2) { create(:deployment, :success, environment: environment, project: project, cluster: cluster) }
 
-          context 'with multiple projects' do
-            let(:environment_2) { create(:environment) }
-            let(:project_2) { environment_2.project }
-            let(:cluster_2) { create(:cluster, environment_scope: environment_scope, projects: [project_2]) }
-            let!(:ingress_2) { create(:clusters_applications_ingress, :modsecurity_logging, cluster: cluster_2) }
-            let!(:deployment_2) { create(:deployment, :success, environment: environment_2, project: project_2, cluster: cluster_2) }
-
-            it 'gathers non-duplicated ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(1)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(1)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(0)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
-            end
+          it 'gathers non-duplicated ingress data' do
+            expect(subject[:ingress_modsecurity_logging]).to eq(0)
+            expect(subject[:ingress_modsecurity_blocking]).to eq(1)
+            expect(subject[:ingress_modsecurity_disabled]).to eq(0)
+            expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
           end
+        end
 
-          context 'with multiple deployments' do
-            let!(:deployment_2) { create(:deployment, :success, environment: environment, project: project, cluster: cluster) }
-
-            it 'gathers non-duplicated ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(0)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(1)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(0)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
-            end
-          end
+        context 'with multiple projects' do
+          let(:environment_2) { create(:environment) }
+          let(:project_2) { environment_2.project }
+          let!(:deployment_2) { create(:deployment, :success, environment: environment_2, project: project_2, cluster: cluster) }
+          let(:cluster) { create(:cluster, environment_scope: environment_scope, projects: [project, project_2]) }
 
-          context 'with multiple projects' do
-            let(:environment_2) { create(:environment) }
-            let(:project_2) { environment_2.project }
-            let!(:deployment_2) { create(:deployment, :success, environment: environment_2, project: project_2, cluster: cluster) }
-            let(:cluster) { create(:cluster, environment_scope: environment_scope, projects: [project, project_2]) }
-
-            it 'gathers ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(0)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(2)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(0)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
-            end
+          it 'gathers ingress data' do
+            expect(subject[:ingress_modsecurity_logging]).to eq(0)
+            expect(subject[:ingress_modsecurity_blocking]).to eq(2)
+            expect(subject[:ingress_modsecurity_disabled]).to eq(0)
+            expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
           end
+        end
 
-          context 'with multiple environments' do
-            let!(:environment_2) { create(:environment, project: project) }
-            let!(:deployment_2) { create(:deployment, :success, environment: environment_2, project: project, cluster: cluster) }
+        context 'with multiple environments' do
+          let!(:environment_2) { create(:environment, project: project) }
+          let!(:deployment_2) { create(:deployment, :success, environment: environment_2, project: project, cluster: cluster) }
 
-            it 'gathers ingress data' do
-              expect(subject[:ingress_modsecurity_logging]).to eq(0)
-              expect(subject[:ingress_modsecurity_blocking]).to eq(2)
-              expect(subject[:ingress_modsecurity_disabled]).to eq(0)
-              expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
-            end
+          it 'gathers ingress data' do
+            expect(subject[:ingress_modsecurity_logging]).to eq(0)
+            expect(subject[:ingress_modsecurity_blocking]).to eq(2)
+            expect(subject[:ingress_modsecurity_disabled]).to eq(0)
+            expect(subject[:ingress_modsecurity_not_installed]).to eq(0)
           end
         end
       end
+    end
 
-      describe '#grafana_embed_usage_data' do
-        subject { described_class.grafana_embed_usage_data }
+    describe '#grafana_embed_usage_data' do
+      subject { described_class.grafana_embed_usage_data }
 
-        let(:project) { create(:project) }
-        let(:description_with_embed) { "Some comment\n\nhttps://grafana.example.com/d/xvAk4q0Wk/go-processes?orgId=1&from=1573238522762&to=1573240322762&var-job=prometheus&var-interval=10m&panelId=1&fullscreen" }
-        let(:description_with_unintegrated_embed) { "Some comment\n\nhttps://grafana.exp.com/d/xvAk4q0Wk/go-processes?orgId=1&from=1573238522762&to=1573240322762&var-job=prometheus&var-interval=10m&panelId=1&fullscreen" }
-        let(:description_with_non_grafana_inline_metric) { "Some comment\n\n#{Gitlab::Routing.url_helpers.metrics_namespace_project_environment_url(*['foo', 'bar', 12])}" }
+      let(:project) { create(:project) }
+      let(:description_with_embed) { "Some comment\n\nhttps://grafana.example.com/d/xvAk4q0Wk/go-processes?orgId=1&from=1573238522762&to=1573240322762&var-job=prometheus&var-interval=10m&panelId=1&fullscreen" }
+      let(:description_with_unintegrated_embed) { "Some comment\n\nhttps://grafana.exp.com/d/xvAk4q0Wk/go-processes?orgId=1&from=1573238522762&to=1573240322762&var-job=prometheus&var-interval=10m&panelId=1&fullscreen" }
+      let(:description_with_non_grafana_inline_metric) { "Some comment\n\n#{Gitlab::Routing.url_helpers.metrics_namespace_project_environment_url(*['foo', 'bar', 12])}" }
 
-        shared_examples "zero count" do
-          it "does not count the issue" do
-            expect(subject).to eq(0)
-          end
+      shared_examples "zero count" do
+        it "does not count the issue" do
+          expect(subject).to eq(0)
         end
+      end
 
-        context 'with project grafana integration enabled' do
-          before do
-            create(:grafana_integration, project: project, enabled: true)
-          end
-
-          context 'with valid and invalid embeds' do
-            before do
-              # Valid
-              create(:issue, project: project, description: description_with_embed)
-              create(:issue, project: project, description: description_with_embed)
-              # In-Valid
-              create(:issue, project: project, description: description_with_unintegrated_embed)
-              create(:issue, project: project, description: description_with_non_grafana_inline_metric)
-              create(:issue, project: project, description: nil)
-              create(:issue, project: project, description: '')
-              create(:issue, project: project)
-            end
-
-            it 'counts only the issues with embeds' do
-              expect(subject).to eq(2)
-            end
-          end
+      context 'with project grafana integration enabled' do
+        before do
+          create(:grafana_integration, project: project, enabled: true)
         end
 
-        context 'with project grafana integration disabled' do
+        context 'with valid and invalid embeds' do
           before do
-            create(:grafana_integration, project: project, enabled: false)
-          end
-
-          context 'with one issue having a grafana link in the description and one without' do
-            before do
-              create(:issue, project: project, description: description_with_embed)
-              create(:issue, project: project)
-            end
-
-            it_behaves_like('zero count')
+            # Valid
+            create(:issue, project: project, description: description_with_embed)
+            create(:issue, project: project, description: description_with_embed)
+            # In-Valid
+            create(:issue, project: project, description: description_with_unintegrated_embed)
+            create(:issue, project: project, description: description_with_non_grafana_inline_metric)
+            create(:issue, project: project, description: nil)
+            create(:issue, project: project, description: '')
+            create(:issue, project: project)
           end
-        end
-
-        context 'with an un-integrated project' do
-          context 'with one issue having a grafana link in the description and one without' do
-            before do
-              create(:issue, project: project, description: description_with_embed)
-              create(:issue, project: project)
-            end
 
-            it_behaves_like('zero count')
+          it 'counts only the issues with embeds' do
+            expect(subject).to eq(2)
           end
         end
       end
 
-      describe '#count' do
-        let(:relation) { double(:relation) }
-
-        it 'returns the count when counting succeeds' do
-          allow(relation).to receive(:count).and_return(1)
-
-          expect(described_class.count(relation, batch: false)).to eq(1)
+      context 'with project grafana integration disabled' do
+        before do
+          create(:grafana_integration, project: project, enabled: false)
         end
 
-        it 'returns the fallback value when counting fails' do
-          stub_const("Gitlab::UsageData::FALLBACK", 15)
-          allow(relation).to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
+        context 'with one issue having a grafana link in the description and one without' do
+          before do
+            create(:issue, project: project, description: description_with_embed)
+            create(:issue, project: project)
+          end
 
-          expect(described_class.count(relation, batch: false)).to eq(15)
+          it_behaves_like('zero count')
         end
       end
 
-      describe '#distinct_count' do
-        let(:relation) { double(:relation) }
-
-        it 'returns the count when counting succeeds' do
-          allow(relation).to receive(:distinct_count_by).and_return(1)
-
-          expect(described_class.distinct_count(relation, batch: false)).to eq(1)
-        end
-
-        it 'returns the fallback value when counting fails' do
-          stub_const("Gitlab::UsageData::FALLBACK", 15)
-          allow(relation).to receive(:distinct_count_by).and_raise(ActiveRecord::StatementInvalid.new(''))
+      context 'with an un-integrated project' do
+        context 'with one issue having a grafana link in the description and one without' do
+          before do
+            create(:issue, project: project, description: description_with_embed)
+            create(:issue, project: project)
+          end
 
-          expect(described_class.distinct_count(relation, batch: false)).to eq(15)
+          it_behaves_like('zero count')
         end
       end
     end
   end
 
-  context 'when usage usage_ping_batch_counter is true' do
-    before do
-      stub_feature_flags(usage_ping_batch_counter: true)
-    end
-
-    it_behaves_like 'usage data execution'
-  end
+  describe '#merge_requests_usage' do
+    let(:time_period) { { created_at: 2.days.ago..Time.current } }
+    let(:merge_request) { create(:merge_request) }
+    let(:other_user) { create(:user) }
+    let(:another_user) { create(:user) }
 
-  context 'when usage usage_ping_batch_counter is false' do
     before do
-      stub_feature_flags(usage_ping_batch_counter: false)
-    end
-
-    it_behaves_like 'usage data execution'
-  end
-
-  describe '#alt_usage_data' do
-    it 'returns the fallback when it gets an error' do
-      expect(described_class.alt_usage_data { raise StandardError } ).to eq(-1)
-    end
-
-    it 'returns the evaluated block when give' do
-      expect(described_class.alt_usage_data { Gitlab::CurrentSettings.uuid } ).to eq(Gitlab::CurrentSettings.uuid)
+      create(:event, target: merge_request, author: merge_request.author, created_at: 1.day.ago)
+      create(:event, target: merge_request, author: merge_request.author, created_at: 1.hour.ago)
+      create(:event, target: merge_request, author: merge_request.author, created_at: 3.days.ago)
+      create(:event, target: merge_request, author: other_user, created_at: 1.day.ago)
+      create(:event, target: merge_request, author: other_user, created_at: 1.hour.ago)
+      create(:event, target: merge_request, author: other_user, created_at: 3.days.ago)
+      create(:event, target: merge_request, author: another_user, created_at: 4.days.ago)
     end
 
-    it 'returns the value when given' do
-      expect(described_class.alt_usage_data(1)).to eq 1
-    end
-  end
-
-  describe '#redis_usage_data' do
-    context 'with block given' do
-      it 'returns the fallback when it gets an error' do
-        expect(described_class.redis_usage_data { raise ::Redis::CommandError } ).to eq(-1)
-      end
-
-      it 'returns the evaluated block when given' do
-        expect(described_class.redis_usage_data { 1 }).to eq(1)
-      end
-    end
-
-    context 'with counter given' do
-      it 'returns the falback values for all counter keys when it gets an error' do
-        allow(::Gitlab::UsageDataCounters::WikiPageCounter).to receive(:totals).and_raise(::Redis::CommandError)
-        expect(described_class.redis_usage_data(::Gitlab::UsageDataCounters::WikiPageCounter)).to eql(::Gitlab::UsageDataCounters::WikiPageCounter.fallback_totals)
-      end
-
-      it 'returns the totals when couter is given' do
-        allow(::Gitlab::UsageDataCounters::WikiPageCounter).to receive(:totals).and_return({ wiki_pages_create: 2 })
-        expect(described_class.redis_usage_data(::Gitlab::UsageDataCounters::WikiPageCounter)).to eql({ wiki_pages_create: 2 })
-      end
+    it 'returns the distinct count of users using merge requests (via events table) within the specified time period' do
+      expect(described_class.merge_requests_usage(time_period)).to eq(
+        merge_requests_users: 2
+      )
     end
   end
 end
diff --git a/spec/lib/gitlab/utils/usage_data_spec.rb b/spec/lib/gitlab/utils/usage_data_spec.rb
new file mode 100644
index 00000000000..7de615384c5
--- /dev/null
+++ b/spec/lib/gitlab/utils/usage_data_spec.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Utils::UsageData do
+  describe '#count' do
+    let(:relation) { double(:relation) }
+
+    it 'returns the count when counting succeeds' do
+      allow(relation).to receive(:count).and_return(1)
+
+      expect(described_class.count(relation, batch: false)).to eq(1)
+    end
+
+    it 'returns the fallback value when counting fails' do
+      stub_const("Gitlab::Utils::UsageData::FALLBACK", 15)
+      allow(relation).to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
+
+      expect(described_class.count(relation, batch: false)).to eq(15)
+    end
+  end
+
+  describe '#distinct_count' do
+    let(:relation) { double(:relation) }
+
+    it 'returns the count when counting succeeds' do
+      allow(relation).to receive(:distinct_count_by).and_return(1)
+
+      expect(described_class.distinct_count(relation, batch: false)).to eq(1)
+    end
+
+    it 'returns the fallback value when counting fails' do
+      stub_const("Gitlab::Utils::UsageData::FALLBACK", 15)
+      allow(relation).to receive(:distinct_count_by).and_raise(ActiveRecord::StatementInvalid.new(''))
+
+      expect(described_class.distinct_count(relation, batch: false)).to eq(15)
+    end
+  end
+
+  describe '#alt_usage_data' do
+    it 'returns the fallback when it gets an error' do
+      expect(described_class.alt_usage_data { raise StandardError } ).to eq(-1)
+    end
+
+    it 'returns the evaluated block when give' do
+      expect(described_class.alt_usage_data { Gitlab::CurrentSettings.uuid } ).to eq(Gitlab::CurrentSettings.uuid)
+    end
+
+    it 'returns the value when given' do
+      expect(described_class.alt_usage_data(1)).to eq 1
+    end
+  end
+
+  describe '#redis_usage_data' do
+    context 'with block given' do
+      it 'returns the fallback when it gets an error' do
+        expect(described_class.redis_usage_data { raise ::Redis::CommandError } ).to eq(-1)
+      end
+
+      it 'returns the evaluated block when given' do
+        expect(described_class.redis_usage_data { 1 }).to eq(1)
+      end
+    end
+
+    context 'with counter given' do
+      it 'returns the falback values for all counter keys when it gets an error' do
+        allow(::Gitlab::UsageDataCounters::WikiPageCounter).to receive(:totals).and_raise(::Redis::CommandError)
+        expect(described_class.redis_usage_data(::Gitlab::UsageDataCounters::WikiPageCounter)).to eql(::Gitlab::UsageDataCounters::WikiPageCounter.fallback_totals)
+      end
+
+      it 'returns the totals when couter is given' do
+        allow(::Gitlab::UsageDataCounters::WikiPageCounter).to receive(:totals).and_return({ wiki_pages_create: 2 })
+        expect(described_class.redis_usage_data(::Gitlab::UsageDataCounters::WikiPageCounter)).to eql({ wiki_pages_create: 2 })
+      end
+    end
+  end
+
+  describe '#with_prometheus_client' do
+    context 'when Prometheus is enabled' do
+      it 'yields a client instance and returns the block result' do
+        expect(Gitlab::Prometheus::Internal).to receive(:prometheus_enabled?).and_return(true)
+        expect(Gitlab::Prometheus::Internal).to receive(:uri).and_return('http://prom:9090')
+
+        result = described_class.with_prometheus_client { |client| client }
+
+        expect(result).to be_an_instance_of(Gitlab::PrometheusClient)
+      end
+    end
+
+    context 'when Prometheus is disabled' do
+      it 'returns nil' do
+        expect(Gitlab::Prometheus::Internal).to receive(:prometheus_enabled?).and_return(false)
+
+        result = described_class.with_prometheus_client { |client| client }
+
+        expect(result).to be nil
+      end
+    end
+  end
+
+  describe '#measure_duration' do
+    it 'returns block result and execution duration' do
+      allow(Process).to receive(:clock_gettime).and_return(1, 3)
+
+      result, duration = described_class.measure_duration { 42 }
+
+      expect(result).to eq(42)
+      expect(duration).to eq(2)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/utils_spec.rb b/spec/lib/gitlab/utils_spec.rb
index 0f0d6a93c97..3a2430d1f2d 100644
--- a/spec/lib/gitlab/utils_spec.rb
+++ b/spec/lib/gitlab/utils_spec.rb
@@ -345,4 +345,17 @@ describe Gitlab::Utils do
       expect(described_class.parse_url(1)).to be nil
     end
   end
+
+  describe 'multiple_key_invert' do
+    it 'invert keys with array values' do
+      hash = {
+        dast: [:vulnerabilities_count, :scanned_resources_count],
+        sast: [:vulnerabilities_count]
+      }
+      expect(described_class.multiple_key_invert(hash)).to eq({
+        vulnerabilities_count: [:dast, :sast],
+        scanned_resources_count: [:dast]
+      })
+    end
+  end
 end
diff --git a/spec/lib/gitlab/web_ide/config/entry/global_spec.rb b/spec/lib/gitlab/web_ide/config/entry/global_spec.rb
new file mode 100644
index 00000000000..04b0752c6fe
--- /dev/null
+++ b/spec/lib/gitlab/web_ide/config/entry/global_spec.rb
@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::WebIde::Config::Entry::Global do
+  let(:global) { described_class.new(hash) }
+
+  describe '.nodes' do
+    it 'returns a hash' do
+      expect(described_class.nodes).to be_a(Hash)
+    end
+
+    context 'when filtering all the entry/node names' do
+      it 'contains the expected node names' do
+        expect(described_class.nodes.keys)
+          .to match_array(%i[terminal])
+      end
+    end
+  end
+
+  context 'when configuration is valid' do
+    context 'when some entries defined' do
+      let(:hash) do
+        { terminal: { before_script: ['ls'], variables: {}, script: 'sleep 10s', services: ['mysql'] } }
+      end
+
+      describe '#compose!' do
+        before do
+          global.compose!
+        end
+
+        it 'creates nodes hash' do
+          expect(global.descendants).to be_an Array
+        end
+
+        it 'creates node object for each entry' do
+          expect(global.descendants.count).to eq 1
+        end
+
+        it 'creates node object using valid class' do
+          expect(global.descendants.first)
+            .to be_an_instance_of Gitlab::WebIde::Config::Entry::Terminal
+        end
+
+        it 'sets correct description for nodes' do
+          expect(global.descendants.first.description)
+            .to eq 'Configuration of the webide terminal.'
+        end
+
+        describe '#leaf?' do
+          it 'is not leaf' do
+            expect(global).not_to be_leaf
+          end
+        end
+      end
+
+      context 'when not composed' do
+        describe '#terminal_value' do
+          it 'returns nil' do
+            expect(global.terminal_value).to be nil
+          end
+        end
+
+        describe '#leaf?' do
+          it 'is leaf' do
+            expect(global).to be_leaf
+          end
+        end
+      end
+
+      context 'when composed' do
+        before do
+          global.compose!
+        end
+
+        describe '#errors' do
+          it 'has no errors' do
+            expect(global.errors).to be_empty
+          end
+        end
+
+        describe '#terminal_value' do
+          it 'returns correct script' do
+            expect(global.terminal_value).to eq({
+              tag_list: [],
+              yaml_variables: [],
+              options: {
+                before_script: ['ls'],
+                script: ['sleep 10s'],
+                services: [{ name: "mysql" }]
+              }
+            })
+          end
+        end
+      end
+    end
+  end
+
+  context 'when configuration is not valid' do
+    before do
+      global.compose!
+    end
+
+    context 'when job does not have valid before script' do
+      let(:hash) do
+        { terminal: { before_script: 100 } }
+      end
+
+      describe '#errors' do
+        it 'reports errors about missing script' do
+          expect(global.errors)
+            .to include "terminal:before_script config should be an array containing strings and arrays of strings"
+        end
+      end
+    end
+  end
+
+  context 'when value is not a hash' do
+    let(:hash) { [] }
+
+    describe '#valid?' do
+      it 'is not valid' do
+        expect(global).not_to be_valid
+      end
+    end
+
+    describe '#errors' do
+      it 'returns error about invalid type' do
+        expect(global.errors.first).to match /should be a hash/
+      end
+    end
+  end
+
+  describe '#specified?' do
+    it 'is concrete entry that is defined' do
+      expect(global.specified?).to be true
+    end
+  end
+
+  describe '#[]' do
+    before do
+      global.compose!
+    end
+
+    let(:hash) do
+      { terminal: { before_script: ['ls'] } }
+    end
+
+    context 'when entry exists' do
+      it 'returns correct entry' do
+        expect(global[:terminal])
+          .to be_an_instance_of Gitlab::WebIde::Config::Entry::Terminal
+        expect(global[:terminal][:before_script].value).to eq ['ls']
+      end
+    end
+
+    context 'when entry does not exist' do
+      it 'always return unspecified node' do
+        expect(global[:some][:unknown][:node])
+          .not_to be_specified
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/web_ide/config/entry/terminal_spec.rb b/spec/lib/gitlab/web_ide/config/entry/terminal_spec.rb
new file mode 100644
index 00000000000..882e389e040
--- /dev/null
+++ b/spec/lib/gitlab/web_ide/config/entry/terminal_spec.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::WebIde::Config::Entry::Terminal do
+  let(:entry) { described_class.new(config, with_image_ports: true) }
+
+  describe '.nodes' do
+    context 'when filtering all the entry/node names' do
+      subject { described_class.nodes.keys }
+
+      let(:result) do
+        %i[before_script script image services variables]
+      end
+
+      it { is_expected.to match_array result }
+    end
+  end
+
+  describe 'validations' do
+    before do
+      entry.compose!
+    end
+
+    context 'when entry config value is correct' do
+      let(:config) { { script: 'rspec' } }
+
+      describe '#valid?' do
+        it 'is valid' do
+          expect(entry).to be_valid
+        end
+      end
+
+      context 'when the same port is not duplicated' do
+        let(:config) do
+          {
+            image: { name: "ruby", ports: [80] },
+            services: [{ name: "mysql", alias: "service1", ports: [81] }, { name: "mysql", alias: "service2", ports: [82] }]
+          }
+        end
+
+        describe '#valid?' do
+          it 'is valid' do
+            expect(entry).to be_valid
+          end
+        end
+      end
+
+      context 'when unknown port keys detected' do
+        let(:config) do
+          {
+            image: { name: "ruby", ports: [80] },
+            services: [{ name: "mysql", alias: "service2", ports: [{ number: 81, invalid_key: 'foobar' }] }]
+          }
+        end
+
+        it 'is not valid' do
+          expect(entry).not_to be_valid
+          expect(entry.errors.first)
+            .to match /port config contains unknown keys: invalid_key/
+        end
+      end
+    end
+
+    context 'when entry value is not correct' do
+      context 'incorrect config value type' do
+        let(:config) { ['incorrect'] }
+
+        describe '#errors' do
+          it 'reports error about a config type' do
+            expect(entry.errors)
+              .to include 'terminal config should be a hash'
+          end
+        end
+      end
+
+      context 'when config is empty' do
+        let(:config) { {} }
+
+        describe '#valid' do
+          it 'is valid' do
+            expect(entry).to be_valid
+          end
+        end
+      end
+
+      context 'when unknown keys detected' do
+        let(:config) { { unknown: true } }
+
+        describe '#valid' do
+          it 'is not valid' do
+            expect(entry).not_to be_valid
+          end
+        end
+      end
+
+      context 'when the same port is duplicated' do
+        let(:config) do
+          {
+            image: { name: "ruby", ports: [80] },
+            services: [{ name: "mysql", ports: [80] }, { name: "mysql", ports: [81] }]
+          }
+        end
+
+        describe '#valid?' do
+          it 'is invalid' do
+            expect(entry).not_to be_valid
+            expect(entry.errors.count).to eq 1
+            expect(entry.errors.first).to match "each port number can only be referenced once"
+          end
+        end
+      end
+    end
+  end
+
+  describe '#relevant?' do
+    it 'is a relevant entry' do
+      entry = described_class.new({ script: 'rspec' })
+
+      expect(entry).to be_relevant
+    end
+  end
+
+  context 'when composed' do
+    before do
+      entry.compose!
+    end
+
+    describe '#value' do
+      context 'when entry is correct' do
+        let(:config) do
+          { before_script: %w[ls pwd],
+            script: 'sleep 100',
+            tags: ['webide'],
+            image: 'ruby:2.5',
+            services: ['mysql'],
+            variables: { KEY: 'value' } }
+        end
+
+        it 'returns correct value' do
+          expect(entry.value)
+            .to eq(
+              tag_list: ['webide'],
+              yaml_variables: [{ key: 'KEY', value: 'value', public: true }],
+              options: {
+                image: { name: "ruby:2.5" },
+                services: [{ name: "mysql" }],
+                before_script: %w[ls pwd],
+                script: ['sleep 100']
+              }
+            )
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/web_ide/config_spec.rb b/spec/lib/gitlab/web_ide/config_spec.rb
new file mode 100644
index 00000000000..c1dafd01197
--- /dev/null
+++ b/spec/lib/gitlab/web_ide/config_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::WebIde::Config do
+  let(:config) do
+    described_class.new(yml)
+  end
+
+  context 'when config is valid' do
+    let(:yml) do
+      <<-EOS
+        terminal:
+          image: ruby:2.7
+          before_script:
+            - gem install rspec
+      EOS
+    end
+
+    describe '#to_hash' do
+      it 'returns hash created from string' do
+        hash = {
+          terminal: {
+            image: 'ruby:2.7',
+            before_script: ['gem install rspec']
+          }
+        }
+
+        expect(config.to_hash).to eq hash
+      end
+
+      describe '#valid?' do
+        it 'is valid' do
+          expect(config).to be_valid
+        end
+
+        it 'has no errors' do
+          expect(config.errors).to be_empty
+        end
+      end
+    end
+  end
+
+  context 'when config is invalid' do
+    context 'when yml is incorrect' do
+      let(:yml) { '// invalid' }
+
+      describe '.new' do
+        it 'raises error' do
+          expect { config }.to raise_error(
+            described_class::ConfigError,
+            /Invalid configuration format/
+          )
+        end
+      end
+    end
+
+    context 'when config logic is incorrect' do
+      let(:yml) { 'terminal: { before_script: "ls" }' }
+
+      describe '#valid?' do
+        it 'is not valid' do
+          expect(config).not_to be_valid
+        end
+
+        it 'has errors' do
+          expect(config.errors).not_to be_empty
+        end
+      end
+
+      describe '#errors' do
+        it 'returns an array of strings' do
+          expect(config.errors).to all(be_an_instance_of(String))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/wiki_pages/front_matter_parser_spec.rb b/spec/lib/gitlab/wiki_pages/front_matter_parser_spec.rb
index f9ed769f2d9..01701589e63 100644
--- a/spec/lib/gitlab/wiki_pages/front_matter_parser_spec.rb
+++ b/spec/lib/gitlab/wiki_pages/front_matter_parser_spec.rb
@@ -7,7 +7,7 @@ describe Gitlab::WikiPages::FrontMatterParser do
 
   let(:content) { 'This is the content' }
   let(:end_divider) { '---' }
-  let(:gate) { double('Gate') }
+  let(:gate) { stub_feature_flag_gate('Gate') }
 
   let(:with_front_matter) do
     <<~MD
diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb
index 9362ff72fbc..84d072a50ec 100644
--- a/spec/lib/gitlab_spec.rb
+++ b/spec/lib/gitlab_spec.rb
@@ -96,6 +96,28 @@ describe Gitlab do
     end
   end
 
+  describe '.staging?' do
+    subject { described_class.staging? }
+
+    it 'is false when on GitLab.com' do
+      stub_config_setting(url: 'https://gitlab.com')
+
+      expect(subject).to eq false
+    end
+
+    it 'is true when on staging' do
+      stub_config_setting(url: 'https://staging.gitlab.com')
+
+      expect(subject).to eq true
+    end
+
+    it 'is false when not on staging' do
+      stub_config_setting(url: 'https://example.gitlab.com')
+
+      expect(subject).to eq false
+    end
+  end
+
   describe '.canary?' do
     it 'is true when CANARY env var is set to true' do
       stub_env('CANARY', '1')
@@ -186,6 +208,26 @@ describe Gitlab do
     end
   end
 
+  describe '.dev_or_test_env?' do
+    subject { described_class.dev_or_test_env? }
+
+    it 'is true when test env' do
+      expect(subject).to eq true
+    end
+
+    it 'is true when dev env' do
+      allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
+
+      expect(subject).to eq true
+    end
+
+    it 'is false when env is not dev or test' do
+      allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production'))
+
+      expect(subject).to eq false
+    end
+  end
+
   describe '.ee?' do
     before do
       stub_env('FOSS_ONLY', nil) # Make sure the ENV is clean
diff --git a/spec/lib/milestone_array_spec.rb b/spec/lib/milestone_array_spec.rb
deleted file mode 100644
index 375cb87dde6..00000000000
--- a/spec/lib/milestone_array_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe MilestoneArray do
-  let(:object1) { instance_double("BirdMilestone", due_date: Time.now, start_date: Time.now - 15.days, title: 'v2.0') }
-  let(:object2) { instance_double("CatMilestone", due_date: Time.now - 1.day, start_date: nil, title: 'v1.0') }
-  let(:object3) { instance_double("DogMilestone", due_date: nil, start_date: Time.now - 30.days, title: 'v3.0') }
-  let(:array) { [object1, object3, object2] }
-
-  describe '#sort' do
-    it 'reorders array with due date in ascending order with nulls last' do
-      expect(described_class.sort(array, 'due_date_asc')).to eq([object2, object1, object3])
-    end
-
-    it 'reorders array with due date in desc order with nulls last' do
-      expect(described_class.sort(array, 'due_date_desc')).to eq([object1, object2, object3])
-    end
-
-    it 'reorders array with start date in ascending order with nulls last' do
-      expect(described_class.sort(array, 'start_date_asc')).to eq([object3, object1, object2])
-    end
-
-    it 'reorders array with start date in descending order with nulls last' do
-      expect(described_class.sort(array, 'start_date_desc')).to eq([object1, object3, object2])
-    end
-
-    it 'reorders array with title in ascending order' do
-      expect(described_class.sort(array, 'name_asc')).to eq([object2, object1, object3])
-    end
-
-    it 'reorders array with title in descending order' do
-      expect(described_class.sort(array, 'name_desc')).to eq([object3, object1, object2])
-    end
-  end
-end
diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb
index fae0c636bdc..c3890c72852 100644
--- a/spec/lib/object_storage/direct_upload_spec.rb
+++ b/spec/lib/object_storage/direct_upload_spec.rb
@@ -3,11 +3,17 @@
 require 'spec_helper'
 
 describe ObjectStorage::DirectUpload do
+  let(:region) { 'us-east-1' }
+  let(:path_style) { false }
+  let(:use_iam_profile) { false }
   let(:credentials) do
     {
       provider: 'AWS',
       aws_access_key_id: 'AWS_ACCESS_KEY_ID',
-      aws_secret_access_key: 'AWS_SECRET_ACCESS_KEY'
+      aws_secret_access_key: 'AWS_SECRET_ACCESS_KEY',
+      region: region,
+      path_style: path_style,
+      use_iam_profile: use_iam_profile
     }
   end
 
@@ -57,6 +63,62 @@ describe ObjectStorage::DirectUpload do
   describe '#to_hash' do
     subject { direct_upload.to_hash }
 
+    shared_examples 'a valid S3 upload' do
+      it_behaves_like 'a valid upload'
+
+      it 'sets Workhorse client data' do
+        expect(subject[:UseWorkhorseClient]).to eq(use_iam_profile)
+        expect(subject[:RemoteTempObjectID]).to eq(object_name)
+
+        object_store_config = subject[:ObjectStorage]
+        expect(object_store_config[:Provider]).to eq 'AWS'
+
+        s3_config = object_store_config[:S3Config]
+        expect(s3_config[:Bucket]).to eq(bucket_name)
+        expect(s3_config[:Region]).to eq(region)
+        expect(s3_config[:PathStyle]).to eq(path_style)
+        expect(s3_config[:UseIamProfile]).to eq(use_iam_profile)
+      end
+
+      context 'when feature flag is disabled' do
+        before do
+          stub_feature_flags(use_workhorse_s3_client: false)
+        end
+
+        it 'does not enable Workhorse client' do
+          expect(subject[:UseWorkhorseClient]).to be false
+        end
+      end
+
+      context 'when V2 signatures are used' do
+        before do
+          credentials[:aws_signature_version] = 2
+        end
+
+        it 'does not enable Workhorse client' do
+          expect(subject[:UseWorkhorseClient]).to be false
+        end
+      end
+
+      context 'when V4 signatures are used' do
+        before do
+          credentials[:aws_signature_version] = 4
+        end
+
+        it 'enables the Workhorse client for instance profiles' do
+          expect(subject[:UseWorkhorseClient]).to eq(use_iam_profile)
+        end
+      end
+    end
+
+    shared_examples 'a valid Google upload' do
+      it_behaves_like 'a valid upload'
+
+      it 'does not set Workhorse client data' do
+        expect(subject.keys).not_to include(:UseWorkhorseClient, :RemoteTempObjectID, :ObjectStorage)
+      end
+    end
+
     shared_examples 'a valid upload' do
       it "returns valid structure" do
         expect(subject).to have_key(:Timeout)
@@ -97,6 +159,16 @@ describe ObjectStorage::DirectUpload do
       end
     end
 
+    shared_examples 'a valid S3 upload without multipart data' do
+      it_behaves_like 'a valid S3 upload'
+      it_behaves_like 'a valid upload without multipart data'
+    end
+
+    shared_examples 'a valid S3 upload with multipart data' do
+      it_behaves_like 'a valid S3 upload'
+      it_behaves_like 'a valid upload with multipart data'
+    end
+
     shared_examples 'a valid upload without multipart data' do
       it_behaves_like 'a valid upload'
 
@@ -109,13 +181,50 @@ describe ObjectStorage::DirectUpload do
       context 'when length is known' do
         let(:has_length) { true }
 
-        it_behaves_like 'a valid upload without multipart data'
+        it_behaves_like 'a valid S3 upload without multipart data'
+
+        context 'when path style is true' do
+          let(:path_style) { true }
+          let(:storage_url) { 'https://s3.amazonaws.com/uploads' }
+
+          before do
+            stub_object_storage_multipart_init(storage_url, "myUpload")
+          end
+
+          it_behaves_like 'a valid S3 upload without multipart data'
+        end
+
+        context 'when IAM profile is true' do
+          let(:use_iam_profile) { true }
+          let(:iam_credentials_url) { "http://169.254.169.254/latest/meta-data/iam/security-credentials/" }
+          let(:iam_credentials) do
+            {
+              'AccessKeyId' => 'dummykey',
+              'SecretAccessKey' => 'dummysecret',
+              'Token' => 'dummytoken',
+              'Expiration' => 1.day.from_now.xmlschema
+            }
+          end
+
+          before do
+            stub_request(:get, iam_credentials_url)
+              .to_return(status: 200, body: "somerole", headers: {})
+            stub_request(:get, "#{iam_credentials_url}somerole")
+              .to_return(status: 200, body: iam_credentials.to_json, headers: {})
+          end
+
+          it_behaves_like 'a valid S3 upload without multipart data'
+        end
       end
 
       context 'when length is unknown' do
         let(:has_length) { false }
 
-        it_behaves_like 'a valid upload with multipart data' do
+        it_behaves_like 'a valid S3 upload with multipart data' do
+          before do
+            stub_object_storage_multipart_init(storage_url, "myUpload")
+          end
+
           context 'when maximum upload size is 10MB' do
             let(:maximum_size) { 10.megabyte }
 
@@ -169,12 +278,14 @@ describe ObjectStorage::DirectUpload do
       context 'when length is known' do
         let(:has_length) { true }
 
+        it_behaves_like 'a valid Google upload'
         it_behaves_like 'a valid upload without multipart data'
       end
 
       context 'when length is unknown' do
         let(:has_length) { false }
 
+        it_behaves_like 'a valid Google upload'
         it_behaves_like 'a valid upload without multipart data'
       end
     end
diff --git a/spec/lib/peek/views/bullet_detailed_spec.rb b/spec/lib/peek/views/bullet_detailed_spec.rb
new file mode 100644
index 00000000000..a482cadc7db
--- /dev/null
+++ b/spec/lib/peek/views/bullet_detailed_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Peek::Views::BulletDetailed do
+  subject { described_class.new }
+
+  before do
+    allow(Bullet).to receive(:enable?).and_return(bullet_enabled)
+  end
+
+  context 'bullet disabled' do
+    let(:bullet_enabled) { false }
+
+    it 'returns empty results' do
+      expect(subject.results).to eq({})
+    end
+  end
+
+  context 'bullet enabled' do
+    let(:bullet_enabled) { true }
+
+    before do
+      allow(Bullet).to receive_message_chain(:notification_collector, :collection).and_return(notifications)
+    end
+
+    context 'where there are no notifications' do
+      let(:notifications) { [] }
+
+      it 'returns empty results' do
+        expect(subject.results).to eq({})
+      end
+    end
+
+    context 'when notifications exist' do
+      let(:notifications) do
+        [
+          double(title: 'Title 1', body: 'Body 1', body_with_caller: "first\nsecond\n"),
+          double(title: 'Title 2', body: 'Body 2', body_with_caller: "first\nsecond\n")
+        ]
+      end
+
+      it 'returns empty results' do
+        expect(subject.key).to eq('bullet')
+        expect(subject.results[:calls]).to eq(2)
+        expect(subject.results[:warnings]).to eq([Peek::Views::BulletDetailed::WARNING_MESSAGE])
+        expect(subject.results[:details]).to eq([
+          { notification: 'Title 1: Body 1', backtrace: "first\nsecond\n" },
+          { notification: 'Title 2: Body 2', backtrace: "first\nsecond\n" }
+        ])
+      end
+    end
+  end
+end
diff --git a/spec/lib/peek/views/redis_detailed_spec.rb b/spec/lib/peek/views/redis_detailed_spec.rb
index fa9532226f2..a270c006a43 100644
--- a/spec/lib/peek/views/redis_detailed_spec.rb
+++ b/spec/lib/peek/views/redis_detailed_spec.rb
@@ -17,7 +17,7 @@ describe Peek::Views::RedisDetailed, :request_store do
 
   with_them do
     it 'scrubs Redis commands' do
-      subject.detail_store << { cmd: cmd, duration: 1.second }
+      Gitlab::Instrumentation::Redis::SharedState.detail_store << { cmd: cmd, duration: 1.second }
 
       expect(subject.results[:details].count).to eq(1)
       expect(subject.results[:details].first)
@@ -29,11 +29,12 @@ describe Peek::Views::RedisDetailed, :request_store do
   end
 
   it 'returns aggregated results' do
-    subject.detail_store << { cmd: [:get, 'test'], duration: 0.001 }
-    subject.detail_store << { cmd: [:get, 'test'], duration: 1.second }
+    Gitlab::Instrumentation::Redis::Cache.detail_store << { cmd: [:get, 'test'], duration: 0.001 }
+    Gitlab::Instrumentation::Redis::Cache.detail_store << { cmd: [:get, 'test'], duration: 1.second }
+    Gitlab::Instrumentation::Redis::SharedState.detail_store << { cmd: [:get, 'test'], duration: 1.second }
 
-    expect(subject.results[:calls]).to eq(2)
-    expect(subject.results[:duration]).to eq('1001.00ms')
-    expect(subject.results[:details].count).to eq(2)
+    expect(subject.results[:calls]).to eq(3)
+    expect(subject.results[:duration]).to eq('2001.00ms')
+    expect(subject.results[:details].count).to eq(3)
   end
 end
diff --git a/spec/lib/peek/views/rugged_spec.rb b/spec/lib/peek/views/rugged_spec.rb
index b9507f772d2..39968afed39 100644
--- a/spec/lib/peek/views/rugged_spec.rb
+++ b/spec/lib/peek/views/rugged_spec.rb
@@ -16,7 +16,7 @@ describe Peek::Views::Rugged, :request_store do
   end
 
   it 'returns aggregated results' do
-    ::Gitlab::RuggedInstrumentation.query_time += 1.234
+    ::Gitlab::RuggedInstrumentation.add_query_time(1.234)
     ::Gitlab::RuggedInstrumentation.increment_query_count
     ::Gitlab::RuggedInstrumentation.increment_query_count
 
diff --git a/spec/lib/quality/test_level_spec.rb b/spec/lib/quality/test_level_spec.rb
index b784a92fa85..ad29c80b07a 100644
--- a/spec/lib/quality/test_level_spec.rb
+++ b/spec/lib/quality/test_level_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Quality::TestLevel do
     context 'when level is unit' do
       it 'returns a pattern' do
         expect(subject.pattern(:unit))
-          .to eq("spec/{bin,channels,config,db,dependencies,factories,finders,frontend,graphql,haml_lint,helpers,initializers,javascripts,lib,models,policies,presenters,rack_servers,replicators,routing,rubocop,serializers,services,sidekiq,support_specs,tasks,uploaders,validators,views,workers,elastic_integration}{,/**/}*_spec.rb")
+          .to eq("spec/{bin,channels,config,db,dependencies,factories,finders,frontend,graphql,haml_lint,helpers,initializers,javascripts,lib,models,policies,presenters,rack_servers,replicators,routing,rubocop,serializers,services,sidekiq,support_specs,tasks,uploaders,validators,views,workers,elastic_integration,tooling}{,/**/}*_spec.rb")
       end
     end
 
@@ -89,7 +89,7 @@ RSpec.describe Quality::TestLevel do
     context 'when level is unit' do
       it 'returns a regexp' do
         expect(subject.regexp(:unit))
-          .to eq(%r{spec/(bin|channels|config|db|dependencies|factories|finders|frontend|graphql|haml_lint|helpers|initializers|javascripts|lib|models|policies|presenters|rack_servers|replicators|routing|rubocop|serializers|services|sidekiq|support_specs|tasks|uploaders|validators|views|workers|elastic_integration)})
+          .to eq(%r{spec/(bin|channels|config|db|dependencies|factories|finders|frontend|graphql|haml_lint|helpers|initializers|javascripts|lib|models|policies|presenters|rack_servers|replicators|routing|rubocop|serializers|services|sidekiq|support_specs|tasks|uploaders|validators|views|workers|elastic_integration|tooling)})
       end
     end
 
@@ -144,6 +144,10 @@ RSpec.describe Quality::TestLevel do
       expect(subject.level_for('spec/models/abuse_report_spec.rb')).to eq(:unit)
     end
 
+    it 'returns the correct level for a tooling test' do
+      expect(subject.level_for('spec/tooling/lib/tooling/test_file_finder_spec.rb')).to eq(:unit)
+    end
+
     it 'returns the correct level for a migration test' do
       expect(subject.level_for('spec/migrations/add_default_and_free_plans_spec.rb')).to eq(:migration)
     end
diff --git a/spec/mailers/emails/profile_spec.rb b/spec/mailers/emails/profile_spec.rb
index f84bf43b9c4..cbf42da2085 100644
--- a/spec/mailers/emails/profile_spec.rb
+++ b/spec/mailers/emails/profile_spec.rb
@@ -160,38 +160,48 @@ describe Emails::Profile do
   describe 'user unknown sign in email' do
     let_it_be(:user) { create(:user) }
     let_it_be(:ip) { '169.0.0.1' }
+    let_it_be(:current_time) { Time.current }
+    let_it_be(:email) { Notify.unknown_sign_in_email(user, ip, current_time) }
 
-    subject { Notify.unknown_sign_in_email(user, ip) }
+    subject { email }
 
     it_behaves_like 'an email sent from GitLab'
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like 'a user cannot unsubscribe through footer link'
 
     it 'is sent to the user' do
-      expect(subject).to deliver_to user.email
+      is_expected.to deliver_to user.email
     end
 
     it 'has the correct subject' do
-      expect(subject).to have_subject /^Unknown sign-in from new location$/
+      is_expected.to have_subject "#{Gitlab.config.gitlab.host} sign-in from new location"
+    end
+
+    it 'mentions the new sign-in IP' do
+      is_expected.to have_body_text ip
     end
 
-    it 'mentions the unknown sign-in IP' do
-      expect(subject).to have_body_text /A sign-in to your account has been made from the following IP address: #{ip}./
+    it 'mentioned the time' do
+      is_expected.to have_body_text current_time.strftime('%Y-%m-%d %l:%M:%S %p %Z')
     end
 
-    it 'includes a link to the change password page' do
-      expect(subject).to have_body_text /#{edit_profile_password_path}/
+    it 'includes a link to the change password documentation' do
+      is_expected.to have_body_text 'https://docs.gitlab.com/ee/user/profile/#changing-your-password'
     end
 
     it 'mentions two factor authentication when two factor is not enabled' do
-      expect(subject).to have_body_text /two-factor authentication/
+      is_expected.to have_body_text 'two-factor authentication'
+    end
+
+    it 'includes a link to two-factor authentication documentation' do
+      is_expected.to have_body_text 'https://docs.gitlab.com/ee/user/profile/account/two_factor_authentication.html'
     end
 
     context 'when two factor authentication is enabled' do
-      it 'does not mention two factor authentication' do
-        two_factor_user = create(:user, :two_factor)
+      let(:user) { create(:user, :two_factor) }
 
-        expect( Notify.unknown_sign_in_email(two_factor_user, ip) )
+      it 'does not mention two factor authentication' do
+        expect( Notify.unknown_sign_in_email(user, ip, current_time) )
           .not_to have_body_text /two-factor authentication/
       end
     end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 3c66902bb2e..8b99cc41a53 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -104,7 +104,11 @@ describe Notify do
 
         it 'contains a link to issue author' do
           is_expected.to have_body_text(issue.author_name)
-          is_expected.to have_body_text 'created an issue:'
+          is_expected.to have_body_text 'created an issue'
+        end
+
+        it 'contains a link to the issue' do
+          is_expected.to have_body_text(issue.to_reference(full: false))
         end
       end
 
@@ -1722,4 +1726,59 @@ describe Notify do
       is_expected.to have_body_text target_url
     end
   end
+
+  describe 'merge request reviews' do
+    let!(:review) { create(:review, project: project, merge_request: merge_request) }
+    let!(:notes) { create_list(:note, 3, review: review, project: project, author: review.author, noteable: merge_request) }
+
+    subject { described_class.new_review_email(recipient.id, review.id) }
+
+    it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
+      let(:model) { review.merge_request }
+    end
+
+    it_behaves_like 'it should show Gmail Actions View Merge request link'
+    it_behaves_like 'an unsubscribeable thread'
+
+    it 'is sent to the given recipient as the author' do
+      sender = subject.header[:from].addrs[0]
+
+      aggregate_failures do
+        expect(sender.display_name).to eq(review.author_name)
+        expect(sender.address).to eq(gitlab_sender)
+        expect(subject).to deliver_to(recipient.notification_email)
+      end
+    end
+
+    it 'contains the message from the notes of the review' do
+      review.notes.each do |note|
+        is_expected.to have_body_text note.note
+      end
+    end
+
+    context 'when diff note' do
+      let!(:notes) { create_list(:diff_note_on_merge_request, 3, review: review, project: project, author: review.author, noteable: merge_request) }
+
+      it 'links to notes' do
+        review.notes.each do |note|
+          # Text part
+          expect(subject.text_part.body.raw_source).to include(
+            project_merge_request_url(project, merge_request, anchor: "note_#{note.id}")
+          )
+        end
+      end
+    end
+
+    it 'contains review author name' do
+      is_expected.to have_body_text review.author_name
+    end
+
+    it 'has the correct subject and body' do
+      aggregate_failures do
+        is_expected.to have_subject "Re: #{project.name} | #{merge_request.title} (#{merge_request.to_reference})"
+
+        is_expected.to have_body_text project_merge_request_path(project, merge_request)
+      end
+    end
+  end
 end
diff --git a/spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb b/spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb
index 669e31618a3..77d8dd002e3 100644
--- a/spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb
+++ b/spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb
@@ -4,10 +4,9 @@ require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20191125114345_add_admin_mode_protected_path.rb')
 
 describe AddAdminModeProtectedPath do
-  ADMIN_MODE_ENDPOINT = '/admin/session'
-
   subject(:migration) { described_class.new }
 
+  let(:admin_mode_endpoint) { '/admin/session' }
   let(:application_settings) { table(:application_settings) }
 
   context 'no settings available' do
@@ -30,7 +29,7 @@ describe AddAdminModeProtectedPath do
     application_settings.create!(protected_paths: '{a,b,c}')
 
     protected_paths_before = %w[a b c]
-    protected_paths_after = protected_paths_before.dup << ADMIN_MODE_ENDPOINT
+    protected_paths_after = protected_paths_before.dup << admin_mode_endpoint
 
     expect { migrate! }.to change { application_settings.first.protected_paths }.from(protected_paths_before).to(protected_paths_after)
   end
@@ -38,13 +37,13 @@ describe AddAdminModeProtectedPath do
   it 'new default includes admin mode endpoint' do
     settings_before = application_settings.create!
 
-    expect(settings_before.protected_paths).not_to include(ADMIN_MODE_ENDPOINT)
+    expect(settings_before.protected_paths).not_to include(admin_mode_endpoint)
 
     migrate!
 
     application_settings.reset_column_information
     settings_after = application_settings.create!
 
-    expect(settings_after.protected_paths).to include(ADMIN_MODE_ENDPOINT)
+    expect(settings_after.protected_paths).to include(admin_mode_endpoint)
   end
 end
diff --git a/spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb b/spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb
deleted file mode 100644
index e973454ecc8..00000000000
--- a/spec/migrations/active_record/schedule_set_confidential_note_events_on_services_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180122154930_schedule_set_confidential_note_events_on_services.rb')
-
-describe ScheduleSetConfidentialNoteEventsOnServices do
-  let(:services_table) { table(:services) }
-  let(:migration_class) { Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnServices }
-  let(:migration_name)  { migration_class.to_s.demodulize }
-
-  let!(:service_1)        { services_table.create!(confidential_note_events: nil, note_events: true) }
-  let!(:service_2)        { services_table.create!(confidential_note_events: nil, note_events: true) }
-  let!(:service_migrated) { services_table.create!(confidential_note_events: true, note_events: true) }
-  let!(:service_skip)     { services_table.create!(confidential_note_events: nil, note_events: false) }
-  let!(:service_new)      { services_table.create!(confidential_note_events: false, note_events: true) }
-  let!(:service_4)        { services_table.create!(confidential_note_events: nil, note_events: true) }
-
-  before do
-    stub_const("#{described_class}::BATCH_SIZE", 1)
-  end
-
-  it 'schedules background migrations at correct time' do
-    Sidekiq::Testing.fake! do
-      Timecop.freeze do
-        migrate!
-
-        expect(migration_name).to be_scheduled_delayed_migration(20.minutes, service_1.id, service_1.id)
-        expect(migration_name).to be_scheduled_delayed_migration(40.minutes, service_2.id, service_2.id)
-        expect(migration_name).to be_scheduled_delayed_migration(60.minutes, service_4.id, service_4.id)
-        expect(BackgroundMigrationWorker.jobs.size).to eq 3
-      end
-    end
-  end
-
-  it 'correctly processes services', :sidekiq_might_not_need_inline do
-    perform_enqueued_jobs do
-      expect(services_table.where(confidential_note_events: nil).count).to eq 4
-      expect(services_table.where(confidential_note_events: true).count).to eq 1
-
-      migrate!
-
-      expect(services_table.where(confidential_note_events: nil).count).to eq 1
-      expect(services_table.where(confidential_note_events: true).count).to eq 4
-    end
-  end
-end
diff --git a/spec/migrations/add_foreign_key_from_notification_settings_to_users_spec.rb b/spec/migrations/add_foreign_key_from_notification_settings_to_users_spec.rb
deleted file mode 100644
index ceca38b148e..00000000000
--- a/spec/migrations/add_foreign_key_from_notification_settings_to_users_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180710162338_add_foreign_key_from_notification_settings_to_users.rb')
-
-describe AddForeignKeyFromNotificationSettingsToUsers do
-  let(:notification_settings) { table(:notification_settings) }
-  let(:users) { table(:users) }
-  let(:projects) { table(:projects) }
-
-  before do
-    users.create!(email: 'email@email.com', name: 'foo', username: 'foo', projects_limit: 0)
-    projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce', namespace_id: 1)
-  end
-
-  describe 'removal of orphans without user' do
-    let!(:notification_setting_without_user) { create_notification_settings!(user_id: 123) }
-    let!(:notification_setting_with_user) { create_notification_settings!(user_id: users.last.id) }
-
-    it 'removes orphaned notification_settings without user' do
-      expect { migrate! }.to change { notification_settings.count }.by(-1)
-    end
-
-    it "doesn't remove notification_settings with valid user" do
-      expect { migrate! }.not_to change { notification_setting_with_user.reload }
-    end
-  end
-
-  def create_notification_settings!(**opts)
-    notification_settings.create!(
-      source_id: projects.last.id,
-      source_type: 'Project',
-      user_id: users.last.id,
-      **opts)
-  end
-end
diff --git a/spec/migrations/add_foreign_keys_to_todos_spec.rb b/spec/migrations/add_foreign_keys_to_todos_spec.rb
deleted file mode 100644
index 49fb3c1a911..00000000000
--- a/spec/migrations/add_foreign_keys_to_todos_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180201110056_add_foreign_keys_to_todos.rb')
-
-describe AddForeignKeysToTodos do
-  let(:todos) { table(:todos) }
-  let(:users) { table(:users) }
-  let(:projects) { table(:projects) }
-
-  let(:project) { projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce', namespace_id: 1) }
-  let(:user) { users.create!(email: 'email@email.com', name: 'foo', username: 'foo', projects_limit: 0) }
-
-  context 'add foreign key on user_id' do
-    let!(:todo_with_user) { create_todo(user_id: user.id) }
-    let!(:todo_without_user) { create_todo(user_id: 4711) }
-
-    it 'removes orphaned todos without corresponding user' do
-      expect { migrate! }.to change { Todo.count }.from(2).to(1)
-    end
-
-    it 'does not remove entries with valid user_id' do
-      expect { migrate! }.not_to change { todo_with_user.reload }
-    end
-  end
-
-  context 'add foreign key on author_id' do
-    let!(:todo_with_author) { create_todo(author_id: user.id) }
-    let!(:todo_with_invalid_author) { create_todo(author_id: 4711) }
-
-    it 'removes orphaned todos by author_id' do
-      expect { migrate! }.to change { Todo.count }.from(2).to(1)
-    end
-
-    it 'does not touch author_id for valid entries' do
-      expect { migrate! }.not_to change { todo_with_author.reload }
-    end
-  end
-
-  context 'add foreign key on note_id' do
-    let(:note) { table(:notes).create! }
-    let!(:todo_with_note) { create_todo(note_id: note.id) }
-    let!(:todo_with_invalid_note) { create_todo(note_id: 4711) }
-    let!(:todo_without_note) { create_todo(note_id: nil) }
-
-    it 'deletes todo if note_id is set but does not exist in notes table' do
-      expect { migrate! }.to change { Todo.count }.from(3).to(2)
-    end
-
-    it 'does not touch entry if note_id is nil' do
-      expect { migrate! }.not_to change { todo_without_note.reload }
-    end
-
-    it 'does not touch note_id for valid entries' do
-      expect { migrate! }.not_to change { todo_with_note.reload }
-    end
-  end
-
-  def create_todo(**opts)
-    todos.create!(
-      project_id: project.id,
-      user_id: user.id,
-      author_id: user.id,
-      target_type: '',
-      action: 0,
-      state: '', **opts
-    )
-  end
-end
diff --git a/spec/migrations/add_incident_settings_to_all_existing_projects_spec.rb b/spec/migrations/add_incident_settings_to_all_existing_projects_spec.rb
new file mode 100644
index 00000000000..507b1a8d580
--- /dev/null
+++ b/spec/migrations/add_incident_settings_to_all_existing_projects_spec.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'migrate', '20200609212701_add_incident_settings_to_all_existing_projects.rb')
+
+describe AddIncidentSettingsToAllExistingProjects, :migration do
+  let(:project_incident_management_settings) { table(:project_incident_management_settings) }
+  let(:labels) { table(:labels) }
+  let(:label_links) { table(:label_links) }
+  let(:issues) { table(:issues) }
+  let(:projects) { table(:projects) }
+  let(:namespaces) { table(:namespaces) }
+
+  RSpec.shared_examples 'setting not added' do
+    it 'does not add settings' do
+      migrate!
+
+      expect { migrate! }.not_to change { IncidentManagement::ProjectIncidentManagementSetting.count }
+    end
+  end
+
+  RSpec.shared_examples 'project has no incident settings' do
+    it 'has no settings' do
+      migrate!
+
+      expect(settings).to eq(nil)
+    end
+  end
+
+  RSpec.shared_examples 'no change to incident settings' do
+    it 'does not change existing settings' do
+      migrate!
+
+      expect(settings.create_issue).to eq(existing_create_issue)
+    end
+  end
+
+  RSpec.shared_context 'with incident settings' do
+    let(:existing_create_issue) { false }
+    before do
+      project_incident_management_settings.create(
+        project_id: project.id,
+        create_issue: existing_create_issue
+      )
+    end
+  end
+
+  describe 'migrate!' do
+    let(:namespace) { namespaces.create!(name: 'foo', path: 'foo') }
+    let!(:project) { projects.create!(namespace_id: namespace.id) }
+    let(:settings) { project_incident_management_settings.find_by(project_id: project.id) }
+
+    context 'when project does not have incident label' do
+      context 'does not have incident settings' do
+        include_examples 'setting not added'
+        include_examples 'project has no incident settings'
+      end
+
+      context 'and has incident settings' do
+        include_context 'with incident settings'
+
+        include_examples 'setting not added'
+        include_examples 'no change to incident settings'
+      end
+    end
+
+    context 'when project has incident labels' do
+      before do
+        issue = issues.create!(project_id: project.id)
+        incident_label_attrs = IncidentManagement::CreateIssueService::INCIDENT_LABEL
+        incident_label = labels.create!(project_id: project.id, **incident_label_attrs)
+        label_links.create!(target_id: issue.id, label_id: incident_label.id, target_type: 'Issue')
+      end
+
+      context 'when project has incident settings' do
+        include_context 'with incident settings'
+
+        include_examples 'setting not added'
+        include_examples 'no change to incident settings'
+      end
+
+      context 'does not have incident settings' do
+        it 'adds incident settings with old defaults' do
+          migrate!
+
+          expect(settings.create_issue).to eq(true)
+          expect(settings.send_email).to eq(false)
+          expect(settings.issue_template_key).to eq(nil)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb b/spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb
deleted file mode 100644
index 03f65aba7c0..00000000000
--- a/spec/migrations/add_not_null_constraint_to_project_mirror_data_foreign_key_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180508100222_add_not_null_constraint_to_project_mirror_data_foreign_key.rb')
-
-describe AddNotNullConstraintToProjectMirrorDataForeignKey do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:import_state) { table(:project_mirror_data) }
-
-  before do
-    import_state.create!(id: 1, project_id: nil, status: :started)
-  end
-
-  it 'removes every import state without an associated project_id' do
-    expect do
-      subject.up
-    end.to change { import_state.count }.from(1).to(0)
-  end
-end
diff --git a/spec/migrations/add_pages_access_level_to_project_feature_spec.rb b/spec/migrations/add_pages_access_level_to_project_feature_spec.rb
deleted file mode 100644
index 69f1e3ba3d0..00000000000
--- a/spec/migrations/add_pages_access_level_to_project_feature_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180423204600_add_pages_access_level_to_project_feature.rb')
-
-describe AddPagesAccessLevelToProjectFeature do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:features) { table(:project_features) }
-  let!(:namespace) { namespaces.create(name: 'gitlab', path: 'gitlab') }
-  let!(:first_project) { projects.create(name: 'gitlab1', path: 'gitlab1', namespace_id: namespace.id) }
-  let!(:first_project_features) { features.create(project_id: first_project.id) }
-  let!(:second_project) { projects.create(name: 'gitlab2', path: 'gitlab2', namespace_id: namespace.id) }
-  let!(:second_project_features) { features.create(project_id: second_project.id) }
-
-  it 'correctly migrate pages for old projects to be public' do
-    migrate!
-
-    # For old projects pages should be public
-    expect(first_project_features.reload.pages_access_level).to eq ProjectFeature::PUBLIC
-    expect(second_project_features.reload.pages_access_level).to eq ProjectFeature::PUBLIC
-  end
-
-  it 'after migration pages are enabled as default' do
-    migrate!
-
-    # For new project default is enabled
-    third_project = projects.create(name: 'gitlab3', path: 'gitlab3', namespace_id: namespace.id)
-    third_project_features = features.create(project_id: third_project.id)
-    expect(third_project_features.reload.pages_access_level).to eq ProjectFeature::ENABLED
-  end
-end
diff --git a/spec/migrations/add_pipeline_build_foreign_key_spec.rb b/spec/migrations/add_pipeline_build_foreign_key_spec.rb
deleted file mode 100644
index dd0189b6bfc..00000000000
--- a/spec/migrations/add_pipeline_build_foreign_key_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180420010016_add_pipeline_build_foreign_key.rb')
-
-describe AddPipelineBuildForeignKey do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:pipelines) { table(:ci_pipelines) }
-  let(:builds) { table(:ci_builds) }
-
-  before do
-    namespaces.create(id: 10, name: 'gitlab-org', path: 'gitlab-org')
-    projects.create!(id: 11, namespace_id: 10, name: 'gitlab', path: 'gitlab')
-    pipelines.create!(id: 12, project_id: 11, ref: 'master', sha: 'adf43c3a')
-
-    builds.create!(id: 101, commit_id: 12, project_id: 11)
-    builds.create!(id: 102, commit_id: 222, project_id: 11)
-    builds.create!(id: 103, commit_id: 333, project_id: 11)
-    builds.create!(id: 104, commit_id: 12, project_id: 11)
-    builds.create!(id: 106, commit_id: nil, project_id: 11)
-    builds.create!(id: 107, commit_id: 12, project_id: nil)
-  end
-
-  it 'adds foreign key after removing orphans' do
-    expect(builds.all.count).to eq 6
-    expect(foreign_key_exists?(:ci_builds, :ci_pipelines, column: :commit_id)).to be_falsey
-
-    migrate!
-
-    expect(builds.all.pluck(:id)).to eq [101, 104]
-    expect(foreign_key_exists?(:ci_builds, :ci_pipelines, column: :commit_id)).to be_truthy
-  end
-end
diff --git a/spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb b/spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb
deleted file mode 100644
index 91abf0f7d1c..00000000000
--- a/spec/migrations/add_unique_constraint_to_project_features_project_id_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180511174224_add_unique_constraint_to_project_features_project_id.rb')
-
-describe AddUniqueConstraintToProjectFeaturesProjectId do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:features) { table(:project_features) }
-  let(:migration) { described_class.new }
-
-  describe '#up' do
-    before do
-      (1..3).each do |i|
-        namespaces.create(id: i, name: "ns-test-#{i}", path: "ns-test-i#{i}")
-        projects.create!(id: i, name: "test-#{i}", path: "test-#{i}", namespace_id: i)
-      end
-
-      features.create!(id: 1, project_id: 1)
-      features.create!(id: 2, project_id: 1)
-      features.create!(id: 3, project_id: 2)
-      features.create!(id: 4, project_id: 2)
-      features.create!(id: 5, project_id: 2)
-      features.create!(id: 6, project_id: 3)
-    end
-
-    it 'creates a unique index and removes duplicates' do
-      expect(migration.index_exists?(:project_features, :project_id, unique: false, name: 'index_project_features_on_project_id')).to be true
-
-      expect { migration.up }.to change { features.count }.from(6).to(3)
-
-      expect(migration.index_exists?(:project_features, :project_id, unique: true, name: 'index_project_features_on_project_id')).to be true
-      expect(migration.index_exists?(:project_features, :project_id, name: 'index_project_features_on_project_id_unique')).to be false
-
-      project_1_features = features.where(project_id: 1)
-      expect(project_1_features.count).to eq(1)
-      expect(project_1_features.first.id).to eq(2)
-
-      project_2_features = features.where(project_id: 2)
-      expect(project_2_features.count).to eq(1)
-      expect(project_2_features.first.id).to eq(5)
-
-      project_3_features = features.where(project_id: 3)
-      expect(project_3_features.count).to eq(1)
-      expect(project_3_features.first.id).to eq(6)
-    end
-  end
-
-  describe '#down' do
-    it 'restores the original index' do
-      migration.up
-
-      expect(migration.index_exists?(:project_features, :project_id, unique: true, name: 'index_project_features_on_project_id')).to be true
-
-      migration.down
-
-      expect(migration.index_exists?(:project_features, :project_id, unique: false, name: 'index_project_features_on_project_id')).to be true
-      expect(migration.index_exists?(:project_features, :project_id, name: 'index_project_features_on_project_id_old')).to be false
-    end
-  end
-end
diff --git a/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb b/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb
deleted file mode 100644
index e9ef6bf3e2d..00000000000
--- a/spec/migrations/assure_commits_count_for_merge_request_diff_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180425131009_assure_commits_count_for_merge_request_diff.rb')
-
-describe AssureCommitsCountForMergeRequestDiff, :redis do
-  let(:migration) { spy('migration') }
-
-  before do
-    allow(Gitlab::BackgroundMigration::AddMergeRequestDiffCommitsCount)
-      .to receive(:new).and_return(migration)
-  end
-
-  context 'when there are still unmigrated commit_counts afterwards' do
-    let(:namespaces) { table('namespaces') }
-    let(:projects) { table('projects') }
-    let(:merge_requests) { table('merge_requests') }
-    let(:diffs) { table('merge_request_diffs') }
-
-    before do
-      namespace = namespaces.create(name: 'foo', path: 'foo')
-      project = projects.create!(namespace_id: namespace.id)
-      merge_request = merge_requests.create!(source_branch: 'x', target_branch: 'y', target_project_id: project.id)
-      diffs.create!(commits_count: nil, merge_request_id: merge_request.id)
-      diffs.create!(commits_count: nil, merge_request_id: merge_request.id)
-    end
-
-    it 'migrates commit_counts sequentially in batches' do
-      migrate!
-
-      expect(migration).to have_received(:perform).once
-    end
-  end
-end
diff --git a/spec/migrations/backfill_imported_snippet_repositories_spec.rb b/spec/migrations/backfill_imported_snippet_repositories_spec.rb
new file mode 100644
index 00000000000..c77978b23e4
--- /dev/null
+++ b/spec/migrations/backfill_imported_snippet_repositories_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200608072931_backfill_imported_snippet_repositories.rb')
+
+describe BackfillImportedSnippetRepositories do
+  let(:users) { table(:users) }
+  let(:snippets) { table(:snippets) }
+  let(:user) { users.create(id: 1, email: 'user@example.com', projects_limit: 10, username: 'test', name: 'Test', state: 'active') }
+
+  def create_snippet(id)
+    params = {
+      id: id,
+      type: 'PersonalSnippet',
+      author_id: user.id,
+      file_name: 'foo',
+      content: 'bar'
+    }
+
+    snippets.create!(params)
+  end
+
+  it 'correctly schedules background migrations' do
+    create_snippet(1)
+    create_snippet(2)
+    create_snippet(3)
+    create_snippet(5)
+    create_snippet(7)
+    create_snippet(8)
+    create_snippet(10)
+
+    Sidekiq::Testing.fake! do
+      Timecop.freeze do
+        migrate!
+
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(2.minutes, 1, 3)
+
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(4.minutes, 5, 5)
+
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(6.minutes, 7, 8)
+
+        expect(described_class::MIGRATION)
+          .to be_scheduled_delayed_migration(8.minutes, 10, 10)
+
+        expect(BackgroundMigrationWorker.jobs.size).to eq(4)
+      end
+    end
+  end
+end
diff --git a/spec/migrations/backfill_releases_name_with_tag_name_spec.rb b/spec/migrations/backfill_releases_name_with_tag_name_spec.rb
deleted file mode 100644
index b38b8dff3fa..00000000000
--- a/spec/migrations/backfill_releases_name_with_tag_name_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20181212104941_backfill_releases_name_with_tag_name.rb')
-
-describe BackfillReleasesNameWithTagName do
-  let(:releases)   { table(:releases) }
-  let(:namespaces) { table(:namespaces) }
-  let(:projects)   { table(:projects) }
-
-  let(:namespace)  { namespaces.create(name: 'foo', path: 'foo') }
-  let(:project)    { projects.create!(namespace_id: namespace.id) }
-  let(:release)    { releases.create!(project_id: project.id, tag: 'v1.0.0') }
-
-  it 'defaults name to tag value' do
-    expect(release.tag).to be_present
-
-    migrate!
-
-    release.reload
-    expect(release.name).to eq(release.tag)
-  end
-end
diff --git a/spec/migrations/backfill_status_page_published_incidents_spec.rb b/spec/migrations/backfill_status_page_published_incidents_spec.rb
new file mode 100644
index 00000000000..ccdc8be4168
--- /dev/null
+++ b/spec/migrations/backfill_status_page_published_incidents_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200421195234_backfill_status_page_published_incidents.rb')
+
+describe BackfillStatusPagePublishedIncidents, :migration do
+  subject(:migration) { described_class.new }
+
+  describe '#up' do
+    let(:projects) { table(:projects) }
+    let(:status_page_settings) { table(:status_page_settings) }
+    let(:issues) { table(:issues) }
+    let(:incidents) { table(:status_page_published_incidents) }
+
+    let(:namespace) { table(:namespaces).create!(name: 'gitlab', path: 'gitlab') }
+    let(:project_without_status_page) { projects.create!(namespace_id: namespace.id) }
+    let(:enabled_project) { projects.create!(namespace_id: namespace.id) }
+    let(:disabled_project) { projects.create!(namespace_id: namespace.id) }
+
+    let!(:enabled_setting) { status_page_settings.create!(enabled: true, project_id: enabled_project.id, **status_page_setting_attrs) }
+    let!(:disabled_setting) { status_page_settings.create!(enabled: false, project_id: disabled_project.id, **status_page_setting_attrs) }
+
+    let!(:published_issue) { issues.create!(confidential: false, project_id: enabled_project.id) }
+    let!(:nonpublished_issue_1) { issues.create!(confidential: true, project_id: enabled_project.id) }
+    let!(:nonpublished_issue_2) { issues.create!(confidential: false, project_id: disabled_project.id) }
+    let!(:nonpublished_issue_3) { issues.create!(confidential: false, project_id: project_without_status_page.id) }
+
+    let(:current_time) { Time.current.change(usec: 0) }
+    let(:status_page_setting_attrs) do
+      {
+        aws_s3_bucket_name: 'bucket',
+        aws_region: 'region',
+        aws_access_key: 'key',
+        encrypted_aws_secret_key: 'abc123',
+        encrypted_aws_secret_key_iv: 'abc123'
+      }
+    end
+
+    it 'creates a StatusPage::PublishedIncident record for each published issue' do
+      Timecop.freeze(current_time) do
+        expect(incidents.all).to be_empty
+
+        migrate!
+
+        incident = incidents.first
+
+        expect(incidents.count).to eq(1)
+        expect(incident.issue_id).to eq(published_issue.id)
+        expect(incident.created_at).to eq(current_time)
+        expect(incident.updated_at).to eq(current_time)
+      end
+    end
+  end
+end
diff --git a/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb b/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
deleted file mode 100644
index a2adde37f11..00000000000
--- a/spec/migrations/backfill_store_project_full_path_in_repo_spec.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-require Rails.root.join('db', 'post_migrate', '20181010133639_backfill_store_project_full_path_in_repo.rb')
-
-describe BackfillStoreProjectFullPathInRepo do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:group) { namespaces.create!(name: 'foo', path: 'foo') }
-  let(:subgroup) { namespaces.create!(name: 'bar', path: 'bar', parent_id: group.id) }
-
-  subject(:migration) { described_class.new }
-
-  around do |example|
-    perform_enqueued_jobs do
-      example.run
-    end
-  end
-
-  describe '#up' do
-    shared_examples_for 'writes the full path to git config' do
-      it 'writes the git config', :sidekiq_might_not_need_inline do
-        expect_next_instance_of(Gitlab::GitalyClient::RepositoryService) do |repository_service|
-          allow(repository_service).to receive(:cleanup)
-          expect(repository_service).to receive(:set_config).with('gitlab.fullpath' => expected_path)
-        end
-
-        migration.up
-      end
-
-      it 'retries in case of failure', :sidekiq_might_not_need_inline do
-        repository_service = spy(:repository_service)
-
-        allow(Gitlab::GitalyClient::RepositoryService).to receive(:new).and_return(repository_service)
-
-        allow(repository_service).to receive(:set_config).and_raise(GRPC::BadStatus, 'Retry me')
-        expect(repository_service).to receive(:set_config).exactly(3).times
-
-        migration.up
-      end
-
-      it 'cleans up repository before writing the config', :sidekiq_might_not_need_inline do
-        expect_next_instance_of(Gitlab::GitalyClient::RepositoryService) do |repository_service|
-          expect(repository_service).to receive(:cleanup).ordered
-          expect(repository_service).to receive(:set_config).ordered
-        end
-
-        migration.up
-      end
-
-      context 'legacy storage' do
-        it 'finds the repository at the correct location' do
-          Project.find(project.id).create_repository
-
-          expect { migration.up }.not_to raise_error
-        end
-      end
-
-      context 'hashed storage' do
-        it 'finds the repository at the correct location' do
-          project.update_attribute(:storage_version, 1)
-
-          Project.find(project.id).create_repository
-
-          expect { migration.up }.not_to raise_error
-        end
-      end
-    end
-
-    context 'project in group' do
-      let!(:project) { projects.create!(namespace_id: group.id, name: 'baz', path: 'baz') }
-      let(:expected_path) { 'foo/baz' }
-
-      it_behaves_like 'writes the full path to git config'
-    end
-
-    context 'project in subgroup' do
-      let!(:project) { projects.create!(namespace_id: subgroup.id, name: 'baz', path: 'baz') }
-      let(:expected_path) { 'foo/bar/baz' }
-
-      it_behaves_like 'writes the full path to git config'
-    end
-  end
-
-  describe '#down' do
-    context 'project in group' do
-      let!(:project) { projects.create!(namespace_id: group.id, name: 'baz', path: 'baz') }
-
-      it 'deletes the gitlab full config value', :sidekiq_might_not_need_inline do
-        expect_any_instance_of(Gitlab::GitalyClient::RepositoryService)
-          .to receive(:delete_config).with(['gitlab.fullpath'])
-
-        migration.down
-      end
-    end
-  end
-end
diff --git a/spec/migrations/cap_designs_filename_length_to_new_limit_spec.rb b/spec/migrations/cap_designs_filename_length_to_new_limit_spec.rb
new file mode 100644
index 00000000000..daa07953cb5
--- /dev/null
+++ b/spec/migrations/cap_designs_filename_length_to_new_limit_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200602013901_cap_designs_filename_length_to_new_limit')
+
+describe CapDesignsFilenameLengthToNewLimit, :migration, schema: 20200528125905 do
+  let(:namespaces) { table(:namespaces) }
+  let(:projects) { table(:projects) }
+  let(:issues) { table(:issues) }
+  let(:designs) { table(:design_management_designs) }
+
+  let(:filename_below_limit) { generate_filename(254) }
+  let(:filename_at_limit) { generate_filename(255) }
+  let(:filename_above_limit) { generate_filename(256) }
+
+  let!(:namespace) { namespaces.create!(name: 'foo', path: 'foo') }
+  let!(:project) { projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab', namespace_id: namespace.id) }
+  let!(:issue) { issues.create!(description: 'issue', project_id: project.id) }
+
+  def generate_filename(length, extension: '.png')
+    name = 'a' * (length - extension.length)
+
+    "#{name}#{extension}"
+  end
+
+  def create_design(filename)
+    designs.create!(
+      issue_id: issue.id,
+      project_id: project.id,
+      filename: filename
+    )
+  end
+
+  it 'correctly sets filenames that are above the limit' do
+    [
+      filename_below_limit,
+      filename_at_limit,
+      filename_above_limit
+    ].each(&method(:create_design))
+
+    migrate!
+
+    expect(designs.find(1).filename).to eq(filename_below_limit)
+    expect(designs.find(2).filename).to eq(filename_at_limit)
+    expect(designs.find(3).filename).to eq([described_class::MODIFIED_NAME, 3, described_class::MODIFIED_EXTENSION].join)
+  end
+
+  it 'runs after filename limit has been set' do
+    # This spec file uses the `schema:` keyword to run these tests
+    # against a schema version before the one that sets the limit,
+    # as otherwise we can't create the design data with filenames greater
+    # than the limit.
+    #
+    # For this test, we migrate any skipped versions up to this migration.
+    migration_context.migrate(20200602013901)
+
+    create_design(filename_at_limit)
+    expect { create_design(filename_above_limit) }.to raise_error(ActiveRecord::StatementInvalid)
+  end
+end
diff --git a/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb b/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb
deleted file mode 100644
index 448f1e2106e..00000000000
--- a/spec/migrations/change_default_value_for_dsa_key_restriction_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180531220618_change_default_value_for_dsa_key_restriction.rb')
-
-describe ChangeDefaultValueForDsaKeyRestriction do
-  let(:application_settings) { table(:application_settings) }
-
-  before do
-    application_settings.create!
-  end
-
-  it 'changes the default value for dsa_key_restriction' do
-    expect(application_settings.first.dsa_key_restriction).to eq(0)
-
-    migrate!
-
-    application_settings.reset_column_information
-    new_setting = application_settings.create!
-
-    expect(application_settings.count).to eq(2)
-    expect(new_setting.dsa_key_restriction).to eq(-1)
-  end
-
-  it 'changes the existing setting' do
-    setting = application_settings.last
-
-    expect(setting.dsa_key_restriction).to eq(0)
-
-    migrate!
-
-    expect(application_settings.count).to eq(1)
-    expect(setting.reload.dsa_key_restriction).to eq(-1)
-  end
-end
diff --git a/spec/migrations/cleanup_build_stage_migration_spec.rb b/spec/migrations/cleanup_build_stage_migration_spec.rb
deleted file mode 100644
index 961e719e2fc..00000000000
--- a/spec/migrations/cleanup_build_stage_migration_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180420010616_cleanup_build_stage_migration.rb')
-
-describe CleanupBuildStageMigration, :redis do
-  let(:migration) { spy('migration') }
-
-  before do
-    allow(Gitlab::BackgroundMigration::MigrateBuildStage)
-      .to receive(:new).and_return(migration)
-  end
-
-  context 'when there are pending background migrations' do
-    it 'processes pending jobs synchronously' do
-      Sidekiq::Testing.disable! do
-        BackgroundMigrationWorker
-          .perform_in(2.minutes, 'MigrateBuildStage', [1, 1])
-        BackgroundMigrationWorker
-          .perform_async('MigrateBuildStage', [1, 1])
-
-        migrate!
-
-        expect(migration).to have_received(:perform).with(1, 1).twice
-      end
-    end
-  end
-
-  context 'when there are no background migrations pending' do
-    it 'does nothing' do
-      Sidekiq::Testing.disable! do
-        migrate!
-
-        expect(migration).not_to have_received(:perform)
-      end
-    end
-  end
-
-  context 'when there are still unmigrated builds present' do
-    let(:builds) { table('ci_builds') }
-
-    before do
-      builds.create!(name: 'test:1', ref: 'master')
-      builds.create!(name: 'test:2', ref: 'master')
-    end
-
-    it 'migrates stages sequentially in batches' do
-      expect(builds.all).to all(have_attributes(stage_id: nil))
-
-      migrate!
-
-      expect(migration).to have_received(:perform).once
-    end
-  end
-end
diff --git a/spec/migrations/cleanup_environments_external_url_spec.rb b/spec/migrations/cleanup_environments_external_url_spec.rb
deleted file mode 100644
index 54fcb8c62cd..00000000000
--- a/spec/migrations/cleanup_environments_external_url_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20181108091549_cleanup_environments_external_url.rb')
-
-describe CleanupEnvironmentsExternalUrl do
-  let(:environments)    { table(:environments) }
-  let(:invalid_entries) { environments.where(environments.arel_table[:external_url].matches('javascript://%')) }
-  let(:namespaces)      { table(:namespaces) }
-  let(:projects)        { table(:projects) }
-
-  before do
-    namespace = namespaces.create(name: 'foo', path: 'foo')
-    project = projects.create!(namespace_id: namespace.id)
-
-    environments.create!(id: 1, project_id: project.id, name: 'poisoned', slug: 'poisoned', external_url: 'javascript://alert("1")')
-  end
-
-  it 'clears every environment with a javascript external_url' do
-    expect do
-      subject.up
-    end.to change { invalid_entries.count }.from(1).to(0)
-  end
-
-  it 'do not removes environments' do
-    expect do
-      subject.up
-    end.not_to change { environments.count }
-  end
-end
diff --git a/spec/migrations/cleanup_projects_with_missing_namespace_spec.rb b/spec/migrations/cleanup_projects_with_missing_namespace_spec.rb
index 06b6d5e3b46..27c954d2984 100644
--- a/spec/migrations/cleanup_projects_with_missing_namespace_spec.rb
+++ b/spec/migrations/cleanup_projects_with_missing_namespace_spec.rb
@@ -5,10 +5,6 @@ require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200511080113_add_projects_foreign_key_to_namespaces.rb')
 require Rails.root.join('db', 'post_migrate', '20200511083541_cleanup_projects_with_missing_namespace.rb')
 
-LOST_AND_FOUND_GROUP = 'lost-and-found'
-USER_TYPE_GHOST = 5
-ACCESS_LEVEL_OWNER = 50
-
 # In order to test the CleanupProjectsWithMissingNamespace migration, we need
 #  to first create an orphaned project (one with an invalid namespace_id)
 #  and then run the migration to check that the project was properly cleaned up
@@ -77,31 +73,39 @@ describe CleanupProjectsWithMissingNamespace, :migration, schema: SchemaVersionF
   end
 
   it 'creates the ghost user' do
-    expect(users.where(user_type: USER_TYPE_GHOST).count).to eq(0)
+    expect(users.where(user_type: described_class::User::USER_TYPE_GHOST).count).to eq(0)
 
     disable_migrations_output { migrate! }
 
-    expect(users.where(user_type: USER_TYPE_GHOST).count).to eq(1)
+    expect(users.where(user_type: described_class::User::USER_TYPE_GHOST).count).to eq(1)
   end
 
   it 'creates the lost-and-found group, owned by the ghost user' do
     expect(
-      Group.where(Group.arel_table[:name].matches("#{LOST_AND_FOUND_GROUP}%")).count
+      described_class::Group.where(
+        described_class::Group
+        .arel_table[:name]
+        .matches("#{described_class::User::LOST_AND_FOUND_GROUP}%")
+      ).count
     ).to eq(0)
 
     disable_migrations_output { migrate! }
 
-    ghost_user = users.find_by(user_type: USER_TYPE_GHOST)
+    ghost_user = users.find_by(user_type: described_class::User::USER_TYPE_GHOST)
     expect(
-      Group
+      described_class::Group
         .joins('INNER JOIN members ON namespaces.id = members.source_id')
         .where('namespaces.type = ?', 'Group')
         .where('members.type = ?', 'GroupMember')
         .where('members.source_type = ?', 'Namespace')
         .where('members.user_id = ?', ghost_user.id)
         .where('members.requested_at IS NULL')
-        .where('members.access_level = ?', ACCESS_LEVEL_OWNER)
-        .where(Group.arel_table[:name].matches("#{LOST_AND_FOUND_GROUP}%"))
+        .where('members.access_level = ?', described_class::ACCESS_LEVEL_OWNER)
+        .where(
+          described_class::Group
+          .arel_table[:name]
+          .matches("#{described_class::User::LOST_AND_FOUND_GROUP}%")
+        )
         .count
     ).to eq(1)
   end
@@ -114,7 +118,11 @@ describe CleanupProjectsWithMissingNamespace, :migration, schema: SchemaVersionF
 
     disable_migrations_output { migrate! }
 
-    lost_and_found_group = Group.find_by(Group.arel_table[:name].matches("#{LOST_AND_FOUND_GROUP}%"))
+    lost_and_found_group = described_class::Group.find_by(
+      described_class::Group
+      .arel_table[:name]
+      .matches("#{described_class::User::LOST_AND_FOUND_GROUP}%")
+    )
     orphaned_project = projects.find_by(id: orphaned_project.id)
 
     expect(orphaned_project.visibility_level).to eq(0)
diff --git a/spec/migrations/cleanup_stages_position_migration_spec.rb b/spec/migrations/cleanup_stages_position_migration_spec.rb
deleted file mode 100644
index 62b9c4e84e3..00000000000
--- a/spec/migrations/cleanup_stages_position_migration_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180604123514_cleanup_stages_position_migration.rb')
-
-describe CleanupStagesPositionMigration, :redis do
-  let(:migration) { spy('migration') }
-
-  before do
-    allow(Gitlab::BackgroundMigration::MigrateStageIndex)
-      .to receive(:new).and_return(migration)
-  end
-
-  context 'when there are pending background migrations' do
-    it 'processes pending jobs synchronously' do
-      Sidekiq::Testing.disable! do
-        BackgroundMigrationWorker
-          .perform_in(2.minutes, 'MigrateStageIndex', [1, 1])
-        BackgroundMigrationWorker
-          .perform_async('MigrateStageIndex', [1, 1])
-
-        migrate!
-
-        expect(migration).to have_received(:perform).with(1, 1).twice
-      end
-    end
-  end
-
-  context 'when there are no background migrations pending' do
-    it 'does nothing' do
-      Sidekiq::Testing.disable! do
-        migrate!
-
-        expect(migration).not_to have_received(:perform)
-      end
-    end
-  end
-
-  context 'when there are still unmigrated stages present' do
-    let(:stages) { table('ci_stages') }
-    let(:builds) { table('ci_builds') }
-
-    let!(:entities) do
-      %w[build test broken].map do |name|
-        stages.create(name: name)
-      end
-    end
-
-    before do
-      stages.update_all(position: nil)
-
-      builds.create(name: 'unit', stage_id: entities.first.id, stage_idx: 1, ref: 'master')
-      builds.create(name: 'unit', stage_id: entities.second.id, stage_idx: 1, ref: 'master')
-    end
-
-    it 'migrates stages sequentially for every stage' do
-      expect(stages.all).to all(have_attributes(position: nil))
-
-      migrate!
-
-      expect(migration).to have_received(:perform)
-        .with(entities.first.id, entities.first.id)
-      expect(migration).to have_received(:perform)
-        .with(entities.second.id, entities.second.id)
-      expect(migration).not_to have_received(:perform)
-        .with(entities.third.id, entities.third.id)
-    end
-  end
-end
diff --git a/spec/migrations/create_missing_namespace_for_internal_users_spec.rb b/spec/migrations/create_missing_namespace_for_internal_users_spec.rb
deleted file mode 100644
index 0872f23c02e..00000000000
--- a/spec/migrations/create_missing_namespace_for_internal_users_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180413022611_create_missing_namespace_for_internal_users.rb')
-
-describe CreateMissingNamespaceForInternalUsers do
-  let(:users) { table(:users) }
-  let(:namespaces) { table(:namespaces) }
-  let(:routes) { table(:routes) }
-
-  context "for ghost user" do
-    let(:internal_user) do
-      users.create!(email: 'test@example.com', projects_limit: 100, username: 'test', ghost: true)
-    end
-
-    it 'creates the missing namespace' do
-      expect(namespaces.find_by(owner_id: internal_user.id)).to be_nil
-
-      migrate!
-
-      namespace = Namespace.find_by(type: nil, owner_id: internal_user.id)
-      route = namespace.route
-
-      expect(namespace.path).to eq(route.path)
-      expect(namespace.name).to eq(route.name)
-    end
-
-    it 'sets notification email' do
-      users.update(internal_user.id, notification_email: nil)
-
-      expect(users.find(internal_user.id).notification_email).to be_nil
-
-      migrate!
-
-      user = users.find(internal_user.id)
-      expect(user.notification_email).to eq(user.email)
-    end
-  end
-end
diff --git a/spec/migrations/drop_duplicate_protected_tags_spec.rb b/spec/migrations/drop_duplicate_protected_tags_spec.rb
deleted file mode 100644
index 7135a15484c..00000000000
--- a/spec/migrations/drop_duplicate_protected_tags_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180711103851_drop_duplicate_protected_tags.rb')
-
-describe DropDuplicateProtectedTags do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:protected_tags) { table(:protected_tags) }
-
-  before do
-    stub_const("#{described_class}::BATCH_SIZE", 2)
-
-    namespaces.create(id: 1, name: 'gitlab-org', path: 'gitlab-org')
-    projects.create!(id: 1, namespace_id: 1, name: 'gitlab1', path: 'gitlab1')
-    projects.create!(id: 2, namespace_id: 1, name: 'gitlab2', path: 'gitlab2')
-  end
-
-  it 'removes duplicated protected tags' do
-    protected_tags.create!(id: 1, project_id: 1, name: 'foo')
-    tag2 = protected_tags.create!(id: 2, project_id: 1, name: 'foo1')
-    protected_tags.create!(id: 3, project_id: 1, name: 'foo')
-    tag4 = protected_tags.create!(id: 4, project_id: 1, name: 'foo')
-    tag5 = protected_tags.create!(id: 5, project_id: 2, name: 'foo')
-
-    migrate!
-
-    expect(protected_tags.all.count).to eq 3
-    expect(protected_tags.all.pluck(:id)).to contain_exactly(tag2.id, tag4.id, tag5.id)
-  end
-
-  it 'does not remove unique protected tags' do
-    tag1 = protected_tags.create!(id: 1, project_id: 1, name: 'foo1')
-    tag2 = protected_tags.create!(id: 2, project_id: 1, name: 'foo2')
-    tag3 = protected_tags.create!(id: 3, project_id: 1, name: 'foo3')
-
-    migrate!
-
-    expect(protected_tags.all.count).to eq 3
-    expect(protected_tags.all.pluck(:id)).to contain_exactly(tag1.id, tag2.id, tag3.id)
-  end
-end
diff --git a/spec/migrations/encrypt_deploy_tokens_tokens_spec.rb b/spec/migrations/encrypt_deploy_tokens_tokens_spec.rb
deleted file mode 100644
index 4d0a0b31571..00000000000
--- a/spec/migrations/encrypt_deploy_tokens_tokens_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-require Rails.root.join('db', 'post_migrate', '20190711201818_encrypt_deploy_tokens_tokens.rb')
-
-describe EncryptDeployTokensTokens do
-  let(:migration) { described_class.new }
-  let(:deployment_tokens) { table(:deploy_tokens) }
-  let(:plaintext) { "secret-token" }
-  let(:expires_at) { DateTime.now + 1.year }
-  let(:ciphertext) { Gitlab::CryptoHelper.aes256_gcm_encrypt(plaintext) }
-
-  describe '#up' do
-    it 'keeps plaintext token the same and populates token_encrypted if not present' do
-      deploy_token = deployment_tokens.create!(
-        name: 'test_token',
-        read_repository: true,
-        expires_at: expires_at,
-        username: 'gitlab-token-1',
-        token: plaintext
-      )
-
-      migration.up
-
-      expect(deploy_token.reload.token).to eq(plaintext)
-      expect(deploy_token.reload.token_encrypted).to eq(ciphertext)
-    end
-  end
-
-  describe '#down' do
-    it 'decrypts encrypted token and saves it' do
-      deploy_token = deployment_tokens.create!(
-        name: 'test_token',
-        read_repository: true,
-        expires_at: expires_at,
-        username: 'gitlab-token-1',
-        token_encrypted: ciphertext
-      )
-
-      migration.down
-
-      expect(deploy_token.reload.token).to eq(plaintext)
-      expect(deploy_token.reload.token_encrypted).to eq(ciphertext)
-    end
-  end
-end
diff --git a/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb b/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb
deleted file mode 100644
index ffb1c04a6c5..00000000000
--- a/spec/migrations/enqueue_verify_pages_domain_workers_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180216121030_enqueue_verify_pages_domain_workers')
-
-describe EnqueueVerifyPagesDomainWorkers do
-  around do |example|
-    Sidekiq::Testing.fake! do
-      example.run
-    end
-  end
-
-  let(:domains_table) { table(:pages_domains) }
-
-  describe '#up' do
-    it 'enqueues a verification worker for every domain' do
-      domains = Array.new(3) do |i|
-        domains_table.create!(domain: "my#{i}.domain.com", verification_code: "123#{i}")
-      end
-
-      expect { migrate! }.to change(PagesDomainVerificationWorker.jobs, :size).by(3)
-
-      enqueued_ids = PagesDomainVerificationWorker.jobs.map { |job| job['args'] }
-      expected_ids = domains.map { |domain| [domain.id] }
-
-      expect(enqueued_ids).to match_array(expected_ids)
-    end
-  end
-end
diff --git a/spec/migrations/fill_empty_finished_at_in_deployments_spec.rb b/spec/migrations/fill_empty_finished_at_in_deployments_spec.rb
deleted file mode 100644
index 546a805dec8..00000000000
--- a/spec/migrations/fill_empty_finished_at_in_deployments_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20181030135124_fill_empty_finished_at_in_deployments')
-
-describe FillEmptyFinishedAtInDeployments do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:environments) { table(:environments) }
-  let(:deployments) { table(:deployments) }
-
-  context 'when a deployment row does not have a value on finished_at' do
-    context 'when a deployment succeeded' do
-      before do
-        namespaces.create!(id: 123, name: 'gitlab1', path: 'gitlab1')
-        projects.create!(id: 1, name: 'gitlab1', path: 'gitlab1', namespace_id: 123)
-        environments.create!(id: 1, name: 'production', slug: 'production', project_id: 1)
-        deployments.create!(id: 1, iid: 1, project_id: 1, environment_id: 1, ref: 'master', sha: 'xxx', tag: false)
-      end
-
-      it 'correctly replicates finished_at by created_at' do
-        expect(deployments.last.created_at).not_to be_nil
-        expect(deployments.last.finished_at).to be_nil
-
-        migrate!
-
-        expect(deployments.last.created_at).not_to be_nil
-        expect(deployments.last.finished_at).to eq(deployments.last.created_at)
-      end
-    end
-
-    context 'when a deployment is running' do
-      before do
-        namespaces.create!(id: 123, name: 'gitlab1', path: 'gitlab1')
-        projects.create!(id: 1, name: 'gitlab1', path: 'gitlab1', namespace_id: 123)
-        environments.create!(id: 1, name: 'production', slug: 'production', project_id: 1)
-        deployments.create!(id: 1, iid: 1, project_id: 1, environment_id: 1, ref: 'master', sha: 'xxx', tag: false, status: 1)
-      end
-
-      it 'does not fill finished_at' do
-        expect(deployments.last.created_at).not_to be_nil
-        expect(deployments.last.finished_at).to be_nil
-
-        migrate!
-
-        expect(deployments.last.created_at).not_to be_nil
-        expect(deployments.last.finished_at).to be_nil
-      end
-    end
-  end
-
-  context 'when a deployment row does has a value on finished_at' do
-    let(:finished_at) { '2018-10-30 11:12:02 UTC' }
-
-    before do
-      namespaces.create!(id: 123, name: 'gitlab1', path: 'gitlab1')
-      projects.create!(id: 1, name: 'gitlab1', path: 'gitlab1', namespace_id: 123)
-      environments.create!(id: 1, name: 'production', slug: 'production', project_id: 1)
-      deployments.create!(id: 1, iid: 1, project_id: 1, environment_id: 1, ref: 'master', sha: 'xxx', tag: false, finished_at: finished_at)
-    end
-
-    it 'does not affect existing value' do
-      expect(deployments.last.created_at).not_to be_nil
-      expect(deployments.last.finished_at).not_to be_nil
-
-      migrate!
-
-      expect(deployments.last.created_at).not_to be_nil
-      expect(deployments.last.finished_at).to eq(finished_at)
-    end
-  end
-end
diff --git a/spec/migrations/fill_file_store_spec.rb b/spec/migrations/fill_file_store_spec.rb
deleted file mode 100644
index 732fdc2a0bb..00000000000
--- a/spec/migrations/fill_file_store_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180424151928_fill_file_store')
-
-describe FillFileStore do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:builds) { table(:ci_builds) }
-  let(:job_artifacts) { table(:ci_job_artifacts) }
-  let(:lfs_objects) { table(:lfs_objects) }
-  let(:uploads) { table(:uploads) }
-
-  before do
-    namespaces.create!(id: 123, name: 'gitlab1', path: 'gitlab1')
-    projects.create!(id: 123, name: 'gitlab1', path: 'gitlab1', namespace_id: 123)
-    builds.create!(id: 1)
-
-    ##
-    # Create rows that have nullfied `file_store` column
-    job_artifacts.create!(project_id: 123, job_id: 1, file_type: 1, file_store: nil)
-    lfs_objects.create!(oid: 123, size: 10, file: 'file_name', file_store: nil)
-    uploads.create!(size: 10, path: 'path', uploader: 'uploader', mount_point: 'file_name', store: nil)
-  end
-
-  it 'correctly migrates nullified file_store/store column', :sidekiq_might_not_need_inline do
-    expect(job_artifacts.where(file_store: nil).count).to eq(1)
-    expect(lfs_objects.where(file_store: nil).count).to eq(1)
-    expect(uploads.where(store: nil).count).to eq(1)
-
-    expect(job_artifacts.where(file_store: 1).count).to eq(0)
-    expect(lfs_objects.where(file_store: 1).count).to eq(0)
-    expect(uploads.where(store: 1).count).to eq(0)
-
-    migrate!
-
-    expect(job_artifacts.where(file_store: nil).count).to eq(0)
-    expect(lfs_objects.where(file_store: nil).count).to eq(0)
-    expect(uploads.where(store: nil).count).to eq(0)
-
-    expect(job_artifacts.where(file_store: 1).count).to eq(1)
-    expect(lfs_objects.where(file_store: 1).count).to eq(1)
-    expect(uploads.where(store: 1).count).to eq(1)
-  end
-end
diff --git a/spec/migrations/generate_missing_routes_spec.rb b/spec/migrations/generate_missing_routes_spec.rb
deleted file mode 100644
index bc7cd3bd55e..00000000000
--- a/spec/migrations/generate_missing_routes_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180702134423_generate_missing_routes.rb')
-
-describe GenerateMissingRoutes do
-  describe '#up' do
-    let(:namespaces) { table(:namespaces) }
-    let(:projects) { table(:projects) }
-    let(:routes) { table(:routes) }
-
-    it 'creates routes for projects without a route' do
-      namespace = namespaces.create!(name: 'GitLab', path: 'gitlab', type: 'Group')
-
-      routes.create!(
-        path: 'gitlab',
-        source_type: 'Namespace',
-        source_id: namespace.id
-      )
-
-      project = projects.create!(
-        name: 'GitLab CE',
-        path: 'gitlab-ce',
-        namespace_id: namespace.id
-      )
-
-      described_class.new.up
-
-      route = routes.find_by(source_type: 'Project')
-
-      expect(route.source_id).to eq(project.id)
-      expect(route.path).to eq("gitlab/gitlab-ce-#{project.id}")
-    end
-
-    it 'creates routes for namespaces without a route' do
-      namespace = namespaces.create!(name: 'GitLab', path: 'gitlab')
-
-      described_class.new.up
-
-      route = routes.find_by(source_type: 'Namespace')
-
-      expect(route.source_id).to eq(namespace.id)
-      expect(route.path).to eq("gitlab-#{namespace.id}")
-    end
-
-    it 'does not create routes for namespaces that already have a route' do
-      namespace = namespaces.create!(name: 'GitLab', path: 'gitlab')
-
-      routes.create!(
-        path: 'gitlab',
-        source_type: 'Namespace',
-        source_id: namespace.id
-      )
-
-      described_class.new.up
-
-      expect(routes.count).to eq(1)
-    end
-
-    it 'does not create routes for projects that already have a route' do
-      namespace = namespaces.create!(name: 'GitLab', path: 'gitlab')
-
-      routes.create!(
-        path: 'gitlab',
-        source_type: 'Namespace',
-        source_id: namespace.id
-      )
-
-      project = projects.create!(
-        name: 'GitLab CE',
-        path: 'gitlab-ce',
-        namespace_id: namespace.id
-      )
-
-      routes.create!(
-        path: 'gitlab/gitlab-ce',
-        source_type: 'Project',
-        source_id: project.id
-      )
-
-      described_class.new.up
-
-      expect(routes.count).to eq(2)
-    end
-  end
-end
diff --git a/spec/migrations/import_common_metrics_spec.rb b/spec/migrations/import_common_metrics_spec.rb
deleted file mode 100644
index 8c28b46cb38..00000000000
--- a/spec/migrations/import_common_metrics_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180831164910_import_common_metrics.rb')
-
-describe ImportCommonMetrics do
-  describe '#up' do
-    it "imports all prometheus metrics" do
-      expect(PrometheusMetric.common).to be_empty
-
-      migrate!
-
-      expect(PrometheusMetric.common).not_to be_empty
-    end
-  end
-end
diff --git a/spec/migrations/migrate_cluster_configure_worker_sidekiq_queue_spec.rb b/spec/migrations/migrate_cluster_configure_worker_sidekiq_queue_spec.rb
deleted file mode 100644
index a3ed9b722d5..00000000000
--- a/spec/migrations/migrate_cluster_configure_worker_sidekiq_queue_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20181219145520_migrate_cluster_configure_worker_sidekiq_queue.rb')
-
-describe MigrateClusterConfigureWorkerSidekiqQueue, :redis do
-  include Gitlab::Database::MigrationHelpers
-  include StubWorker
-
-  context 'when there are jobs in the queue' do
-    it 'correctly migrates queue when migrating up' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'gcp_cluster:cluster_platform_configure').perform_async('Something', [1])
-        stub_worker(queue: 'gcp_cluster:cluster_configure').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('gcp_cluster:cluster_platform_configure')).to eq 0
-        expect(sidekiq_queue_length('gcp_cluster:cluster_configure')).to eq 2
-      end
-    end
-
-    it 'does not affect other queues under the same namespace' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'gcp_cluster:cluster_install_app').perform_async('Something', [1])
-        stub_worker(queue: 'gcp_cluster:cluster_provision').perform_async('Something', [1])
-        stub_worker(queue: 'gcp_cluster:cluster_wait_for_app_installation').perform_async('Something', [1])
-        stub_worker(queue: 'gcp_cluster:wait_for_cluster_creation').perform_async('Something', [1])
-        stub_worker(queue: 'gcp_cluster:cluster_wait_for_ingress_ip_address').perform_async('Something', [1])
-        stub_worker(queue: 'gcp_cluster:cluster_project_configure').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('gcp_cluster:cluster_install_app')).to eq 1
-        expect(sidekiq_queue_length('gcp_cluster:cluster_provision')).to eq 1
-        expect(sidekiq_queue_length('gcp_cluster:cluster_wait_for_app_installation')).to eq 1
-        expect(sidekiq_queue_length('gcp_cluster:wait_for_cluster_creation')).to eq 1
-        expect(sidekiq_queue_length('gcp_cluster:cluster_wait_for_ingress_ip_address')).to eq 1
-        expect(sidekiq_queue_length('gcp_cluster:cluster_project_configure')).to eq 1
-      end
-    end
-
-    it 'correctly migrates queue when migrating down' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'gcp_cluster:cluster_configure').perform_async('Something', [1])
-
-        described_class.new.down
-
-        expect(sidekiq_queue_length('gcp_cluster:cluster_platform_configure')).to eq 1
-        expect(sidekiq_queue_length('gcp_cluster:cluster_configure')).to eq 0
-      end
-    end
-  end
-
-  context 'when there are no jobs in the queues' do
-    it 'does not raise error when migrating up' do
-      expect { described_class.new.up }.not_to raise_error
-    end
-
-    it 'does not raise error when migrating down' do
-      expect { described_class.new.down }.not_to raise_error
-    end
-  end
-end
diff --git a/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb b/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb
deleted file mode 100644
index 6e0bd487d1f..00000000000
--- a/spec/migrations/migrate_create_trace_artifact_sidekiq_queue_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180306074045_migrate_create_trace_artifact_sidekiq_queue.rb')
-
-describe MigrateCreateTraceArtifactSidekiqQueue, :redis do
-  include Gitlab::Database::MigrationHelpers
-  include StubWorker
-
-  context 'when there are jobs in the queues' do
-    it 'correctly migrates queue when migrating up' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'pipeline_default:create_trace_artifact').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_background:archive_trace').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('pipeline_default:create_trace_artifact')).to eq 0
-        expect(sidekiq_queue_length('pipeline_background:archive_trace')).to eq 2
-      end
-    end
-
-    it 'does not affect other queues under the same namespace' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'pipeline_default:build_coverage').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_default:build_trace_sections').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_default:pipeline_metrics').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_default:pipeline_notification').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_default:update_head_pipeline_for_merge_request').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('pipeline_default:build_coverage')).to eq 1
-        expect(sidekiq_queue_length('pipeline_default:build_trace_sections')).to eq 1
-        expect(sidekiq_queue_length('pipeline_default:pipeline_metrics')).to eq 1
-        expect(sidekiq_queue_length('pipeline_default:pipeline_notification')).to eq 1
-        expect(sidekiq_queue_length('pipeline_default:update_head_pipeline_for_merge_request')).to eq 1
-      end
-    end
-
-    it 'correctly migrates queue when migrating down' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'pipeline_background:archive_trace').perform_async('Something', [1])
-
-        described_class.new.down
-
-        expect(sidekiq_queue_length('pipeline_default:create_trace_artifact')).to eq 1
-        expect(sidekiq_queue_length('pipeline_background:archive_trace')).to eq 0
-      end
-    end
-  end
-
-  context 'when there are no jobs in the queues' do
-    it 'does not raise error when migrating up' do
-      expect { described_class.new.up }.not_to raise_error
-    end
-
-    it 'does not raise error when migrating down' do
-      expect { described_class.new.down }.not_to raise_error
-    end
-  end
-end
diff --git a/spec/migrations/migrate_forbidden_redirect_uris_spec.rb b/spec/migrations/migrate_forbidden_redirect_uris_spec.rb
deleted file mode 100644
index 7c3cc9f07c8..00000000000
--- a/spec/migrations/migrate_forbidden_redirect_uris_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20181026091631_migrate_forbidden_redirect_uris.rb')
-
-describe MigrateForbiddenRedirectUris do
-  let(:oauth_application) { table(:oauth_applications) }
-  let(:oauth_access_grant) { table(:oauth_access_grants) }
-
-  let!(:control_app) { oauth_application.create(random_params) }
-  let!(:control_access_grant) { oauth_application.create(random_params) }
-  let!(:forbidden_js_app) { oauth_application.create(random_params.merge(redirect_uri: 'javascript://alert()')) }
-  let!(:forbidden_vb_app) { oauth_application.create(random_params.merge(redirect_uri: 'VBSCRIPT://alert()')) }
-  let!(:forbidden_access_grant) { oauth_application.create(random_params.merge(redirect_uri: 'vbscript://alert()')) }
-
-  context 'oauth application' do
-    it 'migrates forbidden javascript URI' do
-      expect { migrate! }.to change { forbidden_js_app.reload.redirect_uri }.to('http://forbidden-scheme-has-been-overwritten')
-    end
-
-    it 'migrates forbidden VBScript URI' do
-      expect { migrate! }.to change { forbidden_vb_app.reload.redirect_uri }.to('http://forbidden-scheme-has-been-overwritten')
-    end
-
-    it 'does not migrate a valid URI' do
-      expect { migrate! }.not_to change { control_app.reload.redirect_uri }
-    end
-  end
-
-  context 'access grant' do
-    it 'migrates forbidden VBScript URI' do
-      expect { migrate! }.to change { forbidden_access_grant.reload.redirect_uri }.to('http://forbidden-scheme-has-been-overwritten')
-    end
-
-    it 'does not migrate a valid URI' do
-      expect { migrate! }.not_to change { control_access_grant.reload.redirect_uri }
-    end
-  end
-
-  def random_params
-    {
-      name: 'test',
-      secret: 'test',
-      uid: Doorkeeper::OAuth::Helpers::UniqueToken.generate,
-      redirect_uri: 'http://valid.com'
-    }
-  end
-end
diff --git a/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb b/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb
deleted file mode 100644
index 5133afdf5b0..00000000000
--- a/spec/migrations/migrate_legacy_artifacts_to_job_artifacts_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180816161409_migrate_legacy_artifacts_to_job_artifacts.rb')
-
-describe MigrateLegacyArtifactsToJobArtifacts do
-  let(:migration_class) { Gitlab::BackgroundMigration::MigrateLegacyArtifacts }
-  let(:migration_name)  { migration_class.to_s.demodulize }
-
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:pipelines) { table(:ci_pipelines) }
-  let(:jobs) { table(:ci_builds) }
-  let(:job_artifacts) { table(:ci_job_artifacts) }
-  let(:namespace) { namespaces.create!(name: 'gitlab', path: 'gitlab-org') }
-  let(:project) { projects.create!(name: 'gitlab', path: 'gitlab-ce', namespace_id: namespace.id) }
-  let(:pipeline) { pipelines.create!(project_id: project.id, ref: 'master', sha: 'adf43c3a') }
-  let(:archive_file_type) { Gitlab::BackgroundMigration::MigrateLegacyArtifacts::ARCHIVE_FILE_TYPE }
-  let(:metadata_file_type) { Gitlab::BackgroundMigration::MigrateLegacyArtifacts::METADATA_FILE_TYPE }
-  let(:local_store) { ::ObjectStorage::Store::LOCAL }
-  let(:remote_store) { ::ObjectStorage::Store::REMOTE }
-  let(:legacy_location) { Gitlab::BackgroundMigration::MigrateLegacyArtifacts::LEGACY_PATH_FILE_LOCATION }
-
-  context 'when legacy artifacts exist' do
-    before do
-      jobs.create!(id: 1, commit_id: pipeline.id, project_id: project.id, status: :success, artifacts_file: 'archive.zip')
-      jobs.create!(id: 2, commit_id: pipeline.id, project_id: project.id, status: :failed, artifacts_metadata: 'metadata.gz')
-      jobs.create!(id: 3, commit_id: pipeline.id, project_id: project.id, status: :failed, artifacts_file: 'archive.zip', artifacts_metadata: 'metadata.gz')
-      jobs.create!(id: 4, commit_id: pipeline.id, project_id: project.id, status: :running)
-      jobs.create!(id: 5, commit_id: pipeline.id, project_id: project.id, status: :success, artifacts_file: 'archive.zip', artifacts_file_store: remote_store, artifacts_metadata: 'metadata.gz')
-      jobs.create!(id: 6, commit_id: pipeline.id, project_id: project.id, status: :failed, artifacts_file: 'archive.zip', artifacts_metadata: 'metadata.gz')
-    end
-
-    it 'schedules a background migration' do
-      Sidekiq::Testing.fake! do
-        Timecop.freeze do
-          migrate!
-
-          expect(migration_name).to be_scheduled_delayed_migration(5.minutes, 1, 6)
-          expect(BackgroundMigrationWorker.jobs.size).to eq 1
-        end
-      end
-    end
-
-    it 'migrates legacy artifacts to ci_job_artifacts table', :sidekiq_might_not_need_inline do
-      migrate!
-
-      expect(job_artifacts.order(:job_id, :file_type).pluck('project_id, job_id, file_type, file_store, size, expire_at, file, file_sha256, file_location'))
-        .to eq([[project.id, 1, archive_file_type, local_store, nil, nil, 'archive.zip', nil, legacy_location],
-                [project.id, 3, archive_file_type, local_store, nil, nil, 'archive.zip', nil, legacy_location],
-                [project.id, 3, metadata_file_type, local_store, nil, nil, 'metadata.gz', nil, legacy_location],
-                [project.id, 5, archive_file_type, remote_store, nil, nil, 'archive.zip', nil, legacy_location],
-                [project.id, 5, metadata_file_type, local_store, nil, nil, 'metadata.gz', nil, legacy_location],
-                [project.id, 6, archive_file_type, local_store, nil, nil, 'archive.zip', nil, legacy_location],
-                [project.id, 6, metadata_file_type, local_store, nil, nil, 'metadata.gz', nil, legacy_location]])
-    end
-  end
-
-  context 'when legacy artifacts do not exist' do
-    before do
-      jobs.create!(id: 1, commit_id: pipeline.id, project_id: project.id, status: :success)
-      jobs.create!(id: 2, commit_id: pipeline.id, project_id: project.id, status: :failed, artifacts_metadata: 'metadata.gz')
-    end
-
-    it 'does not schedule background migrations' do
-      Sidekiq::Testing.fake! do
-        Timecop.freeze do
-          migrate!
-
-          expect(BackgroundMigrationWorker.jobs.size).to eq 0
-        end
-      end
-    end
-  end
-end
diff --git a/spec/migrations/migrate_null_wiki_access_levels_spec.rb b/spec/migrations/migrate_null_wiki_access_levels_spec.rb
deleted file mode 100644
index f4753f67e17..00000000000
--- a/spec/migrations/migrate_null_wiki_access_levels_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180809195358_migrate_null_wiki_access_levels.rb')
-
-describe MigrateNullWikiAccessLevels do
-  let(:namespaces) { table('namespaces') }
-  let(:projects) { table(:projects) }
-  let(:project_features) { table(:project_features) }
-  let(:migration) { described_class.new }
-
-  before do
-    namespace = namespaces.create(name: 'foo', path: 'foo')
-
-    projects.create!(id: 1, name: 'gitlab1', path: 'gitlab1', namespace_id: namespace.id)
-    projects.create!(id: 2, name: 'gitlab2', path: 'gitlab2', namespace_id: namespace.id)
-    projects.create!(id: 3, name: 'gitlab3', path: 'gitlab3', namespace_id: namespace.id)
-
-    project_features.create!(id: 1, project_id: 1, wiki_access_level: nil)
-    project_features.create!(id: 2, project_id: 2, wiki_access_level: 10)
-    project_features.create!(id: 3, project_id: 3, wiki_access_level: 20)
-  end
-
-  describe '#up' do
-    it 'migrates existing project_features with wiki_access_level NULL to 20' do
-      expect { migration.up }.to change { project_features.where(wiki_access_level: 20).count }.by(1)
-    end
-  end
-end
diff --git a/spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb b/spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb
deleted file mode 100644
index aa4951b2f14..00000000000
--- a/spec/migrations/migrate_object_storage_upload_sidekiq_queue_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180603190921_migrate_object_storage_upload_sidekiq_queue.rb')
-
-describe MigrateObjectStorageUploadSidekiqQueue, :redis do
-  include Gitlab::Database::MigrationHelpers
-  include StubWorker
-
-  context 'when there are jobs in the queue' do
-    it 'correctly migrates queue when migrating up' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'object_storage_upload').perform_async('Something', [1])
-        stub_worker(queue: 'object_storage:object_storage_background_move').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('object_storage_upload')).to eq 0
-        expect(sidekiq_queue_length('object_storage:object_storage_background_move')).to eq 2
-      end
-    end
-  end
-
-  context 'when there are no jobs in the queues' do
-    it 'does not raise error when migrating up' do
-      expect { described_class.new.up }.not_to raise_error
-    end
-  end
-end
diff --git a/spec/migrations/migrate_update_head_pipeline_for_merge_request_sidekiq_queue_spec.rb b/spec/migrations/migrate_update_head_pipeline_for_merge_request_sidekiq_queue_spec.rb
deleted file mode 100644
index 204c38b3fc5..00000000000
--- a/spec/migrations/migrate_update_head_pipeline_for_merge_request_sidekiq_queue_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180307012445_migrate_update_head_pipeline_for_merge_request_sidekiq_queue.rb')
-
-describe MigrateUpdateHeadPipelineForMergeRequestSidekiqQueue, :redis do
-  include Gitlab::Database::MigrationHelpers
-  include StubWorker
-
-  context 'when there are jobs in the queues' do
-    it 'correctly migrates queue when migrating up' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'pipeline_default:update_head_pipeline_for_merge_request').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_processing:update_head_pipeline_for_merge_request').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('pipeline_default:update_head_pipeline_for_merge_request')).to eq 0
-        expect(sidekiq_queue_length('pipeline_processing:update_head_pipeline_for_merge_request')).to eq 2
-      end
-    end
-
-    it 'does not affect other queues under the same namespace' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'pipeline_default:build_coverage').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_default:build_trace_sections').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_default:pipeline_metrics').perform_async('Something', [1])
-        stub_worker(queue: 'pipeline_default:pipeline_notification').perform_async('Something', [1])
-
-        described_class.new.up
-
-        expect(sidekiq_queue_length('pipeline_default:build_coverage')).to eq 1
-        expect(sidekiq_queue_length('pipeline_default:build_trace_sections')).to eq 1
-        expect(sidekiq_queue_length('pipeline_default:pipeline_metrics')).to eq 1
-        expect(sidekiq_queue_length('pipeline_default:pipeline_notification')).to eq 1
-      end
-    end
-
-    it 'correctly migrates queue when migrating down' do
-      Sidekiq::Testing.disable! do
-        stub_worker(queue: 'pipeline_processing:update_head_pipeline_for_merge_request').perform_async('Something', [1])
-
-        described_class.new.down
-
-        expect(sidekiq_queue_length('pipeline_default:update_head_pipeline_for_merge_request')).to eq 1
-        expect(sidekiq_queue_length('pipeline_processing:update_head_pipeline_for_merge_request')).to eq 0
-      end
-    end
-  end
-
-  context 'when there are no jobs in the queues' do
-    it 'does not raise error when migrating up' do
-      expect { described_class.new.up }.not_to raise_error
-    end
-
-    it 'does not raise error when migrating down' do
-      expect { described_class.new.down }.not_to raise_error
-    end
-  end
-end
diff --git a/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb b/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb
deleted file mode 100644
index 5be8706cacf..00000000000
--- a/spec/migrations/remove_empty_extern_uid_auth0_identities_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180220150310_remove_empty_extern_uid_auth0_identities.rb')
-
-describe RemoveEmptyExternUidAuth0Identities do
-  let(:identities) { table(:identities) }
-
-  before do
-    identities.create(provider: 'auth0', extern_uid: '')
-    identities.create(provider: 'auth0', extern_uid: 'valid')
-    identities.create(provider: 'github', extern_uid: '')
-
-    migrate!
-  end
-
-  it 'leaves the correct auth0 identity' do
-    expect(identities.where(provider: 'auth0').pluck(:extern_uid)).to eq(['valid'])
-  end
-
-  it 'leaves the correct github identity' do
-    expect(identities.where(provider: 'github').count).to eq(1)
-  end
-end
diff --git a/spec/migrations/remove_redundant_pipeline_stages_spec.rb b/spec/migrations/remove_redundant_pipeline_stages_spec.rb
deleted file mode 100644
index 9bcbb6022a7..00000000000
--- a/spec/migrations/remove_redundant_pipeline_stages_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180119121225_remove_redundant_pipeline_stages.rb')
-
-describe RemoveRedundantPipelineStages do
-  let(:projects) { table(:projects) }
-  let(:pipelines) { table(:ci_pipelines) }
-  let(:stages) { table(:ci_stages) }
-  let(:builds) { table(:ci_builds) }
-
-  before do
-    projects.create!(id: 123, name: 'gitlab', path: 'gitlab-ce')
-    pipelines.create!(id: 234, project_id: 123, ref: 'master', sha: 'adf43c3a')
-
-    stages.create!(id: 6, project_id: 123, pipeline_id: 234, name: 'build')
-    stages.create!(id: 10, project_id: 123, pipeline_id: 234, name: 'build')
-    stages.create!(id: 21, project_id: 123, pipeline_id: 234, name: 'build')
-    stages.create!(id: 41, project_id: 123, pipeline_id: 234, name: 'test')
-    stages.create!(id: 62, project_id: 123, pipeline_id: 234, name: 'test')
-    stages.create!(id: 102, project_id: 123, pipeline_id: 234, name: 'deploy')
-
-    builds.create!(id: 1, commit_id: 234, project_id: 123, stage_id: 10)
-    builds.create!(id: 2, commit_id: 234, project_id: 123, stage_id: 21)
-    builds.create!(id: 3, commit_id: 234, project_id: 123, stage_id: 21)
-    builds.create!(id: 4, commit_id: 234, project_id: 123, stage_id: 41)
-    builds.create!(id: 5, commit_id: 234, project_id: 123, stage_id: 62)
-    builds.create!(id: 6, commit_id: 234, project_id: 123, stage_id: 102)
-  end
-
-  it 'removes ambiguous stages and preserves builds' do
-    expect(stages.all.count).to eq 6
-    expect(builds.all.count).to eq 6
-
-    migrate!
-
-    expect(stages.all.count).to eq 1
-    expect(builds.all.count).to eq 6
-    expect(builds.all.pluck(:stage_id).compact).to eq [102]
-  end
-
-  it 'retries when incorrectly added index exception is caught' do
-    allow_any_instance_of(described_class)
-      .to receive(:remove_redundant_pipeline_stages!)
-
-    expect_any_instance_of(described_class)
-      .to receive(:remove_outdated_index!)
-      .exactly(100).times.and_call_original
-
-    expect { migrate! }
-      .to raise_error StandardError, /Failed to add an unique index/
-  end
-
-  it 'does not retry when unknown exception is being raised' do
-    allow(subject).to receive(:remove_outdated_index!)
-    expect(subject).to receive(:remove_redundant_pipeline_stages!).once
-    allow(subject).to receive(:add_unique_index!).and_raise(StandardError)
-
-    expect { subject.up(attempts: 3) }.to raise_error StandardError
-  end
-end
diff --git a/spec/migrations/reschedule_builds_stages_migration_spec.rb b/spec/migrations/reschedule_builds_stages_migration_spec.rb
deleted file mode 100644
index 18ea16f97bc..00000000000
--- a/spec/migrations/reschedule_builds_stages_migration_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180405101928_reschedule_builds_stages_migration')
-
-describe RescheduleBuildsStagesMigration do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:pipelines) { table(:ci_pipelines) }
-  let(:stages) { table(:ci_stages) }
-  let(:jobs) { table(:ci_builds) }
-
-  before do
-    stub_const("#{described_class}::BATCH_SIZE", 1)
-
-    namespaces.create(id: 12, name: 'gitlab-org', path: 'gitlab-org')
-    projects.create!(id: 123, namespace_id: 12, name: 'gitlab', path: 'gitlab')
-    pipelines.create!(id: 1, project_id: 123, ref: 'master', sha: 'adf43c3a')
-    stages.create!(id: 1, project_id: 123, pipeline_id: 1, name: 'test')
-
-    jobs.create!(id: 11, commit_id: 1, project_id: 123, stage_id: nil)
-    jobs.create!(id: 206, commit_id: 1, project_id: 123, stage_id: nil)
-    jobs.create!(id: 3413, commit_id: 1, project_id: 123, stage_id: nil)
-    jobs.create!(id: 4109, commit_id: 1, project_id: 123, stage_id: 1)
-  end
-
-  it 'schedules delayed background migrations in batches in bulk' do
-    Sidekiq::Testing.fake! do
-      Timecop.freeze do
-        migrate!
-
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(5.minutes, 11, 11)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(10.minutes, 206, 206)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(15.minutes, 3413, 3413)
-        expect(BackgroundMigrationWorker.jobs.size).to eq 3
-      end
-    end
-  end
-end
diff --git a/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb b/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb
deleted file mode 100644
index dcb31dff9b7..00000000000
--- a/spec/migrations/reschedule_commits_count_for_merge_request_diff_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'migrate', '20180309121820_reschedule_commits_count_for_merge_request_diff')
-
-describe RescheduleCommitsCountForMergeRequestDiff do
-  let(:merge_request_diffs) { table(:merge_request_diffs) }
-  let(:merge_requests) { table(:merge_requests) }
-  let(:projects) { table(:projects) }
-  let(:namespaces) { table(:namespaces) }
-
-  before do
-    stub_const("#{described_class.name}::BATCH_SIZE", 1)
-
-    namespaces.create!(id: 1, name: 'gitlab', path: 'gitlab')
-
-    projects.create!(id: 1, namespace_id: 1)
-
-    merge_requests.create!(id: 1, target_project_id: 1, source_project_id: 1, target_branch: 'feature', source_branch: 'master')
-
-    merge_request_diffs.create!(id: 1, merge_request_id: 1)
-    merge_request_diffs.create!(id: 2, merge_request_id: 1)
-    merge_request_diffs.create!(id: 3, merge_request_id: 1, commits_count: 0)
-    merge_request_diffs.create!(id: 4, merge_request_id: 1)
-  end
-
-  it 'correctly schedules background migrations' do
-    Sidekiq::Testing.fake! do
-      Timecop.freeze do
-        migrate!
-
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(5.minutes, 1, 1)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(10.minutes, 2, 2)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(15.minutes, 4, 4)
-        expect(BackgroundMigrationWorker.jobs.size).to eq 3
-      end
-    end
-  end
-end
diff --git a/spec/migrations/schedule_digest_personal_access_tokens_spec.rb b/spec/migrations/schedule_digest_personal_access_tokens_spec.rb
deleted file mode 100644
index d8e1b089d31..00000000000
--- a/spec/migrations/schedule_digest_personal_access_tokens_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180913142237_schedule_digest_personal_access_tokens.rb')
-
-describe ScheduleDigestPersonalAccessTokens do
-  let(:personal_access_tokens) { table(:personal_access_tokens) }
-  let(:users) { table(:users) }
-
-  before do
-    stub_const("#{described_class.name}::BATCH_SIZE", 4)
-
-    users.create(id: 1, email: 'user@example.com', projects_limit: 10)
-
-    personal_access_tokens.create!(id: 1, user_id: 1, name: 'pat-01', token: 'token-01')
-    personal_access_tokens.create!(id: 2, user_id: 1, name: 'pat-02', token: 'token-02')
-    personal_access_tokens.create!(id: 3, user_id: 1, name: 'pat-03', token_digest: 'token_digest')
-    personal_access_tokens.create!(id: 4, user_id: 1, name: 'pat-04', token: 'token-04')
-    personal_access_tokens.create!(id: 5, user_id: 1, name: 'pat-05', token: 'token-05')
-    personal_access_tokens.create!(id: 6, user_id: 1, name: 'pat-06', token: 'token-06')
-  end
-
-  it 'correctly schedules background migrations' do
-    Sidekiq::Testing.fake! do
-      migrate!
-
-      expect(described_class::MIGRATION).to(
-        be_scheduled_delayed_migration(
-          5.minutes, 'PersonalAccessToken', 'token', 'token_digest', 1, 5))
-      expect(described_class::MIGRATION).to(
-        be_scheduled_delayed_migration(
-          10.minutes, 'PersonalAccessToken', 'token', 'token_digest', 6, 6))
-      expect(BackgroundMigrationWorker.jobs.size).to eq 2
-    end
-  end
-
-  it 'schedules background migrations', :sidekiq_might_not_need_inline do
-    perform_enqueued_jobs do
-      plain_text_token = 'token IS NOT NULL'
-
-      expect(personal_access_tokens.where(plain_text_token).count).to eq 5
-
-      migrate!
-
-      expect(personal_access_tokens.where(plain_text_token).count).to eq 0
-    end
-  end
-end
diff --git a/spec/migrations/schedule_runners_token_encryption_spec.rb b/spec/migrations/schedule_runners_token_encryption_spec.rb
deleted file mode 100644
index 4121a8409b4..00000000000
--- a/spec/migrations/schedule_runners_token_encryption_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20181121111200_schedule_runners_token_encryption')
-
-describe ScheduleRunnersTokenEncryption do
-  let(:settings) { table(:application_settings) }
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:runners) { table(:ci_runners) }
-
-  before do
-    stub_const("#{described_class.name}::BATCH_SIZE", 1)
-
-    settings.create!(id: 1, runners_registration_token: 'plain-text-token1')
-    namespaces.create!(id: 11, name: 'gitlab', path: 'gitlab-org', runners_token: 'my-token1')
-    namespaces.create!(id: 12, name: 'gitlab', path: 'gitlab-org', runners_token: 'my-token2')
-    projects.create!(id: 111, namespace_id: 11, name: 'gitlab', path: 'gitlab-ce', runners_token: 'my-token1')
-    projects.create!(id: 114, namespace_id: 11, name: 'gitlab', path: 'gitlab-ce', runners_token: 'my-token2')
-    runners.create!(id: 201, runner_type: 1, token: 'plain-text-token1')
-    runners.create!(id: 202, runner_type: 1, token: 'plain-text-token2')
-  end
-
-  it 'schedules runners token encryption migration for multiple resources' do
-    Sidekiq::Testing.fake! do
-      Timecop.freeze do
-        migrate!
-
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'settings', 1, 1)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'namespace', 11, 11)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(8.minutes, 'namespace', 12, 12)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'project', 111, 111)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(8.minutes, 'project', 114, 114)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'runner', 201, 201)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(8.minutes, 'runner', 202, 202)
-        expect(BackgroundMigrationWorker.jobs.size).to eq 7
-      end
-    end
-  end
-end
diff --git a/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb b/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb
deleted file mode 100644
index ea1e16a0a35..00000000000
--- a/spec/migrations/schedule_set_confidential_note_events_on_webhooks_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180104131052_schedule_set_confidential_note_events_on_webhooks.rb')
-
-describe ScheduleSetConfidentialNoteEventsOnWebhooks do
-  let(:web_hooks_table) { table(:web_hooks) }
-  let(:migration_class) { Gitlab::BackgroundMigration::SetConfidentialNoteEventsOnWebhooks }
-  let(:migration_name)  { migration_class.to_s.demodulize }
-
-  let!(:web_hook_1)        { web_hooks_table.create!(confidential_note_events: nil, note_events: true) }
-  let!(:web_hook_2)        { web_hooks_table.create!(confidential_note_events: nil, note_events: true) }
-  let!(:web_hook_migrated) { web_hooks_table.create!(confidential_note_events: true, note_events: true) }
-  let!(:web_hook_skip)     { web_hooks_table.create!(confidential_note_events: nil, note_events: false) }
-  let!(:web_hook_new)      { web_hooks_table.create!(confidential_note_events: false, note_events: true) }
-  let!(:web_hook_4)        { web_hooks_table.create!(confidential_note_events: nil, note_events: true) }
-
-  before do
-    stub_const("#{described_class}::BATCH_SIZE", 1)
-  end
-
-  it 'schedules background migrations at correct time' do
-    Sidekiq::Testing.fake! do
-      Timecop.freeze do
-        migrate!
-
-        expect(migration_name).to be_scheduled_delayed_migration(5.minutes, web_hook_1.id, web_hook_1.id)
-        expect(migration_name).to be_scheduled_delayed_migration(10.minutes, web_hook_2.id, web_hook_2.id)
-        expect(migration_name).to be_scheduled_delayed_migration(15.minutes, web_hook_4.id, web_hook_4.id)
-        expect(BackgroundMigrationWorker.jobs.size).to eq 3
-      end
-    end
-  end
-
-  it 'correctly processes web hooks', :sidekiq_might_not_need_inline do
-    perform_enqueued_jobs do
-      expect(web_hooks_table.where(confidential_note_events: nil).count).to eq 4
-      expect(web_hooks_table.where(confidential_note_events: true).count).to eq 1
-
-      migrate!
-
-      expect(web_hooks_table.where(confidential_note_events: nil).count).to eq 1
-      expect(web_hooks_table.where(confidential_note_events: true).count).to eq 4
-    end
-  end
-end
diff --git a/spec/migrations/schedule_stages_index_migration_spec.rb b/spec/migrations/schedule_stages_index_migration_spec.rb
deleted file mode 100644
index 5ca857087e7..00000000000
--- a/spec/migrations/schedule_stages_index_migration_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180420080616_schedule_stages_index_migration')
-
-describe ScheduleStagesIndexMigration do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:pipelines) { table(:ci_pipelines) }
-  let(:stages) { table(:ci_stages) }
-
-  before do
-    stub_const("#{described_class}::BATCH_SIZE", 1)
-
-    namespaces.create(id: 12, name: 'gitlab-org', path: 'gitlab-org')
-    projects.create!(id: 123, namespace_id: 12, name: 'gitlab', path: 'gitlab')
-    pipelines.create!(id: 1, project_id: 123, ref: 'master', sha: 'adf43c3a')
-    stages.create!(id: 121, project_id: 123, pipeline_id: 1, name: 'build')
-    stages.create!(id: 122, project_id: 123, pipeline_id: 1, name: 'test')
-    stages.create!(id: 123, project_id: 123, pipeline_id: 1, name: 'deploy')
-  end
-
-  it 'schedules delayed background migrations in batches' do
-    Sidekiq::Testing.fake! do
-      Timecop.freeze do
-        expect(stages.all).to all(have_attributes(position: be_nil))
-
-        migrate!
-
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(5.minutes, 121, 121)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(10.minutes, 122, 122)
-        expect(described_class::MIGRATION).to be_scheduled_delayed_migration(15.minutes, 123, 123)
-        expect(BackgroundMigrationWorker.jobs.size).to eq 3
-      end
-    end
-  end
-end
diff --git a/spec/migrations/schedule_to_archive_legacy_traces_spec.rb b/spec/migrations/schedule_to_archive_legacy_traces_spec.rb
deleted file mode 100644
index 69c4b15a74f..00000000000
--- a/spec/migrations/schedule_to_archive_legacy_traces_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20180529152628_schedule_to_archive_legacy_traces')
-
-describe ScheduleToArchiveLegacyTraces do
-  include TraceHelpers
-
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:builds) { table(:ci_builds) }
-  let(:job_artifacts) { table(:ci_job_artifacts) }
-
-  before do
-    namespaces.create!(id: 123, name: 'gitlab1', path: 'gitlab1')
-    projects.create!(id: 123, name: 'gitlab1', path: 'gitlab1', namespace_id: 123)
-    @build_success = builds.create!(id: 1, project_id: 123, status: 'success', type: 'Ci::Build')
-    @build_failed = builds.create!(id: 2, project_id: 123, status: 'failed', type: 'Ci::Build')
-    @builds_canceled = builds.create!(id: 3, project_id: 123, status: 'canceled', type: 'Ci::Build')
-    @build_running = builds.create!(id: 4, project_id: 123, status: 'running', type: 'Ci::Build')
-
-    create_legacy_trace(@build_success, 'This job is done')
-    create_legacy_trace(@build_failed, 'This job is done')
-    create_legacy_trace(@builds_canceled, 'This job is done')
-    create_legacy_trace(@build_running, 'This job is not done yet')
-  end
-
-  it 'correctly archive legacy traces', :sidekiq_might_not_need_inline do
-    expect(job_artifacts.count).to eq(0)
-    expect(File.exist?(legacy_trace_path(@build_success))).to be_truthy
-    expect(File.exist?(legacy_trace_path(@build_failed))).to be_truthy
-    expect(File.exist?(legacy_trace_path(@builds_canceled))).to be_truthy
-    expect(File.exist?(legacy_trace_path(@build_running))).to be_truthy
-
-    migrate!
-
-    expect(job_artifacts.count).to eq(3)
-    expect(File.exist?(legacy_trace_path(@build_success))).to be_falsy
-    expect(File.exist?(legacy_trace_path(@build_failed))).to be_falsy
-    expect(File.exist?(legacy_trace_path(@builds_canceled))).to be_falsy
-    expect(File.exist?(legacy_trace_path(@build_running))).to be_truthy
-    expect(File.exist?(archived_trace_path(job_artifacts.find_by(job_id: @build_success.id)))).to be_truthy
-    expect(File.exist?(archived_trace_path(job_artifacts.find_by(job_id: @build_failed.id)))).to be_truthy
-    expect(File.exist?(archived_trace_path(job_artifacts.find_by(job_id: @builds_canceled.id)))).to be_truthy
-    expect(job_artifacts.where(job_id: @build_running.id)).not_to be_exist
-  end
-end
diff --git a/spec/migrations/seed_repository_storages_weighted_spec.rb b/spec/migrations/seed_repository_storages_weighted_spec.rb
new file mode 100644
index 00000000000..9a68ff5fb2f
--- /dev/null
+++ b/spec/migrations/seed_repository_storages_weighted_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200526000407_seed_repository_storages_weighted.rb')
+
+describe SeedRepositoryStoragesWeighted do
+  let(:storages) { { "foo" => {}, "baz" => {} } }
+  let(:application_settings) do
+    table(:application_settings).tap do |klass|
+      klass.class_eval do
+        serialize :repository_storages
+      end
+    end
+  end
+
+  before do
+    allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
+  end
+
+  let(:application_setting) { application_settings.create }
+  let(:repository_storages) { ["foo"] }
+
+  it 'correctly schedules background migrations' do
+    application_setting.repository_storages = repository_storages
+    application_setting.save!
+
+    migrate!
+
+    expect(application_settings.find(application_setting.id).repository_storages_weighted).to eq({ "foo" => 100, "baz" => 0 })
+  end
+end
diff --git a/spec/migrations/steal_fill_store_upload_spec.rb b/spec/migrations/steal_fill_store_upload_spec.rb
deleted file mode 100644
index b5e3de1864c..00000000000
--- a/spec/migrations/steal_fill_store_upload_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20181105201455_steal_fill_store_upload.rb')
-
-describe StealFillStoreUpload do
-  let(:uploads) { table(:uploads) }
-
-  describe '#up' do
-    it 'steals the FillStoreUpload background migration' do
-      expect(Gitlab::BackgroundMigration).to receive(:steal).with('FillStoreUpload').and_call_original
-
-      migrate!
-    end
-
-    it 'does not run migration if not needed' do
-      uploads.create(size: 100.kilobytes,
-                     uploader: 'AvatarUploader',
-                     path: 'uploads/-/system/avatar.jpg',
-                     store: 1)
-
-      expect_any_instance_of(Gitlab::BackgroundMigration::FillStoreUpload).not_to receive(:perform)
-
-      migrate!
-    end
-
-    it 'ensures all rows are migrated' do
-      uploads.create(size: 100.kilobytes,
-                     uploader: 'AvatarUploader',
-                     path: 'uploads/-/system/avatar.jpg',
-                     store: nil)
-
-      expect_any_instance_of(Gitlab::BackgroundMigration::FillStoreUpload).to receive(:perform).and_call_original
-
-      expect do
-        migrate!
-      end.to change { uploads.where(store: nil).count }.from(1).to(0)
-    end
-  end
-end
diff --git a/spec/migrations/update_project_import_visibility_level_spec.rb b/spec/migrations/update_project_import_visibility_level_spec.rb
deleted file mode 100644
index f8439fc4204..00000000000
--- a/spec/migrations/update_project_import_visibility_level_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20181219130552_update_project_import_visibility_level.rb')
-
-describe UpdateProjectImportVisibilityLevel do
-  let(:namespaces) { table(:namespaces) }
-  let(:projects) { table(:projects) }
-  let(:project) { projects.find_by_name(name) }
-
-  before do
-    stub_const("#{described_class}::BATCH_SIZE", 1)
-  end
-
-  context 'private visibility level' do
-    let(:name) { 'private-public' }
-
-    it 'updates the project visibility' do
-      create_namespace(name, Gitlab::VisibilityLevel::PRIVATE)
-      create_project(name, Gitlab::VisibilityLevel::PUBLIC)
-
-      expect { migrate! }.to change { project.reload.visibility_level }.to(Gitlab::VisibilityLevel::PRIVATE)
-    end
-  end
-
-  context 'internal visibility level' do
-    let(:name) { 'internal-public' }
-
-    it 'updates the project visibility' do
-      create_namespace(name, Gitlab::VisibilityLevel::INTERNAL)
-      create_project(name, Gitlab::VisibilityLevel::PUBLIC)
-
-      expect { migrate! }.to change { project.reload.visibility_level }.to(Gitlab::VisibilityLevel::INTERNAL)
-    end
-  end
-
-  context 'public visibility level' do
-    let(:name) { 'public-public' }
-
-    it 'does not update the project visibility' do
-      create_namespace(name, Gitlab::VisibilityLevel::PUBLIC)
-      create_project(name, Gitlab::VisibilityLevel::PUBLIC)
-
-      expect { migrate! }.not_to change { project.reload.visibility_level }
-    end
-  end
-
-  context 'private project visibility level' do
-    let(:name) { 'public-private' }
-
-    it 'does not update the project visibility' do
-      create_namespace(name, Gitlab::VisibilityLevel::PUBLIC)
-      create_project(name, Gitlab::VisibilityLevel::PRIVATE)
-
-      expect { migrate! }.not_to change { project.reload.visibility_level }
-    end
-  end
-
-  context 'no namespace' do
-    let(:name) { 'no-namespace' }
-
-    it 'does not update the project visibility' do
-      create_namespace(name, Gitlab::VisibilityLevel::PRIVATE, type: nil)
-      create_project(name, Gitlab::VisibilityLevel::PUBLIC)
-
-      expect { migrate! }.not_to change { project.reload.visibility_level }
-    end
-  end
-
-  def create_namespace(name, visibility, options = {})
-    namespaces.create({
-                        name: name,
-                        path: name,
-                        type: 'Group',
-                        visibility_level: visibility
-                      }.merge(options))
-  end
-
-  def create_project(name, visibility)
-    projects.create!(namespace_id: namespaces.find_by_name(name).id,
-                     name: name,
-                     path: name,
-                     import_type: 'gitlab_project',
-                     visibility_level: visibility)
-  end
-end
diff --git a/spec/migrations/update_routes_for_lost_and_found_group_and_orphaned_projects_spec.rb b/spec/migrations/update_routes_for_lost_and_found_group_and_orphaned_projects_spec.rb
new file mode 100644
index 00000000000..4cf096b9df6
--- /dev/null
+++ b/spec/migrations/update_routes_for_lost_and_found_group_and_orphaned_projects_spec.rb
@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require Rails.root.join('db', 'post_migrate', '20200602143020_update_routes_for_lost_and_found_group_and_orphaned_projects.rb')
+
+describe UpdateRoutesForLostAndFoundGroupAndOrphanedProjects, :migration do
+  let(:users) { table(:users) }
+  let(:namespaces) { table(:namespaces) }
+  let(:members) { table(:members) }
+  let(:projects) { table(:projects) }
+  let(:routes) { table(:routes) }
+
+  before do
+    # Create a Ghost User and its namnespace, but skip the route
+    ghost_user = users.create!(
+      name: 'Ghost User',
+      username: 'ghost',
+      email: 'ghost@example.com',
+      user_type: described_class::User::USER_TYPE_GHOST,
+      projects_limit: 100,
+      state: :active,
+      bio: 'This is a "Ghost User"'
+    )
+
+    namespaces.create!(
+      name: 'Ghost User',
+      path: 'ghost',
+      owner_id: ghost_user.id,
+      visibility_level: 20
+    )
+
+    # Create the 'lost-and-found', owned by the Ghost user, but with no route
+    lost_and_found_group = namespaces.create!(
+      name: described_class::User::LOST_AND_FOUND_GROUP,
+      path: described_class::User::LOST_AND_FOUND_GROUP,
+      type: 'Group',
+      description: 'Group to store orphaned projects',
+      visibility_level: 0
+    )
+
+    members.create!(
+      type: 'GroupMember',
+      source_id: lost_and_found_group.id,
+      user_id: ghost_user.id,
+      source_type: 'Namespace',
+      access_level: described_class::User::ACCESS_LEVEL_OWNER,
+      notification_level: 3
+    )
+
+    # Add an orphaned project under 'lost-and-found' but with the wrong path in its route
+    orphaned_project = projects.create!(
+      name: 'orphaned_project',
+      path: 'orphaned_project',
+      visibility_level: 20,
+      archived: false,
+      namespace_id: lost_and_found_group.id
+    )
+
+    routes.create!(
+      source_id: orphaned_project.id,
+      source_type: 'Project',
+      path: 'orphaned_project',
+      name: 'orphaned_project',
+      created_at: Time.zone.now,
+      updated_at: Time.zone.now
+    )
+
+    # Create another user named ghost which is not the Ghost User
+    # Also create a 'lost-and-found' group for them and add projects to it
+    # Purpose: test that the routes added for the 'lost-and-found' group and
+    #  its projects are unique
+    fake_ghost_user = users.create!(
+      name: 'Ghost User',
+      username: 'ghost1',
+      email: 'ghost1@example.com',
+      user_type: nil,
+      projects_limit: 100,
+      state: :active,
+      bio: 'This is NOT a "Ghost User"'
+    )
+
+    fake_ghost_user_namespace = namespaces.create!(
+      name: 'Ghost User',
+      path: 'ghost1',
+      owner_id: fake_ghost_user.id,
+      visibility_level: 20
+    )
+
+    routes.create!(
+      source_id: fake_ghost_user_namespace.id,
+      source_type: 'Namespace',
+      path: 'Ghost User',
+      name: 'ghost1',
+      created_at: Time.zone.now,
+      updated_at: Time.zone.now
+    )
+
+    fake_lost_and_found_group = namespaces.create!(
+      name: 'Lost and Found',
+      path: described_class::User::LOST_AND_FOUND_GROUP, # same path as the lost-and-found group
+      type: 'Group',
+      description: 'Fake lost and found group with the same path as the real one',
+      visibility_level: 20
+    )
+
+    routes.create!(
+      source_id: fake_lost_and_found_group.id,
+      source_type: 'Namespace',
+      path: described_class::User::LOST_AND_FOUND_GROUP, # same path as the lost-and-found group
+      name: 'Lost and Found',
+      created_at: Time.zone.now,
+      updated_at: Time.zone.now
+    )
+
+    members.create!(
+      type: 'GroupMember',
+      source_id: fake_lost_and_found_group.id,
+      user_id: fake_ghost_user.id,
+      source_type: 'Namespace',
+      access_level: described_class::User::ACCESS_LEVEL_OWNER,
+      notification_level: 3
+    )
+
+    normal_project = projects.create!(
+      name: 'normal_project',
+      path: 'normal_project',
+      visibility_level: 20,
+      archived: false,
+      namespace_id: fake_lost_and_found_group.id
+    )
+
+    routes.create!(
+      source_id: normal_project.id,
+      source_type: 'Project',
+      path: "#{described_class::User::LOST_AND_FOUND_GROUP}/normal_project",
+      name: 'Lost and Found / normal_project',
+      created_at: Time.zone.now,
+      updated_at: Time.zone.now
+    )
+  end
+
+  it 'creates the route for the ghost user namespace' do
+    expect(routes.where(path: 'ghost').count).to eq(0)
+
+    disable_migrations_output { migrate! }
+
+    expect(routes.where(path: 'ghost').count).to eq(1)
+  end
+
+  it 'fixes the path for the lost-and-found group by generating a unique one' do
+    expect(namespaces.where(path: described_class::User::LOST_AND_FOUND_GROUP).count).to eq(2)
+
+    disable_migrations_output { migrate! }
+
+    expect(namespaces.where(path: described_class::User::LOST_AND_FOUND_GROUP).count).to eq(1)
+
+    lost_and_found_group = namespaces.find_by(name: described_class::User::LOST_AND_FOUND_GROUP)
+    expect(lost_and_found_group.path).to eq('lost-and-found1')
+  end
+
+  it 'creates the route for the lost-and-found group' do
+    expect(routes.where(path: described_class::User::LOST_AND_FOUND_GROUP).count).to eq(1)
+    expect(routes.where(path: 'lost-and-found1').count).to eq(0)
+
+    disable_migrations_output { migrate! }
+
+    expect(routes.where(path: described_class::User::LOST_AND_FOUND_GROUP).count).to eq(1)
+    expect(routes.where(path: 'lost-and-found1').count).to eq(1)
+  end
+
+  it 'updates the route for the orphaned project' do
+    orphaned_project_route = routes.find_by(path: 'orphaned_project')
+    expect(orphaned_project_route.name).to eq('orphaned_project')
+
+    disable_migrations_output { migrate! }
+
+    updated_route = routes.find_by(id: orphaned_project_route.id)
+    expect(updated_route.path).to eq('lost-and-found1/orphaned_project')
+    expect(updated_route.name).to eq("#{described_class::User::LOST_AND_FOUND_GROUP} / orphaned_project")
+  end
+end
diff --git a/spec/models/active_session_spec.rb b/spec/models/active_session_spec.rb
index 6a97d91b3ca..24b47be3c69 100644
--- a/spec/models/active_session_spec.rb
+++ b/spec/models/active_session_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe ActiveSession, :clean_gitlab_redis_shared_state do
     double(:request, {
       user_agent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_3 like Mac OS X) AppleWebKit/600.1.4 ' \
         '(KHTML, like Gecko) Mobile/12B466 [FBDV/iPhone7,2]',
-      ip: '127.0.0.1',
+      remote_ip: '127.0.0.1',
       session: session
     })
   end
diff --git a/spec/models/alert_management/alert_assignee_spec.rb b/spec/models/alert_management/alert_assignee_spec.rb
new file mode 100644
index 00000000000..c51a5d543ab
--- /dev/null
+++ b/spec/models/alert_management/alert_assignee_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe AlertManagement::AlertAssignee do
+  describe 'associations' do
+    it { is_expected.to belong_to(:alert) }
+    it { is_expected.to belong_to(:assignee) }
+  end
+
+  describe 'validations' do
+    let(:alert) { create(:alert_management_alert) }
+    let(:user) { create(:user) }
+
+    subject { alert.alert_assignees.build(assignee: user) }
+
+    it { is_expected.to validate_presence_of(:alert) }
+    it { is_expected.to validate_presence_of(:assignee) }
+    it { is_expected.to validate_uniqueness_of(:assignee).scoped_to(:alert_id) }
+  end
+end
diff --git a/spec/models/alert_management/alert_spec.rb b/spec/models/alert_management/alert_spec.rb
index 1da0c6d4071..27b8bb48073 100644
--- a/spec/models/alert_management/alert_spec.rb
+++ b/spec/models/alert_management/alert_spec.rb
@@ -6,6 +6,10 @@ describe AlertManagement::Alert do
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to belong_to(:issue) }
+    it { is_expected.to have_many(:assignees).through(:alert_assignees) }
+    it { is_expected.to have_many(:notes) }
+    it { is_expected.to have_many(:ordered_notes) }
+    it { is_expected.to have_many(:user_mentions) }
   end
 
   describe 'validations' do
@@ -241,6 +245,12 @@ describe AlertManagement::Alert do
     end
   end
 
+  describe '#to_reference' do
+    let(:alert) { build(:alert_management_alert) }
+
+    it { expect(alert.to_reference).to eq('') }
+  end
+
   describe '#trigger' do
     subject { alert.trigger }
 
@@ -317,4 +327,14 @@ describe AlertManagement::Alert do
       expect { subject }.to change { alert.reload.ended_at }.to nil
     end
   end
+
+  describe '#register_new_event!' do
+    subject { alert.register_new_event! }
+
+    let(:alert) { create(:alert_management_alert) }
+
+    it 'increments the events count by 1' do
+      expect { subject }.to change { alert.events }.by(1)
+    end
+  end
 end
diff --git a/spec/models/alert_management/alert_user_mention_spec.rb b/spec/models/alert_management/alert_user_mention_spec.rb
new file mode 100644
index 00000000000..cce090a2231
--- /dev/null
+++ b/spec/models/alert_management/alert_user_mention_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe AlertManagement::AlertUserMention do
+  describe 'associations' do
+    it { is_expected.to belong_to(:alert_management_alert) }
+    it { is_expected.to belong_to(:note) }
+  end
+
+  it_behaves_like 'has user mentions'
+end
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 64308af38f9..96bf19439a1 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -105,6 +105,14 @@ describe ApplicationSetting do
 
     it { is_expected.not_to allow_value(false).for(:hashed_storage_enabled) }
 
+    it { is_expected.not_to allow_value(101).for(:repository_storages_weighted_default) }
+    it { is_expected.not_to allow_value(-1).for(:repository_storages_weighted_default) }
+    it { is_expected.to allow_value(100).for(:repository_storages_weighted_default) }
+    it { is_expected.to allow_value(0).for(:repository_storages_weighted_default) }
+    it { is_expected.to allow_value(50).for(:repository_storages_weighted_default) }
+    it { is_expected.to allow_value(nil).for(:repository_storages_weighted_default) }
+    it { is_expected.not_to allow_value({ default: 100, shouldntexist: 50 }).for(:repository_storages_weighted) }
+
     context 'grafana_url validations' do
       before do
         subject.instance_variable_set(:@parsed_grafana_url, nil)
@@ -152,6 +160,30 @@ describe ApplicationSetting do
       end
     end
 
+    describe 'spam_check_endpoint' do
+      context 'when spam_check_endpoint is enabled' do
+        before do
+          setting.spam_check_endpoint_enabled = true
+        end
+
+        it { is_expected.to allow_value('https://example.org/spam_check').for(:spam_check_endpoint_url) }
+        it { is_expected.not_to allow_value('nonsense').for(:spam_check_endpoint_url) }
+        it { is_expected.not_to allow_value(nil).for(:spam_check_endpoint_url) }
+        it { is_expected.not_to allow_value('').for(:spam_check_endpoint_url) }
+      end
+
+      context 'when spam_check_endpoint is NOT enabled' do
+        before do
+          setting.spam_check_endpoint_enabled = false
+        end
+
+        it { is_expected.to allow_value('https://example.org/spam_check').for(:spam_check_endpoint_url) }
+        it { is_expected.not_to allow_value('nonsense').for(:spam_check_endpoint_url) }
+        it { is_expected.to allow_value(nil).for(:spam_check_endpoint_url) }
+        it { is_expected.to allow_value('').for(:spam_check_endpoint_url) }
+      end
+    end
+
     context 'when snowplow is enabled' do
       before do
         setting.snowplow_enabled = true
@@ -251,6 +283,14 @@ describe ApplicationSetting do
         .is_greater_than(0)
     end
 
+    it { is_expected.to validate_presence_of(:max_import_size) }
+
+    it do
+      is_expected.to validate_numericality_of(:max_import_size)
+        .only_integer
+        .is_greater_than_or_equal_to(0)
+    end
+
     it do
       is_expected.to validate_numericality_of(:local_markdown_version)
         .only_integer
@@ -762,4 +802,17 @@ describe ApplicationSetting do
   end
 
   it_behaves_like 'application settings examples'
+
+  describe 'repository_storages_weighted_attributes' do
+    it 'returns the keys for repository_storages_weighted' do
+      expect(subject.class.repository_storages_weighted_attributes).to eq([:repository_storages_weighted_default])
+    end
+  end
+
+  it 'does not allow to set weight for non existing storage' do
+    setting.repository_storages_weighted = { invalid_storage: 100 }
+
+    expect(setting).not_to be_valid
+    expect(setting.errors.messages[:repository_storages_weighted]).to match_array(["can't include: invalid_storage"])
+  end
 end
diff --git a/spec/models/blob_viewer/go_mod_spec.rb b/spec/models/blob_viewer/go_mod_spec.rb
new file mode 100644
index 00000000000..ba6038533ea
--- /dev/null
+++ b/spec/models/blob_viewer/go_mod_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe BlobViewer::GoMod do
+  include FakeBlobHelpers
+
+  let(:project) { build_stubbed(:project) }
+  let(:data) do
+    <<-SPEC.strip_heredoc
+      module #{Settings.build_gitlab_go_url}/#{project.full_path}
+    SPEC
+  end
+  let(:blob) { fake_blob(path: 'go.mod', data: data) }
+
+  subject { described_class.new(blob) }
+
+  describe '#package_name' do
+    it 'returns the package name' do
+      expect(subject.package_name).to eq("#{Settings.build_gitlab_go_url}/#{project.full_path}")
+    end
+  end
+
+  describe '#package_url' do
+    it 'returns the package URL' do
+      expect(subject.package_url).to eq("#{Gitlab.config.gitlab.protocol}://#{Settings.build_gitlab_go_url}/#{project.full_path}/")
+    end
+
+    context 'when the homepage has an invalid URL' do
+      let(:data) do
+        <<-SPEC.strip_heredoc
+          module javascript:alert()
+        SPEC
+      end
+
+      it 'returns nil' do
+        expect(subject.package_url).to be_nil
+      end
+    end
+  end
+
+  describe '#package_type' do
+    it 'returns "package"' do
+      expect(subject.package_type).to eq('go')
+    end
+  end
+
+  context 'when the module name does not start with the instance URL' do
+    let(:data) do
+      <<-SPEC.strip_heredoc
+        module example.com/foo/bar
+      SPEC
+    end
+
+    subject { described_class.new(blob) }
+
+    describe '#package_url' do
+      it 'returns the pkg.go.dev URL' do
+        expect(subject.package_url).to eq("https://pkg.go.dev/example.com/foo/bar")
+      end
+    end
+  end
+end
diff --git a/spec/models/blob_viewer/metrics_dashboard_yml_spec.rb b/spec/models/blob_viewer/metrics_dashboard_yml_spec.rb
new file mode 100644
index 00000000000..f5b8586975d
--- /dev/null
+++ b/spec/models/blob_viewer/metrics_dashboard_yml_spec.rb
@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe BlobViewer::MetricsDashboardYml do
+  include FakeBlobHelpers
+  include RepoHelpers
+
+  let_it_be(:project) { create(:project, :repository) }
+  let(:blob) { fake_blob(path: '.gitlab/dashboards/custom-dashboard.yml', data: data) }
+  let(:sha) { sample_commit.id }
+
+  subject(:viewer) { described_class.new(blob) }
+
+  context 'when the definition is valid' do
+    let(:data) { File.read(Rails.root.join('config/prometheus/common_metrics.yml')) }
+
+    describe '#valid?' do
+      it 'calls prepare! on the viewer' do
+        allow(PerformanceMonitoring::PrometheusDashboard).to receive(:from_json)
+
+        expect(viewer).to receive(:prepare!)
+
+        viewer.valid?
+      end
+
+      it 'returns true', :aggregate_failures do
+        yml = ::Gitlab::Config::Loader::Yaml.new(data).load_raw!
+
+        expect_next_instance_of(::Gitlab::Config::Loader::Yaml, data) do |loader|
+          expect(loader).to receive(:load_raw!).and_call_original
+        end
+        expect(PerformanceMonitoring::PrometheusDashboard)
+          .to receive(:from_json)
+          .with(yml)
+          .and_call_original
+        expect(viewer.valid?).to be_truthy
+      end
+    end
+
+    describe '#errors' do
+      it 'returns nil' do
+        allow(PerformanceMonitoring::PrometheusDashboard).to receive(:from_json)
+
+        expect(viewer.errors).to be nil
+      end
+    end
+  end
+
+  context 'when definition is invalid' do
+    let(:error) { ActiveModel::ValidationError.new(PerformanceMonitoring::PrometheusDashboard.new.tap(&:validate)) }
+    let(:data) do
+      <<~YAML
+        dashboard:
+      YAML
+    end
+
+    describe '#valid?' do
+      it 'returns false' do
+        expect(PerformanceMonitoring::PrometheusDashboard)
+          .to receive(:from_json).and_raise(error)
+
+        expect(viewer.valid?).to be_falsey
+      end
+    end
+
+    describe '#errors' do
+      it 'returns validation errors' do
+        allow(PerformanceMonitoring::PrometheusDashboard)
+          .to receive(:from_json).and_raise(error)
+
+        expect(viewer.errors).to be error.model.errors
+      end
+    end
+  end
+
+  context 'when YAML syntax is invalid' do
+    let(:data) do
+      <<~YAML
+        dashboard: 'empty metrics'
+         panel_groups:
+        - group: 'Group Title'
+      YAML
+    end
+
+    describe '#valid?' do
+      it 'returns false' do
+        expect(PerformanceMonitoring::PrometheusDashboard).not_to receive(:from_json)
+        expect(viewer.valid?).to be_falsey
+      end
+    end
+
+    describe '#errors' do
+      it 'returns validation errors' do
+        yaml_wrapped_errors = { 'YAML syntax': ["(<unknown>): did not find expected key while parsing a block mapping at line 1 column 1"] }
+
+        expect(viewer.errors).to be_kind_of ActiveModel::Errors
+        expect(viewer.errors.messages).to eql(yaml_wrapped_errors)
+      end
+    end
+  end
+
+  context 'when YAML loader raises error' do
+    let(:data) do
+      <<~YAML
+        large yaml file
+      YAML
+    end
+
+    before do
+      allow(::Gitlab::Config::Loader::Yaml).to receive(:new)
+        .and_raise(::Gitlab::Config::Loader::Yaml::DataTooLargeError, 'The parsed YAML is too big')
+    end
+
+    it 'is invalid' do
+      expect(PerformanceMonitoring::PrometheusDashboard).not_to receive(:from_json)
+      expect(viewer.valid?).to be(false)
+    end
+
+    it 'returns validation errors' do
+      yaml_wrapped_errors = { 'YAML syntax': ["The parsed YAML is too big"] }
+
+      expect(viewer.errors).to be_kind_of(ActiveModel::Errors)
+      expect(viewer.errors.messages).to eq(yaml_wrapped_errors)
+    end
+  end
+end
diff --git a/spec/models/broadcast_message_spec.rb b/spec/models/broadcast_message_spec.rb
index 127faa5e8e2..8032f913d86 100644
--- a/spec/models/broadcast_message_spec.rb
+++ b/spec/models/broadcast_message_spec.rb
@@ -66,7 +66,7 @@ describe BroadcastMessage do
     end
 
     it 'expires the value if a broadcast message has ended', :request_store do
-      message = create(:broadcast_message, broadcast_type: broadcast_type, ends_at: Time.now.utc + 1.day)
+      message = create(:broadcast_message, broadcast_type: broadcast_type, ends_at: Time.current.utc + 1.day)
 
       expect(subject.call).to match_array([message])
       expect(described_class.cache).to receive(:expire).and_call_original
@@ -87,8 +87,8 @@ describe BroadcastMessage do
 
       future = create(
         :broadcast_message,
-        starts_at: Time.now + 10.minutes,
-        ends_at: Time.now + 20.minutes,
+        starts_at: Time.current + 10.minutes,
+        ends_at: Time.current + 20.minutes,
         broadcast_type: broadcast_type
       )
 
diff --git a/spec/models/ci/bridge_spec.rb b/spec/models/ci/bridge_spec.rb
index 34f89d9cdae..385261e0ee9 100644
--- a/spec/models/ci/bridge_spec.rb
+++ b/spec/models/ci/bridge_spec.rb
@@ -21,6 +21,11 @@ describe Ci::Bridge do
     expect(bridge).to have_many(:sourced_pipelines)
   end
 
+  it 'has one downstream pipeline' do
+    expect(bridge).to have_one(:sourced_pipeline)
+    expect(bridge).to have_one(:downstream_pipeline)
+  end
+
   describe '#tags' do
     it 'only has a bridge tag' do
       expect(bridge.tags).to eq [:bridge]
diff --git a/spec/models/ci/build_report_result_spec.rb b/spec/models/ci/build_report_result_spec.rb
new file mode 100644
index 00000000000..078b0d100a1
--- /dev/null
+++ b/spec/models/ci/build_report_result_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::BuildReportResult do
+  let(:build_report_result) { build(:ci_build_report_result, :with_junit_success) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:build) }
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:project) }
+    it { is_expected.to validate_presence_of(:build) }
+
+    context 'when attributes are valid' do
+      it 'returns no errors' do
+        expect(build_report_result).to be_valid
+      end
+    end
+
+    context 'when data is invalid' do
+      it 'returns errors' do
+        build_report_result.data = { invalid: 'data' }
+
+        expect(build_report_result).to be_invalid
+        expect(build_report_result.errors.full_messages).to eq(["Data must be a valid json schema"])
+      end
+    end
+  end
+
+  describe '#tests_name' do
+    it 'returns the suite name' do
+      expect(build_report_result.tests_name).to eq("rspec")
+    end
+  end
+
+  describe '#tests_duration' do
+    it 'returns the suite duration' do
+      expect(build_report_result.tests_duration).to eq(0.42)
+    end
+  end
+
+  describe '#tests_success' do
+    it 'returns the success count' do
+      expect(build_report_result.tests_success).to eq(2)
+    end
+  end
+
+  describe '#tests_failed' do
+    it 'returns the failed count' do
+      expect(build_report_result.tests_failed).to eq(0)
+    end
+  end
+
+  describe '#tests_errored' do
+    it 'returns the errored count' do
+      expect(build_report_result.tests_errored).to eq(0)
+    end
+  end
+
+  describe '#tests_skipped' do
+    it 'returns the skipped count' do
+      expect(build_report_result.tests_skipped).to eq(0)
+    end
+  end
+
+  describe '#tests_total' do
+    it 'returns the total count' do
+      expect(build_report_result.tests_total).to eq(2)
+    end
+  end
+end
diff --git a/spec/models/ci/build_runner_session_spec.rb b/spec/models/ci/build_runner_session_spec.rb
index cdf56f24cd7..3e520407884 100644
--- a/spec/models/ci/build_runner_session_spec.rb
+++ b/spec/models/ci/build_runner_session_spec.rb
@@ -63,4 +63,64 @@ describe Ci::BuildRunnerSession, model: true do
       end
     end
   end
+
+  describe '#service_specification' do
+    let(:service) { 'foo'}
+    let(:port) { 80 }
+    let(:path) { 'path' }
+    let(:subprotocols) { nil }
+    let(:specification) { subject.service_specification(service: service, port: port, path: path, subprotocols: subprotocols) }
+
+    it 'returns service proxy url' do
+      expect(specification[:url]).to eq "https://localhost/proxy/#{service}/#{port}/#{path}"
+    end
+
+    it 'returns default service proxy websocket subprotocol' do
+      expect(specification[:subprotocols]).to eq %w[terminal.gitlab.com]
+    end
+
+    it 'returns empty hash if no url' do
+      subject.url = ''
+
+      expect(specification).to be_empty
+    end
+
+    context 'when port is not present' do
+      let(:port) { nil }
+
+      it 'uses the default port name' do
+        expect(specification[:url]).to eq "https://localhost/proxy/#{service}/default_port/#{path}"
+      end
+    end
+
+    context 'when the service is not present' do
+      let(:service) { '' }
+
+      it 'uses the service name "build" as default' do
+        expect(specification[:url]).to eq "https://localhost/proxy/build/#{port}/#{path}"
+      end
+    end
+
+    context 'when url is present' do
+      it 'returns ca_pem nil if empty certificate' do
+        subject.certificate = ''
+
+        expect(specification[:ca_pem]).to be_nil
+      end
+
+      it 'adds Authorization header if authorization is present' do
+        subject.authorization = 'foobar'
+
+        expect(specification[:headers]).to include(Authorization: ['foobar'])
+      end
+    end
+
+    context 'when subprotocol is present' do
+      let(:subprotocols) { 'foobar' }
+
+      it 'returns the new subprotocol' do
+        expect(specification[:subprotocols]).to eq [subprotocols]
+      end
+    end
+  end
 end
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 6605866d9c0..6fdd8463329 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -24,6 +24,7 @@ describe Ci::Build do
   it { is_expected.to have_many(:needs) }
   it { is_expected.to have_many(:sourced_pipelines) }
   it { is_expected.to have_many(:job_variables) }
+  it { is_expected.to have_many(:report_results) }
 
   it { is_expected.to have_one(:deployment) }
   it { is_expected.to have_one(:runner_session) }
@@ -626,7 +627,7 @@ describe Ci::Build do
 
     context 'is expired' do
       before do
-        build.update(artifacts_expire_at: Time.now - 7.days)
+        build.update(artifacts_expire_at: Time.current - 7.days)
       end
 
       it { is_expected.to be_truthy }
@@ -634,7 +635,7 @@ describe Ci::Build do
 
     context 'is not expired' do
       before do
-        build.update(artifacts_expire_at: Time.now + 7.days)
+        build.update(artifacts_expire_at: Time.current + 7.days)
       end
 
       it { is_expected.to be_falsey }
@@ -661,13 +662,13 @@ describe Ci::Build do
     it { is_expected.to be_nil }
 
     context 'when artifacts_expire_at is specified' do
-      let(:expire_at) { Time.now + 7.days }
+      let(:expire_at) { Time.current + 7.days }
 
       before do
         build.artifacts_expire_at = expire_at
       end
 
-      it { is_expected.to be_within(5).of(expire_at - Time.now) }
+      it { is_expected.to be_within(5).of(expire_at - Time.current) }
     end
   end
 
@@ -874,6 +875,22 @@ describe Ci::Build do
     end
   end
 
+  describe '#has_test_reports?' do
+    subject { build.has_test_reports? }
+
+    context 'when build has a test report' do
+      let(:build) { create(:ci_build, :test_reports) }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when build does not have a test report' do
+      let(:build) { create(:ci_build) }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+
   describe '#has_old_trace?' do
     subject { build.has_old_trace? }
 
@@ -1795,7 +1812,7 @@ describe Ci::Build do
   end
 
   describe '#keep_artifacts!' do
-    let(:build) { create(:ci_build, artifacts_expire_at: Time.now + 7.days) }
+    let(:build) { create(:ci_build, artifacts_expire_at: Time.current + 7.days) }
 
     subject { build.keep_artifacts! }
 
@@ -2285,7 +2302,7 @@ describe Ci::Build do
       let(:predefined_variables) do
         [
           { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true, masked: false },
-          { key: 'CI_PIPELINE_URL', value: project.web_url + "/pipelines/#{pipeline.id}", public: true, masked: false },
+          { key: 'CI_PIPELINE_URL', value: project.web_url + "/-/pipelines/#{pipeline.id}", public: true, masked: false },
           { key: 'CI_JOB_ID', value: build.id.to_s, public: true, masked: false },
           { key: 'CI_JOB_URL', value: project.web_url + "/-/jobs/#{build.id}", public: true, masked: false },
           { key: 'CI_JOB_TOKEN', value: 'my-token', public: false, masked: true },
@@ -2390,13 +2407,13 @@ describe Ci::Build do
             allow(build).to receive(:job_jwt_variables) { [job_jwt_var] }
             allow(build).to receive(:dependency_variables) { [job_dependency_var] }
 
-            allow_any_instance_of(Project)
+            allow(build.project)
               .to receive(:predefined_variables) { [project_pre_var] }
 
             project.variables.create!(key: 'secret', value: 'value')
 
-            allow_any_instance_of(Ci::Pipeline)
-              .to receive(:predefined_variables) { [pipeline_pre_var] }
+            allow(build.pipeline)
+              .to receive(:predefined_variables).and_return([pipeline_pre_var])
           end
 
           it 'returns variables in order depending on resource hierarchy' do
@@ -2512,6 +2529,17 @@ describe Ci::Build do
           end
         end
       end
+
+      context 'with the :modified_path_ci_variables feature flag disabled' do
+        before do
+          stub_feature_flags(modified_path_ci_variables: false)
+        end
+
+        it 'does not set CI_MERGE_REQUEST_CHANGED_PAGES_* variables' do
+          expect(subject.find { |var| var[:key] == 'CI_MERGE_REQUEST_CHANGED_PAGE_PATHS' }).to be_nil
+          expect(subject.find { |var| var[:key] == 'CI_MERGE_REQUEST_CHANGED_PAGE_URLS' }).to be_nil
+        end
+      end
     end
 
     context 'when build has user' do
@@ -3095,24 +3123,8 @@ describe Ci::Build do
 
       let!(:job_variable) { create(:ci_job_variable, :dotenv_source, job: prepare) }
 
-      context 'FF ci_dependency_variables is enabled' do
-        before do
-          stub_feature_flags(ci_dependency_variables: true)
-        end
-
-        it 'inherits dependent variables' do
-          expect(build.scoped_variables.to_hash).to include(job_variable.key => job_variable.value)
-        end
-      end
-
-      context 'FF ci_dependency_variables is disabled' do
-        before do
-          stub_feature_flags(ci_dependency_variables: false)
-        end
-
-        it 'does not inherit dependent variables' do
-          expect(build.scoped_variables.to_hash).not_to include(job_variable.key => job_variable.value)
-        end
+      it 'inherits dependent variables' do
+        expect(build.scoped_variables.to_hash).to include(job_variable.key => job_variable.value)
       end
     end
   end
@@ -3601,7 +3613,7 @@ describe Ci::Build do
             .to receive(:execute)
             .with(subject)
             .and_raise(Gitlab::Access::AccessDeniedError)
-          allow(Rails.logger).to receive(:error)
+          allow(Gitlab::AppLogger).to receive(:error)
         end
 
         it 'handles raised exception' do
@@ -3611,7 +3623,7 @@ describe Ci::Build do
         it 'logs the error' do
           subject.drop!
 
-          expect(Rails.logger)
+          expect(Gitlab::AppLogger)
             .to have_received(:error)
             .with(a_string_matching("Unable to auto-retry job #{subject.id}"))
         end
@@ -4040,10 +4052,11 @@ describe Ci::Build do
 
           expect(terraform_reports.plans).to match(
             a_hash_including(
-              'tfplan.json' => a_hash_including(
+              build.id.to_s => a_hash_including(
                 'create' => 0,
                 'update' => 1,
-                'delete' => 0
+                'delete' => 0,
+                'job_name' => build.options.dig(:artifacts, :name).to_s
               )
             )
           )
@@ -4203,7 +4216,7 @@ describe Ci::Build do
 
     subject { build.supported_runner?(runner_features) }
 
-    context 'when feature is required by build' do
+    context 'when `upload_multiple_artifacts` feature is required by build' do
       before do
         expect(build).to receive(:runner_required_feature_names) do
           [:upload_multiple_artifacts]
@@ -4227,7 +4240,7 @@ describe Ci::Build do
       end
     end
 
-    context 'when refspecs feature is required by build' do
+    context 'when `refspecs` feature is required by build' do
       before do
         allow(build).to receive(:merge_request_ref?) { true }
       end
@@ -4244,6 +4257,26 @@ describe Ci::Build do
         it { is_expected.to be_falsey }
       end
     end
+
+    context 'when `release_steps` feature is required by build' do
+      before do
+        expect(build).to receive(:runner_required_feature_names) do
+          [:release_steps]
+        end
+      end
+
+      context 'when runner provides given feature' do
+        let(:runner_features) { { release_steps: true } }
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when runner does not provide given feature' do
+        let(:runner_features) { {} }
+
+        it { is_expected.to be_falsey }
+      end
+    end
   end
 
   describe '#deployment_status' do
diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb
index f08f05a09bf..85873847fca 100644
--- a/spec/models/ci/build_trace_chunk_spec.rb
+++ b/spec/models/ci/build_trace_chunk_spec.rb
@@ -33,7 +33,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
         expect(subjects.count).to be > 0
 
         expect { subjects.first.destroy }.to raise_error('`destroy` and `destroy_all` are forbidden. Please use `fast_destroy_all`')
-        expect { subjects.destroy_all }.to raise_error('`destroy` and `destroy_all` are forbidden. Please use `fast_destroy_all`') # rubocop: disable DestroyAll
+        expect { subjects.destroy_all }.to raise_error('`destroy` and `destroy_all` are forbidden. Please use `fast_destroy_all`') # rubocop: disable Cop/DestroyAll
 
         expect(subjects.count).to be > 0
         expect(external_data_counter).to be > 0
diff --git a/spec/models/ci/daily_build_group_report_result_spec.rb b/spec/models/ci/daily_build_group_report_result_spec.rb
index d4c305c649a..f2ce1b5775f 100644
--- a/spec/models/ci/daily_build_group_report_result_spec.rb
+++ b/spec/models/ci/daily_build_group_report_result_spec.rb
@@ -3,6 +3,30 @@
 require 'spec_helper'
 
 describe Ci::DailyBuildGroupReportResult do
+  let(:daily_build_group_report_result) { build(:ci_daily_build_group_report_result)}
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:last_pipeline) }
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe 'validations' do
+    context 'when attributes are valid' do
+      it 'returns no errors' do
+        expect(daily_build_group_report_result).to be_valid
+      end
+    end
+
+    context 'when data is invalid' do
+      it 'returns errors' do
+        daily_build_group_report_result.data = { invalid: 'data' }
+
+        expect(daily_build_group_report_result).to be_invalid
+        expect(daily_build_group_report_result.errors.full_messages).to eq(["Data must be a valid json schema"])
+      end
+    end
+  end
+
   describe '.upsert_reports' do
     let!(:rspec_coverage) do
       create(
diff --git a/spec/models/ci/instance_variable_spec.rb b/spec/models/ci/instance_variable_spec.rb
index ff8676e1424..4d69b7ac2f8 100644
--- a/spec/models/ci/instance_variable_spec.rb
+++ b/spec/models/ci/instance_variable_spec.rb
@@ -9,6 +9,26 @@ describe Ci::InstanceVariable do
 
   it { is_expected.to include_module(Ci::Maskable) }
   it { is_expected.to validate_uniqueness_of(:key).with_message(/\(\w+\) has already been taken/) }
+  it { is_expected.to validate_length_of(:encrypted_value).is_at_most(1024).with_message(/Variables over 700 characters risk exceeding the limit/) }
+
+  it_behaves_like 'includes Limitable concern' do
+    subject { build(:ci_instance_variable) }
+  end
+
+  context 'with instance level variable feature flag disabled' do
+    let(:plan_limits) { create(:plan_limits, :default_plan) }
+
+    before do
+      stub_feature_flags(ci_instance_level_variables_limit: false)
+      plan_limits.update(described_class.limit_name => 1)
+      create(:ci_instance_variable)
+    end
+
+    it 'can create new models exceeding the plan limits', :aggregate_failures do
+      expect { subject.save }.to change { described_class.count }
+      expect(subject.errors[:base]).to be_empty
+    end
+  end
 
   describe '.unprotected' do
     subject { described_class.unprotected }
@@ -39,7 +59,7 @@ describe Ci::InstanceVariable do
     it { expect(described_class.all_cached).to contain_exactly(protected_variable, unprotected_variable) }
 
     it 'memoizes the result' do
-      expect(described_class).to receive(:store_cache).with(:ci_instance_variable_data).once.and_call_original
+      expect(described_class).to receive(:unscoped).once.and_call_original
 
       2.times do
         expect(described_class.all_cached).to contain_exactly(protected_variable, unprotected_variable)
@@ -65,15 +85,6 @@ describe Ci::InstanceVariable do
 
       expect(described_class.all_cached).to contain_exactly(protected_variable, unprotected_variable, variable)
     end
-
-    it 'resets the cache when the shared key is missing' do
-      expect(Rails.cache).to receive(:read).with(:ci_instance_variable_changed_at).twice.and_return(nil)
-      expect(described_class).to receive(:store_cache).with(:ci_instance_variable_data).thrice.and_call_original
-
-      3.times do
-        expect(described_class.all_cached).to contain_exactly(protected_variable, unprotected_variable)
-      end
-    end
   end
 
   describe '.unprotected_cached', :use_clean_rails_memory_store_caching do
@@ -83,7 +94,7 @@ describe Ci::InstanceVariable do
     it { expect(described_class.unprotected_cached).to contain_exactly(unprotected_variable) }
 
     it 'memoizes the result' do
-      expect(described_class).to receive(:store_cache).with(:ci_instance_variable_data).once.and_call_original
+      expect(described_class).to receive(:unscoped).once.and_call_original
 
       2.times do
         expect(described_class.unprotected_cached).to contain_exactly(unprotected_variable)
diff --git a/spec/models/ci/job_artifact_spec.rb b/spec/models/ci/job_artifact_spec.rb
index 4cdc74d7a41..17e00533ac3 100644
--- a/spec/models/ci/job_artifact_spec.rb
+++ b/spec/models/ci/job_artifact_spec.rb
@@ -23,6 +23,14 @@ describe Ci::JobArtifact do
     subject { build(:ci_job_artifact, :archive, size: 107464) }
   end
 
+  describe '.not_expired' do
+    it 'returns artifacts that have not expired' do
+      _expired_artifact = create(:ci_job_artifact, :expired)
+
+      expect(described_class.not_expired).to contain_exactly(artifact)
+    end
+  end
+
   describe '.with_reports' do
     let!(:artifact) { create(:ci_job_artifact, :archive) }
 
@@ -118,6 +126,17 @@ describe Ci::JobArtifact do
     end
   end
 
+  describe '.downloadable' do
+    subject { described_class.downloadable }
+
+    it 'filters for downloadable artifacts' do
+      downloadable_artifact = create(:ci_job_artifact, :codequality)
+      _not_downloadable_artifact = create(:ci_job_artifact, :trace)
+
+      expect(subject).to contain_exactly(downloadable_artifact)
+    end
+  end
+
   describe '.archived_trace_exists_for?' do
     subject { described_class.archived_trace_exists_for?(job_id) }
 
@@ -357,19 +376,75 @@ describe Ci::JobArtifact do
     end
   end
 
+  describe 'expired?' do
+    subject { artifact.expired? }
+
+    context 'when expire_at is nil' do
+      let(:artifact) { build(:ci_job_artifact, expire_at: nil) }
+
+      it 'returns false' do
+        is_expected.to be_falsy
+      end
+    end
+
+    context 'when expire_at is in the past' do
+      let(:artifact) { build(:ci_job_artifact, expire_at: Date.yesterday) }
+
+      it 'returns true' do
+        is_expected.to be_truthy
+      end
+    end
+
+    context 'when expire_at is in the future' do
+      let(:artifact) { build(:ci_job_artifact, expire_at: Date.tomorrow) }
+
+      it 'returns false' do
+        is_expected.to be_falsey
+      end
+    end
+  end
+
+  describe '#expiring?' do
+    subject { artifact.expiring? }
+
+    context 'when expire_at is nil' do
+      let(:artifact) { build(:ci_job_artifact, expire_at: nil) }
+
+      it 'returns false' do
+        is_expected.to be_falsy
+      end
+    end
+
+    context 'when expire_at is in the past' do
+      let(:artifact) { build(:ci_job_artifact, expire_at: Date.yesterday) }
+
+      it 'returns false' do
+        is_expected.to be_falsy
+      end
+    end
+
+    context 'when expire_at is in the future' do
+      let(:artifact) { build(:ci_job_artifact, expire_at: Date.tomorrow) }
+
+      it 'returns true' do
+        is_expected.to be_truthy
+      end
+    end
+  end
+
   describe '#expire_in' do
     subject { artifact.expire_in }
 
     it { is_expected.to be_nil }
 
     context 'when expire_at is specified' do
-      let(:expire_at) { Time.now + 7.days }
+      let(:expire_at) { Time.current + 7.days }
 
       before do
         artifact.expire_at = expire_at
       end
 
-      it { is_expected.to be_within(5).of(expire_at - Time.now) }
+      it { is_expected.to be_within(5).of(expire_at - Time.current) }
     end
   end
 
diff --git a/spec/models/ci/pipeline_schedule_spec.rb b/spec/models/ci/pipeline_schedule_spec.rb
index 9a10c7629b2..4ba70552f01 100644
--- a/spec/models/ci/pipeline_schedule_spec.rb
+++ b/spec/models/ci/pipeline_schedule_spec.rb
@@ -118,7 +118,7 @@ describe Ci::PipelineSchedule do
       let(:pipeline_schedule) { create(:ci_pipeline_schedule, :every_minute) }
 
       it "updates next_run_at to the sidekiq worker's execution time" do
-        Timecop.freeze(Time.parse("2019-06-01 12:18:00+0000")) do
+        Timecop.freeze(Time.zone.parse("2019-06-01 12:18:00+0000")) do
           expect(pipeline_schedule.next_run_at).to eq(cron_worker_next_run_at)
         end
       end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 4f53b6b4418..782a4206c36 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -26,6 +26,8 @@ describe Ci::Pipeline, :mailer do
   it { is_expected.to have_many(:trigger_requests) }
   it { is_expected.to have_many(:variables) }
   it { is_expected.to have_many(:builds) }
+  it { is_expected.to have_many(:bridges) }
+  it { is_expected.to have_many(:job_artifacts).through(:builds) }
   it { is_expected.to have_many(:auto_canceled_pipelines) }
   it { is_expected.to have_many(:auto_canceled_jobs) }
   it { is_expected.to have_many(:sourced_pipelines) }
@@ -51,6 +53,27 @@ describe Ci::Pipeline, :mailer do
       expect(Project.reflect_on_association(:all_pipelines).has_inverse?).to eq(:project)
       expect(Project.reflect_on_association(:ci_pipelines).has_inverse?).to eq(:project)
     end
+
+    describe '#latest_builds' do
+      it 'has a one to many relationship with its latest builds' do
+        _old_build = create(:ci_build, :retried, pipeline: pipeline)
+        latest_build = create(:ci_build, :expired, pipeline: pipeline)
+
+        expect(pipeline.latest_builds).to contain_exactly(latest_build)
+      end
+    end
+
+    describe '#downloadable_artifacts' do
+      let(:build) { create(:ci_build, pipeline: pipeline) }
+
+      it 'returns downloadable artifacts that have not expired' do
+        downloadable_artifact = create(:ci_job_artifact, :codequality, job: build)
+        _expired_artifact = create(:ci_job_artifact, :junit, :expired, job: build)
+        _undownloadable_artifact = create(:ci_job_artifact, :trace, job: build)
+
+        expect(pipeline.downloadable_artifacts).to contain_exactly(downloadable_artifact)
+      end
+    end
   end
 
   describe '#set_status' do
@@ -99,6 +122,17 @@ describe Ci::Pipeline, :mailer do
     end
   end
 
+  describe '.for_iid' do
+    subject { described_class.for_iid(iid) }
+
+    let(:iid) { '1234' }
+    let!(:pipeline) { create(:ci_pipeline, iid: '1234') }
+
+    it 'returns the pipeline' do
+      is_expected.to contain_exactly(pipeline)
+    end
+  end
+
   describe '.for_sha' do
     subject { described_class.for_sha(sha) }
 
@@ -1007,19 +1041,6 @@ describe Ci::Pipeline, :mailer do
 
       subject { pipeline.ordered_stages }
 
-      context 'when using legacy stages' do
-        before do
-          stub_feature_flags(
-            ci_pipeline_persisted_stages: false,
-            ci_atomic_processing: false
-          )
-        end
-
-        it 'returns legacy stages in valid order' do
-          expect(subject.map(&:name)).to eq %w[build test]
-        end
-      end
-
       context 'when using atomic processing' do
         before do
           stub_feature_flags(
@@ -1051,7 +1072,6 @@ describe Ci::Pipeline, :mailer do
       context 'when using persisted stages' do
         before do
           stub_feature_flags(
-            ci_pipeline_persisted_stages: true,
             ci_atomic_processing: false
           )
         end
@@ -1079,7 +1099,7 @@ describe Ci::Pipeline, :mailer do
   end
 
   describe 'state machine' do
-    let(:current) { Time.now.change(usec: 0) }
+    let(:current) { Time.current.change(usec: 0) }
     let(:build) { create_build('build1', queued_at: 0) }
     let(:build_b) { create_build('build2', queued_at: 0) }
     let(:build_c) { create_build('build3', queued_at: 0) }
@@ -2633,38 +2653,34 @@ describe Ci::Pipeline, :mailer do
       end
     end
 
-    shared_examples 'enqueues the notification worker' do
-      it 'enqueues PipelineUpdateCiRefStatusWorker' do
-        expect(PipelineUpdateCiRefStatusWorker).to receive(:perform_async).with(pipeline.id)
-        expect(PipelineNotificationWorker).not_to receive(:perform_async).with(pipeline.id)
+    context 'with success pipeline' do
+      it_behaves_like 'sending a notification' do
+        before do
+          perform_enqueued_jobs do
+            pipeline.succeed
+          end
+        end
+      end
+
+      it 'enqueues PipelineNotificationWorker' do
+        expect(PipelineNotificationWorker)
+          .to receive(:perform_async).with(pipeline.id, ref_status: :success)
 
         pipeline.succeed
       end
 
-      context 'when ci_pipeline_fixed_notifications is disabled' do
+      context 'when pipeline is not the latest' do
         before do
-          stub_feature_flags(ci_pipeline_fixed_notifications: false)
+          create(:ci_pipeline, :success, project: project, ci_ref: pipeline.ci_ref)
         end
 
-        it 'enqueues PipelineNotificationWorker' do
-          expect(PipelineUpdateCiRefStatusWorker).not_to receive(:perform_async).with(pipeline.id)
-          expect(PipelineNotificationWorker).to receive(:perform_async).with(pipeline.id)
+        it 'does not pass ref_status' do
+          expect(PipelineNotificationWorker)
+            .to receive(:perform_async).with(pipeline.id, ref_status: nil)
 
-          pipeline.succeed
-        end
-      end
-    end
-
-    context 'with success pipeline' do
-      it_behaves_like 'sending a notification' do
-        before do
-          perform_enqueued_jobs do
-            pipeline.succeed
-          end
+          pipeline.succeed!
         end
       end
-
-      it_behaves_like 'enqueues the notification worker'
     end
 
     context 'with failed pipeline' do
@@ -2679,7 +2695,12 @@ describe Ci::Pipeline, :mailer do
         end
       end
 
-      it_behaves_like 'enqueues the notification worker'
+      it 'enqueues PipelineNotificationWorker' do
+        expect(PipelineNotificationWorker)
+          .to receive(:perform_async).with(pipeline.id, ref_status: :failed)
+
+        pipeline.drop
+      end
     end
 
     context 'with skipped pipeline' do
@@ -2703,6 +2724,69 @@ describe Ci::Pipeline, :mailer do
     end
   end
 
+  describe 'updates ci_ref when pipeline finished' do
+    context 'when ci_ref exists' do
+      let!(:pipeline) { create(:ci_pipeline, :running) }
+
+      it 'updates the ci_ref' do
+        expect(pipeline.ci_ref)
+          .to receive(:update_status_by!).with(pipeline).and_call_original
+
+        pipeline.succeed!
+      end
+    end
+
+    context 'when ci_ref does not exist' do
+      let!(:pipeline) { create(:ci_pipeline, :running, ci_ref_presence: false) }
+
+      it 'does not raise an exception' do
+        expect { pipeline.succeed! }.not_to raise_error
+      end
+    end
+  end
+
+  describe '#ensure_ci_ref!' do
+    subject { pipeline.ensure_ci_ref! }
+
+    shared_examples_for 'protected by feature flag' do
+      context 'when feature flag is disabled' do
+        before do
+          stub_feature_flags(ci_pipeline_fixed_notifications: false)
+        end
+
+        it 'does not do anything' do
+          expect(Ci::Ref).not_to receive(:ensure_for)
+
+          subject
+        end
+      end
+    end
+
+    context 'when ci_ref does not exist yet' do
+      let!(:pipeline) { create(:ci_pipeline, ci_ref_presence: false) }
+
+      it_behaves_like 'protected by feature flag'
+
+      it 'creates a new ci_ref and assigns it' do
+        expect { subject }.to change { Ci::Ref.count }.by(1)
+
+        expect(pipeline.ci_ref).to be_present
+      end
+    end
+
+    context 'when ci_ref already exists' do
+      let!(:pipeline) { create(:ci_pipeline) }
+
+      it_behaves_like 'protected by feature flag'
+
+      it 'fetches a new ci_ref and assigns it' do
+        expect { subject }.not_to change { Ci::Ref.count }
+
+        expect(pipeline.ci_ref).to be_present
+      end
+    end
+  end
+
   describe '#find_job_with_archive_artifacts' do
     let!(:old_job) { create(:ci_build, name: 'rspec', retried: true, pipeline: pipeline) }
     let!(:job_without_artifacts) { create(:ci_build, name: 'rspec', pipeline: pipeline) }
@@ -2741,6 +2825,30 @@ describe Ci::Pipeline, :mailer do
     end
   end
 
+  describe '#latest_report_builds' do
+    it 'returns build with test artifacts' do
+      test_build = create(:ci_build, :test_reports, pipeline: pipeline, project: project)
+      coverage_build = create(:ci_build, :coverage_reports, pipeline: pipeline, project: project)
+      create(:ci_build, :artifacts, pipeline: pipeline, project: project)
+
+      expect(pipeline.latest_report_builds).to contain_exactly(test_build, coverage_build)
+    end
+
+    it 'filters builds by scope' do
+      test_build = create(:ci_build, :test_reports, pipeline: pipeline, project: project)
+      create(:ci_build, :coverage_reports, pipeline: pipeline, project: project)
+
+      expect(pipeline.latest_report_builds(Ci::JobArtifact.test_reports)).to contain_exactly(test_build)
+    end
+
+    it 'only returns not retried builds' do
+      test_build = create(:ci_build, :test_reports, pipeline: pipeline, project: project)
+      create(:ci_build, :test_reports, :retried, pipeline: pipeline, project: project)
+
+      expect(pipeline.latest_report_builds).to contain_exactly(test_build)
+    end
+  end
+
   describe '#has_reports?' do
     subject { pipeline.has_reports?(Ci::JobArtifact.test_reports) }
 
diff --git a/spec/models/ci/ref_spec.rb b/spec/models/ci/ref_spec.rb
index aa3b8cdbc3e..3d75cb63141 100644
--- a/spec/models/ci/ref_spec.rb
+++ b/spec/models/ci/ref_spec.rb
@@ -4,8 +4,155 @@ require 'spec_helper'
 
 describe Ci::Ref do
   it { is_expected.to belong_to(:project) }
-  it { is_expected.to belong_to(:last_updated_by_pipeline) }
 
-  it { is_expected.to validate_inclusion_of(:status).in_array(%w[success failed fixed]) }
-  it { is_expected.to validate_presence_of(:last_updated_by_pipeline) }
+  describe '.ensure_for' do
+    let_it_be(:project) { create(:project, :repository) }
+
+    subject { described_class.ensure_for(pipeline) }
+
+    shared_examples_for 'ensures ci_ref' do
+      context 'when ci_ref already exists' do
+        let(:options) { {} }
+
+        it 'returns an existing ci_ref' do
+          expect { subject }.not_to change { described_class.count }
+
+          expect(subject).to eq(Ci::Ref.find_by(project_id: project.id, ref_path: expected_ref_path))
+        end
+      end
+
+      context 'when ci_ref does not exist yet' do
+        let(:options) { { ci_ref_presence: false } }
+
+        it 'creates a new ci_ref' do
+          expect { subject }.to change { described_class.count }.by(1)
+
+          expect(subject).to eq(Ci::Ref.find_by(project_id: project.id, ref_path: expected_ref_path))
+        end
+      end
+    end
+
+    context 'when pipeline is a branch pipeline' do
+      let!(:pipeline) { create(:ci_pipeline, ref: 'master', project: project, **options) }
+      let(:expected_ref_path) { 'refs/heads/master' }
+
+      it_behaves_like 'ensures ci_ref'
+    end
+
+    context 'when pipeline is a tag pipeline' do
+      let!(:pipeline) { create(:ci_pipeline, ref: 'v1.1.0', tag: true, project: project, **options) }
+      let(:expected_ref_path) { 'refs/tags/v1.1.0' }
+
+      it_behaves_like 'ensures ci_ref'
+    end
+
+    context 'when pipeline is a detached merge request pipeline' do
+      let(:merge_request) do
+        create(:merge_request, target_project: project, target_branch: 'master',
+                               source_project: project, source_branch: 'feature')
+      end
+
+      let!(:pipeline) do
+        create(:ci_pipeline, :detached_merge_request_pipeline, merge_request: merge_request, project: project, **options)
+      end
+
+      let(:expected_ref_path) { 'refs/heads/feature' }
+
+      it_behaves_like 'ensures ci_ref'
+    end
+  end
+
+  describe '#update_status_by!' do
+    subject { ci_ref.update_status_by!(pipeline) }
+
+    let!(:ci_ref) { create(:ci_ref) }
+
+    shared_examples_for 'no-op' do
+      it 'does nothing and returns nil' do
+        expect { subject }.not_to change { ci_ref.status_name }
+
+        is_expected.to be_nil
+      end
+    end
+
+    context 'when pipeline status is success or failed' do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:pipeline_status, :current_ref_status, :expected_ref_status) do
+        :success   | :unknown       | :success
+        :success   | :success       | :success
+        :success   | :failed        | :fixed
+        :success   | :fixed         | :success
+        :success   | :broken        | :fixed
+        :success   | :still_failing | :fixed
+        :failed    | :unknown       | :failed
+        :failed    | :success       | :broken
+        :failed    | :failed        | :still_failing
+        :failed    | :fixed         | :broken
+        :failed    | :broken        | :still_failing
+        :failed    | :still_failing | :still_failing
+      end
+
+      with_them do
+        let(:ci_ref) { create(:ci_ref, status: described_class.state_machines[:status].states[current_ref_status].value) }
+        let(:pipeline) { create(:ci_pipeline, status: pipeline_status, ci_ref: ci_ref) }
+
+        it 'transitions the status via state machine' do
+          expect(subject).to eq(expected_ref_status)
+          expect(ci_ref.status_name).to eq(expected_ref_status)
+        end
+      end
+    end
+
+    context 'when pipeline status is success' do
+      let(:pipeline) { create(:ci_pipeline, :success, ci_ref: ci_ref) }
+
+      it 'updates the status' do
+        expect { subject }.to change { ci_ref.status_name }.from(:unknown).to(:success)
+
+        is_expected.to eq(:success)
+      end
+    end
+
+    context 'when pipeline status is canceled' do
+      let(:pipeline) { create(:ci_pipeline, status: :canceled, ci_ref: ci_ref) }
+
+      it { is_expected.to eq(:unknown) }
+    end
+
+    context 'when pipeline status is skipped' do
+      let(:pipeline) { create(:ci_pipeline, status: :skipped, ci_ref: ci_ref) }
+
+      it_behaves_like 'no-op'
+    end
+
+    context 'when pipeline status is not complete' do
+      let(:pipeline) { create(:ci_pipeline, :running, ci_ref: ci_ref) }
+
+      it_behaves_like 'no-op'
+    end
+
+    context 'when feature flag is disabled' do
+      let(:pipeline) { create(:ci_pipeline, :success, ci_ref: ci_ref) }
+
+      before do
+        stub_feature_flags(ci_pipeline_fixed_notifications: false)
+      end
+
+      it_behaves_like 'no-op'
+    end
+
+    context 'when pipeline is not the latest pipeline' do
+      let!(:pipeline) { create(:ci_pipeline, :success, ci_ref: ci_ref) }
+      let!(:latest_pipeline) { create(:ci_pipeline, :success, ci_ref: ci_ref) }
+
+      it_behaves_like 'no-op'
+    end
+
+    context 'when pipeline does not belong to the ci_ref' do
+      let(:pipeline) { create(:ci_pipeline, :success, ci_ref: create(:ci_ref)) }
+
+      it_behaves_like 'no-op'
+    end
+  end
 end
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index 8b6a4fa6ade..296240b1602 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -263,7 +263,7 @@ describe Ci::Runner do
     subject { described_class.online }
 
     before do
-      @runner1 = create(:ci_runner, :instance, contacted_at: 1.hour.ago)
+      @runner1 = create(:ci_runner, :instance, contacted_at: 2.hours.ago)
       @runner2 = create(:ci_runner, :instance, contacted_at: 1.second.ago)
     end
 
@@ -344,7 +344,7 @@ describe Ci::Runner do
     subject { described_class.offline }
 
     before do
-      @runner1 = create(:ci_runner, :instance, contacted_at: 1.hour.ago)
+      @runner1 = create(:ci_runner, :instance, contacted_at: 2.hours.ago)
       @runner2 = create(:ci_runner, :instance, contacted_at: 1.second.ago)
     end
 
@@ -598,14 +598,14 @@ describe Ci::Runner do
     end
   end
 
-  describe '#update_cached_info' do
+  describe '#heartbeat' do
     let(:runner) { create(:ci_runner, :project) }
 
-    subject { runner.update_cached_info(architecture: '18-bit') }
+    subject { runner.heartbeat(architecture: '18-bit') }
 
     context 'when database was updated recently' do
       before do
-        runner.contacted_at = Time.now
+        runner.contacted_at = Time.current
       end
 
       it 'updates cache' do
diff --git a/spec/models/clusters/applications/elastic_stack_spec.rb b/spec/models/clusters/applications/elastic_stack_spec.rb
index 02ada219e32..50042a4e29a 100644
--- a/spec/models/clusters/applications/elastic_stack_spec.rb
+++ b/spec/models/clusters/applications/elastic_stack_spec.rb
@@ -175,6 +175,7 @@ describe Clusters::Applications::ElasticStack do
         expect(faraday_connection.headers["Authorization"]).to eq(kube_client.headers[:Authorization])
         expect(faraday_connection.ssl.cert_store).to be_instance_of(OpenSSL::X509::Store)
         expect(faraday_connection.ssl.verify).to eq(1)
+        expect(faraday_connection.options.timeout).to be_nil
       end
 
       context 'when cluster is not reachable' do
@@ -186,6 +187,15 @@ describe Clusters::Applications::ElasticStack do
           expect(subject.elasticsearch_client).to be_nil
         end
       end
+
+      context 'when timeout is provided' do
+        it 'sets timeout in elasticsearch_client' do
+          client = subject.elasticsearch_client(timeout: 123)
+          faraday_connection = client.transport.connections.first.connection
+
+          expect(faraday_connection.options.timeout).to eq(123)
+        end
+      end
     end
   end
 end
diff --git a/spec/models/clusters/applications/prometheus_spec.rb b/spec/models/clusters/applications/prometheus_spec.rb
index ce341e67c14..1ed9e207b6b 100644
--- a/spec/models/clusters/applications/prometheus_spec.rb
+++ b/spec/models/clusters/applications/prometheus_spec.rb
@@ -47,7 +47,7 @@ describe Clusters::Applications::Prometheus do
 
     it 'sets last_update_started_at to now' do
       Timecop.freeze do
-        expect { subject.make_updating }.to change { subject.reload.last_update_started_at }.to be_within(1.second).of(Time.now)
+        expect { subject.make_updating }.to change { subject.reload.last_update_started_at }.to be_within(1.second).of(Time.current)
       end
     end
   end
@@ -347,14 +347,14 @@ describe Clusters::Applications::Prometheus do
   describe '#updated_since?' do
     let(:cluster) { create(:cluster) }
     let(:prometheus_app) { build(:clusters_applications_prometheus, cluster: cluster) }
-    let(:timestamp) { Time.now - 5.minutes }
+    let(:timestamp) { Time.current - 5.minutes }
 
     around do |example|
       Timecop.freeze { example.run }
     end
 
     before do
-      prometheus_app.last_update_started_at = Time.now
+      prometheus_app.last_update_started_at = Time.current
     end
 
     context 'when app does not have status failed' do
@@ -363,7 +363,7 @@ describe Clusters::Applications::Prometheus do
       end
 
       it 'returns false when last update started before the timestamp' do
-        expect(prometheus_app.updated_since?(Time.now + 5.minutes)).to be false
+        expect(prometheus_app.updated_since?(Time.current + 5.minutes)).to be false
       end
     end
 
diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb
index 521ed98f637..4dd74976028 100644
--- a/spec/models/clusters/cluster_spec.rb
+++ b/spec/models/clusters/cluster_spec.rb
@@ -28,6 +28,8 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
   it { is_expected.to have_one(:cluster_project) }
   it { is_expected.to have_many(:deployment_clusters) }
   it { is_expected.to have_many(:metrics_dashboard_annotations) }
+  it { is_expected.to have_many(:successful_deployments) }
+  it { is_expected.to have_many(:environments).through(:deployments) }
 
   it { is_expected.to delegate_method(:status).to(:provider) }
   it { is_expected.to delegate_method(:status_reason).to(:provider) }
@@ -172,6 +174,108 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
     end
   end
 
+  describe '.with_application_prometheus' do
+    subject { described_class.with_application_prometheus }
+
+    let!(:cluster) { create(:cluster) }
+
+    context 'cluster has prometheus application' do
+      let!(:application) { create(:clusters_applications_prometheus, :installed, cluster: cluster) }
+
+      it { is_expected.to include(cluster) }
+    end
+
+    context 'cluster does not have prometheus application' do
+      let(:cluster) { create(:cluster) }
+
+      it { is_expected.not_to include(cluster) }
+    end
+  end
+
+  describe '.with_enabled_modsecurity' do
+    subject { described_class.with_enabled_modsecurity }
+
+    let_it_be(:cluster) { create(:cluster) }
+
+    context 'cluster has ingress application with enabled modsecurity' do
+      let!(:application) { create(:clusters_applications_ingress, :installed, :modsecurity_logging, cluster: cluster) }
+
+      it { is_expected.to include(cluster) }
+    end
+
+    context 'cluster has ingress application with disabled modsecurity' do
+      let!(:application) { create(:clusters_applications_ingress, :installed, :modsecurity_disabled, cluster: cluster) }
+
+      it { is_expected.not_to include(cluster) }
+    end
+
+    context 'cluster does not have ingress application' do
+      it { is_expected.not_to include(cluster) }
+    end
+  end
+
+  describe '.with_available_elasticstack' do
+    subject { described_class.with_available_elasticstack }
+
+    let_it_be(:cluster) { create(:cluster) }
+
+    context 'cluster has ElasticStack application' do
+      let!(:application) { create(:clusters_applications_elastic_stack, :installed, cluster: cluster) }
+
+      it { is_expected.to include(cluster) }
+    end
+
+    context 'cluster does not have ElasticStack application' do
+      it { is_expected.not_to include(cluster) }
+    end
+  end
+
+  describe '.distinct_with_deployed_environments' do
+    subject { described_class.distinct_with_deployed_environments }
+
+    let_it_be(:cluster) { create(:cluster) }
+
+    context 'cluster has multiple successful deployment with environment' do
+      let!(:environment) { create(:environment) }
+      let!(:deployment) { create(:deployment, :success, cluster: cluster, environment: environment) }
+      let!(:deployment_2) { create(:deployment, :success, cluster: cluster, environment: environment) }
+
+      it { is_expected.to include(cluster) }
+
+      it 'lists only distinct environments' do
+        expect(subject.first.environments.count).to eq(1)
+      end
+    end
+
+    context 'cluster has only failed deployment with environment' do
+      let!(:environment) { create(:environment) }
+      let!(:deployment) { create(:deployment, :failed, cluster: cluster, environment: environment) }
+
+      it { is_expected.not_to include(cluster) }
+    end
+
+    context 'cluster does not have any deployment' do
+      it { is_expected.not_to include(cluster) }
+    end
+  end
+
+  describe '.with_project_alert_service_data' do
+    subject { described_class.with_project_alert_service_data(project_id) }
+
+    let!(:cluster) { create(:cluster, :project) }
+    let!(:project_id) { cluster.first_project.id }
+
+    context 'project has alert service data' do
+      let!(:alerts_service) { create(:alerts_service, project: cluster.clusterable) }
+
+      it { is_expected.to include(cluster) }
+    end
+
+    context 'project has no alert service data' do
+      it { is_expected.not_to include(cluster) }
+    end
+  end
+
   describe '.for_project_namespace' do
     subject { described_class.for_project_namespace(namespace_id) }
 
@@ -573,19 +677,12 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
     end
 
     context 'when applications are created' do
-      let!(:helm) { create(:clusters_applications_helm, cluster: cluster) }
-      let!(:ingress) { create(:clusters_applications_ingress, cluster: cluster) }
-      let!(:cert_manager) { create(:clusters_applications_cert_manager, cluster: cluster) }
-      let!(:crossplane) { create(:clusters_applications_crossplane, cluster: cluster) }
-      let!(:prometheus) { create(:clusters_applications_prometheus, cluster: cluster) }
-      let!(:runner) { create(:clusters_applications_runner, cluster: cluster) }
-      let!(:jupyter) { create(:clusters_applications_jupyter, cluster: cluster) }
-      let!(:knative) { create(:clusters_applications_knative, cluster: cluster) }
-      let!(:elastic_stack) { create(:clusters_applications_elastic_stack, cluster: cluster) }
-      let!(:fluentd) { create(:clusters_applications_fluentd, cluster: cluster) }
+      let(:cluster) { create(:cluster, :with_all_applications) }
 
-      it 'returns a list of created applications' do
-        is_expected.to contain_exactly(helm, ingress, cert_manager, crossplane, prometheus, runner, jupyter, knative, elastic_stack, fluentd)
+      it 'returns a list of created applications', :aggregate_failures do
+        is_expected.to have_attributes(size: described_class::APPLICATIONS.size)
+        is_expected.to all(be_kind_of(::Clusters::Concerns::ApplicationCore))
+        is_expected.to all(be_persisted)
       end
     end
   end
@@ -611,33 +708,13 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
     end
 
     context 'when application is persisted' do
-      let!(:helm) { create(:clusters_applications_helm, cluster: cluster) }
-      let!(:ingress) { create(:clusters_applications_ingress, cluster: cluster) }
-      let!(:cert_manager) { create(:clusters_applications_cert_manager, cluster: cluster) }
-      let!(:crossplane) { create(:clusters_applications_crossplane, cluster: cluster) }
-      let!(:prometheus) { create(:clusters_applications_prometheus, cluster: cluster) }
-      let!(:runner) { create(:clusters_applications_runner, cluster: cluster) }
-      let!(:jupyter) { create(:clusters_applications_jupyter, cluster: cluster) }
-      let!(:knative) { create(:clusters_applications_knative, cluster: cluster) }
-      let!(:elastic_stack) { create(:clusters_applications_elastic_stack, cluster: cluster) }
-      let!(:fluentd) { create(:clusters_applications_fluentd, cluster: cluster) }
+      let(:cluster) { create(:cluster, :with_all_applications) }
 
       it 'returns the persisted application', :aggregate_failures do
-        {
-          Clusters::Applications::Helm => helm,
-          Clusters::Applications::Ingress => ingress,
-          Clusters::Applications::CertManager => cert_manager,
-          Clusters::Applications::Crossplane => crossplane,
-          Clusters::Applications::Prometheus => prometheus,
-          Clusters::Applications::Runner => runner,
-          Clusters::Applications::Jupyter => jupyter,
-          Clusters::Applications::Knative => knative,
-          Clusters::Applications::ElasticStack => elastic_stack,
-          Clusters::Applications::Fluentd => fluentd
-        }.each do |application_class, expected_object|
+        described_class::APPLICATIONS.each_value do |application_class|
           application = cluster.find_or_build_application(application_class)
 
-          expect(application).to eq(expected_object)
+          expect(application).to be_kind_of(::Clusters::Concerns::ApplicationCore)
           expect(application).to be_persisted
         end
       end
@@ -1049,7 +1126,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
             .and_raise(SocketError)
         end
 
-        it { is_expected.to eq(connection_status: :unreachable, nodes: []) }
+        it { is_expected.to eq(connection_status: :unreachable, nodes: nil) }
       end
 
       context 'cluster cannot be authenticated to' do
@@ -1058,7 +1135,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
             .and_raise(OpenSSL::X509::CertificateError.new("Certificate error"))
         end
 
-        it { is_expected.to eq(connection_status: :authentication_failure, nodes: []) }
+        it { is_expected.to eq(connection_status: :authentication_failure, nodes: nil) }
       end
 
       describe 'Kubeclient::HttpError' do
@@ -1070,18 +1147,18 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
             .and_raise(Kubeclient::HttpError.new(error_code, error_message, nil))
         end
 
-        it { is_expected.to eq(connection_status: :authentication_failure, nodes: []) }
+        it { is_expected.to eq(connection_status: :authentication_failure, nodes: nil) }
 
         context 'generic timeout' do
           let(:error_message) { 'Timed out connecting to server'}
 
-          it { is_expected.to eq(connection_status: :unreachable, nodes: []) }
+          it { is_expected.to eq(connection_status: :unreachable, nodes: nil) }
         end
 
         context 'gateway timeout' do
           let(:error_message) { '504 Gateway Timeout for GET https://kubernetes.example.com/api/v1'}
 
-          it { is_expected.to eq(connection_status: :unreachable, nodes: []) }
+          it { is_expected.to eq(connection_status: :unreachable, nodes: nil) }
         end
       end
 
@@ -1091,7 +1168,7 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
             .and_raise(StandardError)
         end
 
-        it { is_expected.to eq(connection_status: :unknown_failure, nodes: []) }
+        it { is_expected.to eq(connection_status: :unknown_failure, nodes: nil) }
 
         it 'notifies Sentry' do
           expect(Gitlab::ErrorTracking).to receive(:track_exception)
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 05d3329215a..85fc503a1ca 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -96,6 +96,21 @@ describe CommitStatus do
 
         it { is_expected.to be_truthy }
       end
+
+      it "processed state is always persisted" do
+        commit_status.update!(retried: false, status: :pending)
+
+        # another process does mark object as processed
+        CommitStatus.find(commit_status.id).update_column(:processed, true)
+
+        # subsequent status transitions on the same instance
+        # always saves processed=false to DB even though
+        # the current value did not change
+        commit_status.update!(retried: false, status: :running)
+
+        # we look at a persisted state in DB
+        expect(CommitStatus.find(commit_status.id).processed).to eq(false)
+      end
     end
   end
 
@@ -235,7 +250,7 @@ describe CommitStatus do
 
     context 'if the building process has started' do
       before do
-        commit_status.started_at = Time.now - 1.minute
+        commit_status.started_at = Time.current - 1.minute
         commit_status.finished_at = nil
       end
 
@@ -708,7 +723,7 @@ describe CommitStatus do
   end
 
   describe '#enqueue' do
-    let!(:current_time) { Time.new(2018, 4, 5, 14, 0, 0) }
+    let!(:current_time) { Time.zone.local(2018, 4, 5, 14, 0, 0) }
 
     before do
       allow(Time).to receive(:now).and_return(current_time)
diff --git a/spec/models/concerns/bulk_insert_safe_spec.rb b/spec/models/concerns/bulk_insert_safe_spec.rb
index 5d65d614ac5..07d6cee487f 100644
--- a/spec/models/concerns/bulk_insert_safe_spec.rb
+++ b/spec/models/concerns/bulk_insert_safe_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe BulkInsertSafe do
-  class BulkInsertItem < ApplicationRecord
+  class BulkInsertItem < ActiveRecord::Base
     include BulkInsertSafe
     include ShaAttribute
 
@@ -74,6 +74,8 @@ describe BulkInsertSafe do
     ActiveRecord::Schema.define do
       drop_table :bulk_insert_items, force: true
     end
+
+    BulkInsertItem.reset_column_information
   end
 
   describe BulkInsertItem do
diff --git a/spec/models/concerns/cacheable_attributes_spec.rb b/spec/models/concerns/cacheable_attributes_spec.rb
index 56e0d044247..6694b2aba22 100644
--- a/spec/models/concerns/cacheable_attributes_spec.rb
+++ b/spec/models/concerns/cacheable_attributes_spec.rb
@@ -135,7 +135,7 @@ describe CacheableAttributes do
         end
 
         it 'returns an uncached record and logs a warning' do
-          expect(Rails.logger).to receive(:warn).with("Cached record for TestClass couldn't be loaded, falling back to uncached record: Redis::BaseError")
+          expect(Gitlab::AppLogger).to receive(:warn).with("Cached record for TestClass couldn't be loaded, falling back to uncached record: Redis::BaseError")
 
           expect(MinimalTestClass.current).to eq(:last)
         end
@@ -147,7 +147,7 @@ describe CacheableAttributes do
         end
 
         it 'returns an uncached record and logs a warning' do
-          expect(Rails.logger).not_to receive(:warn)
+          expect(Gitlab::AppLogger).not_to receive(:warn)
 
           expect { MinimalTestClass.current }.to raise_error(Redis::BaseError)
         end
diff --git a/spec/models/concerns/each_batch_spec.rb b/spec/models/concerns/each_batch_spec.rb
index 294fde4f8e6..ee3d9aea505 100644
--- a/spec/models/concerns/each_batch_spec.rb
+++ b/spec/models/concerns/each_batch_spec.rb
@@ -44,7 +44,7 @@ describe EachBatch do
       end
 
       it 'allows updating of the yielded relations' do
-        time = Time.now
+        time = Time.current
 
         model.each_batch do |relation|
           relation.update_all(updated_at: time)
diff --git a/spec/models/concerns/featurable_spec.rb b/spec/models/concerns/featurable_spec.rb
new file mode 100644
index 00000000000..89720e3652c
--- /dev/null
+++ b/spec/models/concerns/featurable_spec.rb
@@ -0,0 +1,184 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Featurable do
+  let_it_be(:user) { create(:user) }
+  let(:project) { create(:project) }
+  let(:feature_class) { subject.class }
+  let(:features) { feature_class::FEATURES }
+
+  subject { project.project_feature }
+
+  describe '.quoted_access_level_column' do
+    it 'returns the table name and quoted column name for a feature' do
+      expected = '"project_features"."issues_access_level"'
+
+      expect(feature_class.quoted_access_level_column(:issues)).to eq(expected)
+    end
+  end
+
+  describe '.access_level_attribute' do
+    it { expect(feature_class.access_level_attribute(:wiki)).to eq :wiki_access_level }
+
+    it 'raises error for unspecified feature' do
+      expect { feature_class.access_level_attribute(:unknown) }
+        .to raise_error(ArgumentError, /invalid feature: unknown/)
+    end
+  end
+
+  describe '.set_available_features' do
+    let!(:klass) do
+      Class.new do
+        include Featurable
+        set_available_features %i(feature1 feature2)
+
+        def feature1_access_level
+          Featurable::DISABLED
+        end
+
+        def feature2_access_level
+          Featurable::ENABLED
+        end
+      end
+    end
+    let!(:instance) { klass.new }
+
+    it { expect(klass.available_features).to eq [:feature1, :feature2] }
+    it { expect(instance.feature1_enabled?).to be_falsey }
+    it { expect(instance.feature2_enabled?).to be_truthy }
+  end
+
+  describe '.available_features' do
+    it { expect(feature_class.available_features).to include(*features) }
+  end
+
+  describe '#access_level' do
+    it 'returns access level' do
+      expect(subject.access_level(:wiki)).to eq(subject.wiki_access_level)
+    end
+  end
+
+  describe '#feature_available?' do
+    let(:features) { %w(issues wiki builds merge_requests snippets repository pages metrics_dashboard) }
+
+    context 'when features are disabled' do
+      it "returns false" do
+        update_all_project_features(project, features, ProjectFeature::DISABLED)
+
+        features.each do |feature|
+          expect(project.feature_available?(feature.to_sym, user)).to eq(false), "#{feature} failed"
+        end
+      end
+    end
+
+    context 'when features are enabled only for team members' do
+      it "returns false when user is not a team member" do
+        update_all_project_features(project, features, ProjectFeature::PRIVATE)
+
+        features.each do |feature|
+          expect(project.feature_available?(feature.to_sym, user)).to eq(false), "#{feature} failed"
+        end
+      end
+
+      it "returns true when user is a team member" do
+        project.add_developer(user)
+
+        update_all_project_features(project, features, ProjectFeature::PRIVATE)
+
+        features.each do |feature|
+          expect(project.feature_available?(feature.to_sym, user)).to eq(true), "#{feature} failed"
+        end
+      end
+
+      it "returns true when user is a member of project group" do
+        group = create(:group)
+        project = create(:project, namespace: group)
+        group.add_developer(user)
+
+        update_all_project_features(project, features, ProjectFeature::PRIVATE)
+
+        features.each do |feature|
+          expect(project.feature_available?(feature.to_sym, user)).to eq(true), "#{feature} failed"
+        end
+      end
+
+      context 'when admin mode is enabled', :enable_admin_mode do
+        it "returns true if user is an admin" do
+          user.update_attribute(:admin, true)
+
+          update_all_project_features(project, features, ProjectFeature::PRIVATE)
+
+          features.each do |feature|
+            expect(project.feature_available?(feature.to_sym, user)).to eq(true), "#{feature} failed"
+          end
+        end
+      end
+
+      context 'when admin mode is disabled' do
+        it "returns false when user is an admin" do
+          user.update_attribute(:admin, true)
+
+          update_all_project_features(project, features, ProjectFeature::PRIVATE)
+
+          features.each do |feature|
+            expect(project.feature_available?(feature.to_sym, user)).to eq(false), "#{feature} failed"
+          end
+        end
+      end
+    end
+
+    context 'when feature is enabled for everyone' do
+      it "returns true" do
+        expect(project.feature_available?(:issues, user)).to eq(true)
+      end
+    end
+
+    context 'when feature is disabled by a feature flag' do
+      it 'returns false' do
+        stub_feature_flags(issues: false)
+
+        expect(project.feature_available?(:issues, user)).to eq(false)
+      end
+    end
+
+    context 'when feature is enabled by a feature flag' do
+      it 'returns true' do
+        stub_feature_flags(issues: true)
+
+        expect(project.feature_available?(:issues, user)).to eq(true)
+      end
+    end
+  end
+
+  describe '#*_enabled?' do
+    let(:features) { %w(wiki builds merge_requests) }
+
+    it "returns false when feature is disabled" do
+      update_all_project_features(project, features, ProjectFeature::DISABLED)
+
+      features.each do |feature|
+        expect(project.public_send("#{feature}_enabled?")).to eq(false), "#{feature} failed"
+      end
+    end
+
+    it "returns true when feature is enabled only for team members" do
+      update_all_project_features(project, features, ProjectFeature::PRIVATE)
+
+      features.each do |feature|
+        expect(project.public_send("#{feature}_enabled?")).to eq(true), "#{feature} failed"
+      end
+    end
+
+    it "returns true when feature is enabled for everyone" do
+      features.each do |feature|
+        expect(project.public_send("#{feature}_enabled?")).to eq(true), "#{feature} failed"
+      end
+    end
+  end
+
+  def update_all_project_features(project, features, value)
+    project_feature_attributes = features.map { |f| ["#{f}_access_level", value] }.to_h
+    project.project_feature.update(project_feature_attributes)
+  end
+end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 24908785320..74ee7a87b7b 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -102,6 +102,22 @@ describe Issuable do
     end
   end
 
+  describe '.any_label' do
+    let_it_be(:issue_with_label) { create(:labeled_issue, labels: [create(:label)]) }
+    let_it_be(:issue_with_multiple_labels) { create(:labeled_issue, labels: [create(:label), create(:label)]) }
+    let_it_be(:issue_without_label) { create(:issue) }
+
+    it 'returns an issuable with at least one label' do
+      expect(issuable_class.any_label).to match_array([issue_with_label, issue_with_multiple_labels])
+    end
+
+    context 'for custom sorting' do
+      it 'returns an issuable with at least one label' do
+        expect(issuable_class.any_label('created_at')).to eq([issue_with_label, issue_with_multiple_labels])
+      end
+    end
+  end
+
   describe ".search" do
     let!(:searchable_issue) { create(:issue, title: "Searchable awesome issue") }
     let!(:searchable_issue2) { create(:issue, title: 'Aw') }
@@ -422,7 +438,7 @@ describe Issuable do
 
     context 'total_time_spent is updated' do
       before do
-        issue.spend_time(duration: 2, user_id: user.id, spent_at: Time.now)
+        issue.spend_time(duration: 2, user_id: user.id, spent_at: Time.current)
         issue.save
         expect(Gitlab::HookData::IssuableBuilder)
           .to receive(:new).with(issue).and_return(builder)
@@ -572,8 +588,8 @@ describe Issuable do
       second_priority = create(:label, project: project, priority: 2)
       no_priority = create(:label, project: project)
 
-      first_milestone = create(:milestone, project: project, due_date: Time.now)
-      second_milestone = create(:milestone, project: project, due_date: Time.now + 1.month)
+      first_milestone = create(:milestone, project: project, due_date: Time.current)
+      second_milestone = create(:milestone, project: project, due_date: Time.current + 1.month)
       third_milestone = create(:milestone, project: project)
 
       # The issues here are ordered by label priority, to ensure that we don't
diff --git a/spec/models/concerns/limitable_spec.rb b/spec/models/concerns/limitable_spec.rb
new file mode 100644
index 00000000000..ca0a257be7a
--- /dev/null
+++ b/spec/models/concerns/limitable_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Limitable do
+  let(:minimal_test_class) do
+    Class.new do
+      include ActiveModel::Model
+
+      def self.name
+        'TestClass'
+      end
+
+      include Limitable
+    end
+  end
+
+  before do
+    stub_const("MinimalTestClass", minimal_test_class)
+  end
+
+  it { expect(MinimalTestClass.limit_name).to eq('test_classes') }
+
+  context 'with scoped limit' do
+    before do
+      MinimalTestClass.limit_scope = :project
+    end
+
+    it { expect(MinimalTestClass.limit_scope).to eq(:project) }
+
+    it 'triggers scoped validations' do
+      instance = MinimalTestClass.new
+
+      expect(instance).to receive(:validate_scoped_plan_limit_not_exceeded)
+
+      instance.valid?(:create)
+    end
+  end
+
+  context 'with global limit' do
+    before do
+      MinimalTestClass.limit_scope = Limitable::GLOBAL_SCOPE
+    end
+
+    it { expect(MinimalTestClass.limit_scope).to eq(Limitable::GLOBAL_SCOPE) }
+
+    it 'triggers scoped validations' do
+      instance = MinimalTestClass.new
+
+      expect(instance).to receive(:validate_global_plan_limit_not_exceeded)
+
+      instance.valid?(:create)
+    end
+  end
+end
diff --git a/spec/models/concerns/milestoneish_spec.rb b/spec/models/concerns/milestoneish_spec.rb
index 81f173cd23a..8c43a12aa15 100644
--- a/spec/models/concerns/milestoneish_spec.rb
+++ b/spec/models/concerns/milestoneish_spec.rb
@@ -290,13 +290,13 @@ describe Milestone, 'Milestoneish' do
     end
 
     it 'shows 0 if start_date is a future' do
-      milestone = build_stubbed(:milestone, start_date: Time.now + 2.days)
+      milestone = build_stubbed(:milestone, start_date: Time.current + 2.days)
 
       expect(milestone.elapsed_days).to eq(0)
     end
 
     it 'shows correct amount of days' do
-      milestone = build_stubbed(:milestone, start_date: Time.now - 2.days)
+      milestone = build_stubbed(:milestone, start_date: Time.current - 2.days)
 
       expect(milestone.elapsed_days).to eq(2)
     end
diff --git a/spec/models/concerns/resolvable_discussion_spec.rb b/spec/models/concerns/resolvable_discussion_spec.rb
index 9ea01ca9002..95553fb13a6 100644
--- a/spec/models/concerns/resolvable_discussion_spec.rb
+++ b/spec/models/concerns/resolvable_discussion_spec.rb
@@ -6,10 +6,10 @@ describe Discussion, ResolvableDiscussion do
   subject { described_class.new([first_note, second_note, third_note]) }
 
   let(:first_note) { create(:discussion_note_on_merge_request) }
-  let(:merge_request) { first_note.noteable }
+  let(:noteable) { first_note.noteable }
   let(:project) { first_note.project }
-  let(:second_note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, in_reply_to: first_note) }
-  let(:third_note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
+  let(:second_note) { create(:discussion_note_on_merge_request, noteable: noteable, project: project, in_reply_to: first_note) }
+  let(:third_note) { create(:discussion_note_on_merge_request, noteable: noteable, project: project) }
 
   describe "#resolvable?" do
     context "when potentially resolvable" do
@@ -198,12 +198,26 @@ describe Discussion, ResolvableDiscussion do
           it "returns true" do
             expect(subject.can_resolve?(current_user)).to be true
           end
+
+          context "when the noteable has no author" do
+            it "returns true" do
+              expect(noteable).to receive(:author).and_return(nil)
+              expect(subject.can_resolve?(current_user)).to be true
+            end
+          end
         end
 
         context "when the signed in user is a random user" do
           it "returns false" do
             expect(subject.can_resolve?(current_user)).to be false
           end
+
+          context "when the noteable has no author" do
+            it "returns false" do
+              expect(noteable).to receive(:author).and_return(nil)
+              expect(subject.can_resolve?(current_user)).to be false
+            end
+          end
         end
       end
     end
@@ -536,7 +550,7 @@ describe Discussion, ResolvableDiscussion do
 
   describe "#last_resolved_note" do
     let(:current_user) { create(:user) }
-    let(:time) { Time.now.utc }
+    let(:time) { Time.current.utc }
 
     before do
       Timecop.freeze(time - 1.second) do
diff --git a/spec/models/concerns/sortable_spec.rb b/spec/models/concerns/sortable_spec.rb
index 18ac4d19938..a1fe5c0928d 100644
--- a/spec/models/concerns/sortable_spec.rb
+++ b/spec/models/concerns/sortable_spec.rb
@@ -91,7 +91,7 @@ describe Sortable do
       Group.all.order_by(order).map(&:name)
     end
 
-    let!(:ref_time) { Time.parse('2018-05-01 00:00:00') }
+    let!(:ref_time) { Time.zone.parse('2018-05-01 00:00:00') }
     let!(:group1) { create(:group, name: 'aa', id: 1, created_at: ref_time - 15.seconds, updated_at: ref_time) }
     let!(:group2) { create(:group, name: 'AAA', id: 2, created_at: ref_time - 10.seconds, updated_at: ref_time - 5.seconds) }
     let!(:group3) { create(:group, name: 'BB', id: 3, created_at: ref_time - 5.seconds, updated_at: ref_time - 10.seconds) }
diff --git a/spec/models/container_expiration_policy_spec.rb b/spec/models/container_expiration_policy_spec.rb
index c22362ed5d4..588685b04bf 100644
--- a/spec/models/container_expiration_policy_spec.rb
+++ b/spec/models/container_expiration_policy_spec.rb
@@ -37,6 +37,37 @@ RSpec.describe ContainerExpirationPolicy, type: :model do
       it { is_expected.to allow_value(nil).for(:keep_n) }
       it { is_expected.not_to allow_value('foo').for(:keep_n) }
     end
+
+    context 'with a set of regexps' do
+      valid_regexps = %w[master .* v.+ v10.1.* (?:v.+|master|release)]
+      invalid_regexps = ['[', '(?:v.+|master|release']
+
+      valid_regexps.each do |valid_regexp|
+        it { is_expected.to allow_value(valid_regexp).for(:name_regex) }
+        it { is_expected.to allow_value(valid_regexp).for(:name_regex_keep) }
+      end
+
+      invalid_regexps.each do |invalid_regexp|
+        it { is_expected.not_to allow_value(invalid_regexp).for(:name_regex) }
+        it { is_expected.not_to allow_value(invalid_regexp).for(:name_regex_keep) }
+      end
+
+      context 'with a disabled container expiration policy' do
+        let_it_be(:container_expiration_policy) { create(:container_expiration_policy, :disabled) }
+
+        subject { container_expiration_policy }
+
+        valid_regexps.each do |valid_regexp|
+          it { is_expected.to allow_value(valid_regexp).for(:name_regex) }
+          it { is_expected.to allow_value(valid_regexp).for(:name_regex_keep) }
+        end
+
+        invalid_regexps.each do |invalid_regexp|
+          it { is_expected.to allow_value(invalid_regexp).for(:name_regex) }
+          it { is_expected.to allow_value(invalid_regexp).for(:name_regex_keep) }
+        end
+      end
+    end
   end
 
   describe '.preloaded' do
@@ -72,4 +103,14 @@ RSpec.describe ContainerExpirationPolicy, type: :model do
       end
     end
   end
+
+  describe '#disable!' do
+    let_it_be(:container_expiration_policy) { create(:container_expiration_policy) }
+
+    subject { container_expiration_policy.disable! }
+
+    it 'disables the container expiration policy' do
+      expect { subject }.to change { container_expiration_policy.reload.enabled }.from(true).to(false)
+    end
+  end
 end
diff --git a/spec/models/container_repository_spec.rb b/spec/models/container_repository_spec.rb
index 1eecefe5d4a..4f23a905e93 100644
--- a/spec/models/container_repository_spec.rb
+++ b/spec/models/container_repository_spec.rb
@@ -81,6 +81,12 @@ describe ContainerRepository do
     end
   end
 
+  describe '#tags_count' do
+    it 'returns the count of tags' do
+      expect(repository.tags_count).to eq(1)
+    end
+  end
+
   describe '#has_tags?' do
     it 'has tags' do
       expect(repository).to have_tags
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index 6eb006a5d67..ac2a4c9877d 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -114,7 +114,7 @@ describe Deployment do
           deployment.succeed!
 
           expect(deployment).to be_success
-          expect(deployment.finished_at).to be_like_time(Time.now)
+          expect(deployment.finished_at).to be_like_time(Time.current)
         end
       end
 
@@ -141,7 +141,7 @@ describe Deployment do
           deployment.drop!
 
           expect(deployment).to be_failed
-          expect(deployment.finished_at).to be_like_time(Time.now)
+          expect(deployment.finished_at).to be_like_time(Time.current)
         end
       end
 
@@ -161,7 +161,7 @@ describe Deployment do
           deployment.cancel!
 
           expect(deployment).to be_canceled
-          expect(deployment.finished_at).to be_like_time(Time.now)
+          expect(deployment.finished_at).to be_like_time(Time.current)
         end
       end
 
@@ -587,7 +587,7 @@ describe Deployment do
       Timecop.freeze do
         deploy.update_status('success')
 
-        expect(deploy.read_attribute(:finished_at)).to eq(Time.now)
+        expect(deploy.read_attribute(:finished_at)).to eq(Time.current)
       end
     end
   end
diff --git a/spec/models/design_management/design_spec.rb b/spec/models/design_management/design_spec.rb
index 95782c1f674..bc1f54f057e 100644
--- a/spec/models/design_management/design_spec.rb
+++ b/spec/models/design_management/design_spec.rb
@@ -27,6 +27,7 @@ describe DesignManagement::Design do
     it { is_expected.to validate_presence_of(:project) }
     it { is_expected.to validate_presence_of(:issue) }
     it { is_expected.to validate_presence_of(:filename) }
+    it { is_expected.to validate_length_of(:filename).is_at_most(255) }
     it { is_expected.to validate_uniqueness_of(:filename).scoped_to(:issue_id) }
 
     it "validates that the extension is an image" do
@@ -460,38 +461,6 @@ describe DesignManagement::Design do
       it 'uses the simple format' do
         expect(reference).to eq "#1[homescreen.jpg]"
       end
-
-      context 'when the filename contains spaces, hyphens, periods, single-quotes, underscores and colons' do
-        let(:filename) { %q{a complex filename: containing - _ : etc., but still 'simple'.gif} }
-
-        it 'uses the simple format' do
-          expect(reference).to eq "#1[#{filename}]"
-        end
-      end
-
-      context 'when the filename contains HTML angle brackets' do
-        let(:filename) { 'a <em>great</em> filename.jpg' }
-
-        it 'uses Base64 encoding' do
-          expect(reference).to eq "#1[base64:#{Base64.strict_encode64(filename)}]"
-        end
-      end
-
-      context 'when the filename contains quotation marks' do
-        let(:filename) { %q{a "great" filename.jpg} }
-
-        it 'uses enclosing quotes, with backslash encoding' do
-          expect(reference).to eq %q{#1["a \"great\" filename.jpg"]}
-        end
-      end
-
-      context 'when the filename contains square brackets' do
-        let(:filename) { %q{a [great] filename.jpg} }
-
-        it 'uses enclosing quotes' do
-          expect(reference).to eq %q{#1["a [great] filename.jpg"]}
-        end
-      end
     end
 
     context 'when full is true' do
@@ -525,31 +494,55 @@ describe DesignManagement::Design do
   end
 
   describe 'reference_pattern' do
-    let(:match) { described_class.reference_pattern.match(ref) }
-    let(:ref) { design.to_reference }
-    let(:design) { build(:design, filename: filename) }
+    it 'is nil' do
+      expect(described_class.reference_pattern).to be_nil
+    end
+  end
 
-    context 'simple_file_name' do
-      let(:filename) { 'simple-file-name.jpg' }
+  describe 'link_reference_pattern' do
+    it 'is not nil' do
+      expect(described_class.link_reference_pattern).not_to be_nil
+    end
+
+    it 'does not match the designs tab' do
+      expect(described_class.link_reference_pattern).not_to match(url_for_designs(issue))
+    end
 
-      it 'matches :simple_file_name' do
-        expect(match[:simple_file_name]).to eq(filename)
+    where(:ext) do
+      (described_class::SAFE_IMAGE_EXT + described_class::DANGEROUS_IMAGE_EXT).flat_map do |ext|
+        [[ext], [ext.upcase]]
       end
     end
 
-    context 'quoted_file_name' do
-      let(:filename) { 'simple "file" name.jpg' }
+    with_them do
+      let(:filename) { "my-file.#{ext}" }
+      let(:design) { build(:design, filename: filename) }
+      let(:url) { url_for_design(design) }
+      let(:captures) { described_class.link_reference_pattern.match(url)&.named_captures }
 
-      it 'matches :simple_file_name' do
-        expect(match[:escaped_filename].gsub(/\\"/, '"')).to eq(filename)
+      it 'matches the URL' do
+        expect(captures).to include(
+          'url_filename' => filename,
+          'issue' => design.issue.iid.to_s,
+          'namespace' => design.project.namespace.to_param,
+          'project' => design.project.name
+        )
       end
-    end
 
-    context 'Base64 name' do
-      let(:filename) { '<>.png' }
+      context 'the file needs to be encoded' do
+        let(:filename) { "my file.#{ext}" }
 
-      it 'matches base_64_encoded_name' do
-        expect(Base64.decode64(match[:base_64_encoded_name])).to eq(filename)
+        it 'extracts the encoded filename' do
+          expect(captures).to include('url_filename' => 'my%20file.' + ext)
+        end
+      end
+
+      context 'the file is all upper case' do
+        let(:filename) { "file.#{ext}".upcase }
+
+        it 'extracts the encoded filename' do
+          expect(captures).to include('url_filename' => filename)
+        end
       end
     end
   end
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb
index 65f06a5b270..8bfe2ac7a6c 100644
--- a/spec/models/diff_note_spec.rb
+++ b/spec/models/diff_note_spec.rb
@@ -238,12 +238,32 @@ describe DiffNote do
     end
 
     context 'when the discussion was created in the diff' do
-      it 'returns correct diff file' do
-        diff_file = subject.diff_file
+      context 'when file_identifier_hash is disabled' do
+        before do
+          stub_feature_flags(file_identifier_hash: false)
+        end
 
-        expect(diff_file.old_path).to eq(position.old_path)
-        expect(diff_file.new_path).to eq(position.new_path)
-        expect(diff_file.diff_refs).to eq(position.diff_refs)
+        it 'returns correct diff file' do
+          diff_file = subject.diff_file
+
+          expect(diff_file.old_path).to eq(position.old_path)
+          expect(diff_file.new_path).to eq(position.new_path)
+          expect(diff_file.diff_refs).to eq(position.diff_refs)
+        end
+      end
+
+      context 'when file_identifier_hash is enabled' do
+        before do
+          stub_feature_flags(file_identifier_hash: true)
+        end
+
+        it 'returns correct diff file' do
+          diff_file = subject.diff_file
+
+          expect(diff_file.old_path).to eq(position.old_path)
+          expect(diff_file.new_path).to eq(position.new_path)
+          expect(diff_file.diff_refs).to eq(position.diff_refs)
+        end
       end
     end
 
diff --git a/spec/models/draft_note_spec.rb b/spec/models/draft_note_spec.rb
new file mode 100644
index 00000000000..b880d3c5b97
--- /dev/null
+++ b/spec/models/draft_note_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe DraftNote do
+  include RepoHelpers
+
+  let(:project)       { create(:project, :repository) }
+  let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
+
+  describe 'validations' do
+    it_behaves_like 'a valid diff positionable note', :draft_note
+  end
+
+  describe 'delegations' do
+    it { is_expected.to delegate_method(:file_path).to(:diff_file).allow_nil }
+    it { is_expected.to delegate_method(:file_hash).to(:diff_file).allow_nil }
+    it { is_expected.to delegate_method(:file_identifier_hash).to(:diff_file).allow_nil }
+  end
+
+  describe '#diff_file' do
+    let(:draft_note) { build(:draft_note, merge_request: merge_request) }
+
+    context 'when diff_file exists' do
+      it "returns an unfolded diff_file" do
+        diff_file = instance_double(Gitlab::Diff::File)
+        expect(draft_note.original_position).to receive(:diff_file).with(project.repository).and_return(diff_file)
+        expect(diff_file).to receive(:unfold_diff_lines).with(draft_note.original_position)
+
+        expect(draft_note.diff_file).to be diff_file
+      end
+    end
+
+    context 'when diff_file does not exist' do
+      it 'returns nil' do
+        expect(draft_note.original_position).to receive(:diff_file).with(project.repository).and_return(nil)
+
+        expect(draft_note.diff_file).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index c0b2a4ae984..b93da518b68 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -1061,7 +1061,7 @@ describe Environment, :use_clean_rails_memory_store_caching do
       end
 
       context 'when time window arguments are provided' do
-        let(:metric_params) { [1552642245.067, Time.now] }
+        let(:metric_params) { [1552642245.067, Time.current] }
 
         it 'queries with the expected parameters' do
           expect(environment.prometheus_adapter)
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index ac89f8fe9e1..14066b1e9d2 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -13,6 +13,7 @@ describe Event do
     it { is_expected.to respond_to(:author_email) }
     it { is_expected.to respond_to(:issue_title) }
     it { is_expected.to respond_to(:merge_request_title) }
+    it { is_expected.to respond_to(:design_title) }
   end
 
   describe 'Callbacks' do
@@ -37,7 +38,7 @@ describe Event do
 
           project.reload
 
-          expect(project.last_repository_updated_at).to be_within(1.minute).of(Time.now)
+          expect(project.last_repository_updated_at).to be_within(1.minute).of(Time.current)
         end
       end
 
@@ -67,19 +68,32 @@ describe Event do
       end
     end
 
-    describe 'after_create :track_user_interacted_projects' do
+    describe 'after_create UserInteractedProject.track' do
       let(:event) { build(:push_event, project: project, author: project.owner) }
 
       it 'passes event to UserInteractedProject.track' do
-        expect(UserInteractedProject).to receive(:available?).and_return(true)
         expect(UserInteractedProject).to receive(:track).with(event)
         event.save
       end
+    end
+  end
 
-      it 'does not call UserInteractedProject.track if its not yet available' do
-        expect(UserInteractedProject).to receive(:available?).and_return(false)
-        expect(UserInteractedProject).not_to receive(:track)
-        event.save
+  describe 'validations' do
+    describe 'action' do
+      context 'for a design' do
+        where(:action, :valid) do
+          valid = described_class::DESIGN_ACTIONS.map(&:to_s).to_set
+
+          described_class.actions.keys.map do |action|
+            [action, valid.include?(action)]
+          end
+        end
+
+        with_them do
+          let(:event) { build(:design_event, action: action) }
+
+          specify { expect(event.valid?).to eq(valid) }
+        end
       end
     end
   end
@@ -552,7 +566,7 @@ describe Event do
       end
     end
 
-    context 'design event' do
+    context 'design note event' do
       include DesignManagementTestHelpers
 
       let(:target) { note_on_design }
@@ -577,6 +591,32 @@ describe Event do
         include_examples 'visible to assignee and author', true
       end
     end
+
+    context 'design event' do
+      include DesignManagementTestHelpers
+
+      let(:target) { design }
+
+      before do
+        enable_design_management
+      end
+
+      include_examples 'visibility examples' do
+        let(:visibility) { visible_to_all }
+      end
+
+      include_examples 'visible to assignee and author', true
+
+      context 'the event refers to a design on a confidential issue' do
+        let(:design) { create(:design, issue: confidential_issue, project: project) }
+
+        include_examples 'visibility examples' do
+          let(:visibility) { visible_to_none_except(:member, :admin) }
+        end
+
+        include_examples 'visible to assignee and author', true
+      end
+    end
   end
 
   describe 'wiki_page predicate scopes' do
@@ -587,10 +627,31 @@ describe Event do
         create(:wiki_page_event),
         create(:closed_issue_event),
         create(:event, :created),
-        create(:wiki_page_event)
+        create(:design_event, :destroyed),
+        create(:wiki_page_event),
+        create(:design_event)
       ]
     end
 
+    describe '.for_design' do
+      it 'only includes design events' do
+        design_events = events.select(&:design?)
+
+        expect(described_class.for_design)
+          .to be_present
+          .and match_array(design_events)
+      end
+    end
+
+    describe '.not_design' do
+      it 'does not contain the design events' do
+        non_design_events = events.reject(&:design?)
+
+        expect(events).not_to match_array(non_design_events)
+        expect(described_class.not_design).to match_array(non_design_events)
+      end
+    end
+
     describe '.for_wiki_page' do
       it 'only contains the wiki page events' do
         wiki_events = events.select(&:wiki_page?)
@@ -618,26 +679,76 @@ describe Event do
     end
   end
 
-  describe '#wiki_page and #wiki_page?' do
+  describe 'categorization' do
     let_it_be(:project) { create(:project, :repository) }
+    let_it_be(:all_valid_events) do
+      # mapping from factory name to whether we need to supply the project
+      valid_target_factories = {
+        issue: true,
+        note_on_issue: true,
+        user: false,
+        merge_request: true,
+        note_on_merge_request: true,
+        project_snippet: true,
+        personal_snippet: false,
+        note_on_project_snippet: true,
+        note_on_personal_snippet: false,
+        wiki_page_meta: true,
+        milestone: true,
+        project: false,
+        design: true,
+        note_on_design: true,
+        note_on_commit: true
+      }
+      valid_target_factories.map do |kind, needs_project|
+        extra_data = needs_project ? { project: project } : {}
+        target = kind == :project ? nil : build(kind, **extra_data)
+        [kind, build(:event, :created, project: project, target: target)]
+      end.to_h
+    end
+
+    it 'passes a sanity check', :aggregate_failures do
+      expect(all_valid_events.values).to all(be_valid)
+    end
 
-    context 'for a wiki page event' do
-      let(:wiki_page) do
-        create(:wiki_page, project: project)
+    describe '#wiki_page and #wiki_page?' do
+      context 'for a wiki page event' do
+        let(:wiki_page) do
+          create(:wiki_page, project: project)
+        end
+
+        subject(:event) { create(:wiki_page_event, project: project, wiki_page: wiki_page) }
+
+        it { is_expected.to have_attributes(wiki_page?: be_truthy, wiki_page: wiki_page) }
       end
 
-      subject(:event) { create(:wiki_page_event, project: project, wiki_page: wiki_page) }
+      context 'for any other event' do
+        it 'has no wiki_page and is not a wiki_page', :aggregate_failures do
+          all_valid_events.each do |k, event|
+            next if k == :wiki_page_meta
 
-      it { is_expected.to have_attributes(wiki_page?: be_truthy, wiki_page: wiki_page) }
+            expect(event).to have_attributes(wiki_page: be_nil, wiki_page?: be_falsy)
+          end
+        end
+      end
     end
 
-    [:issue, :user, :merge_request, :snippet, :milestone, nil].each do |kind|
-      context "for a #{kind} event" do
-        it 'is nil' do
-          target = create(kind) if kind
-          event = create(:event, project: project, target: target)
+    describe '#design and #design?' do
+      context 'for a design event' do
+        let(:design) { build(:design, project: project) }
+
+        subject(:event) { build(:design_event, target: design, project: project) }
+
+        it { is_expected.to have_attributes(design?: be_truthy, design: design) }
+      end
+
+      context 'for any other event' do
+        it 'has no design and is not a design', :aggregate_failures do
+          all_valid_events.each do |k, event|
+            next if k == :design
 
-          expect(event).to have_attributes(wiki_page: be_nil, wiki_page?: be_falsy)
+            expect(event).to have_attributes(design: be_nil, design?: be_falsy)
+          end
         end
       end
     end
@@ -665,7 +776,7 @@ describe Event do
 
     context 'when a project was updated less than 1 hour ago' do
       it 'does not update the project' do
-        project.update(last_activity_at: Time.now)
+        project.update(last_activity_at: Time.current)
 
         expect(project).not_to receive(:update_column)
           .with(:last_activity_at, a_kind_of(Time))
@@ -682,7 +793,7 @@ describe Event do
 
         project.reload
 
-        expect(project.last_activity_at).to be_within(1.minute).of(Time.now)
+        expect(project.last_activity_at).to be_within(1.minute).of(Time.current)
       end
     end
   end
@@ -765,6 +876,19 @@ describe Event do
     end
   end
 
+  describe '#action_name' do
+    it 'handles all valid design events' do
+      created, updated, destroyed, archived = %i[created updated destroyed archived].map do |trait|
+        build(:design_event, trait).action_name
+      end
+
+      expect(created).to eq('uploaded')
+      expect(updated).to eq('revised')
+      expect(destroyed).to eq('deleted')
+      expect(archived).to eq('archived')
+    end
+  end
+
   def create_push_event(project, user)
     event = create(:push_event, project: project, author: user)
 
diff --git a/spec/models/fork_network_member_spec.rb b/spec/models/fork_network_member_spec.rb
index eab758248de..d7a0dd5be65 100644
--- a/spec/models/fork_network_member_spec.rb
+++ b/spec/models/fork_network_member_spec.rb
@@ -13,7 +13,7 @@ describe ForkNetworkMember do
     let(:fork_network) { fork_network_member.fork_network }
 
     it 'removes the fork network if it was the last member' do
-      fork_network.fork_network_members.destroy_all # rubocop: disable DestroyAll
+      fork_network.fork_network_members.destroy_all # rubocop: disable Cop/DestroyAll
 
       expect(ForkNetwork.count).to eq(0)
     end
diff --git a/spec/models/global_milestone_spec.rb b/spec/models/global_milestone_spec.rb
deleted file mode 100644
index 34dbdfec60d..00000000000
--- a/spec/models/global_milestone_spec.rb
+++ /dev/null
@@ -1,208 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe GlobalMilestone do
-  let(:user) { create(:user) }
-  let(:user2) { create(:user) }
-  let(:group) { create(:group) }
-  let(:project1) { create(:project, group: group) }
-  let(:project2) { create(:project, path: 'gitlab-ci', group: group) }
-  let(:project3) { create(:project, path: 'cookbook-gitlab', group: group) }
-
-  describe '.build_collection' do
-    let(:milestone1_due_date) { 2.weeks.from_now.to_date }
-
-    let!(:milestone1_project1) do
-      create(
-        :milestone,
-        title: "Milestone v1.2",
-        project: project1,
-        due_date: milestone1_due_date
-      )
-    end
-
-    let!(:milestone1_project2) do
-      create(
-        :milestone,
-        title: "Milestone v1.2",
-        project: project2,
-        due_date: milestone1_due_date
-      )
-    end
-
-    let!(:milestone1_project3) do
-      create(
-        :milestone,
-        title: "Milestone v1.2",
-        project: project3,
-        due_date: milestone1_due_date
-      )
-    end
-
-    let!(:milestone2_project1) do
-      create(
-        :milestone,
-        title: "VD-123",
-        project: project1,
-        due_date: nil
-      )
-    end
-
-    let!(:milestone2_project2) do
-      create(
-        :milestone,
-        title: "VD-123",
-        project: project2,
-        due_date: nil
-      )
-    end
-
-    let!(:milestone2_project3) do
-      create(
-        :milestone,
-        title: "VD-123",
-        project: project3,
-        due_date: nil
-      )
-    end
-
-    let!(:projects) do
-      [
-        project1,
-        project2,
-        project3
-      ]
-    end
-
-    let!(:global_milestones) { described_class.build_collection(projects, {}) }
-
-    context 'when building a collection of milestones' do
-      it 'has all project milestones' do
-        expect(global_milestones.count).to eq(6)
-      end
-
-      it 'has all project milestones titles' do
-        expect(global_milestones.map(&:title)).to match_array(['Milestone v1.2', 'Milestone v1.2', 'Milestone v1.2', 'VD-123', 'VD-123', 'VD-123'])
-      end
-
-      it 'has all project milestones' do
-        expect(global_milestones.size).to eq(6)
-      end
-
-      it 'sorts collection by due date' do
-        expect(global_milestones.map(&:due_date)).to eq [milestone1_due_date, milestone1_due_date, milestone1_due_date, nil, nil, nil]
-      end
-
-      it 'filters milestones by search_title when params[:search_title] is present' do
-        global_milestones = described_class.build_collection(projects, { search_title: 'v1.2' })
-
-        expect(global_milestones.map(&:title)).to match_array(['Milestone v1.2', 'Milestone v1.2', 'Milestone v1.2'])
-      end
-    end
-
-    context 'when adding new milestones' do
-      it 'does not add more queries' do
-        control_count = ActiveRecord::QueryRecorder.new do
-          described_class.build_collection(projects, {})
-        end.count
-
-        create_list(:milestone, 3, project: project3)
-
-        expect do
-          described_class.build_collection(projects, {})
-        end.not_to exceed_all_query_limit(control_count)
-      end
-    end
-  end
-
-  describe '.states_count' do
-    context 'when the projects have milestones' do
-      before do
-        create(:closed_milestone, title: 'Active Group Milestone', project: project3)
-        create(:active_milestone, title: 'Active Group Milestone', project: project1)
-        create(:active_milestone, title: 'Active Group Milestone', project: project2)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project1)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project2)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project3)
-        create(:closed_milestone, title: 'Closed Group Milestone 4', group: group)
-      end
-
-      it 'returns the quantity of global milestones and group milestones in each possible state' do
-        expected_count = { opened: 2, closed: 5, all: 7 }
-
-        count = described_class.states_count(Project.all, group)
-
-        expect(count).to eq(expected_count)
-      end
-
-      it 'returns the quantity of global milestones in each possible state' do
-        expected_count = { opened: 2, closed: 4, all: 6 }
-
-        count = described_class.states_count(Project.all)
-
-        expect(count).to eq(expected_count)
-      end
-    end
-
-    context 'when the projects do not have milestones' do
-      before do
-        project1
-      end
-
-      it 'returns 0 as the quantity of global milestones in each state' do
-        expected_count = { opened: 0, closed: 0, all: 0 }
-
-        count = described_class.states_count(Project.all)
-
-        expect(count).to eq(expected_count)
-      end
-    end
-  end
-
-  describe '#initialize' do
-    let(:milestone1_project1) { create(:milestone, title: "Milestone v1.2", project: project1) }
-
-    subject(:global_milestone) { described_class.new(milestone1_project1) }
-
-    it 'has exactly one group milestone' do
-      expect(global_milestone.title).to eq('Milestone v1.2')
-    end
-
-    it 'has all project milestones with the same title' do
-      expect(global_milestone.milestone).to eq(milestone1_project1)
-    end
-  end
-
-  describe '#safe_title' do
-    let(:milestone) { create(:milestone, title: "git / test", project: project1) }
-
-    it 'strips out slashes and spaces' do
-      global_milestone = described_class.new(milestone)
-
-      expect(global_milestone.safe_title).to eq('git-test')
-    end
-  end
-
-  describe '#state' do
-    context 'when at least one milestone is active' do
-      it 'returns active' do
-        title = 'Active Group Milestone'
-
-        global_milestone = described_class.new(create(:active_milestone, title: title))
-
-        expect(global_milestone.state).to eq('active')
-      end
-    end
-
-    context 'when all milestones are closed' do
-      it 'returns closed' do
-        title = 'Closed Group Milestone'
-
-        global_milestone = described_class.new(create(:closed_milestone, title: title))
-
-        expect(global_milestone.state).to eq('closed')
-      end
-    end
-  end
-end
diff --git a/spec/models/group_deploy_key_spec.rb b/spec/models/group_deploy_key_spec.rb
new file mode 100644
index 00000000000..3ba56c7e504
--- /dev/null
+++ b/spec/models/group_deploy_key_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GroupDeployKey do
+  it { is_expected.to validate_presence_of(:user) }
+
+  it 'is of type DeployKey' do
+    expect(build(:group_deploy_key).type).to eq('DeployKey')
+  end
+end
diff --git a/spec/models/group_group_link_spec.rb b/spec/models/group_group_link_spec.rb
index 1fbd399e82b..54e622b2f22 100644
--- a/spec/models/group_group_link_spec.rb
+++ b/spec/models/group_group_link_spec.rb
@@ -29,6 +29,32 @@ describe GroupGroupLink do
                                                           ])
       end
     end
+
+    describe '.public_or_visible_to_user' do
+      let!(:user_with_access) { create :user }
+      let!(:user_without_access) { create :user }
+      let!(:shared_with_group) { create :group, :private }
+      let!(:shared_group) { create :group }
+      let!(:private_group_group_link) { create(:group_group_link, shared_group: shared_group, shared_with_group: shared_with_group) }
+
+      before do
+        shared_group.add_owner(user_with_access)
+        shared_group.add_owner(user_without_access)
+        shared_with_group.add_developer(user_with_access)
+      end
+
+      context 'when user can access shared group' do
+        it 'returns the private group' do
+          expect(described_class.public_or_visible_to_user(shared_group, user_with_access)).to include(private_group_group_link)
+        end
+      end
+
+      context 'when user does not have access to shared group' do
+        it 'does not return private group' do
+          expect(described_class.public_or_visible_to_user(shared_group, user_without_access)).not_to include(private_group_group_link)
+        end
+      end
+    end
   end
 
   describe 'validation' do
diff --git a/spec/models/group_import_state_spec.rb b/spec/models/group_import_state_spec.rb
new file mode 100644
index 00000000000..9d9cb1e8391
--- /dev/null
+++ b/spec/models/group_import_state_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GroupImportState do
+  describe 'validations' do
+    let_it_be(:group) { create(:group) }
+
+    it { is_expected.to validate_presence_of(:group) }
+    it { is_expected.to validate_presence_of(:status) }
+
+    it 'can be created without a jid' do
+      import_state = build(:group_import_state, :created, group: group, jid: nil)
+
+      expect(import_state).to be_valid
+    end
+
+    it 'cannot be started without a jid' do
+      import_state = build(:group_import_state, :started, group: group, jid: nil)
+
+      expect(import_state).not_to be_valid
+      expect(import_state.errors[:jid]).to include "can't be blank"
+    end
+
+    it 'cannot be finished without a jid' do
+      import_state = build(:group_import_state, :finished, group: group, jid: nil)
+
+      expect(import_state).not_to be_valid
+      expect(import_state.errors[:jid]).to include "can't be blank"
+    end
+
+    it 'can fail without a jid' do
+      import_state = build(:group_import_state, :failed, group: group, jid: nil)
+
+      expect(import_state).to be_valid
+    end
+  end
+
+  describe '#in_progress?' do
+    context "when the import is 'created'" do
+      it "returns true" do
+        group_import_state = build(:group_import_state, :created)
+
+        expect(group_import_state.in_progress?).to eq true
+      end
+    end
+
+    context "when the import is 'started'" do
+      it "returns true" do
+        group_import_state = build(:group_import_state, :started)
+
+        expect(group_import_state.in_progress?).to eq true
+      end
+    end
+
+    context "when the import is 'finished'" do
+      it "returns false" do
+        group_import_state = build(:group_import_state, :finished)
+
+        expect(group_import_state.in_progress?).to eq false
+      end
+    end
+
+    context "when the import is 'failed'" do
+      it "returns false" do
+        group_import_state = build(:group_import_state, :failed)
+
+        expect(group_import_state.in_progress?).to eq false
+      end
+    end
+  end
+end
diff --git a/spec/models/group_milestone_spec.rb b/spec/models/group_milestone_spec.rb
deleted file mode 100644
index 01856870fe0..00000000000
--- a/spec/models/group_milestone_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe GroupMilestone do
-  let(:group) { create(:group) }
-  let(:project) { create(:project, group: group) }
-  let(:project_milestone) do
-    create(:milestone, title: "Milestone v1.2", project: project)
-  end
-
-  describe '.build' do
-    it 'returns milestone with group assigned' do
-      milestone = described_class.build(
-        group,
-        [project],
-        project_milestone.title
-      )
-
-      expect(milestone.group).to eq group
-    end
-  end
-
-  describe '.build_collection' do
-    let(:group) { create(:group) }
-    let(:project1) { create(:project, group: group) }
-    let(:project2) { create(:project, path: 'gitlab-ci', group: group) }
-    let(:project3) { create(:project, path: 'cookbook-gitlab', group: group) }
-
-    let!(:projects) do
-      [
-          project1,
-          project2,
-          project3
-      ]
-    end
-
-    it 'returns array of milestones, each with group assigned' do
-      milestones = described_class.build_collection(group, [project], {})
-      expect(milestones).to all(have_attributes(group: group))
-    end
-
-    context 'when adding new milestones' do
-      it 'does not add more queries' do
-        control_count = ActiveRecord::QueryRecorder.new do
-          described_class.build_collection(group, projects, {})
-        end.count
-
-        create(:milestone, title: 'This title', project: project1)
-
-        expect do
-          described_class.build_collection(group, projects, {})
-        end.not_to exceed_all_query_limit(control_count)
-      end
-    end
-  end
-end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index d6e76258491..93cb6d83489 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -662,6 +662,19 @@ describe Group do
       expect(group.members_with_parents).to include(developer)
       expect(group.members_with_parents).to include(maintainer)
     end
+
+    context 'group sharing' do
+      let!(:shared_group) { create(:group) }
+
+      before do
+        create(:group_group_link, shared_group: shared_group, shared_with_group: group)
+      end
+
+      it 'returns shared with group members' do
+        expect(shared_group.members_with_parents).to(
+          include(developer))
+      end
+    end
   end
 
   describe '#members_from_self_and_ancestors_with_effective_access_level' do
@@ -800,6 +813,22 @@ describe Group do
       expect(group.user_ids_for_project_authorizations)
         .to include(maintainer.id, developer.id)
     end
+
+    context 'group sharing' do
+      let_it_be(:group) { create(:group) }
+      let_it_be(:group_user) { create(:user) }
+      let_it_be(:shared_group) { create(:group) }
+
+      before do
+        group.add_developer(group_user)
+        create(:group_group_link, shared_group: shared_group, shared_with_group: group)
+      end
+
+      it 'returns the user IDs for shared with group members' do
+        expect(shared_group.user_ids_for_project_authorizations).to(
+          include(group_user.id))
+      end
+    end
   end
 
   describe '#update_two_factor_requirement' do
diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb
index 94f1b0cba2e..2e836c19e3c 100644
--- a/spec/models/hooks/system_hook_spec.rb
+++ b/spec/models/hooks/system_hook_spec.rb
@@ -75,7 +75,7 @@ describe SystemHook do
 
     it "project member destroy hook" do
       project.add_maintainer(user)
-      project.project_members.destroy_all # rubocop: disable DestroyAll
+      project.project_members.destroy_all # rubocop: disable Cop/DestroyAll
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_remove_from_team/,
@@ -121,7 +121,7 @@ describe SystemHook do
 
     it 'group member destroy hook' do
       group.add_maintainer(user)
-      group.group_members.destroy_all # rubocop: disable DestroyAll
+      group.group_members.destroy_all # rubocop: disable Cop/DestroyAll
 
       expect(WebMock).to have_requested(:post, system_hook.url).with(
         body: /user_remove_from_group/,
diff --git a/spec/models/instance_configuration_spec.rb b/spec/models/instance_configuration_spec.rb
index 3e0181b8846..747e9dc2faa 100644
--- a/spec/models/instance_configuration_spec.rb
+++ b/spec/models/instance_configuration_spec.rb
@@ -110,7 +110,7 @@ describe InstanceConfiguration do
       end
 
       it 'expires after EXPIRATION_TIME' do
-        allow(Time).to receive(:now).and_return(Time.now + described_class::EXPIRATION_TIME)
+        allow(Time).to receive(:now).and_return(Time.current + described_class::EXPIRATION_TIME)
         Rails.cache.cleanup
 
         expect(Rails.cache.read(described_class::CACHE_KEY)).to eq(nil)
diff --git a/spec/models/integration_spec.rb b/spec/models/integration_spec.rb
new file mode 100644
index 00000000000..3042fd15a7b
--- /dev/null
+++ b/spec/models/integration_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Integration do
+  let(:project_1) { create(:project) }
+  let(:project_2) { create(:project) }
+  let(:instance_integration) { create(:jira_service, :instance) }
+
+  before do
+    create(:jira_service, project: project_1, inherit_from_id: instance_integration.id)
+    create(:jira_service, project: project_2, inherit_from_id: nil)
+    create(:slack_service, project: project_1, inherit_from_id: nil)
+  end
+
+  describe '#with_custom_integration_for' do
+    it 'returns projects with custom integrations' do
+      expect(Project.with_custom_integration_for(instance_integration)).to contain_exactly(project_2)
+    end
+  end
+end
diff --git a/spec/models/internal_id_spec.rb b/spec/models/internal_id_spec.rb
index 33d03bfc0f5..0dfb59cf43a 100644
--- a/spec/models/internal_id_spec.rb
+++ b/spec/models/internal_id_spec.rb
@@ -88,33 +88,6 @@ describe InternalId do
 
       expect(normalized).to eq((0..seq.size - 1).to_a)
     end
-
-    context 'with an insufficient schema version' do
-      before do
-        described_class.reset_column_information
-        # Project factory will also call the current_version
-        expect(ActiveRecord::Migrator).to receive(:current_version).at_least(:once).and_return(InternalId::REQUIRED_SCHEMA_VERSION - 1)
-      end
-
-      let(:init) { double('block') }
-
-      it 'calculates next internal ids on the fly' do
-        val = rand(1..100)
-
-        expect(init).to receive(:call).with(issue).and_return(val)
-        expect(subject).to eq(val + 1)
-      end
-
-      it 'always attempts to generate internal IDs in production mode' do
-        stub_rails_env('production')
-
-        val = rand(1..100)
-        generator = double(generate: val)
-        expect(InternalId::InternalIdGenerator).to receive(:new).and_return(generator)
-
-        expect(subject).to eq(val)
-      end
-    end
   end
 
   describe '.reset' do
@@ -152,20 +125,6 @@ describe InternalId do
         described_class.generate_next(issue, scope, usage, init)
       end
     end
-
-    context 'with an insufficient schema version' do
-      let(:value) { 2 }
-
-      before do
-        described_class.reset_column_information
-        # Project factory will also call the current_version
-        expect(ActiveRecord::Migrator).to receive(:current_version).at_least(:once).and_return(InternalId::REQUIRED_SCHEMA_VERSION - 1)
-      end
-
-      it 'does not reset any of the iids' do
-        expect(subject).to be_falsey
-      end
-    end
   end
 
   describe '.track_greatest' do
diff --git a/spec/models/issue/metrics_spec.rb b/spec/models/issue/metrics_spec.rb
index 0d0628277a6..dc22d26e2f9 100644
--- a/spec/models/issue/metrics_spec.rb
+++ b/spec/models/issue/metrics_spec.rb
@@ -23,7 +23,7 @@ describe Issue::Metrics do
   describe '.with_first_mention_not_earlier_than' do
     subject(:scope) { described_class.with_first_mention_not_earlier_than(timestamp) }
 
-    let(:timestamp) { DateTime.now }
+    let(:timestamp) { DateTime.current }
 
     it 'returns metrics without mentioning in commit or with mentioning after given timestamp' do
       issue1 = create(:issue)
@@ -37,7 +37,7 @@ describe Issue::Metrics do
   describe "when recording the default set of issue metrics on issue save" do
     context "milestones" do
       it "records the first time an issue is associated with a milestone" do
-        time = Time.now
+        time = Time.current
         Timecop.freeze(time) { subject.update(milestone: create(:milestone, project: project)) }
         metrics = subject.metrics
 
@@ -46,7 +46,7 @@ describe Issue::Metrics do
       end
 
       it "does not record the second time an issue is associated with a milestone" do
-        time = Time.now
+        time = Time.current
         Timecop.freeze(time) { subject.update(milestone: create(:milestone, project: project)) }
         Timecop.freeze(time + 2.hours) { subject.update(milestone: nil) }
         Timecop.freeze(time + 6.hours) { subject.update(milestone: create(:milestone, project: project)) }
@@ -60,7 +60,7 @@ describe Issue::Metrics do
     context "list labels" do
       it "records the first time an issue is associated with a list label" do
         list_label = create(:list).label
-        time = Time.now
+        time = Time.current
         Timecop.freeze(time) { subject.update(label_ids: [list_label.id]) }
         metrics = subject.metrics
 
@@ -69,7 +69,7 @@ describe Issue::Metrics do
       end
 
       it "does not record the second time an issue is associated with a list label" do
-        time = Time.now
+        time = Time.current
         first_list_label = create(:list).label
         Timecop.freeze(time) { subject.update(label_ids: [first_list_label.id]) }
         second_list_label = create(:list).label
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index dd5ff3dbdde..291cccd72db 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -21,6 +21,9 @@ describe Issue do
     it { is_expected.to have_one(:alert_management_alert) }
     it { is_expected.to have_many(:resource_milestone_events) }
     it { is_expected.to have_many(:resource_state_events) }
+    it { is_expected.to have_and_belong_to_many(:prometheus_alert_events) }
+    it { is_expected.to have_and_belong_to_many(:self_managed_prometheus_alert_events) }
+    it { is_expected.to have_many(:prometheus_alerts) }
 
     describe 'versions.most_recent' do
       it 'returns the most recent version' do
@@ -176,7 +179,7 @@ describe Issue do
   describe '#close' do
     subject(:issue) { create(:issue, state: 'opened') }
 
-    it 'sets closed_at to Time.now when an issue is closed' do
+    it 'sets closed_at to Time.current when an issue is closed' do
       expect { issue.close }.to change { issue.closed_at }.from(nil)
     end
 
@@ -186,11 +189,40 @@ describe Issue do
 
       expect { issue.close }.to change { issue.state_id }.from(open_state).to(closed_state)
     end
+
+    context 'when there is an associated Alert Management Alert' do
+      context 'when alert can be resolved' do
+        let!(:alert) { create(:alert_management_alert, project: issue.project, issue: issue) }
+
+        it 'resolves an alert' do
+          expect { issue.close }.to change { alert.reload.resolved? }.to(true)
+        end
+      end
+
+      context 'when alert cannot be resolved' do
+        let!(:alert) { create(:alert_management_alert, :with_validation_errors, project: issue.project, issue: issue) }
+
+        before do
+          allow(Gitlab::AppLogger).to receive(:warn).and_call_original
+        end
+
+        it 'writes a warning into the log' do
+          issue.close
+
+          expect(Gitlab::AppLogger).to have_received(:warn).with(
+            message: 'Cannot resolve an associated Alert Management alert',
+            issue_id: issue.id,
+            alert_id: alert.id,
+            alert_errors: { hosts: ['hosts array is over 255 chars'] }
+          )
+        end
+      end
+    end
   end
 
   describe '#reopen' do
     let(:user) { create(:user) }
-    let(:issue) { create(:issue, state: 'closed', closed_at: Time.now, closed_by: user) }
+    let(:issue) { create(:issue, state: 'closed', closed_at: Time.current, closed_by: user) }
 
     it 'sets closed_at to nil when an issue is reopend' do
       expect { issue.reopen }.to change { issue.closed_at }.to(nil)
@@ -994,7 +1026,7 @@ describe Issue do
   it_behaves_like 'versioned description'
 
   describe "#previous_updated_at" do
-    let_it_be(:updated_at) { Time.new(2012, 01, 06) }
+    let_it_be(:updated_at) { Time.zone.local(2012, 01, 06) }
     let_it_be(:issue) { create(:issue, updated_at: updated_at) }
 
     it 'returns updated_at value if updated_at did not change at all' do
@@ -1010,15 +1042,15 @@ describe Issue do
     end
 
     it 'returns updated_at value if previous updated_at value is not present' do
-      allow(issue).to receive(:previous_changes).and_return({ 'updated_at' => [nil, Time.new(2013, 02, 06)] })
+      allow(issue).to receive(:previous_changes).and_return({ 'updated_at' => [nil, Time.zone.local(2013, 02, 06)] })
 
       expect(issue.previous_updated_at).to eq(updated_at)
     end
 
     it 'returns previous updated_at when present' do
-      allow(issue).to receive(:previous_changes).and_return({ 'updated_at' => [Time.new(2013, 02, 06), Time.new(2013, 03, 06)] })
+      allow(issue).to receive(:previous_changes).and_return({ 'updated_at' => [Time.zone.local(2013, 02, 06), Time.zone.local(2013, 03, 06)] })
 
-      expect(issue.previous_updated_at).to eq(Time.new(2013, 02, 06))
+      expect(issue.previous_updated_at).to eq(Time.zone.local(2013, 02, 06))
     end
   end
 
@@ -1085,4 +1117,15 @@ describe Issue do
       expect(subject).not_to include(labeled_issue)
     end
   end
+
+  describe 'banzai_render_context' do
+    let(:project) { build(:project_empty_repo) }
+    let(:issue) { build :issue, project: project }
+
+    subject(:context) { issue.banzai_render_context(:title) }
+
+    it 'sets the label_url_method in the context' do
+      expect(context[:label_url_method]).to eq(:project_issues_url)
+    end
+  end
 end
diff --git a/spec/models/iteration_spec.rb b/spec/models/iteration_spec.rb
index e5b7b746639..ae14adf9106 100644
--- a/spec/models/iteration_spec.rb
+++ b/spec/models/iteration_spec.rb
@@ -6,10 +6,6 @@ describe Iteration do
   let_it_be(:project) { create(:project) }
   let_it_be(:group) { create(:group) }
 
-  it_behaves_like 'a timebox', :iteration do
-    let(:timebox_table_name) { described_class.table_name.to_sym }
-  end
-
   describe "#iid" do
     it "is properly scoped on project and group" do
       iteration1 = create(:iteration, project: project)
@@ -62,7 +58,7 @@ describe Iteration do
           end
 
           context 'when end_date is in range' do
-            let(:start_date) { Time.now }
+            let(:start_date) { Time.current }
             let(:due_date) { 6.days.from_now }
 
             it 'is not valid' do
@@ -94,7 +90,7 @@ describe Iteration do
 
     describe '#future_date' do
       context 'when dates are in the future' do
-        let(:start_date) { Time.now }
+        let(:start_date) { Time.current }
         let(:due_date) { 1.week.from_now }
 
         it { is_expected.to be_valid }
@@ -111,7 +107,7 @@ describe Iteration do
       end
 
       context 'when due_date is in the past' do
-        let(:start_date) { Time.now }
+        let(:start_date) { Time.current }
         let(:due_date) { 1.week.ago }
 
         it 'is not valid' do
@@ -122,7 +118,7 @@ describe Iteration do
 
       context 'when start_date is over 500 years in the future' do
         let(:start_date) { 501.years.from_now }
-        let(:due_date) { Time.now }
+        let(:due_date) { Time.current }
 
         it 'is not valid' do
           expect(subject).not_to be_valid
@@ -131,7 +127,7 @@ describe Iteration do
       end
 
       context 'when due_date is over 500 years in the future' do
-        let(:start_date) { Time.now }
+        let(:start_date) { Time.current }
         let(:due_date) { 501.years.from_now }
 
         it 'is not valid' do
@@ -143,7 +139,7 @@ describe Iteration do
   end
 
   describe '.within_timeframe' do
-    let_it_be(:now) { Time.now }
+    let_it_be(:now) { Time.current }
     let_it_be(:project) { create(:project, :empty_repo) }
     let_it_be(:iteration_1) { create(:iteration, project: project, start_date: now, due_date: 1.day.from_now) }
     let_it_be(:iteration_2) { create(:iteration, project: project, start_date: 2.days.from_now, due_date: 3.days.from_now) }
diff --git a/spec/models/jira_import_state_spec.rb b/spec/models/jira_import_state_spec.rb
index 99f9e035205..d2535636c63 100644
--- a/spec/models/jira_import_state_spec.rb
+++ b/spec/models/jira_import_state_spec.rb
@@ -124,7 +124,7 @@ describe JiraImportState do
         jira_import.schedule
 
         expect(jira_import.jid).to eq('some-job-id')
-        expect(jira_import.scheduled_at).to be_within(1.second).of(Time.now)
+        expect(jira_import.scheduled_at).to be_within(1.second).of(Time.current)
       end
     end
 
@@ -163,4 +163,39 @@ describe JiraImportState do
       end
     end
   end
+
+  context 'ensure error_message size on save' do
+    let_it_be(:project) { create(:project) }
+
+    before do
+      stub_const('JiraImportState::ERROR_MESSAGE_SIZE', 10)
+    end
+
+    context 'when jira import has no error_message' do
+      let(:jira_import) { build(:jira_import_state, project: project)}
+
+      it 'does not run the callback', :aggregate_failures do
+        expect { jira_import.save }.to change { JiraImportState.count }.by(1)
+        expect(jira_import.reload.error_message).to be_nil
+      end
+    end
+
+    context 'when jira import error_message does not exceed the limit' do
+      let(:jira_import) { build(:jira_import_state, project: project, error_message: 'error')}
+
+      it 'does not run the callback', :aggregate_failures do
+        expect { jira_import.save }.to change { JiraImportState.count }.by(1)
+        expect(jira_import.reload.error_message).to eq('error')
+      end
+    end
+
+    context 'when error_message exceeds limit' do
+      let(:jira_import) { build(:jira_import_state, project: project, error_message: 'error message longer than the limit')}
+
+      it 'truncates error_message to the limit', :aggregate_failures do
+        expect { jira_import.save! }.to change { JiraImportState.count }.by(1)
+        expect(jira_import.reload.error_message.size).to eq 10
+      end
+    end
+  end
 end
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index a8d864ad3f0..7c40bb24b56 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -494,7 +494,7 @@ describe Member do
   end
 
   describe '#accept_request' do
-    let(:member) { create(:project_member, requested_at: Time.now.utc) }
+    let(:member) { create(:project_member, requested_at: Time.current.utc) }
 
     it { expect(member.accept_request).to be_truthy }
 
@@ -518,14 +518,14 @@ describe Member do
   end
 
   describe '#request?' do
-    subject { create(:project_member, requested_at: Time.now.utc) }
+    subject { create(:project_member, requested_at: Time.current.utc) }
 
     it { is_expected.to be_request }
   end
 
   describe '#pending?' do
     let(:invited_member) { create(:project_member, invite_email: "user@example.com", user: nil) }
-    let(:requester) { create(:project_member, requested_at: Time.now.utc) }
+    let(:requester) { create(:project_member, requested_at: Time.current.utc) }
 
     it { expect(invited_member).to be_invite }
     it { expect(requester).to be_pending }
diff --git a/spec/models/members/group_member_spec.rb b/spec/models/members/group_member_spec.rb
index 9b5cce1aebf..fdb71b7ec7d 100644
--- a/spec/models/members/group_member_spec.rb
+++ b/spec/models/members/group_member_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe GroupMember do
   context 'scopes' do
-    describe '.count_users_by_group_id' do
+    shared_examples '.count_users_by_group_id' do
       it 'counts users by group ID' do
         user_1 = create(:user)
         user_2 = create(:user)
@@ -20,6 +20,36 @@ describe GroupMember do
       end
     end
 
+    describe '.count_users_by_group_id with optimized_count_users_by_group_id feature flag on' do
+      before do
+        stub_feature_flags(optimized_count_users_by_group_id: true)
+      end
+
+      it_behaves_like '.count_users_by_group_id'
+
+      it 'does not JOIN users' do
+        scope = described_class.all
+        expect(scope).not_to receive(:joins).with(:user)
+
+        scope.count_users_by_group_id
+      end
+    end
+
+    describe '.count_users_by_group_id with optimized_count_users_by_group_id feature flag off' do
+      before do
+        stub_feature_flags(optimized_count_users_by_group_id: false)
+      end
+
+      it_behaves_like '.count_users_by_group_id'
+
+      it 'does JOIN users' do
+        scope = described_class.all
+        expect(scope).to receive(:joins).with(:user).and_call_original
+
+        scope.count_users_by_group_id
+      end
+    end
+
     describe '.of_ldap_type' do
       it 'returns ldap type users' do
         group_member = create(:group_member, :ldap)
diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb
index 79c39b81196..fdb9457b211 100644
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.rb
@@ -44,14 +44,14 @@ describe ProjectMember do
     let(:maintainer) { create(:project_member, project: project) }
 
     it "creates an expired event when left due to expiry" do
-      expired = create(:project_member, project: project, expires_at: Time.now - 6.days)
+      expired = create(:project_member, project: project, expires_at: Time.current - 6.days)
       expired.destroy
-      expect(Event.recent.first.action).to eq(Event::EXPIRED)
+      expect(Event.recent.first).to be_expired_action
     end
 
     it "creates a left event when left due to leave" do
       maintainer.destroy
-      expect(Event.recent.first.action).to eq(Event::LEFT)
+      expect(Event.recent.first).to be_left_action
     end
   end
 
diff --git a/spec/models/merge_request_diff_commit_spec.rb b/spec/models/merge_request_diff_commit_spec.rb
index 8b51c6fae08..62430b08c5c 100644
--- a/spec/models/merge_request_diff_commit_spec.rb
+++ b/spec/models/merge_request_diff_commit_spec.rb
@@ -73,7 +73,7 @@ describe MergeRequestDiffCommit do
         # This commit's date is "Sun Aug 17 07:12:55 292278994 +0000"
         [project.commit('ba3343bc4fa403a8dfbfcab7fc1a8c29ee34bd69')]
       end
-      let(:timestamp) { Time.at((1 << 31) - 1) }
+      let(:timestamp) { Time.zone.at((1 << 31) - 1) }
       let(:rows) do
         [{
           "message": "Weird commit date\n",
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index fc4590f7b22..c70ddac5da6 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -22,6 +22,8 @@ describe MergeRequest do
     it { is_expected.to belong_to(:iteration) }
     it { is_expected.to have_many(:resource_milestone_events) }
     it { is_expected.to have_many(:resource_state_events) }
+    it { is_expected.to have_many(:draft_notes) }
+    it { is_expected.to have_many(:reviews).inverse_of(:merge_request) }
 
     context 'for forks' do
       let!(:project) { create(:project) }
@@ -721,11 +723,15 @@ describe MergeRequest do
   end
 
   describe '#note_positions_for_paths' do
+    let(:user) { create(:user) }
     let(:merge_request) { create(:merge_request, :with_diffs) }
     let(:project) { merge_request.project }
     let!(:diff_note) do
       create(:diff_note_on_merge_request, project: project, noteable: merge_request)
     end
+    let!(:draft_note) do
+      create(:draft_note_on_text_diff, author: user, merge_request: merge_request)
+    end
 
     let(:file_paths) { merge_request.diffs.diff_files.map(&:file_path) }
 
@@ -758,6 +764,26 @@ describe MergeRequest do
         expect(subject.to_a).to be_empty
       end
     end
+
+    context 'when user is given' do
+      subject do
+        merge_request.note_positions_for_paths(file_paths, user)
+      end
+
+      it 'returns notes and draft notes positions' do
+        expect(subject).to match_array([draft_note.position, diff_note.position])
+      end
+    end
+
+    context 'when user is not given' do
+      subject do
+        merge_request.note_positions_for_paths(file_paths)
+      end
+
+      it 'returns notes positions' do
+        expect(subject).to match_array([diff_note.position])
+      end
+    end
   end
 
   describe '#discussions_diffs' do
@@ -1625,14 +1651,6 @@ describe MergeRequest do
       let(:merge_request) { create(:merge_request, :with_accessibility_reports, source_project: project) }
 
       it { is_expected.to be_truthy }
-
-      context 'when feature flag is disabled' do
-        before do
-          stub_feature_flags(accessibility_report_view: false)
-        end
-
-        it { is_expected.to be_falsey }
-      end
     end
 
     context 'when head pipeline does not have accessibility reports' do
@@ -2018,7 +2036,7 @@ describe MergeRequest do
   describe '#can_be_reverted?' do
     context 'when there is no merge_commit for the MR' do
       before do
-        subject.metrics.update!(merged_at: Time.now.utc)
+        subject.metrics.update!(merged_at: Time.current.utc)
       end
 
       it 'returns false' do
@@ -2157,7 +2175,34 @@ describe MergeRequest do
       end
     end
 
-    context 'when merging note is persisted, but no metrics or merge event exists' do
+    context 'when state event tracking is disabled' do
+      before do
+        stub_feature_flags(track_resource_state_change_events: false)
+      end
+
+      context 'when merging note is persisted, but no metrics or merge event exists' do
+        let(:user) { create(:user) }
+        let(:merge_request) { create(:merge_request, :merged) }
+
+        before do
+          merge_request.metrics.destroy!
+
+          SystemNoteService.change_status(merge_request,
+                                          merge_request.target_project,
+                                          user,
+                                          merge_request.state, nil)
+        end
+
+        it 'returns merging note creation date' do
+          expect(merge_request.reload.metrics).to be_nil
+          expect(merge_request.merge_event).to be_nil
+          expect(merge_request.notes.count).to eq(1)
+          expect(merge_request.merged_at).to eq(merge_request.notes.first.created_at)
+        end
+      end
+    end
+
+    context 'when state event tracking is enabled' do
       let(:user) { create(:user) }
       let(:merge_request) { create(:merge_request, :merged) }
 
@@ -2170,11 +2215,8 @@ describe MergeRequest do
                                         merge_request.state, nil)
       end
 
-      it 'returns merging note creation date' do
-        expect(merge_request.reload.metrics).to be_nil
-        expect(merge_request.merge_event).to be_nil
-        expect(merge_request.notes.count).to eq(1)
-        expect(merge_request.merged_at).to eq(merge_request.notes.first.created_at)
+      it 'does not create a system note' do
+        expect(merge_request.notes).to be_empty
       end
     end
   end
@@ -2327,24 +2369,10 @@ describe MergeRequest do
       end
 
       context 'when async is true' do
-        context 'and async_merge_request_check_mergeability feature flag is enabled' do
-          it 'executes MergeabilityCheckService asynchronously' do
-            expect(mergeability_service).to receive(:async_execute)
-
-            subject.check_mergeability(async: true)
-          end
-        end
-
-        context 'and async_merge_request_check_mergeability feature flag is disabled' do
-          before do
-            stub_feature_flags(async_merge_request_check_mergeability: false)
-          end
-
-          it 'executes MergeabilityCheckService' do
-            expect(mergeability_service).to receive(:execute)
+        it 'executes MergeabilityCheckService asynchronously' do
+          expect(mergeability_service).to receive(:async_execute)
 
-            subject.check_mergeability(async: true)
-          end
+          subject.check_mergeability(async: true)
         end
       end
     end
@@ -2489,12 +2517,13 @@ describe MergeRequest do
   end
 
   describe '#mergeable_ci_state?' do
-    let(:project) { create(:project, only_allow_merge_if_pipeline_succeeds: true) }
     let(:pipeline) { create(:ci_empty_pipeline) }
 
-    subject { build(:merge_request, target_project: project) }
-
     context 'when it is only allowed to merge when build is green' do
+      let(:project) { create(:project, only_allow_merge_if_pipeline_succeeds: true) }
+
+      subject { build(:merge_request, target_project: project) }
+
       context 'and a failed pipeline is associated' do
         before do
           pipeline.update(status: 'failed', sha: subject.diff_head_sha)
@@ -2516,7 +2545,7 @@ describe MergeRequest do
       context 'and a skipped pipeline is associated' do
         before do
           pipeline.update(status: 'skipped', sha: subject.diff_head_sha)
-          allow(subject).to receive(:head_pipeline) { pipeline }
+          allow(subject).to receive(:head_pipeline).and_return(pipeline)
         end
 
         it { expect(subject.mergeable_ci_state?).to be_falsey }
@@ -2524,7 +2553,48 @@ describe MergeRequest do
 
       context 'when no pipeline is associated' do
         before do
-          allow(subject).to receive(:head_pipeline) { nil }
+          allow(subject).to receive(:head_pipeline).and_return(nil)
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_falsey }
+      end
+    end
+
+    context 'when it is only allowed to merge when build is green or skipped' do
+      let(:project) { create(:project, only_allow_merge_if_pipeline_succeeds: true, allow_merge_on_skipped_pipeline: true) }
+
+      subject { build(:merge_request, target_project: project) }
+
+      context 'and a failed pipeline is associated' do
+        before do
+          pipeline.update!(status: 'failed', sha: subject.diff_head_sha)
+          allow(subject).to receive(:head_pipeline).and_return(pipeline)
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_falsey }
+      end
+
+      context 'and a successful pipeline is associated' do
+        before do
+          pipeline.update!(status: 'success', sha: subject.diff_head_sha)
+          allow(subject).to receive(:head_pipeline).and_return(pipeline)
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_truthy }
+      end
+
+      context 'and a skipped pipeline is associated' do
+        before do
+          pipeline.update!(status: 'skipped', sha: subject.diff_head_sha)
+          allow(subject).to receive(:head_pipeline).and_return(pipeline)
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_truthy }
+      end
+
+      context 'when no pipeline is associated' do
+        before do
+          allow(subject).to receive(:head_pipeline).and_return(nil)
         end
 
         it { expect(subject.mergeable_ci_state?).to be_falsey }
@@ -2532,7 +2602,9 @@ describe MergeRequest do
     end
 
     context 'when merges are not restricted to green builds' do
-      subject { build(:merge_request, target_project: create(:project, only_allow_merge_if_pipeline_succeeds: false)) }
+      let(:project) { create(:project, only_allow_merge_if_pipeline_succeeds: false) }
+
+      subject { build(:merge_request, target_project: project) }
 
       context 'and a failed pipeline is associated' do
         before do
@@ -2550,6 +2622,23 @@ describe MergeRequest do
 
         it { expect(subject.mergeable_ci_state?).to be_truthy }
       end
+
+      context 'and a skipped pipeline is associated' do
+        before do
+          pipeline.update!(status: 'skipped', sha: subject.diff_head_sha)
+          allow(subject).to receive(:head_pipeline).and_return(pipeline)
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_truthy }
+      end
+
+      context 'when no pipeline is associated' do
+        before do
+          allow(subject).to receive(:head_pipeline).and_return(nil)
+        end
+
+        it { expect(subject.mergeable_ci_state?).to be_truthy }
+      end
     end
   end
 
@@ -2581,7 +2670,7 @@ describe MergeRequest do
 
       context 'with no discussions' do
         before do
-          merge_request.notes.destroy_all # rubocop: disable DestroyAll
+          merge_request.notes.destroy_all # rubocop: disable Cop/DestroyAll
         end
 
         it 'returns true' do
@@ -3876,4 +3965,15 @@ describe MergeRequest do
       expect(count).to eq(0)
     end
   end
+
+  describe 'banzai_render_context' do
+    let(:project) { build(:project_empty_repo) }
+    let(:merge_request) { build :merge_request, target_project: project, source_project: project }
+
+    subject(:context) { merge_request.banzai_render_context(:title) }
+
+    it 'sets the label_url_method in the context' do
+      expect(context[:label_url_method]).to eq(:project_merge_requests_url)
+    end
+  end
 end
diff --git a/spec/models/metrics/dashboard/annotation_spec.rb b/spec/models/metrics/dashboard/annotation_spec.rb
index f7fd7ded7e6..3cba31ffdfe 100644
--- a/spec/models/metrics/dashboard/annotation_spec.rb
+++ b/spec/models/metrics/dashboard/annotation_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe Metrics::Dashboard::Annotation do
+  using RSpec::Parameterized::TableSyntax
+
   describe 'associations' do
     it { is_expected.to belong_to(:environment).inverse_of(:metrics_dashboard_annotations) }
     it { is_expected.to belong_to(:cluster).class_name('Clusters::Cluster').inverse_of(:metrics_dashboard_annotations) }
@@ -28,6 +30,26 @@ describe Metrics::Dashboard::Annotation do
       end
     end
 
+    context 'ending_at_after_starting_at' do
+      where(:starting_at, :ending_at, :valid?, :message) do
+        2.days.ago.beginning_of_day | 1.day.ago.beginning_of_day  | true  | nil
+        1.day.ago.beginning_of_day  | nil                         | true  | nil
+        1.day.ago.beginning_of_day  | 1.day.ago.beginning_of_day  | true  | nil
+        1.day.ago.beginning_of_day  | 2.days.ago.beginning_of_day | false | /Ending at can't be before starting_at time/
+        nil                         | 2.days.ago.beginning_of_day | false | /Starting at can't be blank/ # validation is covered by other method, be we need to assure, that ending_at_after_starting_at will not break with nil as starting_at
+        nil                         | nil                         | false | /Starting at can't be blank/ # validation is covered by other method, be we need to assure, that ending_at_after_starting_at will not break with nil as starting_at
+      end
+
+      with_them do
+        subject(:annotation) { build(:metrics_dashboard_annotation, starting_at: starting_at, ending_at: ending_at) }
+
+        it do
+          expect(annotation.valid?).to be(valid?)
+          expect(annotation.errors.full_messages).to include(message) if message
+        end
+      end
+    end
+
     context 'environments annotation' do
       subject { build(:metrics_dashboard_annotation) }
 
@@ -75,5 +97,16 @@ describe Metrics::Dashboard::Annotation do
         expect(described_class.for_dashboard('other_dashboard.yml')).to match_array [other_dashboard_annotation]
       end
     end
+
+    describe '#ending_before' do
+      it 'returns annotations only for appointed dashboard' do
+        Timecop.freeze do
+          twelve_minutes_old_annotation = create(:metrics_dashboard_annotation, starting_at: 15.minutes.ago, ending_at: 12.minutes.ago)
+          create(:metrics_dashboard_annotation, starting_at: 15.minutes.ago, ending_at: 11.minutes.ago)
+
+          expect(described_class.ending_before(11.minutes.ago)).to match_array [fifteen_minutes_old_annotation, twelve_minutes_old_annotation]
+        end
+      end
+    end
   end
 end
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index e51108947a7..33f84da27f6 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -81,7 +81,7 @@ describe Milestone do
   end
 
   it_behaves_like 'within_timeframe scope' do
-    let_it_be(:now) { Time.now }
+    let_it_be(:now) { Time.current }
     let_it_be(:project) { create(:project, :empty_repo) }
     let_it_be(:resource_1) { create(:milestone, project: project, start_date: now - 1.day, due_date: now + 1.day) }
     let_it_be(:resource_2) { create(:milestone, project: project, start_date: now + 2.days, due_date: now + 3.days) }
@@ -130,7 +130,7 @@ describe Milestone do
 
   describe '#upcoming?' do
     it 'returns true when start_date is in the future' do
-      milestone = build(:milestone, start_date: Time.now + 1.month)
+      milestone = build(:milestone, start_date: Time.current + 1.month)
       expect(milestone.upcoming?).to be_truthy
     end
 
@@ -225,70 +225,88 @@ describe Milestone do
     end
   end
 
-  describe '#for_projects_and_groups' do
-    let(:project) { create(:project) }
-    let(:project_other) { create(:project) }
-    let(:group) { create(:group) }
-    let(:group_other) { create(:group) }
+  shared_examples '#for_projects_and_groups' do
+    describe '#for_projects_and_groups' do
+      let_it_be(:project) { create(:project) }
+      let_it_be(:project_other) { create(:project) }
+      let_it_be(:group) { create(:group) }
+      let_it_be(:group_other) { create(:group) }
+
+      before(:all) do
+        create(:milestone, project: project)
+        create(:milestone, project: project_other)
+        create(:milestone, group: group)
+        create(:milestone, group: group_other)
+      end
 
-    before do
-      create(:milestone, project: project)
-      create(:milestone, project: project_other)
-      create(:milestone, group: group)
-      create(:milestone, group: group_other)
-    end
+      subject { described_class.for_projects_and_groups(projects, groups) }
+
+      shared_examples 'filters by projects and groups' do
+        it 'returns milestones filtered by project' do
+          milestones = described_class.for_projects_and_groups(projects, [])
 
-    subject { described_class.for_projects_and_groups(projects, groups) }
+          expect(milestones.count).to eq(1)
+          expect(milestones.first.project_id).to eq(project.id)
+        end
+
+        it 'returns milestones filtered by group' do
+          milestones = described_class.for_projects_and_groups([], groups)
+
+          expect(milestones.count).to eq(1)
+          expect(milestones.first.group_id).to eq(group.id)
+        end
 
-    shared_examples 'filters by projects and groups' do
-      it 'returns milestones filtered by project' do
-        milestones = described_class.for_projects_and_groups(projects, [])
+        it 'returns milestones filtered by both project and group' do
+          milestones = described_class.for_projects_and_groups(projects, groups)
 
-        expect(milestones.count).to eq(1)
-        expect(milestones.first.project_id).to eq(project.id)
+          expect(milestones.count).to eq(2)
+          expect(milestones).to contain_exactly(project.milestones.first, group.milestones.first)
+        end
       end
 
-      it 'returns milestones filtered by group' do
-        milestones = described_class.for_projects_and_groups([], groups)
+      context 'ids as params' do
+        let(:projects) { [project.id] }
+        let(:groups) { [group.id] }
 
-        expect(milestones.count).to eq(1)
-        expect(milestones.first.group_id).to eq(group.id)
+        it_behaves_like 'filters by projects and groups'
       end
 
-      it 'returns milestones filtered by both project and group' do
-        milestones = described_class.for_projects_and_groups(projects, groups)
+      context 'relations as params' do
+        let(:projects) { Project.where(id: project.id).select(:id) }
+        let(:groups) { Group.where(id: group.id).select(:id) }
 
-        expect(milestones.count).to eq(2)
-        expect(milestones).to contain_exactly(project.milestones.first, group.milestones.first)
+        it_behaves_like 'filters by projects and groups'
       end
-    end
 
-    context 'ids as params' do
-      let(:projects) { [project.id] }
-      let(:groups) { [group.id] }
+      context 'objects as params' do
+        let(:projects) { [project] }
+        let(:groups) { [group] }
 
-      it_behaves_like 'filters by projects and groups'
-    end
+        it_behaves_like 'filters by projects and groups'
+      end
 
-    context 'relations as params' do
-      let(:projects) { Project.where(id: project.id).select(:id) }
-      let(:groups) { Group.where(id: group.id).select(:id) }
+      it 'returns no records if projects and groups are nil' do
+        milestones = described_class.for_projects_and_groups(nil, nil)
 
-      it_behaves_like 'filters by projects and groups'
+        expect(milestones).to be_empty
+      end
     end
+  end
 
-    context 'objects as params' do
-      let(:projects) { [project] }
-      let(:groups) { [group] }
-
-      it_behaves_like 'filters by projects and groups'
+  context 'when `optimized_timebox_queries` feature flag is enabled' do
+    before do
+      stub_feature_flags(optimized_timebox_queries: true)
     end
 
-    it 'returns no records if projects and groups are nil' do
-      milestones = described_class.for_projects_and_groups(nil, nil)
+    it_behaves_like '#for_projects_and_groups'
+  end
 
-      expect(milestones).to be_empty
+  context 'when `optimized_timebox_queries` feature flag is disabled' do
+    before do
+      stub_feature_flags(optimized_timebox_queries: false)
     end
+
+    it_behaves_like '#for_projects_and_groups'
   end
 
   describe '.upcoming_ids' do
@@ -297,30 +315,30 @@ describe Milestone do
     let(:group_3) { create(:group) }
     let(:groups) { [group_1, group_2, group_3] }
 
-    let!(:past_milestone_group_1) { create(:milestone, group: group_1, due_date: Time.now - 1.day) }
-    let!(:current_milestone_group_1) { create(:milestone, group: group_1, due_date: Time.now + 1.day) }
-    let!(:future_milestone_group_1) { create(:milestone, group: group_1, due_date: Time.now + 2.days) }
+    let!(:past_milestone_group_1) { create(:milestone, group: group_1, due_date: Time.current - 1.day) }
+    let!(:current_milestone_group_1) { create(:milestone, group: group_1, due_date: Time.current + 1.day) }
+    let!(:future_milestone_group_1) { create(:milestone, group: group_1, due_date: Time.current + 2.days) }
 
-    let!(:past_milestone_group_2) { create(:milestone, group: group_2, due_date: Time.now - 1.day) }
-    let!(:closed_milestone_group_2) { create(:milestone, :closed, group: group_2, due_date: Time.now + 1.day) }
-    let!(:current_milestone_group_2) { create(:milestone, group: group_2, due_date: Time.now + 2.days) }
+    let!(:past_milestone_group_2) { create(:milestone, group: group_2, due_date: Time.current - 1.day) }
+    let!(:closed_milestone_group_2) { create(:milestone, :closed, group: group_2, due_date: Time.current + 1.day) }
+    let!(:current_milestone_group_2) { create(:milestone, group: group_2, due_date: Time.current + 2.days) }
 
-    let!(:past_milestone_group_3) { create(:milestone, group: group_3, due_date: Time.now - 1.day) }
+    let!(:past_milestone_group_3) { create(:milestone, group: group_3, due_date: Time.current - 1.day) }
 
     let(:project_1) { create(:project) }
     let(:project_2) { create(:project) }
     let(:project_3) { create(:project) }
     let(:projects) { [project_1, project_2, project_3] }
 
-    let!(:past_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.now - 1.day) }
-    let!(:current_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.now + 1.day) }
-    let!(:future_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.now + 2.days) }
+    let!(:past_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.current - 1.day) }
+    let!(:current_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.current + 1.day) }
+    let!(:future_milestone_project_1) { create(:milestone, project: project_1, due_date: Time.current + 2.days) }
 
-    let!(:past_milestone_project_2) { create(:milestone, project: project_2, due_date: Time.now - 1.day) }
-    let!(:closed_milestone_project_2) { create(:milestone, :closed, project: project_2, due_date: Time.now + 1.day) }
-    let!(:current_milestone_project_2) { create(:milestone, project: project_2, due_date: Time.now + 2.days) }
+    let!(:past_milestone_project_2) { create(:milestone, project: project_2, due_date: Time.current - 1.day) }
+    let!(:closed_milestone_project_2) { create(:milestone, :closed, project: project_2, due_date: Time.current + 1.day) }
+    let!(:current_milestone_project_2) { create(:milestone, project: project_2, due_date: Time.current + 2.days) }
 
-    let!(:past_milestone_project_3) { create(:milestone, project: project_3, due_date: Time.now - 1.day) }
+    let!(:past_milestone_project_3) { create(:milestone, project: project_3, due_date: Time.current - 1.day) }
 
     let(:milestone_ids) { described_class.upcoming_ids(projects, groups).map(&:id) }
 
@@ -498,4 +516,23 @@ describe Milestone do
       end
     end
   end
+
+  describe '#subgroup_milestone' do
+    context 'parent is subgroup' do
+      it 'returns true' do
+        group = create(:group)
+        subgroup = create(:group, :private, parent: group)
+
+        expect(build(:milestone, group: subgroup).subgroup_milestone?).to eq(true)
+      end
+    end
+
+    context 'parent is not subgroup' do
+      it 'returns false' do
+        group = create(:group)
+
+        expect(build(:milestone, group: group).subgroup_milestone?).to eq(false)
+      end
+    end
+  end
 end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 6dd295ca915..af3fdcfaa2e 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -11,6 +11,7 @@ describe Note do
     it { is_expected.to belong_to(:author).class_name('User') }
 
     it { is_expected.to have_many(:todos) }
+    it { is_expected.to belong_to(:review).inverse_of(:notes) }
   end
 
   describe 'modules' do
@@ -285,7 +286,7 @@ describe Note do
   end
 
   describe "edited?" do
-    let(:note) { build(:note, updated_by_id: nil, created_at: Time.now, updated_at: Time.now + 5.hours) }
+    let(:note) { build(:note, updated_by_id: nil, created_at: Time.current, updated_at: Time.current + 5.hours) }
 
     context "with updated_by" do
       it "returns true" do
@@ -304,11 +305,22 @@ describe Note do
 
   describe '#confidential?' do
     context 'when note is not confidential' do
-      it 'is true when a noteable is confidential' do
-        issue = create(:issue, :confidential)
-        note = build(:note, noteable: issue, project: issue.project)
+      context 'when include_noteable is set to true' do
+        it 'is true when a noteable is confidential ' do
+          issue = create(:issue, :confidential)
+          note = build(:note, noteable: issue, project: issue.project)
 
-        expect(note.confidential?).to be_truthy
+          expect(note.confidential?(include_noteable: true)).to be_truthy
+        end
+      end
+
+      context 'when include_noteable is not set to true' do
+        it 'is false when a noteable is confidential ' do
+          issue = create(:issue, :confidential)
+          note = build(:note, noteable: issue, project: issue.project)
+
+          expect(note.confidential?).to be_falsey
+        end
       end
 
       it 'is false when a noteable is not confidential' do
@@ -318,7 +330,7 @@ describe Note do
         expect(note.confidential?).to be_falsy
       end
 
-      it "is falsey when noteable can't be confidential" do
+      it "is false when noteable can't be confidential" do
         commit_note = build(:note_on_commit)
 
         expect(commit_note.confidential?).to be_falsy
@@ -817,6 +829,10 @@ describe Note do
     it 'returns commit for a commit note' do
       expect(build(:note_on_commit).noteable_ability_name).to eq('commit')
     end
+
+    it 'returns alert_management_alert for an alert note' do
+      expect(build(:note_on_alert).noteable_ability_name).to eq('alert_management_alert')
+    end
   end
 
   describe '#cache_markdown_field' do
@@ -1352,4 +1368,28 @@ describe Note do
       end
     end
   end
+
+  describe 'banzai_render_context' do
+    let(:project) { build(:project_empty_repo) }
+
+    context 'when noteable is a merge request' do
+      let(:noteable) { build :merge_request, target_project: project, source_project: project }
+
+      subject(:context) { noteable.banzai_render_context(:title) }
+
+      it 'sets the label_url_method in the context' do
+        expect(context[:label_url_method]).to eq(:project_merge_requests_url)
+      end
+    end
+
+    context 'when noteable is an issue' do
+      let(:noteable) { build :issue, project: project }
+
+      subject(:context) { noteable.banzai_render_context(:title) }
+
+      it 'sets the label_url_method in the context' do
+        expect(context[:label_url_method]).to eq(:project_issues_url)
+      end
+    end
+  end
 end
diff --git a/spec/models/pages_domain_spec.rb b/spec/models/pages_domain_spec.rb
index 54747ddf525..fc7694530d0 100644
--- a/spec/models/pages_domain_spec.rb
+++ b/spec/models/pages_domain_spec.rb
@@ -97,8 +97,8 @@ describe PagesDomain do
     it 'saves validity time' do
       domain.save
 
-      expect(domain.certificate_valid_not_before).to be_like_time(Time.parse("2020-03-16 14:20:34 UTC"))
-      expect(domain.certificate_valid_not_after).to be_like_time(Time.parse("2220-01-28 14:20:34 UTC"))
+      expect(domain.certificate_valid_not_before).to be_like_time(Time.zone.parse("2020-03-16 14:20:34 UTC"))
+      expect(domain.certificate_valid_not_after).to be_like_time(Time.zone.parse("2220-01-28 14:20:34 UTC"))
     end
   end
 
@@ -366,7 +366,7 @@ describe PagesDomain do
       let_it_be(:domain) { create(:pages_domain) }
 
       where(:attribute, :old_value, :new_value, :update_expected) do
-        now = Time.now
+        now = Time.current
         future = now + 1.day
 
         :project | nil       | :project1 | true
@@ -548,7 +548,7 @@ describe PagesDomain do
 
       it 'does not clear failure on unrelated updates' do
         expect do
-          domain.update!(verified_at: Time.now)
+          domain.update!(verified_at: Time.current)
         end.not_to change { domain.auto_ssl_failed }.from(true)
       end
     end
diff --git a/spec/models/performance_monitoring/prometheus_dashboard_spec.rb b/spec/models/performance_monitoring/prometheus_dashboard_spec.rb
index e6fc03a0fb6..ef7298c3d8c 100644
--- a/spec/models/performance_monitoring/prometheus_dashboard_spec.rb
+++ b/spec/models/performance_monitoring/prometheus_dashboard_spec.rb
@@ -38,24 +38,141 @@ describe PerformanceMonitoring::PrometheusDashboard do
     end
 
     describe 'validations' do
-      context 'when dashboard is missing' do
-        before do
-          json_content['dashboard'] = nil
+      shared_examples 'validation failed' do |errors_messages|
+        it 'raises error with corresponding messages', :aggregate_failures do
+          expect { subject }.to raise_error do |error|
+            expect(error).to be_kind_of(ActiveModel::ValidationError)
+            expect(error.model.errors.messages).to eq(errors_messages)
+          end
         end
+      end
+
+      context 'dashboard content is missing' do
+        let(:json_content) { nil }
+
+        it_behaves_like 'validation failed', panel_groups: ["can't be blank"], dashboard: ["can't be blank"]
+      end
+
+      context 'dashboard content is NOT a hash' do
+        let(:json_content) { YAML.safe_load("'test'") }
+
+        it_behaves_like 'validation failed', panel_groups: ["can't be blank"], dashboard: ["can't be blank"]
+      end
+
+      context 'content is an array' do
+        let(:json_content) { [{ "dashboard" => "Dashboard Title" }] }
+
+        it_behaves_like 'validation failed', panel_groups: ["can't be blank"], dashboard: ["can't be blank"]
+      end
 
-        subject { described_class.from_json(json_content) }
+      context 'dashboard definition is missing panels_groups and dashboard keys' do
+        let(:json_content) do
+          {
+            "dashboard" => nil
+          }
+        end
+
+        it_behaves_like 'validation failed', panel_groups: ["can't be blank"], dashboard: ["can't be blank"]
+      end
+
+      context 'group definition is missing panels and group keys' do
+        let(:json_content) do
+          {
+            "dashboard" => "Dashboard Title",
+            "templating" => {
+              "variables" => {
+                "variable1" => %w(value1 value2 value3)
+              }
+            },
+            "panel_groups" => [{ "group" => nil }]
+          }
+        end
+
+        it_behaves_like 'validation failed', panels: ["can't be blank"], group: ["can't be blank"]
+      end
+
+      context 'panel definition is missing metrics and title keys' do
+        let(:json_content) do
+          {
+            "dashboard" => "Dashboard Title",
+            "templating" => {
+              "variables" => {
+                "variable1" => %w(value1 value2 value3)
+              }
+            },
+            "panel_groups" => [{
+              "group" => "Group Title",
+              "panels" => [{
+                "type" => "area-chart",
+                "y_label" => "Y-Axis"
+              }]
+            }]
+          }
+        end
 
-        it { expect { subject }.to raise_error(ActiveModel::ValidationError) }
+        it_behaves_like 'validation failed', metrics: ["can't be blank"], title: ["can't be blank"]
       end
 
-      context 'when panel groups are missing' do
-        before do
-          json_content['panel_groups'] = []
+      context 'metrics definition is missing unit, query and query_range keys' do
+        let(:json_content) do
+          {
+            "dashboard" => "Dashboard Title",
+            "templating" => {
+              "variables" => {
+                "variable1" => %w(value1 value2 value3)
+              }
+            },
+            "panel_groups" => [{
+              "group" => "Group Title",
+              "panels" => [{
+                "type" => "area-chart",
+                "title" => "Chart Title",
+                "y_label" => "Y-Axis",
+                "metrics" => [{
+                  "id" => "metric_of_ages",
+                  "label" => "Metric of Ages",
+                  "query_range" => nil
+                }]
+              }]
+            }]
+          }
         end
 
-        subject { described_class.from_json(json_content) }
+        it_behaves_like 'validation failed', unit: ["can't be blank"], query_range: ["can't be blank"], query: ["can't be blank"]
+      end
+
+      # for each parent entry validation first is done to its children,
+      # whole execution is stopped on first encountered error
+      # which is the one that is reported
+      context 'multiple offences on different levels' do
+        let(:json_content) do
+          {
+            "dashboard" => nil,
+            "panel_groups" => [{
+              "group" => nil,
+              "panels" => [{
+                "type" => "area-chart",
+                "title" => nil,
+                "y_label" => "Y-Axis",
+                "metrics" => [{
+                  "id" => "metric_of_ages",
+                  "label" => "Metric of Ages",
+                  "query_range" => 'query'
+                }, {
+                  "id" => "metric_of_ages",
+                  "unit" => "count",
+                  "label" => "Metric of Ages",
+                  "query_range" => nil
+                }]
+              }]
+            }, {
+              "group" => 'group',
+              "panels" => nil
+            }]
+          }
+        end
 
-        it { expect { subject }.to raise_error(ActiveModel::ValidationError) }
+        it_behaves_like 'validation failed', unit: ["can't be blank"]
       end
     end
   end
@@ -73,20 +190,51 @@ describe PerformanceMonitoring::PrometheusDashboard do
         dashboard_instance = described_class.find_for(project: project, user: user, path: path, options: { environment: environment })
 
         expect(dashboard_instance).to be_instance_of described_class
-        expect(dashboard_instance.environment).to be environment
-        expect(dashboard_instance.path).to be path
+        expect(dashboard_instance.environment).to eq environment
+        expect(dashboard_instance.path).to eq path
       end
     end
 
     context 'dashboard has NOT been found' do
       it 'returns nil' do
-        allow(Gitlab::Metrics::Dashboard::Finder).to receive(:find).and_return(status: :error)
+        allow(Gitlab::Metrics::Dashboard::Finder).to receive(:find).and_return(http_status: :not_found)
 
         dashboard_instance = described_class.find_for(project: project, user: user, path: path, options: { environment: environment })
 
         expect(dashboard_instance).to be_nil
       end
     end
+
+    context 'dashboard has invalid schema', :aggregate_failures do
+      it 'still returns dashboard object' do
+        expect(Gitlab::Metrics::Dashboard::Finder).to receive(:find).and_return(http_status: :unprocessable_entity)
+
+        dashboard_instance = described_class.find_for(project: project, user: user, path: path, options: { environment: environment })
+
+        expect(dashboard_instance).to be_instance_of described_class
+        expect(dashboard_instance.environment).to eq environment
+        expect(dashboard_instance.path).to eq path
+      end
+    end
+  end
+
+  describe '#schema_validation_warnings' do
+    context 'when schema is valid' do
+      it 'returns nil' do
+        expect(described_class).to receive(:from_json)
+        expect(described_class.new.schema_validation_warnings).to be_nil
+      end
+    end
+
+    context 'when schema is invalid' do
+      it 'returns array with errors messages' do
+        instance = described_class.new
+        instance.errors.add(:test, 'test error')
+
+        expect(described_class).to receive(:from_json).and_raise(ActiveModel::ValidationError.new(instance))
+        expect(described_class.new.schema_validation_warnings).to eq ['test: test error']
+      end
+    end
   end
 
   describe '#to_yaml' do
diff --git a/spec/models/performance_monitoring/prometheus_metric_spec.rb b/spec/models/performance_monitoring/prometheus_metric_spec.rb
index 08288e5d993..83f687aa90e 100644
--- a/spec/models/performance_monitoring/prometheus_metric_spec.rb
+++ b/spec/models/performance_monitoring/prometheus_metric_spec.rb
@@ -24,6 +24,14 @@ describe PerformanceMonitoring::PrometheusMetric do
     end
 
     describe 'validations' do
+      context 'json_content is not a hash' do
+        let(:json_content) { nil }
+
+        subject { described_class.from_json(json_content) }
+
+        it { expect { subject }.to raise_error(ActiveModel::ValidationError) }
+      end
+
       context 'when unit is missing' do
         before do
           json_content['unit'] = nil
diff --git a/spec/models/performance_monitoring/prometheus_panel_group_spec.rb b/spec/models/performance_monitoring/prometheus_panel_group_spec.rb
index 2447bb5df94..ecf7e13a9a3 100644
--- a/spec/models/performance_monitoring/prometheus_panel_group_spec.rb
+++ b/spec/models/performance_monitoring/prometheus_panel_group_spec.rb
@@ -30,9 +30,17 @@ describe PerformanceMonitoring::PrometheusPanelGroup do
     end
 
     describe 'validations' do
+      context 'json_content is not a hash' do
+        let(:json_content) { nil }
+
+        subject { described_class.from_json(json_content) }
+
+        it { expect { subject }.to raise_error(ActiveModel::ValidationError) }
+      end
+
       context 'when group is missing' do
         before do
-          json_content['group'] = nil
+          json_content.delete('group')
         end
 
         subject { described_class.from_json(json_content) }
diff --git a/spec/models/performance_monitoring/prometheus_panel_spec.rb b/spec/models/performance_monitoring/prometheus_panel_spec.rb
index f5e04ec91e2..127b9e8183a 100644
--- a/spec/models/performance_monitoring/prometheus_panel_spec.rb
+++ b/spec/models/performance_monitoring/prometheus_panel_spec.rb
@@ -42,6 +42,14 @@ describe PerformanceMonitoring::PrometheusPanel do
     end
 
     describe 'validations' do
+      context 'json_content is not a hash' do
+        let(:json_content) { nil }
+
+        subject { described_class.from_json(json_content) }
+
+        it { expect { subject }.to raise_error(ActiveModel::ValidationError) }
+      end
+
       context 'when title is missing' do
         before do
           json_content['title'] = nil
@@ -54,7 +62,7 @@ describe PerformanceMonitoring::PrometheusPanel do
 
       context 'when metrics are missing' do
         before do
-          json_content['metrics'] = []
+          json_content.delete('metrics')
         end
 
         subject { described_class.from_json(json_content) }
diff --git a/spec/models/personal_access_token_spec.rb b/spec/models/personal_access_token_spec.rb
index 596b11613b3..a3f5eb38511 100644
--- a/spec/models/personal_access_token_spec.rb
+++ b/spec/models/personal_access_token_spec.rb
@@ -178,6 +178,15 @@ describe PersonalAccessToken do
         end
       end
     end
+
+    describe '.without_impersonation' do
+      let_it_be(:impersonation_token) { create(:personal_access_token, :impersonation) }
+      let_it_be(:personal_access_token) { create(:personal_access_token) }
+
+      it 'returns only non-impersonation tokens' do
+        expect(described_class.without_impersonation).to contain_exactly(personal_access_token)
+      end
+    end
   end
 
   describe '.simple_sorts' do
diff --git a/spec/models/project_ci_cd_setting_spec.rb b/spec/models/project_ci_cd_setting_spec.rb
index 86115a61aa7..ecca371ce4e 100644
--- a/spec/models/project_ci_cd_setting_spec.rb
+++ b/spec/models/project_ci_cd_setting_spec.rb
@@ -3,25 +3,6 @@
 require 'spec_helper'
 
 describe ProjectCiCdSetting do
-  describe '.available?' do
-    before do
-      described_class.reset_column_information
-    end
-
-    it 'returns true' do
-      expect(described_class).to be_available
-    end
-
-    it 'memoizes the schema version' do
-      expect(ActiveRecord::Migrator)
-        .to receive(:current_version)
-        .and_call_original
-        .once
-
-      2.times { described_class.available? }
-    end
-  end
-
   describe 'validations' do
     it 'validates default_git_depth is between 0 and 1000 or nil' do
       expect(subject).to validate_numericality_of(:default_git_depth)
diff --git a/spec/models/project_feature_spec.rb b/spec/models/project_feature_spec.rb
index e072cc21b38..e33ea75bc5d 100644
--- a/spec/models/project_feature_spec.rb
+++ b/spec/models/project_feature_spec.rb
@@ -18,106 +18,6 @@ describe ProjectFeature do
     end
   end
 
-  describe '.quoted_access_level_column' do
-    it 'returns the table name and quoted column name for a feature' do
-      expected = '"project_features"."issues_access_level"'
-
-      expect(described_class.quoted_access_level_column(:issues)).to eq(expected)
-    end
-  end
-
-  describe '#feature_available?' do
-    let(:features) { %w(issues wiki builds merge_requests snippets repository pages metrics_dashboard) }
-
-    context 'when features are disabled' do
-      it "returns false" do
-        update_all_project_features(project, features, ProjectFeature::DISABLED)
-
-        features.each do |feature|
-          expect(project.feature_available?(feature.to_sym, user)).to eq(false), "#{feature} failed"
-        end
-      end
-    end
-
-    context 'when features are enabled only for team members' do
-      it "returns false when user is not a team member" do
-        update_all_project_features(project, features, ProjectFeature::PRIVATE)
-
-        features.each do |feature|
-          expect(project.feature_available?(feature.to_sym, user)).to eq(false), "#{feature} failed"
-        end
-      end
-
-      it "returns true when user is a team member" do
-        project.add_developer(user)
-
-        update_all_project_features(project, features, ProjectFeature::PRIVATE)
-
-        features.each do |feature|
-          expect(project.feature_available?(feature.to_sym, user)).to eq(true), "#{feature} failed"
-        end
-      end
-
-      it "returns true when user is a member of project group" do
-        group = create(:group)
-        project = create(:project, namespace: group)
-        group.add_developer(user)
-
-        update_all_project_features(project, features, ProjectFeature::PRIVATE)
-
-        features.each do |feature|
-          expect(project.feature_available?(feature.to_sym, user)).to eq(true), "#{feature} failed"
-        end
-      end
-
-      context 'when admin mode is enabled', :enable_admin_mode do
-        it "returns true if user is an admin" do
-          user.update_attribute(:admin, true)
-
-          update_all_project_features(project, features, ProjectFeature::PRIVATE)
-
-          features.each do |feature|
-            expect(project.feature_available?(feature.to_sym, user)).to eq(true), "#{feature} failed"
-          end
-        end
-      end
-
-      context 'when admin mode is disabled' do
-        it "returns false when user is an admin" do
-          user.update_attribute(:admin, true)
-
-          update_all_project_features(project, features, ProjectFeature::PRIVATE)
-
-          features.each do |feature|
-            expect(project.feature_available?(feature.to_sym, user)).to eq(false), "#{feature} failed"
-          end
-        end
-      end
-    end
-
-    context 'when feature is enabled for everyone' do
-      it "returns true" do
-        expect(project.feature_available?(:issues, user)).to eq(true)
-      end
-    end
-
-    context 'when feature is disabled by a feature flag' do
-      it 'returns false' do
-        stub_feature_flags(issues: false)
-
-        expect(project.feature_available?(:issues, user)).to eq(false)
-      end
-    end
-
-    context 'when feature is enabled by a feature flag' do
-      it 'returns true' do
-        stub_feature_flags(issues: true)
-
-        expect(project.feature_available?(:issues, user)).to eq(true)
-      end
-    end
-  end
-
   context 'repository related features' do
     before do
       project.project_feature.update(
@@ -153,32 +53,6 @@ describe ProjectFeature do
     end
   end
 
-  describe '#*_enabled?' do
-    let(:features) { %w(wiki builds merge_requests) }
-
-    it "returns false when feature is disabled" do
-      update_all_project_features(project, features, ProjectFeature::DISABLED)
-
-      features.each do |feature|
-        expect(project.public_send("#{feature}_enabled?")).to eq(false), "#{feature} failed"
-      end
-    end
-
-    it "returns true when feature is enabled only for team members" do
-      update_all_project_features(project, features, ProjectFeature::PRIVATE)
-
-      features.each do |feature|
-        expect(project.public_send("#{feature}_enabled?")).to eq(true), "#{feature} failed"
-      end
-    end
-
-    it "returns true when feature is enabled for everyone" do
-      features.each do |feature|
-        expect(project.public_send("#{feature}_enabled?")).to eq(true), "#{feature} failed"
-      end
-    end
-  end
-
   describe 'default pages access level' do
     subject { project_feature.pages_access_level }
 
@@ -313,9 +187,4 @@ describe ProjectFeature do
       expect(described_class.required_minimum_access_level_for_private_project(:issues)).to eq(Gitlab::Access::GUEST)
     end
   end
-
-  def update_all_project_features(project, features, value)
-    project_feature_attributes = features.map { |f| ["#{f}_access_level", value] }.to_h
-    project.project_feature.update(project_feature_attributes)
-  end
 end
diff --git a/spec/models/project_group_link_spec.rb b/spec/models/project_group_link_spec.rb
index 9c51180b55b..8ef29e8a876 100644
--- a/spec/models/project_group_link_spec.rb
+++ b/spec/models/project_group_link_spec.rb
@@ -49,22 +49,6 @@ describe ProjectGroupLink do
     end
   end
 
-  describe "destroying a record", :delete do
-    it "refreshes group users' authorized projects" do
-      project     = create(:project, :private)
-      group       = create(:group)
-      reporter    = create(:user)
-      group_users = group.users
-
-      group.add_reporter(reporter)
-      project.project_group_links.create(group: group)
-      group_users.each { |user| expect(user.authorized_projects).to include(project) }
-
-      project.project_group_links.destroy_all # rubocop: disable DestroyAll
-      group_users.each { |user| expect(user.authorized_projects).not_to include(project) }
-    end
-  end
-
   describe 'search by group name' do
     let_it_be(:project_group_link) { create(:project_group_link) }
     let_it_be(:group) { project_group_link.group }
diff --git a/spec/models/project_import_state_spec.rb b/spec/models/project_import_state_spec.rb
index cb34d898a6e..f3b83c036b5 100644
--- a/spec/models/project_import_state_spec.rb
+++ b/spec/models/project_import_state_spec.rb
@@ -57,6 +57,30 @@ describe ProjectImportState, type: :model do
     end
   end
 
+  describe '#mark_as_failed' do
+    let(:error_message) { 'some message' }
+
+    it 'logs error when update column fails' do
+      allow(import_state).to receive(:update_column).and_raise(ActiveRecord::ActiveRecordError)
+
+      expect_next_instance_of(Gitlab::Import::Logger) do |logger|
+        expect(logger).to receive(:error).with(
+          error: 'ActiveRecord::ActiveRecordError',
+          message: 'Error setting import status to failed',
+          original_error: error_message
+        )
+      end
+
+      import_state.mark_as_failed(error_message)
+    end
+
+    it 'updates last_error with error message' do
+      import_state.mark_as_failed(error_message)
+
+      expect(import_state.last_error).to eq(error_message)
+    end
+  end
+
   describe '#human_status_name' do
     context 'when import_state exists' do
       it 'returns the humanized status name' do
diff --git a/spec/models/project_metrics_setting_spec.rb b/spec/models/project_metrics_setting_spec.rb
index 7df01625ba1..adfbbbc3a45 100644
--- a/spec/models/project_metrics_setting_spec.rb
+++ b/spec/models/project_metrics_setting_spec.rb
@@ -44,12 +44,20 @@ describe ProjectMetricsSetting do
       it { is_expected.to be_valid }
     end
 
-    context 'external_dashboard_url is blank' do
-      before do
-        subject.external_dashboard_url = ''
+    context 'dashboard_timezone' do
+      it { is_expected.to define_enum_for(:dashboard_timezone).with_values({ local: 0, utc: 1 }) }
+
+      it 'defaults to local' do
+        expect(subject.dashboard_timezone).to eq('local')
       end
+    end
+  end
 
-      it { is_expected.to be_invalid }
+  describe '#dashboard_timezone=' do
+    it 'downcases string' do
+      subject.dashboard_timezone = 'UTC'
+
+      expect(subject.dashboard_timezone).to eq('utc')
     end
   end
 end
diff --git a/spec/models/project_repository_storage_move_spec.rb b/spec/models/project_repository_storage_move_spec.rb
index 146fc13bee0..83711085c92 100644
--- a/spec/models/project_repository_storage_move_spec.rb
+++ b/spec/models/project_repository_storage_move_spec.rb
@@ -30,25 +30,36 @@ RSpec.describe ProjectRepositoryStorageMove, type: :model do
         expect(subject.errors[:destination_storage_name].first).to match(/is not included in the list/)
       end
     end
+
+    context 'project repository read-only' do
+      subject { build(:project_repository_storage_move, project: project) }
+
+      let(:project) { build(:project, repository_read_only: true) }
+
+      it "does not allow the project to be read-only on create" do
+        expect(subject).not_to be_valid
+        expect(subject.errors[:project].first).to match(/is read only/)
+      end
+    end
   end
 
   describe 'state transitions' do
-    using RSpec::Parameterized::TableSyntax
+    let(:project) { create(:project) }
+
+    before do
+      stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
+    end
 
     context 'when in the default state' do
       subject(:storage_move) { create(:project_repository_storage_move, project: project, destination_storage_name: 'test_second_storage') }
 
-      let(:project) { create(:project) }
-
-      before do
-        stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
-      end
-
       context 'and transits to scheduled' do
         it 'triggers ProjectUpdateRepositoryStorageWorker' do
           expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', storage_move.id)
 
           storage_move.schedule!
+
+          expect(project).to be_repository_read_only
         end
       end
 
@@ -59,5 +70,26 @@ RSpec.describe ProjectRepositoryStorageMove, type: :model do
         end
       end
     end
+
+    context 'when started' do
+      subject(:storage_move) { create(:project_repository_storage_move, :started, project: project, destination_storage_name: 'test_second_storage') }
+
+      context 'and transits to finished' do
+        it 'sets the repository storage and marks the project as writable' do
+          storage_move.finish!
+
+          expect(project.repository_storage).to eq('test_second_storage')
+          expect(project).not_to be_repository_read_only
+        end
+      end
+
+      context 'and transits to failed' do
+        it 'marks the project as writable' do
+          storage_move.do_fail!
+
+          expect(project).not_to be_repository_read_only
+        end
+      end
+    end
   end
 end
diff --git a/spec/models/project_services/chat_message/alert_message_spec.rb b/spec/models/project_services/chat_message/alert_message_spec.rb
new file mode 100644
index 00000000000..a1dd332c005
--- /dev/null
+++ b/spec/models/project_services/chat_message/alert_message_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ChatMessage::AlertMessage do
+  subject { described_class.new(args) }
+
+  let_it_be(:start_time) { Time.current }
+  let(:alert) { create(:alert_management_alert, started_at: start_time) }
+
+  let(:args) do
+    {
+      project_name: 'project_name',
+      project_url: 'http://example.com'
+    }.merge(Gitlab::DataBuilder::Alert.build(alert))
+  end
+
+  describe '#message' do
+    it 'returns the correct message' do
+      expect(subject.message).to eq("Alert firing in #{args[:project_name]}")
+    end
+  end
+
+  describe '#attachments' do
+    it 'returns an array of one' do
+      expect(subject.attachments).to be_a(Array)
+      expect(subject.attachments.size).to eq(1)
+    end
+
+    it 'contains the correct attributes' do
+      attachments_item = subject.attachments.first
+      expect(attachments_item).to have_key(:title)
+      expect(attachments_item).to have_key(:title_link)
+      expect(attachments_item).to have_key(:color)
+      expect(attachments_item).to have_key(:fields)
+    end
+
+    it 'returns the correct color' do
+      expect(subject.attachments.first[:color]).to eq("#C95823")
+    end
+
+    it 'returns the correct attachment fields' do
+      attachments_item = subject.attachments.first
+      fields = attachments_item[:fields].map { |h| h[:title] }
+
+      expect(fields).to match_array(['Severity', 'Events', 'Status', 'Start time'])
+    end
+
+    it 'returns the correctly formatted time' do
+      time_item = subject.attachments.first[:fields].detect { |h| h[:title] == 'Start time' }
+
+      expected_time = start_time.strftime("%B #{start_time.day.ordinalize}, %Y %l:%M%p %Z")
+
+      expect(time_item[:value]).to eq(expected_time)
+    end
+  end
+end
diff --git a/spec/models/project_services/chat_message/merge_message_spec.rb b/spec/models/project_services/chat_message/merge_message_spec.rb
index 150ee6f7472..6063ef4ecb3 100644
--- a/spec/models/project_services/chat_message/merge_message_spec.rb
+++ b/spec/models/project_services/chat_message/merge_message_spec.rb
@@ -52,7 +52,7 @@ describe ChatMessage::MergeMessage do
     context 'open' do
       it 'returns a message regarding opening of merge requests' do
         expect(subject.pretext).to eq(
-          'Test User (test.user) opened <http://somewhere.com/-/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>')
+          'Test User (test.user) opened merge request <http://somewhere.com/-/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>')
         expect(subject.attachments).to be_empty
       end
     end
@@ -63,7 +63,7 @@ describe ChatMessage::MergeMessage do
       end
       it 'returns a message regarding closing of merge requests' do
         expect(subject.pretext).to eq(
-          'Test User (test.user) closed <http://somewhere.com/-/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>')
+          'Test User (test.user) closed merge request <http://somewhere.com/-/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>')
         expect(subject.attachments).to be_empty
       end
     end
@@ -77,7 +77,7 @@ describe ChatMessage::MergeMessage do
     context 'open' do
       it 'returns a message regarding opening of merge requests' do
         expect(subject.pretext).to eq(
-          'Test User (test.user) opened [!100 *Merge Request title*](http://somewhere.com/-/merge_requests/100) in [project_name](http://somewhere.com)')
+          'Test User (test.user) opened merge request [!100 *Merge Request title*](http://somewhere.com/-/merge_requests/100) in [project_name](http://somewhere.com)')
         expect(subject.attachments).to be_empty
         expect(subject.activity).to eq({
           title: 'Merge Request opened by Test User (test.user)',
@@ -95,7 +95,7 @@ describe ChatMessage::MergeMessage do
 
       it 'returns a message regarding closing of merge requests' do
         expect(subject.pretext).to eq(
-          'Test User (test.user) closed [!100 *Merge Request title*](http://somewhere.com/-/merge_requests/100) in [project_name](http://somewhere.com)')
+          'Test User (test.user) closed merge request [!100 *Merge Request title*](http://somewhere.com/-/merge_requests/100) in [project_name](http://somewhere.com)')
         expect(subject.attachments).to be_empty
         expect(subject.activity).to eq({
           title: 'Merge Request closed by Test User (test.user)',
diff --git a/spec/models/project_services/chat_message/pipeline_message_spec.rb b/spec/models/project_services/chat_message/pipeline_message_spec.rb
index 7c3e48f572a..a7171577063 100644
--- a/spec/models/project_services/chat_message/pipeline_message_spec.rb
+++ b/spec/models/project_services/chat_message/pipeline_message_spec.rb
@@ -61,8 +61,8 @@ describe ChatMessage::PipelineMessage do
 
   it "returns the pipeline summary in the activity's title" do
     expect(subject.activity[:title]).to eq(
-      "Pipeline [#123](http://example.gitlab.com/pipelines/123)" \
-        " of branch [develop](http://example.gitlab.com/commits/develop)" \
+      "Pipeline [#123](http://example.gitlab.com/-/pipelines/123)" \
+        " of branch [develop](http://example.gitlab.com/-/commits/develop)" \
         " by The Hacker (hacker) has passed"
     )
   end
@@ -74,8 +74,8 @@ describe ChatMessage::PipelineMessage do
 
     it "returns the summary with a 'failed' status" do
       expect(subject.activity[:title]).to eq(
-        "Pipeline [#123](http://example.gitlab.com/pipelines/123)" \
-          " of branch [develop](http://example.gitlab.com/commits/develop)" \
+        "Pipeline [#123](http://example.gitlab.com/-/pipelines/123)" \
+          " of branch [develop](http://example.gitlab.com/-/commits/develop)" \
           " by The Hacker (hacker) has failed"
       )
     end
@@ -88,8 +88,8 @@ describe ChatMessage::PipelineMessage do
 
     it "returns the summary with a 'passed with warnings' status" do
       expect(subject.activity[:title]).to eq(
-        "Pipeline [#123](http://example.gitlab.com/pipelines/123)" \
-          " of branch [develop](http://example.gitlab.com/commits/develop)" \
+        "Pipeline [#123](http://example.gitlab.com/-/pipelines/123)" \
+          " of branch [develop](http://example.gitlab.com/-/commits/develop)" \
           " by The Hacker (hacker) has passed with warnings"
       )
     end
@@ -102,8 +102,8 @@ describe ChatMessage::PipelineMessage do
 
     it "returns the summary with 'API' as the username" do
       expect(subject.activity[:title]).to eq(
-        "Pipeline [#123](http://example.gitlab.com/pipelines/123)" \
-          " of branch [develop](http://example.gitlab.com/commits/develop)" \
+        "Pipeline [#123](http://example.gitlab.com/-/pipelines/123)" \
+          " of branch [develop](http://example.gitlab.com/-/commits/develop)" \
           " by API has passed"
       )
     end
@@ -134,8 +134,8 @@ describe ChatMessage::PipelineMessage do
   it "returns the pipeline summary as the attachment's fallback property" do
     expect(subject.attachments.first[:fallback]).to eq(
       "<http://example.gitlab.com|project_name>:" \
-        " Pipeline <http://example.gitlab.com/pipelines/123|#123>" \
-        " of branch <http://example.gitlab.com/commits/develop|develop>" \
+        " Pipeline <http://example.gitlab.com/-/pipelines/123|#123>" \
+        " of branch <http://example.gitlab.com/-/commits/develop|develop>" \
         " by The Hacker (hacker) has passed in 02:00:10"
     )
   end
@@ -199,7 +199,7 @@ describe ChatMessage::PipelineMessage do
   end
 
   it "returns the pipeline URL as the attachment's title_link property" do
-    expect(subject.attachments.first[:title_link]).to eq("http://example.gitlab.com/pipelines/123")
+    expect(subject.attachments.first[:title_link]).to eq("http://example.gitlab.com/-/pipelines/123")
   end
 
   it "returns two attachment fields" do
@@ -209,7 +209,7 @@ describe ChatMessage::PipelineMessage do
   it "returns the commit message as the attachment's second field property" do
     expect(subject.attachments.first[:fields][0]).to eq({
       title: "Branch",
-      value: "<http://example.gitlab.com/commits/develop|develop>",
+      value: "<http://example.gitlab.com/-/commits/develop|develop>",
       short: true
     })
   end
@@ -237,7 +237,7 @@ describe ChatMessage::PipelineMessage do
     it "returns the stage name and link to the 'Failed jobs' tab on the pipeline's page as the attachment's third field property" do
       expect(subject.attachments.first[:fields][2]).to eq({
         title: "Failed stage",
-        value: "<http://example.gitlab.com/pipelines/123/failures|test>",
+        value: "<http://example.gitlab.com/-/pipelines/123/failures|test>",
         short: true
       })
     end
@@ -261,7 +261,7 @@ describe ChatMessage::PipelineMessage do
     it "returns the stage names and links to the 'Failed jobs' tab on the pipeline's page as the attachment's third field property" do
       expect(subject.attachments.first[:fields][2]).to eq({
         title: "Failed stages",
-        value: "<http://example.gitlab.com/pipelines/123/failures|stage-2>, <http://example.gitlab.com/pipelines/123/failures|stage-1>, <http://example.gitlab.com/pipelines/123/failures|stage-3>",
+        value: "<http://example.gitlab.com/-/pipelines/123/failures|stage-2>, <http://example.gitlab.com/-/pipelines/123/failures|stage-1>, <http://example.gitlab.com/-/pipelines/123/failures|stage-3>",
         short: true
       })
     end
@@ -271,7 +271,7 @@ describe ChatMessage::PipelineMessage do
         "<http://example.gitlab.com/-/jobs/#{i}|job-#{i}>"
       end
 
-      expected_jobs << "and <http://example.gitlab.com/pipelines/123/failures|15 more>"
+      expected_jobs << "and <http://example.gitlab.com/-/pipelines/123/failures|15 more>"
 
       expect(subject.attachments.first[:fields][3]).to eq({
         title: "Failed jobs",
@@ -369,8 +369,8 @@ describe ChatMessage::PipelineMessage do
     it 'returns the pipeline summary as the attachments in markdown format' do
       expect(subject.attachments).to eq(
         "[project_name](http://example.gitlab.com):" \
-          " Pipeline [#123](http://example.gitlab.com/pipelines/123)" \
-          " of branch [develop](http://example.gitlab.com/commits/develop)" \
+          " Pipeline [#123](http://example.gitlab.com/-/pipelines/123)" \
+          " of branch [develop](http://example.gitlab.com/-/commits/develop)" \
           " by The Hacker (hacker) has passed in 02:00:10"
       )
     end
diff --git a/spec/models/project_services/emails_on_push_service_spec.rb b/spec/models/project_services/emails_on_push_service_spec.rb
index ce1952b503f..44db95afc57 100644
--- a/spec/models/project_services/emails_on_push_service_spec.rb
+++ b/spec/models/project_services/emails_on_push_service_spec.rb
@@ -21,23 +21,25 @@ describe EmailsOnPushService do
     end
   end
 
-  context 'when properties is missing branches_to_be_notified' do
-    subject { described_class.new(properties: {}) }
+  describe '.new' do
+    context 'when properties is missing branches_to_be_notified' do
+      subject { described_class.new(properties: {}) }
 
-    it 'sets the default value to all' do
-      expect(subject.branches_to_be_notified).to eq('all')
+      it 'sets the default value to all' do
+        expect(subject.branches_to_be_notified).to eq('all')
+      end
     end
-  end
 
-  context 'when branches_to_be_notified is already set' do
-    subject { described_class.new(properties: { branches_to_be_notified: 'protected' }) }
+    context 'when branches_to_be_notified is already set' do
+      subject { described_class.new(properties: { branches_to_be_notified: 'protected' }) }
 
-    it 'does not overwrite it with the default value' do
-      expect(subject.branches_to_be_notified).to eq('protected')
+      it 'does not overwrite it with the default value' do
+        expect(subject.branches_to_be_notified).to eq('protected')
+      end
     end
   end
 
-  context 'project emails' do
+  describe '#execute' do
     let(:push_data) { { object_kind: 'push' } }
     let(:project)   { create(:project, :repository) }
     let(:service)   { create(:emails_on_push_service, project: project) }
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index ae6e93cfe3a..c25edf81352 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -327,8 +327,8 @@ describe HipchatService do
           user_name = data[:user][:name]
 
           expect(message).to eq("<a href=\"#{project_url}\">#{project_name}</a>: " \
-            "Pipeline <a href=\"#{project_url}/pipelines/#{pipeline.id}\">##{pipeline.id}</a> " \
-            "of <a href=\"#{project_url}/commits/#{ref}\">#{ref}</a> #{ref_type} " \
+            "Pipeline <a href=\"#{project_url}/-/pipelines/#{pipeline.id}\">##{pipeline.id}</a> " \
+            "of <a href=\"#{project_url}/-/commits/#{ref}\">#{ref}</a> #{ref_type} " \
             "by #{user_name} failed in #{duration} second(s)")
         end
       end
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index a0d36f0a238..20e85f0fd4b 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -688,22 +688,18 @@ describe JiraService do
     context 'when the test fails' do
       it 'returns result with the error' do
         test_url = 'http://jira.example.com/rest/api/2/serverInfo'
+        error_message = 'Some specific failure.'
 
         WebMock.stub_request(:get, test_url).with(basic_auth: [username, password])
-          .to_raise(JIRA::HTTPError.new(double(message: 'Some specific failure.')))
+          .to_raise(JIRA::HTTPError.new(double(message: error_message)))
 
         expect(jira_service).to receive(:log_error).with(
-          "Error sending message",
-          hash_including(
-            client_url: url,
-            error: hash_including(
-              exception_class: 'JIRA::HTTPError',
-              exception_message: 'Some specific failure.'
-            )
-          )
+          'Error sending message',
+          client_url: 'http://jira.example.com',
+          error: error_message
         )
 
-        expect(jira_service.test(nil)).to eq(success: false, result: 'Some specific failure.')
+        expect(jira_service.test(nil)).to eq(success: false, result: error_message)
       end
     end
   end
diff --git a/spec/models/project_services/pipelines_email_service_spec.rb b/spec/models/project_services/pipelines_email_service_spec.rb
index f29414c80c9..de1edf2099a 100644
--- a/spec/models/project_services/pipelines_email_service_spec.rb
+++ b/spec/models/project_services/pipelines_email_service_spec.rb
@@ -37,22 +37,6 @@ describe PipelinesEmailService, :mailer do
     end
   end
 
-  describe '#test_data' do
-    let(:build)   { create(:ci_build) }
-    let(:project) { build.project }
-    let(:user)    { create(:user) }
-
-    before do
-      project.add_developer(user)
-    end
-
-    it 'builds test data' do
-      data = subject.test_data(project, user)
-
-      expect(data[:object_kind]).to eq('pipeline')
-    end
-  end
-
   shared_examples 'sending email' do |branches_to_be_notified: nil|
     before do
       subject.recipients = recipients
diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb
index a85dbe3a7df..db3cbe23ad3 100644
--- a/spec/models/project_services/prometheus_service_spec.rb
+++ b/spec/models/project_services/prometheus_service_spec.rb
@@ -252,6 +252,26 @@ describe PrometheusService, :use_clean_rails_memory_store_caching do
         end
       end
     end
+
+    context 'behind IAP' do
+      let(:manual_configuration) { true }
+
+      before do
+        # dummy private key generated only for this test to pass openssl validation
+        service.google_iap_service_account_json = '{"type":"service_account","private_key":"-----BEGIN RSA PRIVATE KEY-----\nMIIBOAIBAAJAU85LgUY5o6j6j/07GMLCNUcWJOBA1buZnNgKELayA6mSsHrIv31J\nY8kS+9WzGPQninea7DcM4hHA7smMgQD1BwIDAQABAkAqKxMy6PL3tn7dFL43p0ex\nJyOtSmlVIiAZG1t1LXhE/uoLpYi5DnbYqGgu0oih+7nzLY/dXpNpXUmiRMOUEKmB\nAiEAoTi2rBXbrLSi2C+H7M/nTOjMQQDuZ8Wr4uWpKcjYJTMCIQCFEskL565oFl/7\nRRQVH+cARrAsAAoJSbrOBAvYZ0PI3QIgIEFwis10vgEF86rOzxppdIG/G+JL0IdD\n9IluZuXAGPECIGUo7qSaLr75o2VEEgwtAFH5aptIPFjrL5LFCKwtdB4RAiAYZgFV\nHCMmaooAw/eELuMoMWNYmujZ7VaAnOewGDW0uw==\n-----END RSA PRIVATE KEY-----\n"}'
+        service.google_iap_audience_client_id = "IAP_CLIENT_ID.apps.googleusercontent.com"
+
+        stub_request(:post, "https://oauth2.googleapis.com/token").to_return(status: 200, body: '{"id_token": "FOO"}', headers: { 'Content-Type': 'application/json; charset=UTF-8' })
+
+        stub_feature_flags(prometheus_service_iap_auth: true)
+      end
+
+      it 'includes the authorization header' do
+        expect(service.prometheus_client).not_to be_nil
+        expect(service.prometheus_client.send(:options)).to have_key(:headers)
+        expect(service.prometheus_client.send(:options)[:headers]).to eq(authorization: "Bearer FOO")
+      end
+    end
   end
 
   describe '#prometheus_available?' do
@@ -457,9 +477,34 @@ describe PrometheusService, :use_clean_rails_memory_store_caching do
         }
       ]
     end
+    let(:feature_flagged_fields) do
+      [
+        {
+          type: 'text',
+          name: 'google_iap_audience_client_id',
+          title: 'Google IAP Audience Client ID',
+          placeholder: s_('PrometheusService|Client ID of the IAP secured resource (looks like IAP_CLIENT_ID.apps.googleusercontent.com)'),
+          autocomplete: 'off',
+          required: false
+        },
+        {
+          type: 'textarea',
+          name: 'google_iap_service_account_json',
+          title: 'Google IAP Service Account JSON',
+          placeholder: s_('PrometheusService|Contents of the credentials.json file of your service account, like: { "type": "service_account", "project_id": ... }'),
+          required: false
+        }
+      ]
+    end
 
     it 'returns fields' do
+      stub_feature_flags(prometheus_service_iap_auth: false)
       expect(service.fields).to eq(expected_fields)
     end
+
+    it 'returns fields with feature flag on' do
+      stub_feature_flags(prometheus_service_iap_auth: true)
+      expect(service.fields).to eq(expected_fields + feature_flagged_fields)
+    end
   end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 5f8b51c250d..9ec306d297e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -79,6 +79,7 @@ describe Project do
     it { is_expected.to have_many(:ci_refs) }
     it { is_expected.to have_many(:builds) }
     it { is_expected.to have_many(:build_trace_section_names)}
+    it { is_expected.to have_many(:build_report_results) }
     it { is_expected.to have_many(:runner_projects) }
     it { is_expected.to have_many(:runners) }
     it { is_expected.to have_many(:variables) }
@@ -117,6 +118,7 @@ describe Project do
     it { is_expected.to have_many(:jira_imports) }
     it { is_expected.to have_many(:metrics_users_starred_dashboards).inverse_of(:project) }
     it { is_expected.to have_many(:repository_storage_moves) }
+    it { is_expected.to have_many(:reviews).inverse_of(:project) }
 
     it_behaves_like 'model with repository' do
       let_it_be(:container) { create(:project, :repository, path: 'somewhere') }
@@ -181,9 +183,9 @@ describe Project do
         expect(project.pages_metadatum).to be_persisted
       end
 
-      it 'automatically creates a project setting row' do
+      it 'automatically builds a project setting row' do
         expect(project.project_setting).to be_an_instance_of(ProjectSetting)
-        expect(project.project_setting).to be_persisted
+        expect(project.project_setting).to be_new_record
       end
     end
 
@@ -770,7 +772,7 @@ describe Project do
 
     describe 'last_activity_date' do
       it 'returns the creation date of the project\'s last event if present' do
-        new_event = create(:event, :closed, project: project, created_at: Time.now)
+        new_event = create(:event, :closed, project: project, created_at: Time.current)
 
         project.reload
         expect(project.last_activity_at.to_i).to eq(new_event.created_at.to_i)
@@ -2836,48 +2838,6 @@ describe Project do
     end
   end
 
-  describe '#change_repository_storage' do
-    let(:project) { create(:project, :repository) }
-    let(:read_only_project) { create(:project, :repository, repository_read_only: true) }
-
-    before do
-      stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
-    end
-
-    it 'schedules the transfer of the repository to the new storage and locks the project' do
-      expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', anything)
-
-      project.change_repository_storage('test_second_storage')
-      project.save!
-
-      expect(project).to be_repository_read_only
-      expect(project.repository_storage_moves.last).to have_attributes(
-        source_storage_name: "default",
-        destination_storage_name: "test_second_storage"
-      )
-    end
-
-    it "doesn't schedule the transfer if the repository is already read-only" do
-      expect(ProjectUpdateRepositoryStorageWorker).not_to receive(:perform_async)
-
-      read_only_project.change_repository_storage('test_second_storage')
-      read_only_project.save!
-    end
-
-    it "doesn't lock or schedule the transfer if the storage hasn't changed" do
-      expect(ProjectUpdateRepositoryStorageWorker).not_to receive(:perform_async)
-
-      project.change_repository_storage(project.repository_storage)
-      project.save!
-
-      expect(project).not_to be_repository_read_only
-    end
-
-    it 'throws an error if an invalid repository storage is provided' do
-      expect { project.change_repository_storage('unknown') }.to raise_error(ArgumentError)
-    end
-  end
-
   describe '#pushes_since_gc' do
     let(:project) { create(:project) }
 
@@ -3620,7 +3580,7 @@ describe Project do
       expect(project).not_to receive(:visibility_level_allowed_as_fork).and_call_original
       expect(project).not_to receive(:visibility_level_allowed_by_group).and_call_original
 
-      project.update(updated_at: Time.now)
+      project.update(updated_at: Time.current)
     end
   end
 
@@ -3766,7 +3726,7 @@ describe Project do
       context 'when feature is private' do
         let(:project) { create(:project, :public, :merge_requests_private) }
 
-        context 'when user does not has access to the feature' do
+        context 'when user does not have access to the feature' do
           it 'does not return projects with the project feature private' do
             is_expected.not_to include(project)
           end
@@ -4302,8 +4262,7 @@ describe Project do
 
   describe '#auto_devops_enabled?' do
     before do
-      allow(Feature).to receive(:enabled?).and_call_original
-      Feature.get(:force_autodevops_on_by_default).enable_percentage_of_actors(0)
+      Feature.enable_percentage_of_actors(:force_autodevops_on_by_default, 0)
     end
 
     let_it_be(:project, reload: true) { create(:project) }
@@ -4505,8 +4464,7 @@ describe Project do
     let_it_be(:project, reload: true) { create(:project) }
 
     before do
-      allow(Feature).to receive(:enabled?).and_call_original
-      Feature.get(:force_autodevops_on_by_default).enable_percentage_of_actors(0)
+      Feature.enable_percentage_of_actors(:force_autodevops_on_by_default, 0)
     end
 
     context 'when explicitly disabled' do
@@ -4552,7 +4510,7 @@ describe Project do
         before do
           create(:project_auto_devops, project: project, enabled: false)
 
-          Feature.get(:force_autodevops_on_by_default).enable_percentage_of_actors(100)
+          Feature.enable_percentage_of_actors(:force_autodevops_on_by_default, 100)
         end
 
         it 'does not have auto devops implicitly disabled' do
@@ -4854,6 +4812,32 @@ describe Project do
     end
   end
 
+  describe '#execute_services' do
+    let(:service) { create(:slack_service, push_events: true, merge_requests_events: false, active: true) }
+
+    it 'executes services with the specified scope' do
+      data = 'any data'
+
+      expect(SlackService).to receive(:allocate).and_wrap_original do |method|
+        method.call.tap do |instance|
+          expect(instance).to receive(:async_execute).with(data).once
+        end
+      end
+
+      service.project.execute_services(data, :push_hooks)
+    end
+
+    it 'does not execute services that don\'t match the specified scope' do
+      expect(SlackService).not_to receive(:allocate).and_wrap_original do |method|
+        method.call.tap do |instance|
+          expect(instance).not_to receive(:async_execute)
+        end
+      end
+
+      service.project.execute_services(anything, :merge_request_hooks)
+    end
+  end
+
   describe '#has_active_hooks?' do
     let_it_be(:project) { create(:project) }
 
@@ -5241,25 +5225,21 @@ describe Project do
     end
   end
 
-  describe "#find_or_initialize_services" do
-    subject { build(:project) }
-
+  describe '#find_or_initialize_services' do
     it 'returns only enabled services' do
-      allow(Service).to receive(:available_services_names).and_return(%w(prometheus pushover))
-      allow(subject).to receive(:disabled_services).and_return(%w(prometheus))
+      allow(Service).to receive(:available_services_names).and_return(%w[prometheus pushover teamcity])
+      allow(subject).to receive(:disabled_services).and_return(%w[prometheus])
 
       services = subject.find_or_initialize_services
 
-      expect(services.count).to eq 1
-      expect(services).to include(PushoverService)
+      expect(services.count).to eq(2)
+      expect(services.map(&:title)).to eq(['JetBrains TeamCity CI', 'Pushover'])
     end
   end
 
-  describe "#find_or_initialize_service" do
-    subject { build(:project) }
-
+  describe '#find_or_initialize_service' do
     it 'avoids N+1 database queries' do
-      allow(Service).to receive(:available_services_names).and_return(%w(prometheus pushover))
+      allow(Service).to receive(:available_services_names).and_return(%w[prometheus pushover])
 
       control_count = ActiveRecord::QueryRecorder.new { subject.find_or_initialize_service('prometheus') }.count
 
@@ -5268,11 +5248,51 @@ describe Project do
       expect { subject.find_or_initialize_service('prometheus') }.not_to exceed_query_limit(control_count)
     end
 
-    it 'returns nil if service is disabled' do
-      allow(subject).to receive(:disabled_services).and_return(%w(prometheus))
+    it 'returns nil if integration is disabled' do
+      allow(subject).to receive(:disabled_services).and_return(%w[prometheus])
 
       expect(subject.find_or_initialize_service('prometheus')).to be_nil
     end
+
+    context 'with an existing integration' do
+      subject { create(:project) }
+
+      before do
+        create(:prometheus_service, project: subject, api_url: 'https://prometheus.project.com/')
+      end
+
+      it 'retrieves the integration' do
+        expect(subject.find_or_initialize_service('prometheus').api_url).to eq('https://prometheus.project.com/')
+      end
+    end
+
+    context 'with an instance-level and template integrations' do
+      before do
+        create(:prometheus_service, :instance, api_url: 'https://prometheus.instance.com/')
+        create(:prometheus_service, :template, api_url: 'https://prometheus.template.com/')
+      end
+
+      it 'builds the service from the instance if exists' do
+        expect(subject.find_or_initialize_service('prometheus').api_url).to eq('https://prometheus.instance.com/')
+      end
+    end
+
+    context 'with an instance-level and template integrations' do
+      before do
+        create(:prometheus_service, :template, api_url: 'https://prometheus.template.com/')
+      end
+
+      it 'builds the service from the template if instance does not exists' do
+        expect(subject.find_or_initialize_service('prometheus').api_url).to eq('https://prometheus.template.com/')
+      end
+    end
+
+    context 'without an exisiting integration, nor instance-level or template' do
+      it 'builds the service if instance or template does not exists' do
+        expect(subject.find_or_initialize_service('prometheus')).to be_a(PrometheusService)
+        expect(subject.find_or_initialize_service('prometheus').api_url).to be_nil
+      end
+    end
   end
 
   describe '.for_group' do
@@ -6005,119 +6025,6 @@ describe Project do
     end
   end
 
-  describe '#validate_jira_import_settings!' do
-    include JiraServiceHelper
-
-    let_it_be(:project, reload: true) { create(:project) }
-
-    shared_examples 'raise Jira import error' do |message|
-      it 'returns error' do
-        expect { subject }.to raise_error(Projects::ImportService::Error, message)
-      end
-    end
-
-    shared_examples 'jira configuration base checks' do
-      context 'when feature flag is disabled' do
-        before do
-          stub_feature_flags(jira_issue_import: false)
-        end
-
-        it_behaves_like 'raise Jira import error', 'Jira import feature is disabled.'
-      end
-
-      context 'when feature flag is enabled' do
-        before do
-          stub_feature_flags(jira_issue_import: true)
-        end
-
-        context 'when Jira service was not setup' do
-          it_behaves_like 'raise Jira import error', 'Jira integration not configured.'
-        end
-
-        context 'when Jira service exists' do
-          let!(:jira_service) { create(:jira_service, project: project, active: true) }
-
-          context 'when Jira connection is not valid' do
-            before do
-              WebMock.stub_request(:get, 'https://jira.example.com/rest/api/2/serverInfo')
-                .to_raise(JIRA::HTTPError.new(double(message: 'Some failure.')))
-            end
-
-            it_behaves_like 'raise Jira import error', 'Unable to connect to the Jira instance. Please check your Jira integration configuration.'
-          end
-        end
-      end
-    end
-
-    before do
-      stub_jira_service_test
-    end
-
-    context 'without user param' do
-      subject { project.validate_jira_import_settings! }
-
-      it_behaves_like 'jira configuration base checks'
-
-      context 'when jira connection is valid' do
-        let!(:jira_service) { create(:jira_service, project: project, active: true) }
-
-        it 'does not return any error' do
-          expect { subject }.not_to raise_error
-        end
-      end
-    end
-
-    context 'with user param provided' do
-      let_it_be(:user) { create(:user) }
-
-      subject { project.validate_jira_import_settings!(user: user) }
-
-      context 'when user has permission to run import' do
-        before do
-          project.add_maintainer(user)
-        end
-
-        it_behaves_like 'jira configuration base checks'
-      end
-
-      context 'when feature flag is enabled' do
-        before do
-          stub_feature_flags(jira_issue_import: true)
-        end
-
-        context 'when user does not have permissions to run the import' do
-          before do
-            create(:jira_service, project: project, active: true)
-
-            project.add_developer(user)
-          end
-
-          it_behaves_like 'raise Jira import error', 'You do not have permissions to run the import.'
-        end
-
-        context 'when user has permission to run import' do
-          before do
-            project.add_maintainer(user)
-          end
-
-          let!(:jira_service) { create(:jira_service, project: project, active: true) }
-
-          context 'when issues feature is disabled' do
-            let_it_be(:project, reload: true) { create(:project, :issues_disabled) }
-
-            it_behaves_like 'raise Jira import error', 'Cannot import because issues are not available in this project.'
-          end
-
-          context 'when everything is ok' do
-            it 'does not return any error' do
-              expect { subject }.not_to raise_error
-            end
-          end
-        end
-      end
-    end
-  end
-
   describe '#design_management_enabled?' do
     let(:project) { build(:project) }
 
@@ -6157,6 +6064,14 @@ describe Project do
     it { is_expected.not_to include(user) }
   end
 
+  describe "#metrics_setting" do
+    let(:project) { build(:project) }
+
+    it 'creates setting if it does not exist' do
+      expect(project.metrics_setting).to be_an_instance_of(ProjectMetricsSetting)
+    end
+  end
+
   def finish_job(export_job)
     export_job.start
     export_job.finish
diff --git a/spec/models/project_team_spec.rb b/spec/models/project_team_spec.rb
index d62fa58739a..24652a1d706 100644
--- a/spec/models/project_team_spec.rb
+++ b/spec/models/project_team_spec.rb
@@ -96,11 +96,9 @@ describe ProjectTeam do
 
       it 'returns invited members of a group' do
         group_member = create(:group_member)
-
-        project.project_group_links.create!(
-          group: group_member.group,
-          group_access: Gitlab::Access::GUEST
-        )
+        create(:project_group_link, group: group_member.group,
+                                    project: project,
+                                    group_access: Gitlab::Access::GUEST)
 
         expect(project.team.members)
           .to contain_exactly(group_member.user, project.owner)
@@ -108,11 +106,9 @@ describe ProjectTeam do
 
       it 'returns invited members of a group of a specified level' do
         group_member = create(:group_member)
-
-        project.project_group_links.create!(
-          group: group_member.group,
-          group_access: Gitlab::Access::REPORTER
-        )
+        create(:project_group_link, group: group_member.group,
+                                    project: project,
+                                    group_access: Gitlab::Access::REPORTER)
 
         expect(project.team.guests).to be_empty
         expect(project.team.reporters).to contain_exactly(group_member.user)
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index a4181e3be9a..aff2b248642 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -27,8 +27,8 @@ describe ProjectWiki do
         subject.create_page('Test Page', 'This is content')
         wiki_container.reload
 
-        expect(wiki_container.last_activity_at).to be_within(1.minute).of(Time.now)
-        expect(wiki_container.last_repository_updated_at).to be_within(1.minute).of(Time.now)
+        expect(wiki_container.last_activity_at).to be_within(1.minute).of(Time.current)
+        expect(wiki_container.last_repository_updated_at).to be_within(1.minute).of(Time.current)
       end
     end
   end
diff --git a/spec/models/prometheus_alert_event_spec.rb b/spec/models/prometheus_alert_event_spec.rb
index 040113643dd..85e57cb08c3 100644
--- a/spec/models/prometheus_alert_event_spec.rb
+++ b/spec/models/prometheus_alert_event_spec.rb
@@ -49,7 +49,7 @@ describe PrometheusAlertEvent do
 
   describe 'transaction' do
     describe 'fire' do
-      let(:started_at) { Time.now }
+      let(:started_at) { Time.current }
 
       context 'when status is none' do
         subject { build(:prometheus_alert_event, :none) }
@@ -75,7 +75,7 @@ describe PrometheusAlertEvent do
     end
 
     describe 'resolve' do
-      let(:ended_at) { Time.now }
+      let(:ended_at) { Time.current }
 
       context 'when firing' do
         subject { build(:prometheus_alert_event) }
diff --git a/spec/models/push_event_spec.rb b/spec/models/push_event_spec.rb
index 8682e1c797b..5c1802669c1 100644
--- a/spec/models/push_event_spec.rb
+++ b/spec/models/push_event_spec.rb
@@ -118,8 +118,8 @@ describe PushEvent do
   end
 
   describe '.sti_name' do
-    it 'returns Event::PUSHED' do
-      expect(described_class.sti_name).to eq(Event::PUSHED)
+    it 'returns the integer representation of the :pushed event action' do
+      expect(described_class.sti_name).to eq(Event.actions[:pushed])
     end
   end
 
@@ -299,7 +299,7 @@ describe PushEvent do
 
   describe '#validate_push_action' do
     it 'adds an error when the action is not PUSHED' do
-      event.action = Event::CREATED
+      event.action = :created
       event.validate_push_action
 
       expect(event.errors.count).to eq(1)
diff --git a/spec/models/release_spec.rb b/spec/models/release_spec.rb
index d72fd137f3f..716e7dc786e 100644
--- a/spec/models/release_spec.rb
+++ b/spec/models/release_spec.rb
@@ -94,14 +94,6 @@ RSpec.describe Release do
   describe 'evidence' do
     let(:release_with_evidence) { create(:release, :with_evidence, project: project) }
 
-    describe '#create_evidence!' do
-      context 'when a release is created' do
-        it 'creates one Evidence object too' do
-          expect { release_with_evidence }.to change(Releases::Evidence, :count).by(1)
-        end
-      end
-    end
-
     context 'when a release is deleted' do
       it 'also deletes the associated evidence' do
         release_with_evidence
diff --git a/spec/models/releases/evidence_spec.rb b/spec/models/releases/evidence_spec.rb
index d38d2021117..927e2e9bbe6 100644
--- a/spec/models/releases/evidence_spec.rb
+++ b/spec/models/releases/evidence_spec.rb
@@ -5,83 +5,21 @@ require 'spec_helper'
 describe Releases::Evidence do
   let_it_be(:project) { create(:project) }
   let(:release) { create(:release, project: project) }
-  let(:schema_file) { 'evidences/evidence' }
-  let(:summary_json) { described_class.last.summary.to_json }
 
   describe 'associations' do
     it { is_expected.to belong_to(:release) }
   end
 
-  describe 'summary_sha' do
-    it 'returns nil if summary is nil' do
-      expect(build(:evidence, summary: nil).summary_sha).to be_nil
-    end
-  end
-
-  describe '#generate_summary_and_sha' do
-    before do
-      described_class.create!(release: release)
-    end
-
-    context 'when a release name is not provided' do
-      let(:release) { create(:release, project: project, name: nil) }
-
-      it 'creates a valid JSON object' do
-        expect(release.name).to eq(release.tag)
-        expect(summary_json).to match_schema(schema_file)
-      end
-    end
-
-    context 'when a release is associated to a milestone' do
-      let(:milestone) { create(:milestone, project: project) }
-      let(:release) { create(:release, project: project, milestones: [milestone]) }
-
-      context 'when a milestone has no issue associated with it' do
-        it 'creates a valid JSON object' do
-          expect(milestone.issues).to be_empty
-          expect(summary_json).to match_schema(schema_file)
-        end
-      end
-
-      context 'when a milestone has no description' do
-        let(:milestone) { create(:milestone, project: project, description: nil) }
-
-        it 'creates a valid JSON object' do
-          expect(milestone.description).to be_nil
-          expect(summary_json).to match_schema(schema_file)
-        end
-      end
-
-      context 'when a milestone has no due_date' do
-        let(:milestone) { create(:milestone, project: project, due_date: nil) }
-
-        it 'creates a valid JSON object' do
-          expect(milestone.due_date).to be_nil
-          expect(summary_json).to match_schema(schema_file)
-        end
-      end
-
-      context 'when a milestone has an issue' do
-        context 'when the issue has no description' do
-          let(:issue) { create(:issue, project: project, description: nil, state: 'closed') }
-
-          before do
-            milestone.issues << issue
-          end
+  it 'filters out issues from summary json' do
+    milestone = create(:milestone, project: project, due_date: nil)
+    issue = create(:issue, project: project, description: nil, state: 'closed')
+    milestone.issues << issue
+    release.milestones << milestone
 
-          it 'creates a valid JSON object' do
-            expect(milestone.issues.first.description).to be_nil
-            expect(summary_json).to match_schema(schema_file)
-          end
-        end
-      end
-    end
+    ::Releases::CreateEvidenceService.new(release).execute
+    evidence = release.evidences.last
 
-    context 'when a release is not associated to any milestone' do
-      it 'creates a valid JSON object' do
-        expect(release.milestones).to be_empty
-        expect(summary_json).to match_schema(schema_file)
-      end
-    end
+    expect(evidence.read_attribute(:summary)["release"]["milestones"].first["issues"].first["title"]).to be_present
+    expect(evidence.summary["release"]["milestones"].first["issues"]).to be_nil
   end
 end
diff --git a/spec/models/remote_mirror_spec.rb b/spec/models/remote_mirror_spec.rb
index a87cdcf9344..6d163a16e63 100644
--- a/spec/models/remote_mirror_spec.rb
+++ b/spec/models/remote_mirror_spec.rb
@@ -306,7 +306,7 @@ describe RemoteMirror, :mailer do
 
         context 'when it did not update in the last minute' do
           it 'schedules a RepositoryUpdateRemoteMirrorWorker to run now' do
-            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.now)
+            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.current)
 
             remote_mirror.sync
           end
@@ -314,9 +314,9 @@ describe RemoteMirror, :mailer do
 
         context 'when it did update in the last minute' do
           it 'schedules a RepositoryUpdateRemoteMirrorWorker to run in the next minute' do
-            remote_mirror.last_update_started_at = Time.now - 30.seconds
+            remote_mirror.last_update_started_at = Time.current - 30.seconds
 
-            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::PROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.now)
+            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::PROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.current)
 
             remote_mirror.sync
           end
@@ -330,7 +330,7 @@ describe RemoteMirror, :mailer do
 
         context 'when it did not update in the last 5 minutes' do
           it 'schedules a RepositoryUpdateRemoteMirrorWorker to run now' do
-            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.now)
+            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.current)
 
             remote_mirror.sync
           end
@@ -338,9 +338,9 @@ describe RemoteMirror, :mailer do
 
         context 'when it did update within the last 5 minutes' do
           it 'schedules a RepositoryUpdateRemoteMirrorWorker to run in the next 5 minutes' do
-            remote_mirror.last_update_started_at = Time.now - 30.seconds
+            remote_mirror.last_update_started_at = Time.current - 30.seconds
 
-            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::UNPROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.now)
+            expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::UNPROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.current)
 
             remote_mirror.sync
           end
@@ -377,9 +377,9 @@ describe RemoteMirror, :mailer do
     let(:remote_mirror) { create(:project, :repository, :remote_mirror).remote_mirrors.first }
 
     it 'resets all the columns when URL changes' do
-      remote_mirror.update(last_error: Time.now,
-                           last_update_at: Time.now,
-                           last_successful_update_at: Time.now,
+      remote_mirror.update(last_error: Time.current,
+                           last_update_at: Time.current,
+                           last_successful_update_at: Time.current,
                            update_status: 'started',
                            error_notification_sent: true)
 
@@ -394,14 +394,14 @@ describe RemoteMirror, :mailer do
 
   describe '#updated_since?' do
     let(:remote_mirror) { create(:project, :repository, :remote_mirror).remote_mirrors.first }
-    let(:timestamp) { Time.now - 5.minutes }
+    let(:timestamp) { Time.current - 5.minutes }
 
     around do |example|
       Timecop.freeze { example.run }
     end
 
     before do
-      remote_mirror.update(last_update_started_at: Time.now)
+      remote_mirror.update(last_update_started_at: Time.current)
     end
 
     context 'when remote mirror does not have status failed' do
@@ -410,7 +410,7 @@ describe RemoteMirror, :mailer do
       end
 
       it 'returns false when last update started before the timestamp' do
-        expect(remote_mirror.updated_since?(Time.now + 5.minutes)).to be false
+        expect(remote_mirror.updated_since?(Time.current + 5.minutes)).to be false
       end
     end
 
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index be626dd6e32..c698b40a4c0 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -88,8 +88,8 @@ describe Repository do
         subject { repository.tags_sorted_by('updated_desc').map(&:name) }
 
         before do
-          double_first = double(committed_date: Time.now)
-          double_last = double(committed_date: Time.now - 1.second)
+          double_first = double(committed_date: Time.current)
+          double_last = double(committed_date: Time.current - 1.second)
 
           allow(tag_a).to receive(:dereferenced_target).and_return(double_first)
           allow(tag_b).to receive(:dereferenced_target).and_return(double_last)
@@ -103,8 +103,8 @@ describe Repository do
         subject { repository.tags_sorted_by('updated_asc').map(&:name) }
 
         before do
-          double_first = double(committed_date: Time.now - 1.second)
-          double_last = double(committed_date: Time.now)
+          double_first = double(committed_date: Time.current - 1.second)
+          double_last = double(committed_date: Time.current)
 
           allow(tag_a).to receive(:dereferenced_target).and_return(double_last)
           allow(tag_b).to receive(:dereferenced_target).and_return(double_first)
@@ -125,8 +125,8 @@ describe Repository do
 
           rugged_repo(repository).tags.create(annotated_tag_name, 'a48e4fc218069f68ef2e769dd8dfea3991362175', options)
 
-          double_first = double(committed_date: Time.now - 1.second)
-          double_last = double(committed_date: Time.now)
+          double_first = double(committed_date: Time.current - 1.second)
+          double_last = double(committed_date: Time.current)
 
           allow(tag_a).to receive(:dereferenced_target).and_return(double_last)
           allow(tag_b).to receive(:dereferenced_target).and_return(double_first)
@@ -227,7 +227,7 @@ describe Repository do
         tree_builder = Rugged::Tree::Builder.new(rugged)
         tree_builder.insert({ oid: blob_id, name: "hello\x80world", filemode: 0100644 })
         tree_id = tree_builder.write
-        user = { email: "jcai@gitlab.com", time: Time.now, name: "John Cai" }
+        user = { email: "jcai@gitlab.com", time: Time.current.to_time, name: "John Cai" }
 
         Rugged::Commit.create(rugged, message: 'some commit message', parents: [rugged.head.target.oid], tree: tree_id, committer: user, author: user)
       end
@@ -974,7 +974,7 @@ describe Repository do
       end
 
       it 'returns nil' do
-        expect(Rails.logger).to receive(:info).with("Remove remote job failed to create for #{project.id} with remote name joe.")
+        expect(Gitlab::AppLogger).to receive(:info).with("Remove remote job failed to create for #{project.id} with remote name joe.")
 
         expect(repository.async_remove_remote('joe')).to be_nil
       end
@@ -1446,17 +1446,13 @@ describe Repository do
     let(:empty_repository) { create(:project_empty_repo).repository }
 
     it 'returns empty array for an empty repository' do
-      # rubocop:disable Style/WordArray
-      expect(empty_repository.blobs_at(['master', 'foobar'])).to eq([])
-      # rubocop:enable Style/WordArray
+      expect(empty_repository.blobs_at(%w[master foobar])).to eq([])
     end
 
     it 'returns blob array for a non-empty repository' do
       repository.create_file(User.last, 'foobar', 'CONTENT', message: 'message', branch_name: 'master')
 
-      # rubocop:disable Style/WordArray
-      blobs = repository.blobs_at([['master', 'foobar']])
-      # rubocop:enable Style/WordArray
+      blobs = repository.blobs_at([%w[master foobar]])
 
       expect(blobs.first.name).to eq('foobar')
       expect(blobs.size).to eq(1)
diff --git a/spec/models/resource_label_event_spec.rb b/spec/models/resource_label_event_spec.rb
index a1a2150f461..6a235d3aa17 100644
--- a/spec/models/resource_label_event_spec.rb
+++ b/spec/models/resource_label_event_spec.rb
@@ -96,4 +96,48 @@ RSpec.describe ResourceLabelEvent, type: :model do
       expect(subject.outdated_markdown?).to be false
     end
   end
+
+  describe '.visible_to_user?' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:issue_project) { create(:project) }
+    let_it_be(:issue) { create(:issue, project: issue_project) }
+
+    subject { described_class.visible_to_user?(user, issue.resource_label_events.inc_relations) }
+
+    it 'returns events with labels accessible by user' do
+      label = create(:label, project: issue_project)
+      event = create_event(label)
+      issue_project.add_guest(user)
+
+      expect(subject).to eq [event]
+    end
+
+    it 'filters events with public project labels if issues and MRs are private' do
+      project = create(:project, :public, :issues_private, :merge_requests_private)
+      label = create(:label, project: project)
+      create_event(label)
+
+      expect(subject).to be_empty
+    end
+
+    it 'filters events with project labels not accessible by user' do
+      project = create(:project, :private)
+      label = create(:label, project: project)
+      create_event(label)
+
+      expect(subject).to be_empty
+    end
+
+    it 'filters events with group labels not accessible by user' do
+      group = create(:group, :private)
+      label = create(:group_label, group: group)
+      create_event(label)
+
+      expect(subject).to be_empty
+    end
+
+    def create_event(label)
+      create(:resource_label_event, issue: issue, label: label)
+    end
+  end
 end
diff --git a/spec/models/resource_milestone_event_spec.rb b/spec/models/resource_milestone_event_spec.rb
index 3f8d8b4c1df..66686ec77d0 100644
--- a/spec/models/resource_milestone_event_spec.rb
+++ b/spec/models/resource_milestone_event_spec.rb
@@ -95,4 +95,34 @@ describe ResourceMilestoneEvent, type: :model do
       end
     end
   end
+
+  describe '#milestone_parent' do
+    let_it_be(:project) { create(:project) }
+    let_it_be(:group) { create(:group) }
+
+    let(:milestone) { create(:milestone, project: project) }
+    let(:event) { create(:resource_milestone_event, milestone: milestone) }
+
+    context 'when milestone parent is project' do
+      it 'returns the expected parent' do
+        expect(event.milestone_parent).to eq(project)
+      end
+    end
+
+    context 'when milestone parent is group' do
+      let(:milestone) { create(:milestone, group: group) }
+
+      it 'returns the expected parent' do
+        expect(event.milestone_parent).to eq(group)
+      end
+    end
+
+    context 'when milestone is nil' do
+      let(:event) { create(:resource_milestone_event, milestone: nil) }
+
+      it 'returns nil' do
+        expect(event.milestone_parent).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/models/review_spec.rb b/spec/models/review_spec.rb
new file mode 100644
index 00000000000..9dd8b90feee
--- /dev/null
+++ b/spec/models/review_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Review do
+  describe 'associations' do
+    it { is_expected.to belong_to(:author).class_name('User').with_foreign_key(:author_id).inverse_of(:reviews) }
+    it { is_expected.to belong_to(:merge_request).inverse_of(:reviews).touch(false) }
+    it { is_expected.to belong_to(:project).inverse_of(:reviews) }
+
+    it { is_expected.to have_many(:notes).order(:id).inverse_of(:review) }
+  end
+
+  describe 'modules' do
+    it { is_expected.to include_module(Participable) }
+    it { is_expected.to include_module(Mentionable) }
+  end
+
+  describe '#all_references' do
+    it 'returns an extractor with the correct referenced users' do
+      user1 = create(:user, username: "foo")
+      user2 = create(:user, username: "bar")
+      review = create(:review)
+      project = review.project
+      author = review.author
+
+      create(:note, review: review, project: project, author: author, note: "cc @foo @non_existent")
+      create(:note, review: review, project: project, author: author, note: "cc @bar")
+
+      expect(review.all_references(author).users).to match_array([user1, user2])
+    end
+  end
+
+  describe '#participants' do
+    it 'includes the review author' do
+      project = create(:project, :public)
+      merge_request = create(:merge_request, source_project: project)
+      review = create(:review, project: project, merge_request: merge_request)
+      create(:note, review: review, noteable: merge_request, project: project, author: review.author)
+
+      expect(review.participants).to include(review.author)
+    end
+  end
+end
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 106f8def42d..8698a6cf3d3 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -114,6 +114,20 @@ describe Service do
         expect(described_class.confidential_note_hooks.count).to eq 0
       end
     end
+
+    describe '.alert_hooks' do
+      it 'includes services where alert_events is true' do
+        create(:service, active: true, alert_events: true)
+
+        expect(described_class.alert_hooks.count).to eq 1
+      end
+
+      it 'excludes services where alert_events is false' do
+        create(:service, active: true, alert_events: false)
+
+        expect(described_class.alert_hooks.count).to eq 0
+      end
+    end
   end
 
   describe "Test Button" do
@@ -264,20 +278,32 @@ describe Service do
       end
     end
 
-    describe '.build_from_template' do
-      context 'when template is invalid' do
-        it 'sets service template to inactive when template is invalid' do
-          template = build(:prometheus_service, template: true, active: true, properties: {})
-          template.save(validate: false)
+    describe '.build_from_integration' do
+      context 'when integration is invalid' do
+        let(:integration) do
+          build(:prometheus_service, :template, active: true, properties: {})
+            .tap { |integration| integration.save(validate: false) }
+        end
 
-          service = described_class.build_from_template(project.id, template)
+        it 'sets service to inactive' do
+          service = described_class.build_from_integration(project.id, integration)
 
           expect(service).to be_valid
           expect(service.active).to be false
         end
       end
 
-      describe 'build issue tracker from a template' do
+      context 'when integration is an instance' do
+        let(:integration) { create(:jira_service, :instance) }
+
+        it 'sets inherit_from_id from integration' do
+          service = described_class.build_from_integration(project.id, integration)
+
+          expect(service.inherit_from_id).to eq(integration.id)
+        end
+      end
+
+      describe 'build issue tracker from an integration' do
         let(:title) { 'custom title' }
         let(:description) { 'custom description' }
         let(:url) { 'http://jira.example.com' }
@@ -291,9 +317,9 @@ describe Service do
           }
         end
 
-        shared_examples 'service creation from a template' do
+        shared_examples 'service creation from an integration' do
           it 'creates a correct service' do
-            service = described_class.build_from_template(project.id, template)
+            service = described_class.build_from_integration(project.id, integration)
 
             expect(service).to be_active
             expect(service.title).to eq(title)
@@ -302,36 +328,38 @@ describe Service do
             expect(service.api_url).to eq(api_url)
             expect(service.username).to eq(username)
             expect(service.password).to eq(password)
+            expect(service.template).to eq(false)
+            expect(service.instance).to eq(false)
           end
         end
 
         # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
         context 'when data are stored in properties' do
           let(:properties) { data_params.merge(title: title, description: description) }
-          let!(:template) do
+          let!(:integration) do
             create(:jira_service, :without_properties_callback, template: true, properties: properties.merge(additional: 'something'))
           end
 
-          it_behaves_like 'service creation from a template'
+          it_behaves_like 'service creation from an integration'
         end
 
         context 'when data are stored in separated fields' do
-          let(:template) do
+          let(:integration) do
             create(:jira_service, :template, data_params.merge(properties: {}, title: title, description: description))
           end
 
-          it_behaves_like 'service creation from a template'
+          it_behaves_like 'service creation from an integration'
         end
 
         context 'when data are stored in both properties and separated fields' do
           let(:properties) { data_params.merge(title: title, description: description) }
-          let(:template) do
+          let(:integration) do
             create(:jira_service, :without_properties_callback, active: true, template: true, properties: properties).tap do |service|
               create(:jira_tracker_data, data_params.merge(service: service))
             end
           end
 
-          it_behaves_like 'service creation from a template'
+          it_behaves_like 'service creation from an integration'
         end
       end
     end
diff --git a/spec/models/snippet_input_action_collection_spec.rb b/spec/models/snippet_input_action_collection_spec.rb
new file mode 100644
index 00000000000..ef18ab5a810
--- /dev/null
+++ b/spec/models/snippet_input_action_collection_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe SnippetInputActionCollection do
+  let(:action_name)    { 'create' }
+  let(:action)         { { action: action_name, file_path: 'foo', content: 'bar', previous_path: 'foobar' } }
+  let(:data)           { [action, action] }
+
+  it { is_expected.to delegate_method(:empty?).to(:actions) }
+  it { is_expected.to delegate_method(:any?).to(:actions) }
+  it { is_expected.to delegate_method(:[]).to(:actions) }
+
+  describe '#to_commit_actions' do
+    subject { described_class.new(data).to_commit_actions}
+
+    it 'translates all actions to commit actions' do
+      transformed_action = action.merge(action: action_name.to_sym)
+
+      expect(subject).to eq [transformed_action, transformed_action]
+    end
+  end
+
+  describe '#valid?' do
+    subject { described_class.new(data).valid?}
+
+    it 'returns true' do
+      expect(subject).to be true
+    end
+
+    context 'when any of the actions is invalid' do
+      let(:data) { [action, { action: 'foo' }, action]}
+
+      it 'returns false' do
+        expect(subject).to be false
+      end
+    end
+  end
+
+  context 'when allowed_actions param is passed' do
+    it 'builds SnippetInputAction with that param' do
+      expect(SnippetInputAction).to receive(:new).with(hash_including(allowed_actions: :create))
+
+      described_class.new([action], allowed_actions: :create)
+    end
+  end
+end
diff --git a/spec/models/snippet_input_action_spec.rb b/spec/models/snippet_input_action_spec.rb
new file mode 100644
index 00000000000..5e379a48171
--- /dev/null
+++ b/spec/models/snippet_input_action_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe SnippetInputAction do
+  describe 'validations' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:action, :file_path, :content, :previous_path, :allowed_actions, :is_valid, :invalid_field) do
+      :create  | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      :move    | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      :delete  | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      :update  | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      :foo     | 'foobar'  | 'foobar' | 'foobar' | nil                | false | :action
+      'create' | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      'move'   | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      'delete' | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      'update' | 'foobar'  | 'foobar' | 'foobar' | nil                | true  | nil
+      'foo'    | 'foobar'  | 'foobar' | 'foobar' | nil                | false | :action
+      nil      | 'foobar'  | 'foobar' | 'foobar' | nil                | false | :action
+      ''       | 'foobar'  | 'foobar' | 'foobar' | nil                | false | :action
+      :move    | 'foobar'  | 'foobar' | nil      | nil                | false | :previous_path
+      :move    | 'foobar'  | 'foobar' | ''       | nil                | false | :previous_path
+      :create  | 'foobar'  | nil      | 'foobar' | nil                | false | :content
+      :create  | 'foobar'  | ''       | 'foobar' | nil                | false | :content
+      :create  | nil       | 'foobar' | 'foobar' | nil                | false | :file_path
+      :create  | ''        | 'foobar' | 'foobar' | nil                | false | :file_path
+      :update  | 'foobar'  | nil      | 'foobar' | nil                | false | :content
+      :update  | 'foobar'  | ''       | 'foobar' | nil                | false | :content
+      :update  | 'other'   | 'foobar' | 'foobar' | nil                | false | :file_path
+      :update  | 'foobar'  | 'foobar' | nil      | nil                | true  | nil
+      :update  | 'foobar'  | 'foobar' | ''       | nil                | true  | nil
+      :update  | 'foobar'  | 'foobar' | ''       | :update            | true  | nil
+      :update  | 'foobar'  | 'foobar' | ''       | 'update'           | true  | nil
+      :update  | 'foobar'  | 'foobar' | ''       | [:update]          | true  | nil
+      :update  | 'foobar'  | 'foobar' | ''       | [:update, :create] | true  | nil
+      :update  | 'foobar'  | 'foobar' | ''       | :create            | false | :action
+      :update  | 'foobar'  | 'foobar' | ''       | 'create'           | false | :action
+      :update  | 'foobar'  | 'foobar' | ''       | [:create]          | false | :action
+      :foo     | 'foobar'  | 'foobar' | ''       | :foo               | false | :action
+    end
+
+    with_them do
+      subject { described_class.new(action: action, file_path: file_path, content: content, previous_path: previous_path, allowed_actions: allowed_actions) }
+
+      specify do
+        expect(subject.valid?).to be is_valid
+
+        unless is_valid
+          expect(subject.errors).to include(invalid_field)
+        end
+      end
+    end
+  end
+
+  describe '#to_commit_action' do
+    let(:action)           { 'create' }
+    let(:file_path)        { 'foo' }
+    let(:content)          { 'bar' }
+    let(:previous_path)    { 'previous_path' }
+    let(:options)          { { action: action, file_path: file_path, content: content, previous_path: previous_path } }
+    let(:expected_options) { options.merge(action: action.to_sym) }
+
+    subject { described_class.new(options).to_commit_action }
+
+    it 'transforms attributes to commit action' do
+      expect(subject).to eq(expected_options)
+    end
+
+    context 'action is update' do
+      let(:action) { 'update' }
+
+      context 'when previous_path is present' do
+        it 'returns the existing previous_path' do
+          expect(subject).to eq(expected_options)
+        end
+      end
+
+      context 'when previous_path is not present' do
+        let(:previous_path) { nil }
+        let(:expected_options) { options.merge(action: action.to_sym, previous_path: file_path) }
+
+        it 'assigns the file_path to the previous_path' do
+          expect(subject).to eq(expected_options)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/todo_spec.rb b/spec/models/todo_spec.rb
index e125f58399e..bda89fc01f3 100644
--- a/spec/models/todo_spec.rb
+++ b/spec/models/todo_spec.rb
@@ -100,6 +100,20 @@ describe Todo do
     end
   end
 
+  describe '#for_alert?' do
+    it 'returns true when target is a Alert' do
+      subject.target_type = 'AlertManagement::Alert'
+
+      expect(subject.for_alert?).to eq(true)
+    end
+
+    it 'returns false when target is not a Alert' do
+      subject.target_type = 'Issue'
+
+      expect(subject.for_alert?).to eq(false)
+    end
+  end
+
   describe '#target' do
     context 'for commits' do
       let(:project) { create(:project, :repository) }
@@ -393,10 +407,10 @@ describe Todo do
     end
   end
 
-  describe '.update_state' do
+  describe '.batch_update' do
     it 'updates the state of todos' do
       todo = create(:todo, :pending)
-      ids = described_class.update_state(:done)
+      ids = described_class.batch_update(state: :done)
 
       todo.reload
 
@@ -407,16 +421,16 @@ describe Todo do
     it 'does not update todos that already have the given state' do
       create(:todo, :pending)
 
-      expect(described_class.update_state(:pending)).to be_empty
+      expect(described_class.batch_update(state: :pending)).to be_empty
     end
 
     it 'updates updated_at' do
       create(:todo, :pending)
 
       Timecop.freeze(1.day.from_now) do
-        expected_update_date = Time.now.utc
+        expected_update_date = Time.current.utc
 
-        ids = described_class.update_state(:done)
+        ids = described_class.batch_update(state: :done)
 
         expect(Todo.where(id: ids).map(&:updated_at)).to all(be_like_time(expected_update_date))
       end
diff --git a/spec/models/user_interacted_project_spec.rb b/spec/models/user_interacted_project_spec.rb
index e2c485343ae..83c66bf1969 100644
--- a/spec/models/user_interacted_project_spec.rb
+++ b/spec/models/user_interacted_project_spec.rb
@@ -8,7 +8,7 @@ describe UserInteractedProject do
 
     let(:event) { build(:event) }
 
-    Event::ACTIONS.each do |action|
+    Event.actions.each_key do |action|
       context "for all actions (event types)" do
         let(:event) { build(:event, action: action) }
 
@@ -44,21 +44,6 @@ describe UserInteractedProject do
     end
   end
 
-  describe '.available?' do
-    before do
-      described_class.instance_variable_set('@available_flag', nil)
-    end
-
-    it 'checks schema version and properly caches positive result' do
-      expect(ActiveRecord::Migrator).to receive(:current_version).and_return(described_class::REQUIRED_SCHEMA_VERSION - 1 - rand(1000))
-      expect(described_class.available?).to be_falsey
-      expect(ActiveRecord::Migrator).to receive(:current_version).and_return(described_class::REQUIRED_SCHEMA_VERSION + rand(1000))
-      expect(described_class.available?).to be_truthy
-      expect(ActiveRecord::Migrator).not_to receive(:current_version)
-      expect(described_class.available?).to be_truthy # cached response
-    end
-  end
-
   it { is_expected.to validate_presence_of(:project_id) }
   it { is_expected.to validate_presence_of(:user_id) }
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e82e8c1a21d..dd4b174a38f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -23,8 +23,41 @@ describe User do
   describe 'delegations' do
     it { is_expected.to delegate_method(:path).to(:namespace).with_prefix }
 
+    it { is_expected.to delegate_method(:notes_filter_for).to(:user_preference) }
+    it { is_expected.to delegate_method(:set_notes_filter).to(:user_preference) }
+
+    it { is_expected.to delegate_method(:first_day_of_week).to(:user_preference) }
+    it { is_expected.to delegate_method(:first_day_of_week=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:timezone).to(:user_preference) }
+    it { is_expected.to delegate_method(:timezone=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:time_display_relative).to(:user_preference) }
+    it { is_expected.to delegate_method(:time_display_relative=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:time_format_in_24h).to(:user_preference) }
+    it { is_expected.to delegate_method(:time_format_in_24h=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:show_whitespace_in_diffs).to(:user_preference) }
+    it { is_expected.to delegate_method(:show_whitespace_in_diffs=).to(:user_preference).with_arguments(:args) }
+
     it { is_expected.to delegate_method(:tab_width).to(:user_preference) }
-    it { is_expected.to delegate_method(:tab_width=).to(:user_preference).with_arguments(5) }
+    it { is_expected.to delegate_method(:tab_width=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:sourcegraph_enabled).to(:user_preference) }
+    it { is_expected.to delegate_method(:sourcegraph_enabled=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:setup_for_company).to(:user_preference) }
+    it { is_expected.to delegate_method(:setup_for_company=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:render_whitespace_in_code).to(:user_preference) }
+    it { is_expected.to delegate_method(:render_whitespace_in_code=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:experience_level).to(:user_preference) }
+    it { is_expected.to delegate_method(:experience_level=).to(:user_preference).with_arguments(:args) }
+
+    it { is_expected.to delegate_method(:job_title).to(:user_detail).allow_nil }
+    it { is_expected.to delegate_method(:job_title=).to(:user_detail).with_arguments(:args).allow_nil }
   end
 
   describe 'associations' do
@@ -56,6 +89,7 @@ describe User do
     it { is_expected.to have_many(:custom_attributes).class_name('UserCustomAttribute') }
     it { is_expected.to have_many(:releases).dependent(:nullify) }
     it { is_expected.to have_many(:metrics_users_starred_dashboards).inverse_of(:user) }
+    it { is_expected.to have_many(:reviews).inverse_of(:author) }
 
     describe "#bio" do
       it 'syncs bio with `user_details.bio` on create' do
@@ -816,6 +850,7 @@ describe User do
 
       let_it_be(:expired_token) { create(:personal_access_token, user: user1, expires_at: 2.days.ago) }
       let_it_be(:revoked_token) { create(:personal_access_token, user: user1, revoked: true) }
+      let_it_be(:impersonation_token) { create(:personal_access_token, :impersonation, user: user1, expires_at: 2.days.from_now) }
       let_it_be(:valid_token_and_notified) { create(:personal_access_token, user: user2, expires_at: 2.days.from_now, expire_notification_delivered: true) }
       let_it_be(:valid_token1) { create(:personal_access_token, user: user2, expires_at: 2.days.from_now) }
       let_it_be(:valid_token2) { create(:personal_access_token, user: user2, expires_at: 2.days.from_now) }
@@ -967,7 +1002,7 @@ describe User do
         end
 
         it 'has only one email association' do
-          expect(user.emails.size).to be(1)
+          expect(user.emails.size).to eq(1)
         end
       end
     end
@@ -1381,7 +1416,7 @@ describe User do
     end
 
     it 'is true when sent less than one minute ago' do
-      user = build_stubbed(:user, reset_password_sent_at: Time.now)
+      user = build_stubbed(:user, reset_password_sent_at: Time.current)
 
       expect(user.recently_sent_password_reset?).to eq true
     end
@@ -2157,7 +2192,7 @@ describe User do
 
   describe '#all_emails' do
     let(:user) { create(:user) }
-    let!(:email_confirmed) { create :email, user: user, confirmed_at: Time.now }
+    let!(:email_confirmed) { create :email, user: user, confirmed_at: Time.current }
     let!(:email_unconfirmed) { create :email, user: user }
 
     context 'when `include_private_email` is true' do
@@ -2186,7 +2221,7 @@ describe User do
     let(:user) { create(:user) }
 
     it 'returns only confirmed emails' do
-      email_confirmed = create :email, user: user, confirmed_at: Time.now
+      email_confirmed = create :email, user: user, confirmed_at: Time.current
       create :email, user: user
 
       expect(user.verified_emails).to contain_exactly(
@@ -2226,7 +2261,7 @@ describe User do
     let(:user) { create(:user) }
 
     it 'returns true when the email is verified/confirmed' do
-      email_confirmed = create :email, user: user, confirmed_at: Time.now
+      email_confirmed = create :email, user: user, confirmed_at: Time.current
       create :email, user: user
       user.reload
 
@@ -2350,26 +2385,6 @@ describe User do
     end
   end
 
-  describe '#ultraauth_user?' do
-    it 'is true if provider is ultraauth' do
-      user = create(:omniauth_user, provider: 'ultraauth')
-
-      expect(user.ultraauth_user?).to be_truthy
-    end
-
-    it 'is false with othe provider' do
-      user = create(:omniauth_user, provider: 'not-ultraauth')
-
-      expect(user.ultraauth_user?).to be_falsey
-    end
-
-    it 'is false if no extern_uid is provided' do
-      user = create(:omniauth_user, extern_uid: nil)
-
-      expect(user.ldap_user?).to be_falsey
-    end
-  end
-
   describe '#full_website_url' do
     let(:user) { create(:user) }
 
@@ -2863,10 +2878,10 @@ describe User do
     it "includes projects shared with user's group" do
       user    = create(:user)
       project = create(:project, :private)
-      group   = create(:group)
-
-      group.add_reporter(user)
-      project.project_group_links.create(group: group)
+      group   = create(:group) do |group|
+        group.add_reporter(user)
+      end
+      create(:project_group_link, group: group, project: project)
 
       expect(user.authorized_projects).to include(project)
     end
@@ -3645,12 +3660,6 @@ describe User do
 
       expect(user.allow_password_authentication_for_web?).to be_falsey
     end
-
-    it 'returns false for ultraauth user' do
-      user = create(:omniauth_user, provider: 'ultraauth')
-
-      expect(user.allow_password_authentication_for_web?).to be_falsey
-    end
   end
 
   describe '#allow_password_authentication_for_git?' do
@@ -3673,12 +3682,6 @@ describe User do
 
       expect(user.allow_password_authentication_for_git?).to be_falsey
     end
-
-    it 'returns false for ultraauth user' do
-      user = create(:omniauth_user, provider: 'ultraauth')
-
-      expect(user.allow_password_authentication_for_git?).to be_falsey
-    end
   end
 
   describe '#assigned_open_merge_requests_count' do
diff --git a/spec/models/web_ide_terminal_spec.rb b/spec/models/web_ide_terminal_spec.rb
new file mode 100644
index 00000000000..4103a26c75a
--- /dev/null
+++ b/spec/models/web_ide_terminal_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe WebIdeTerminal do
+  let(:build) { create(:ci_build) }
+
+  subject { described_class.new(build) }
+
+  it 'returns the show_path of the build' do
+    expect(subject.show_path).to end_with("/ide_terminals/#{build.id}")
+  end
+
+  it 'returns the retry_path of the build' do
+    expect(subject.retry_path).to end_with("/ide_terminals/#{build.id}/retry")
+  end
+
+  it 'returns the cancel_path of the build' do
+    expect(subject.cancel_path).to end_with("/ide_terminals/#{build.id}/cancel")
+  end
+
+  it 'returns the terminal_path of the build' do
+    expect(subject.terminal_path).to end_with("/jobs/#{build.id}/terminal.ws")
+  end
+
+  it 'returns the proxy_websocket_path of the build' do
+    expect(subject.proxy_websocket_path).to end_with("/jobs/#{build.id}/proxy.ws")
+  end
+
+  describe 'services' do
+    let(:services_with_aliases) do
+      {
+        services: [{ name: 'postgres', alias: 'postgres' },
+                   { name: 'docker:stable-dind', alias: 'docker' }]
+      }
+    end
+
+    before do
+      allow(build).to receive(:options).and_return(config)
+    end
+
+    context 'when image does not have an alias' do
+      let(:config) do
+        { image: 'ruby:2.7' }.merge(services_with_aliases)
+      end
+
+      it 'returns services aliases' do
+        expect(subject.services).to eq %w(postgres docker)
+      end
+    end
+
+    context 'when both image and services have aliases' do
+      let(:config) do
+        { image: { name: 'ruby:2.7', alias: 'ruby' } }.merge(services_with_aliases)
+      end
+
+      it 'returns all aliases' do
+        expect(subject.services).to eq %w(postgres docker ruby)
+      end
+    end
+
+    context 'when image and services does not have any alias' do
+      let(:config) do
+        { image: 'ruby:2.7', services: ['postgres'] }
+      end
+
+      it 'returns an empty array' do
+        expect(subject.services).to be_empty
+      end
+    end
+
+    context 'when no image nor services' do
+      let(:config) do
+        { script: %w(echo) }
+      end
+
+      it 'returns an empty array' do
+        expect(subject.services).to be_empty
+      end
+    end
+  end
+end
diff --git a/spec/models/wiki_directory_spec.rb b/spec/models/wiki_directory_spec.rb
index 5fbcccf897e..4cac90786eb 100644
--- a/spec/models/wiki_directory_spec.rb
+++ b/spec/models/wiki_directory_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe WikiDirectory do
     it 'returns the relative path to the partial to be used' do
       directory = build(:wiki_directory)
 
-      expect(directory.to_partial_path).to eq('projects/wikis/wiki_directory')
+      expect(directory.to_partial_path).to eq('../shared/wikis/wiki_directory')
     end
   end
 end
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index 201dc85daf8..8f2da8ff9a1 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -651,6 +651,7 @@ describe WikiPage do
 
     let(:untitled_page) { described_class.new(wiki) }
     let(:directory_page) { create(:wiki_page, title: 'parent directory/child page') }
+    let(:page_with_special_characters) { create(:wiki_page, title: 'test+page') }
 
     where(:page, :title, :changed) do
       :untitled_page  | nil                             | false
@@ -658,6 +659,8 @@ describe WikiPage do
 
       :new_page       | nil                             | true
       :new_page       | 'test page'                     | true
+      :new_page       | 'test-page'                     | true
+      :new_page       | 'test+page'                     | true
       :new_page       | 'new title'                     | true
 
       :existing_page  | nil                             | false
@@ -665,6 +668,7 @@ describe WikiPage do
       :existing_page  | 'test-page'                     | false
       :existing_page  | '/test page'                    | false
       :existing_page  | '/test-page'                    | false
+      :existing_page  | 'test+page'                     | true
       :existing_page  | ' test page '                   | true
       :existing_page  | 'new title'                     | true
       :existing_page  | 'new-title'                     | true
@@ -681,6 +685,11 @@ describe WikiPage do
       :directory_page | 'parent-directory / child-page' | true
       :directory_page | 'other directory/child page'    | true
       :directory_page | 'other-directory/child page'    | true
+
+      :page_with_special_characters | nil               | false
+      :page_with_special_characters | 'test+page'       | false
+      :page_with_special_characters | 'test-page'       | true
+      :page_with_special_characters | 'test page'       | true
     end
 
     with_them do
@@ -772,7 +781,7 @@ describe WikiPage do
 
   describe '#to_partial_path' do
     it 'returns the relative path to the partial to be used' do
-      expect(subject.to_partial_path).to eq('projects/wikis/wiki_page')
+      expect(subject.to_partial_path).to eq('../shared/wikis/wiki_page')
     end
   end
 
diff --git a/spec/policies/ci/build_policy_spec.rb b/spec/policies/ci/build_policy_spec.rb
index f29ed26f2aa..5857369a550 100644
--- a/spec/policies/ci/build_policy_spec.rb
+++ b/spec/policies/ci/build_policy_spec.rb
@@ -249,4 +249,129 @@ describe Ci::BuildPolicy do
       end
     end
   end
+
+  describe 'manage a web ide terminal' do
+    let(:build_permissions) { %i[read_web_ide_terminal create_build_terminal update_web_ide_terminal create_build_service_proxy] }
+    let_it_be(:maintainer) { create(:user) }
+    let(:owner) { create(:owner) }
+    let(:admin) { create(:admin) }
+    let(:maintainer) { create(:user) }
+    let(:developer) { create(:user) }
+    let(:reporter) { create(:user) }
+    let(:guest) { create(:user) }
+    let(:project) { create(:project, :public, namespace: owner.namespace) }
+    let(:pipeline) { create(:ci_empty_pipeline, project: project, source: :webide) }
+    let(:build) { create(:ci_build, pipeline: pipeline) }
+
+    before do
+      allow(build).to receive(:has_terminal?).and_return(true)
+
+      project.add_maintainer(maintainer)
+      project.add_developer(developer)
+      project.add_reporter(reporter)
+      project.add_guest(guest)
+    end
+
+    subject { described_class.new(current_user, build) }
+
+    context 'when create_web_ide_terminal access enabled' do
+      context 'with admin' do
+        let(:current_user) { admin }
+
+        context 'when admin mode enabled', :enable_admin_mode do
+          it { expect_allowed(*build_permissions) }
+        end
+
+        context 'when admin mode disabled' do
+          it { expect_disallowed(*build_permissions) }
+        end
+
+        context 'when build is not from a webide pipeline' do
+          let(:pipeline) { create(:ci_empty_pipeline, project: project, source: :chat) }
+
+          it { expect_disallowed(:read_web_ide_terminal, :update_web_ide_terminal, :create_build_service_proxy) }
+        end
+
+        context 'when build has no runner terminal' do
+          before do
+            allow(build).to receive(:has_terminal?).and_return(false)
+          end
+
+          context 'when admin mode enabled', :enable_admin_mode do
+            it { expect_allowed(:read_web_ide_terminal, :update_web_ide_terminal) }
+            it { expect_disallowed(:create_build_terminal, :create_build_service_proxy) }
+          end
+
+          context 'when admin mode disabled' do
+            it { expect_disallowed(:read_web_ide_terminal, :update_web_ide_terminal) }
+            it { expect_disallowed(:create_build_terminal, :create_build_service_proxy) }
+          end
+        end
+
+        context 'feature flag "build_service_proxy" is disabled' do
+          before do
+            stub_feature_flags(build_service_proxy: false)
+          end
+
+          it { expect_disallowed(:create_build_service_proxy) }
+        end
+      end
+
+      shared_examples 'allowed build owner access' do
+        it { expect_disallowed(*build_permissions) }
+
+        context 'when user is the owner of the job' do
+          let(:build) { create(:ci_build, pipeline: pipeline, user: current_user) }
+
+          it { expect_allowed(*build_permissions) }
+        end
+      end
+
+      shared_examples 'forbidden access' do
+        it { expect_disallowed(*build_permissions) }
+
+        context 'when user is the owner of the job' do
+          let(:build) { create(:ci_build, pipeline: pipeline, user: current_user) }
+
+          it { expect_disallowed(*build_permissions) }
+        end
+      end
+
+      context 'with owner' do
+        let(:current_user) { owner }
+
+        it_behaves_like 'allowed build owner access'
+      end
+
+      context 'with maintainer' do
+        let(:current_user) { maintainer }
+
+        it_behaves_like 'allowed build owner access'
+      end
+
+      context 'with developer' do
+        let(:current_user) { developer }
+
+        it_behaves_like 'forbidden access'
+      end
+
+      context 'with reporter' do
+        let(:current_user) { reporter }
+
+        it_behaves_like 'forbidden access'
+      end
+
+      context 'with guest' do
+        let(:current_user) { guest }
+
+        it_behaves_like 'forbidden access'
+      end
+
+      context 'with non member' do
+        let(:current_user) { create(:user) }
+
+        it_behaves_like 'forbidden access'
+      end
+    end
+  end
 end
diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb
index 9faddfd00e5..6b17a8285a2 100644
--- a/spec/policies/group_policy_spec.rb
+++ b/spec/policies/group_policy_spec.rb
@@ -175,7 +175,7 @@ describe GroupPolicy do
       nested_group.add_guest(developer)
       nested_group.add_guest(maintainer)
 
-      group.owners.destroy_all # rubocop: disable DestroyAll
+      group.owners.destroy_all # rubocop: disable Cop/DestroyAll
 
       group.add_guest(owner)
       nested_group.add_owner(owner)
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index f91d5658626..6ec63ba61ca 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -219,41 +219,16 @@ describe ProjectPolicy do
         project.project_feature.update!(builds_access_level: ProjectFeature::DISABLED)
       end
 
-      context 'without metrics_dashboard_allowed' do
-        before do
-          project.project_feature.update(metrics_dashboard_access_level: ProjectFeature::DISABLED)
-        end
-
-        it 'disallows all permissions except pipeline when the feature is disabled' do
-          builds_permissions = [
-            :create_build, :read_build, :update_build, :admin_build, :destroy_build,
-            :create_pipeline_schedule, :read_pipeline_schedule, :update_pipeline_schedule, :admin_pipeline_schedule, :destroy_pipeline_schedule,
-            :create_environment, :read_environment, :update_environment, :admin_environment, :destroy_environment,
-            :create_cluster, :read_cluster, :update_cluster, :admin_cluster, :destroy_cluster,
-            :create_deployment, :read_deployment, :update_deployment, :admin_deployment, :destroy_deployment
-          ]
-
-          expect_disallowed(*builds_permissions)
-        end
-      end
-
-      context 'with metrics_dashboard_allowed' do
-        before do
-          project.project_feature.update(metrics_dashboard_access_level: ProjectFeature::ENABLED)
-        end
+      it 'disallows all permissions except pipeline when the feature is disabled' do
+        builds_permissions = [
+          :create_build, :read_build, :update_build, :admin_build, :destroy_build,
+          :create_pipeline_schedule, :read_pipeline_schedule, :update_pipeline_schedule, :admin_pipeline_schedule, :destroy_pipeline_schedule,
+          :create_environment, :read_environment, :update_environment, :admin_environment, :destroy_environment,
+          :create_cluster, :read_cluster, :update_cluster, :admin_cluster, :destroy_cluster,
+          :create_deployment, :read_deployment, :update_deployment, :admin_deployment, :destroy_deployment
+        ]
 
-        it 'disallows all permissions except pipeline and read_environment when the feature is disabled' do
-          builds_permissions = [
-            :create_build, :read_build, :update_build, :admin_build, :destroy_build,
-            :create_pipeline_schedule, :read_pipeline_schedule, :update_pipeline_schedule, :admin_pipeline_schedule, :destroy_pipeline_schedule,
-            :create_environment, :update_environment, :admin_environment, :destroy_environment,
-            :create_cluster, :read_cluster, :update_cluster, :admin_cluster, :destroy_cluster,
-            :create_deployment, :read_deployment, :update_deployment, :admin_deployment, :destroy_deployment
-          ]
-
-          expect_disallowed(*builds_permissions)
-          expect_allowed(:read_environment)
-        end
+        expect_disallowed(*builds_permissions)
       end
     end
 
@@ -301,25 +276,8 @@ describe ProjectPolicy do
           )
         end
 
-        context 'without metrics_dashboard_allowed' do
-          before do
-            project.project_feature.update(metrics_dashboard_access_level: ProjectFeature::DISABLED)
-          end
-
-          it 'disallows all permissions when the feature is disabled' do
-            expect_disallowed(*repository_permissions)
-          end
-        end
-
-        context 'with metrics_dashboard_allowed' do
-          before do
-            project.project_feature.update(metrics_dashboard_access_level: ProjectFeature::ENABLED)
-          end
-
-          it 'disallows all permissions but read_environment when the feature is disabled' do
-            expect_disallowed(*(repository_permissions - [:read_environment]))
-            expect_allowed(:read_environment)
-          end
+        it 'disallows all permissions' do
+          expect_disallowed(*repository_permissions)
         end
       end
     end
@@ -817,4 +775,121 @@ describe ProjectPolicy do
       it { is_expected.to be_disallowed(:destroy_package) }
     end
   end
+
+  describe 'create_web_ide_terminal' do
+    subject { described_class.new(current_user, project) }
+
+    context 'with admin' do
+      let(:current_user) { admin }
+
+      context 'when admin mode enabled', :enable_admin_mode do
+        it { is_expected.to be_allowed(:create_web_ide_terminal) }
+      end
+
+      context 'when admin mode disabled' do
+        it { is_expected.to be_disallowed(:create_web_ide_terminal) }
+      end
+    end
+
+    context 'with owner' do
+      let(:current_user) { owner }
+
+      it { is_expected.to be_allowed(:create_web_ide_terminal) }
+    end
+
+    context 'with maintainer' do
+      let(:current_user) { maintainer }
+
+      it { is_expected.to be_allowed(:create_web_ide_terminal) }
+    end
+
+    context 'with developer' do
+      let(:current_user) { developer }
+
+      it { is_expected.to be_disallowed(:create_web_ide_terminal) }
+    end
+
+    context 'with reporter' do
+      let(:current_user) { reporter }
+
+      it { is_expected.to be_disallowed(:create_web_ide_terminal) }
+    end
+
+    context 'with guest' do
+      let(:current_user) { guest }
+
+      it { is_expected.to be_disallowed(:create_web_ide_terminal) }
+    end
+
+    context 'with non member' do
+      let(:current_user) { create(:user) }
+
+      it { is_expected.to be_disallowed(:create_web_ide_terminal) }
+    end
+
+    context 'with anonymous' do
+      let(:current_user) { nil }
+
+      it { is_expected.to be_disallowed(:create_web_ide_terminal) }
+    end
+  end
+
+  describe 'read_repository_graphs' do
+    subject { described_class.new(guest, project) }
+
+    before do
+      allow(subject).to receive(:allowed?).with(:read_repository_graphs).and_call_original
+      allow(subject).to receive(:allowed?).with(:download_code).and_return(can_download_code)
+    end
+
+    context 'when user can download_code' do
+      let(:can_download_code) { true }
+
+      it { is_expected.to be_allowed(:read_repository_graphs) }
+    end
+
+    context 'when user cannot download_code' do
+      let(:can_download_code) { false }
+
+      it { is_expected.to be_disallowed(:read_repository_graphs) }
+    end
+  end
+
+  describe 'read_build_report_results' do
+    subject { described_class.new(guest, project) }
+
+    before do
+      allow(subject).to receive(:allowed?).with(:read_build_report_results).and_call_original
+      allow(subject).to receive(:allowed?).with(:read_build).and_return(can_read_build)
+      allow(subject).to receive(:allowed?).with(:read_pipeline).and_return(can_read_pipeline)
+    end
+
+    context 'when user can read_build and read_pipeline' do
+      let(:can_read_build) { true }
+      let(:can_read_pipeline) { true }
+
+      it { is_expected.to be_allowed(:read_build_report_results) }
+    end
+
+    context 'when user can read_build but cannot read_pipeline' do
+      let(:can_read_build) { true }
+      let(:can_read_pipeline) { false }
+
+      it { is_expected.to be_disallowed(:read_build_report_results) }
+    end
+
+    context 'when user cannot read_build but can read_pipeline' do
+      let(:can_read_build) { false }
+      let(:can_read_pipeline) { true }
+
+      it { is_expected.to be_disallowed(:read_build_report_results) }
+    end
+
+    context 'when user cannot read_build and cannot read_pipeline' do
+      let(:can_read_build) { false }
+      let(:can_read_pipeline) { false }
+
+      it { is_expected.to be_disallowed(:read_build_report_results) }
+    end
+  end
 end
diff --git a/spec/policies/releases/source_policy_spec.rb b/spec/policies/releases/source_policy_spec.rb
new file mode 100644
index 00000000000..1bc6d5415d3
--- /dev/null
+++ b/spec/policies/releases/source_policy_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Releases::SourcePolicy do
+  using RSpec::Parameterized::TableSyntax
+
+  let(:policy) { described_class.new(user, source) }
+
+  let_it_be(:public_user) { create(:user) }
+  let_it_be(:guest) { create(:user) }
+  let_it_be(:reporter) { create(:user) }
+
+  let(:release) { create(:release, project: project) }
+  let(:source) { release.sources.first }
+
+  shared_examples 'source code access' do
+    it "allows access a release's source code" do
+      expect(policy).to be_allowed(:read_release_sources)
+    end
+  end
+
+  shared_examples 'no source code access' do
+    it "does not allow access a release's source code" do
+      expect(policy).to be_disallowed(:read_release_sources)
+    end
+  end
+
+  context 'a private project' do
+    let_it_be(:project) { create(:project, :private) }
+
+    context 'accessed by a public user' do
+      let(:user) { public_user }
+
+      it_behaves_like 'no source code access'
+    end
+
+    context 'accessed by a user with Guest permissions' do
+      let(:user) { guest }
+
+      before do
+        project.add_guest(user)
+      end
+
+      it_behaves_like 'no source code access'
+    end
+
+    context 'accessed by a user with Reporter permissions' do
+      let(:user) { reporter }
+
+      before do
+        project.add_reporter(user)
+      end
+
+      it_behaves_like 'source code access'
+    end
+  end
+
+  context 'a public project' do
+    let_it_be(:project) { create(:project, :public) }
+
+    context 'accessed by a public user' do
+      let(:user) { public_user }
+
+      it_behaves_like 'source code access'
+    end
+
+    context 'accessed by a user with Guest permissions' do
+      let(:user) { guest }
+
+      before do
+        project.add_guest(user)
+      end
+
+      it_behaves_like 'source code access'
+    end
+
+    context 'accessed by a user with Reporter permissions' do
+      let(:user) { reporter }
+
+      before do
+        project.add_reporter(user)
+      end
+
+      it_behaves_like 'source code access'
+    end
+  end
+end
diff --git a/spec/presenters/gitlab/blame_presenter_spec.rb b/spec/presenters/gitlab/blame_presenter_spec.rb
new file mode 100644
index 00000000000..d2a173b557c
--- /dev/null
+++ b/spec/presenters/gitlab/blame_presenter_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::BlamePresenter do
+  let(:project) { create(:project, :repository) }
+  let(:path) { 'files/ruby/popen.rb' }
+  let(:commit) { project.commit('master') }
+  let(:blob) { project.repository.blob_at(commit.id, path) }
+  let(:blame) { Gitlab::Blame.new(blob, commit) }
+
+  subject { described_class.new(blame, project: project, path: path) }
+
+  it 'precalculates necessary data on init' do
+    expect_any_instance_of(described_class)
+      .to receive(:precalculate_data_by_commit!)
+      .and_call_original
+
+    subject
+  end
+
+  describe '#groups' do
+    it 'delegates #groups call to the blame' do
+      expect(blame).to receive(:groups).and_call_original
+
+      subject.groups
+    end
+  end
+
+  describe '#commit_data' do
+    it 'has the data necessary to render the view' do
+      commit = blame.groups.first[:commit]
+      data = subject.commit_data(commit)
+
+      aggregate_failures do
+        expect(data.author_avatar.to_s).to include('src="https://www.gravatar.com/')
+        expect(data.age_map_class).to include('blame-commit-age-')
+        expect(data.commit_link.to_s).to include '913c66a37b4a45b9769037c55c2d238bd0942d2e">Files, encoding and much more</a>'
+        expect(data.commit_author_link.to_s).to include('<a class="commit-author-link" href=')
+        expect(data.project_blame_link.to_s).to include('<a title="View blame prior to this change"')
+        expect(data.time_ago_tooltip.to_s).to include('data-container="body">Feb 27, 2014</time>')
+      end
+    end
+  end
+end
diff --git a/spec/presenters/projects/prometheus/alert_presenter_spec.rb b/spec/presenters/projects/prometheus/alert_presenter_spec.rb
index 967a0fb2c09..8ee5a4d7b3f 100644
--- a/spec/presenters/projects/prometheus/alert_presenter_spec.rb
+++ b/spec/presenters/projects/prometheus/alert_presenter_spec.rb
@@ -24,18 +24,25 @@ describe Projects::Prometheus::AlertPresenter do
     it { is_expected.to eq(project.full_path) }
   end
 
-  describe '#starts_at' do
-    subject { presenter.starts_at }
+  describe '#start_time' do
+    subject { presenter.start_time }
+
+    let(:starts_at) { '2020-10-31T14:02:04Z' }
 
     before do
       payload['startsAt'] = starts_at
     end
 
-    context 'with valid datetime' do
-      let(:datetime) { Time.now }
-      let(:starts_at) { datetime.rfc3339 }
+    context 'with valid utc datetime' do
+      it { is_expected.to eq('31 October 2020, 2:02PM (UTC)') }
 
-      it { is_expected.to eq(datetime.rfc3339) }
+      context 'with admin time zone not UTC' do
+        before do
+          allow(Time).to receive(:zone).and_return(ActiveSupport::TimeZone.new('Perth'))
+        end
+
+        it { is_expected.to eq('31 October 2020, 2:02PM (UTC)') }
+      end
     end
 
     context 'with invalid datetime' do
@@ -56,7 +63,7 @@ describe Projects::Prometheus::AlertPresenter do
           <<~MARKDOWN.chomp
             #### Summary
 
-            **Start time:** #{presenter.starts_at}
+            **Start time:** #{presenter.start_time}
 
           MARKDOWN
         )
@@ -73,7 +80,7 @@ describe Projects::Prometheus::AlertPresenter do
           <<~MARKDOWN.chomp
             #### Summary
 
-            **Start time:** #{presenter.starts_at}
+            **Start time:** #{presenter.start_time}
 
             #### Alert Details
 
@@ -94,7 +101,7 @@ describe Projects::Prometheus::AlertPresenter do
           <<~MARKDOWN.chomp
             #### Summary
 
-            **Start time:** #{presenter.starts_at}#{markdown_line_break}
+            **Start time:** #{presenter.start_time}#{markdown_line_break}
             **full_query:** `query`
 
           MARKDOWN
@@ -122,7 +129,7 @@ describe Projects::Prometheus::AlertPresenter do
           <<~MARKDOWN.chomp
             #### Summary
 
-            **Start time:** #{presenter.starts_at}#{markdown_line_break}
+            **Start time:** #{presenter.start_time}#{markdown_line_break}
             **Service:** service_name#{markdown_line_break}
             **Monitoring tool:** monitoring_tool_name#{markdown_line_break}
             **Hosts:** http://localhost:3000 http://localhost:3001
@@ -144,7 +151,7 @@ describe Projects::Prometheus::AlertPresenter do
             <<~MARKDOWN.chomp
             #### Summary
 
-            **Start time:** #{presenter.starts_at}#{markdown_line_break}
+            **Start time:** #{presenter.start_time}#{markdown_line_break}
             **Hosts:** http://localhost:3000
 
             MARKDOWN
@@ -161,7 +168,7 @@ describe Projects::Prometheus::AlertPresenter do
           <<~MARKDOWN.chomp
           #### Summary
 
-          **Start time:** #{presenter.starts_at}#{markdown_line_break}
+          **Start time:** #{presenter.start_time}#{markdown_line_break}
           **full_query:** `avg(metric) > 1.0`
 
           [](#{url})
@@ -253,7 +260,7 @@ describe Projects::Prometheus::AlertPresenter do
             <<~MARKDOWN.chomp
             #### Summary
 
-            **Start time:** #{presenter.starts_at}#{markdown_line_break}
+            **Start time:** #{presenter.start_time}#{markdown_line_break}
             **full_query:** `avg(metric) > 1.0`
 
             MARKDOWN
@@ -280,7 +287,7 @@ describe Projects::Prometheus::AlertPresenter do
               <<~MARKDOWN.chomp
               #### Summary
 
-              **Start time:** #{presenter.starts_at}
+              **Start time:** #{presenter.start_time}
 
               MARKDOWN
             end
diff --git a/spec/presenters/snippet_presenter_spec.rb b/spec/presenters/snippet_presenter_spec.rb
index 591d86652b6..423e9edc219 100644
--- a/spec/presenters/snippet_presenter_spec.rb
+++ b/spec/presenters/snippet_presenter_spec.rb
@@ -163,4 +163,25 @@ describe SnippetPresenter do
       end
     end
   end
+
+  describe '#blobs' do
+    let(:snippet) { personal_snippet }
+
+    subject { presenter.blobs }
+
+    context 'when snippet does not have a repository' do
+      it 'returns an array with one SnippetBlob' do
+        expect(subject.size).to eq(1)
+        expect(subject.first).to eq(snippet.blob)
+      end
+    end
+
+    context 'when snippet has a repository' do
+      let(:snippet) { create(:snippet, :repository, author: user) }
+
+      it 'returns an array with all repository blobs' do
+        expect(subject).to match_array(snippet.blobs)
+      end
+    end
+  end
 end
diff --git a/spec/requests/api/admin/ci/variables_spec.rb b/spec/requests/api/admin/ci/variables_spec.rb
index bc2f0ba50a2..185fde17e1b 100644
--- a/spec/requests/api/admin/ci/variables_spec.rb
+++ b/spec/requests/api/admin/ci/variables_spec.rb
@@ -109,6 +109,22 @@ describe ::API::Admin::Ci::Variables do
 
         expect(response).to have_gitlab_http_status(:bad_request)
       end
+
+      it 'does not allow values above 700 characters' do
+        too_long_message = <<~MESSAGE.strip
+          The encrypted value of the provided variable exceeds 1024 bytes. \
+          Variables over 700 characters risk exceeding the limit.
+        MESSAGE
+
+        expect do
+          post api('/admin/ci/variables', admin),
+            params: { key: 'too_long', value: SecureRandom.hex(701) }
+        end.not_to change { ::Ci::InstanceVariable.count }
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response).to match('message' =>
+          a_hash_including('encrypted_value' => [too_long_message]))
+      end
     end
 
     context 'authorized user with invalid permissions' do
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 86b3dd4095f..a423c92e2fb 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -356,28 +356,35 @@ describe API::Commits do
         }
       end
 
+      shared_examples_for "successfully creates the commit" do
+        it "creates the commit" do
+          expect(response).to have_gitlab_http_status(:created)
+          expect(json_response['title']).to eq(message)
+          expect(json_response['committer_name']).to eq(user.name)
+          expect(json_response['committer_email']).to eq(user.email)
+        end
+      end
+
       it 'does not increment the usage counters using access token authentication' do
         expect(::Gitlab::UsageDataCounters::WebIdeCounter).not_to receive(:increment_commits_count)
 
         post api(url, user), params: valid_c_params
       end
 
-      it 'a new file in project repo' do
-        post api(url, user), params: valid_c_params
+      context 'a new file in project repo' do
+        before do
+          post api(url, user), params: valid_c_params
+        end
 
-        expect(response).to have_gitlab_http_status(:created)
-        expect(json_response['title']).to eq(message)
-        expect(json_response['committer_name']).to eq(user.name)
-        expect(json_response['committer_email']).to eq(user.email)
+        it_behaves_like "successfully creates the commit"
       end
 
-      it 'a new file with utf8 chars in project repo' do
-        post api(url, user), params: valid_utf8_c_params
+      context 'a new file with utf8 chars in project repo' do
+        before do
+          post api(url, user), params: valid_utf8_c_params
+        end
 
-        expect(response).to have_gitlab_http_status(:created)
-        expect(json_response['title']).to eq(message)
-        expect(json_response['committer_name']).to eq(user.name)
-        expect(json_response['committer_email']).to eq(user.email)
+        it_behaves_like "successfully creates the commit"
       end
 
       it 'returns a 400 bad request if file exists' do
diff --git a/spec/requests/api/deploy_keys_spec.rb b/spec/requests/api/deploy_keys_spec.rb
index e8cc6bc71ae..1baa18b53ce 100644
--- a/spec/requests/api/deploy_keys_spec.rb
+++ b/spec/requests/api/deploy_keys_spec.rb
@@ -8,7 +8,7 @@ describe API::DeployKeys do
   let(:admin)       { create(:admin) }
   let(:project)     { create(:project, creator_id: user.id) }
   let(:project2)    { create(:project, creator_id: user.id) }
-  let(:deploy_key)  { create(:deploy_key, public: true) }
+  let(:deploy_key)  { create(:deploy_key, public: true, user: user) }
 
   let!(:deploy_keys_project) do
     create(:deploy_keys_project, project: project, deploy_key: deploy_key)
@@ -40,6 +40,32 @@ describe API::DeployKeys do
         expect(json_response).to be_an Array
         expect(json_response.first['id']).to eq(deploy_keys_project.deploy_key.id)
       end
+
+      it 'returns all deploy keys with comments replaced with'\
+         'a simple identifier of username + hostname' do
+        get api('/deploy_keys', admin)
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+
+        keys = json_response.map { |key_detail| key_detail['key'] }
+        expect(keys).to all(include("#{user.name} (#{Gitlab.config.gitlab.host}"))
+      end
+
+      context 'N+1 queries' do
+        before do
+          get api('/deploy_keys', admin)
+        end
+
+        it 'avoids N+1 queries', :request_store do
+          control_count = ActiveRecord::QueryRecorder.new { get api('/deploy_keys', admin) }.count
+
+          create_list(:deploy_key, 2, public: true, user: create(:user))
+
+          expect { get api('/deploy_keys', admin) }.not_to exceed_query_limit(control_count)
+        end
+      end
     end
   end
 
@@ -56,6 +82,25 @@ describe API::DeployKeys do
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(deploy_key.title)
     end
+
+    context 'N+1 queries' do
+      before do
+        get api("/projects/#{project.id}/deploy_keys", admin)
+      end
+
+      it 'avoids N+1 queries', :request_store do
+        control_count = ActiveRecord::QueryRecorder.new do
+          get api("/projects/#{project.id}/deploy_keys", admin)
+        end.count
+
+        deploy_key = create(:deploy_key, user: create(:user))
+        create(:deploy_keys_project, project: project, deploy_key: deploy_key)
+
+        expect do
+          get api("/projects/#{project.id}/deploy_keys", admin)
+        end.not_to exceed_query_limit(control_count)
+      end
+    end
   end
 
   describe 'GET /projects/:id/deploy_keys/:key_id' do
@@ -66,6 +111,13 @@ describe API::DeployKeys do
       expect(json_response['title']).to eq(deploy_key.title)
     end
 
+    it 'exposes key comment as a simple identifier of username + hostname' do
+      get api("/projects/#{project.id}/deploy_keys/#{deploy_key.id}", admin)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['key']).to include("#{deploy_key.user_name} (#{Gitlab.config.gitlab.host})")
+    end
+
     it 'returns 404 Not Found with invalid ID' do
       get api("/projects/#{project.id}/deploy_keys/404", admin)
 
diff --git a/spec/requests/api/events_spec.rb b/spec/requests/api/events_spec.rb
index decdcc66327..0425e0791eb 100644
--- a/spec/requests/api/events_spec.rb
+++ b/spec/requests/api/events_spec.rb
@@ -7,9 +7,9 @@ describe API::Events do
   let(:non_member) { create(:user) }
   let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) }
   let(:closed_issue) { create(:closed_issue, project: private_project, author: user) }
-  let!(:closed_issue_event) { create(:event, project: private_project, author: user, target: closed_issue, action: Event::CLOSED, created_at: Date.new(2016, 12, 30)) }
+  let!(:closed_issue_event) { create(:event, :closed, project: private_project, author: user, target: closed_issue, created_at: Date.new(2016, 12, 30)) }
   let(:closed_issue2) { create(:closed_issue, project: private_project, author: non_member) }
-  let!(:closed_issue_event2) { create(:event, project: private_project, author: non_member, target: closed_issue2, action: Event::CLOSED, created_at: Date.new(2016, 12, 30)) }
+  let!(:closed_issue_event2) { create(:event, :closed, project: private_project, author: non_member, target: closed_issue2, created_at: Date.new(2016, 12, 30)) }
 
   describe 'GET /events' do
     context 'when unauthenticated' do
@@ -117,7 +117,7 @@ describe API::Events do
       context 'when the list of events includes wiki page events' do
         it 'returns information about the wiki event', :aggregate_failures do
           page = create(:wiki_page, project: private_project)
-          [Event::CREATED, Event::UPDATED, Event::DESTROYED].each do |action|
+          [:created, :updated, :destroyed].each do |action|
             create(:wiki_page_event, wiki_page: page, action: action, author: user)
           end
 
diff --git a/spec/requests/api/features_spec.rb b/spec/requests/api/features_spec.rb
index 4ad5b4f9d49..59a9ed2f77d 100644
--- a/spec/requests/api/features_spec.rb
+++ b/spec/requests/api/features_spec.rb
@@ -2,11 +2,12 @@
 
 require 'spec_helper'
 
-describe API::Features do
+describe API::Features, stub_feature_flags: false do
   let_it_be(:user)  { create(:user) }
   let_it_be(:admin) { create(:admin) }
 
   before do
+    Feature.reset
     Flipper.unregister_groups
     Flipper.register(:perf_team) do |actor|
       actor.respond_to?(:admin) && actor.admin?
@@ -38,9 +39,9 @@ describe API::Features do
     end
 
     before do
-      Feature.get('feature_1').enable
-      Feature.get('feature_2').disable
-      Feature.get('feature_3').enable Feature.group(:perf_team)
+      Feature.enable('feature_1')
+      Feature.disable('feature_2')
+      Feature.enable('feature_3', Feature.group(:perf_team))
     end
 
     it 'returns a 401 for anonymous users' do
@@ -226,10 +227,8 @@ describe API::Features do
     end
 
     context 'when the feature exists' do
-      let(:feature) { Feature.get(feature_name) }
-
       before do
-        feature.disable # This also persists the feature on the DB
+        Feature.disable(feature_name) # This also persists the feature on the DB
       end
 
       context 'when passed value=true' do
@@ -272,8 +271,8 @@ describe API::Features do
 
       context 'when feature is enabled and value=false is passed' do
         it 'disables the feature' do
-          feature.enable
-          expect(feature).to be_enabled
+          Feature.enable(feature_name)
+          expect(Feature.enabled?(feature_name)).to eq(true)
 
           post api("/features/#{feature_name}", admin), params: { value: 'false' }
 
@@ -285,8 +284,8 @@ describe API::Features do
         end
 
         it 'disables the feature for the given Flipper group when passed feature_group=perf_team' do
-          feature.enable(Feature.group(:perf_team))
-          expect(Feature.get(feature_name).enabled?(admin)).to be_truthy
+          Feature.enable(feature_name, Feature.group(:perf_team))
+          expect(Feature.enabled?(feature_name, admin)).to be_truthy
 
           post api("/features/#{feature_name}", admin), params: { value: 'false', feature_group: 'perf_team' }
 
@@ -298,8 +297,8 @@ describe API::Features do
         end
 
         it 'disables the feature for the given user when passed user=username' do
-          feature.enable(user)
-          expect(Feature.get(feature_name).enabled?(user)).to be_truthy
+          Feature.enable(feature_name, user)
+          expect(Feature.enabled?(feature_name, user)).to be_truthy
 
           post api("/features/#{feature_name}", admin), params: { value: 'false', user: user.username }
 
@@ -313,7 +312,7 @@ describe API::Features do
 
       context 'with a pre-existing percentage of time value' do
         before do
-          feature.enable_percentage_of_time(50)
+          Feature.enable_percentage_of_time(feature_name, 50)
         end
 
         it 'updates the percentage of time if passed an integer' do
@@ -332,7 +331,7 @@ describe API::Features do
 
       context 'with a pre-existing percentage of actors value' do
         before do
-          feature.enable_percentage_of_actors(42)
+          Feature.enable_percentage_of_actors(feature_name, 42)
         end
 
         it 'updates the percentage of actors if passed an integer' do
@@ -377,14 +376,17 @@ describe API::Features do
 
       context 'when the gate value was set' do
         before do
-          Feature.get(feature_name).enable
+          Feature.enable(feature_name)
         end
 
         it 'deletes an enabled feature' do
-          delete api("/features/#{feature_name}", admin)
+          expect do
+            delete api("/features/#{feature_name}", admin)
+            Feature.reset
+          end.to change { Feature.persisted_name?(feature_name) }
+            .and change { Feature.enabled?(feature_name) }
 
           expect(response).to have_gitlab_http_status(:no_content)
-          expect(Feature.get(feature_name)).not_to be_enabled
         end
       end
     end
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index e6406174391..198e4f64bcc 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -134,7 +134,8 @@ describe API::Files do
     context 'when PATs are used' do
       it_behaves_like 'repository files' do
         let(:token) { create(:personal_access_token, scopes: ['read_repository'], user: user) }
-        let(:current_user) { { personal_access_token: token } }
+        let(:current_user) { user }
+        let(:api_user) { { personal_access_token: token } }
       end
     end
 
@@ -153,15 +154,17 @@ describe API::Files do
 
   describe "GET /projects/:id/repository/files/:file_path" do
     shared_examples_for 'repository files' do
+      let(:api_user) { current_user }
+
       it 'returns 400 for invalid file path' do
-        get api(route(rouge_file_path), current_user), params: params
+        get api(route(rouge_file_path), api_user), params: params
 
         expect(response).to have_gitlab_http_status(:bad_request)
         expect(json_response['error']).to eq(invalid_file_message)
       end
 
       it 'returns file attributes as json' do
-        get api(route(file_path), current_user), params: params
+        get api(route(file_path), api_user), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['file_path']).to eq(CGI.unescape(file_path))
@@ -174,7 +177,7 @@ describe API::Files do
       it 'returns json when file has txt extension' do
         file_path = "bar%2Fbranch-test.txt"
 
-        get api(route(file_path), current_user), params: params
+        get api(route(file_path), api_user), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response.content_type).to eq('application/json')
@@ -185,7 +188,7 @@ describe API::Files do
         file_path = "files%2Fjs%2Fcommit%2Ejs%2Ecoffee"
         params[:ref] = "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
 
-        get api(route(file_path), current_user), params: params
+        get api(route(file_path), api_user), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['file_name']).to eq('commit.js.coffee')
@@ -197,7 +200,7 @@ describe API::Files do
         url = route(file_path) + "/raw"
         expect(Gitlab::Workhorse).to receive(:send_git_blob)
 
-        get api(url, current_user), params: params
+        get api(url, api_user), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
@@ -206,7 +209,7 @@ describe API::Files do
       it 'returns blame file info' do
         url = route(file_path) + '/blame'
 
-        get api(url, current_user), params: params
+        get api(url, api_user), params: params
 
         expect(response).to have_gitlab_http_status(:ok)
       end
@@ -214,7 +217,7 @@ describe API::Files do
       it 'sets inline content disposition by default' do
         url = route(file_path) + "/raw"
 
-        get api(url, current_user), params: params
+        get api(url, api_user), params: params
 
         expect(headers['Content-Disposition']).to eq(%q(inline; filename="popen.rb"; filename*=UTF-8''popen.rb))
       end
@@ -229,7 +232,7 @@ describe API::Files do
         let(:params) { { ref: 'master' } }
 
         it_behaves_like '404 response' do
-          let(:request) { get api(route('app%2Fmodels%2Fapplication%2Erb'), current_user), params: params }
+          let(:request) { get api(route('app%2Fmodels%2Fapplication%2Erb'), api_user), params: params }
           let(:message) { '404 File Not Found' }
         end
       end
@@ -238,7 +241,7 @@ describe API::Files do
         include_context 'disabled repository'
 
         it_behaves_like '403 response' do
-          let(:request) { get api(route(file_path), current_user), params: params }
+          let(:request) { get api(route(file_path), api_user), params: params }
         end
       end
     end
@@ -253,7 +256,8 @@ describe API::Files do
     context 'when PATs are used' do
       it_behaves_like 'repository files' do
         let(:token) { create(:personal_access_token, scopes: ['read_repository'], user: user) }
-        let(:current_user) { { personal_access_token: token } }
+        let(:current_user) { user }
+        let(:api_user) { { personal_access_token: token } }
       end
     end
 
diff --git a/spec/requests/api/graphql/boards/board_lists_query_spec.rb b/spec/requests/api/graphql/boards/board_lists_query_spec.rb
index f0927487f85..3cc1468be02 100644
--- a/spec/requests/api/graphql/boards/board_lists_query_spec.rb
+++ b/spec/requests/api/graphql/boards/board_lists_query_spec.rb
@@ -65,41 +65,41 @@ describe 'get board lists' do
       end
 
       describe 'sorting and pagination' do
+        let_it_be(:current_user) { user }
+        let(:data_path) { [board_parent_type, :boards, :edges, 0, :node, :lists] }
+
+        def pagination_query(params, page_info)
+          graphql_query_for(
+            board_parent_type,
+            { 'fullPath' => board_parent.full_path },
+            <<~BOARDS
+              boards(first: 1) {
+                edges {
+                  node {
+                    #{query_graphql_field('lists', params, "#{page_info} edges { node { id } }")}
+                  }
+                }
+              }
+            BOARDS
+          )
+        end
+
+        def pagination_results_data(data)
+          data.map { |list| list.dig('node', 'id') }
+        end
+
         context 'when using default sorting' do
           let!(:label_list)   { create(:list, board: board, label: label, position: 10) }
           let!(:label_list2)  { create(:list, board: board, label: label2, position: 2) }
           let!(:backlog_list) { create(:backlog_list, board: board) }
           let(:closed_list)   { board.lists.find_by(list_type: :closed) }
-
-          before do
-            post_graphql(query, current_user: user)
-          end
-
-          it_behaves_like 'a working graphql query'
+          let(:lists)         { [backlog_list, label_list2, label_list, closed_list] }
 
           context 'when ascending' do
-            let(:lists) { [backlog_list, label_list2, label_list, closed_list] }
-            let(:expected_list_gids) do
-              lists.map { |list| list.to_global_id.to_s }
-            end
-
-            it 'sorts lists' do
-              expect(grab_ids).to eq expected_list_gids
-            end
-
-            context 'when paginating' do
-              let(:params) { 'first: 2' }
-
-              it 'sorts boards' do
-                expect(grab_ids).to eq expected_list_gids.first(2)
-
-                cursored_query = query("after: \"#{end_cursor}\"")
-                post_graphql(cursored_query, current_user: user)
-
-                response_data = grab_list_data(response.body)
-
-                expect(grab_ids(response_data)).to eq expected_list_gids.drop(2).first(2)
-              end
+            it_behaves_like 'sorted paginated query' do
+              let(:sort_param)       { }
+              let(:first_param)      { 2 }
+              let(:expected_results) { lists.map { |list| list.to_global_id.to_s } }
             end
           end
         end
@@ -126,12 +126,4 @@ describe 'get board lists' do
 
     it_behaves_like 'group and project board lists query'
   end
-
-  def grab_ids(data = lists_data)
-    data.map { |list| list.dig('node', 'id') }
-  end
-
-  def grab_list_data(response_body)
-    Gitlab::Json.parse(response_body)['data'][board_parent_type]['boards']['edges'][0]['node']['lists']['edges']
-  end
 end
diff --git a/spec/requests/api/graphql/group/labels_query_spec.rb b/spec/requests/api/graphql/group/labels_query_spec.rb
new file mode 100644
index 00000000000..6c34cbadf95
--- /dev/null
+++ b/spec/requests/api/graphql/group/labels_query_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'getting group label information' do
+  include GraphqlHelpers
+
+  let_it_be(:group) { create(:group, :public) }
+  let_it_be(:label_factory) { :group_label }
+  let_it_be(:label_attrs) { { group: group } }
+
+  it_behaves_like 'querying a GraphQL type with labels' do
+    let(:path_prefix) { ['group'] }
+
+    def make_query(fields)
+      graphql_query_for('group', { full_path: group.full_path }, fields)
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/metrics/dashboard_query_spec.rb b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
index 8b0965a815b..d9d9ea9ad61 100644
--- a/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
+++ b/spec/requests/api/graphql/metrics/dashboard_query_spec.rb
@@ -9,25 +9,19 @@ describe 'Getting Metrics Dashboard' do
   let(:project) { create(:project) }
   let!(:environment) { create(:environment, project: project) }
 
-  let(:fields) do
-    <<~QUERY
-      #{all_graphql_fields_for('MetricsDashboard'.classify)}
-    QUERY
-  end
-
   let(:query) do
-    %(
-      query {
-        project(fullPath:"#{project.full_path}") {
-          environments(name: "#{environment.name}") {
-            nodes {
-              metricsDashboard(path: "#{path}"){
-                #{fields}
-              }
-            }
-          }
-        }
-      }
+    graphql_query_for(
+      'project', { 'fullPath' => project.full_path },
+      query_graphql_field(
+        :environments, { 'name' => environment.name },
+        query_graphql_field(
+          :nodes, nil,
+          query_graphql_field(
+            :metricsDashboard, { 'path' => path },
+            all_graphql_fields_for('MetricsDashboard'.classify)
+          )
+        )
+      )
     )
   end
 
@@ -63,7 +57,29 @@ describe 'Getting Metrics Dashboard' do
       it 'returns metrics dashboard' do
         dashboard = graphql_data.dig('project', 'environments', 'nodes')[0]['metricsDashboard']
 
-        expect(dashboard).to eql("path" => path)
+        expect(dashboard).to eql("path" => path, "schemaValidationWarnings" => nil)
+      end
+
+      context 'invalid dashboard' do
+        let(:path) { '.gitlab/dashboards/metrics.yml' }
+        let(:project) { create(:project, :repository, :custom_repo, namespace: current_user.namespace, files: { path => "---\ndasboard: ''" }) }
+
+        it 'returns metrics dashboard' do
+          dashboard = graphql_data.dig('project', 'environments', 'nodes', 0, 'metricsDashboard')
+
+          expect(dashboard).to eql("path" => path, "schemaValidationWarnings" => ["dashboard: can't be blank", "panel_groups: can't be blank"])
+        end
+      end
+
+      context 'empty dashboard' do
+        let(:path) { '.gitlab/dashboards/metrics.yml' }
+        let(:project) { create(:project, :repository, :custom_repo, namespace: current_user.namespace, files: { path => "" }) }
+
+        it 'returns metrics dashboard' do
+          dashboard = graphql_data.dig('project', 'environments', 'nodes', 0, 'metricsDashboard')
+
+          expect(dashboard).to eql("path" => path, "schemaValidationWarnings" => ["dashboard: can't be blank", "panel_groups: can't be blank"])
+        end
       end
     end
 
@@ -72,7 +88,7 @@ describe 'Getting Metrics Dashboard' do
 
       it_behaves_like 'a working graphql query'
 
-      it 'return snil' do
+      it 'returns nil' do
         dashboard = graphql_data.dig('project', 'environments', 'nodes')[0]['metricsDashboard']
 
         expect(dashboard).to be_nil
diff --git a/spec/requests/api/graphql/mutations/alert_management/alerts/create_alert_issue_spec.rb b/spec/requests/api/graphql/mutations/alert_management/alerts/create_alert_issue_spec.rb
new file mode 100644
index 00000000000..5b5b2ec8788
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/alert_management/alerts/create_alert_issue_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Create an alert issue from an alert' do
+  include GraphqlHelpers
+
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:alert) { create(:alert_management_alert, project: project) }
+
+  let(:mutation) do
+    variables = {
+      project_path: project.full_path,
+      iid: alert.iid.to_s
+    }
+    graphql_mutation(:create_alert_issue, variables,
+                     <<~QL
+                       clientMutationId
+                       errors
+                       alert {
+                         iid
+                         issueIid
+                       }
+                       issue {
+                         iid
+                         title
+                       }
+                     QL
+    )
+  end
+
+  let(:mutation_response) { graphql_mutation_response(:create_alert_issue) }
+
+  before do
+    project.add_developer(user)
+  end
+
+  context 'when there is no issue associated with the alert' do
+    it 'creates an alert issue' do
+      post_graphql_mutation(mutation, current_user: user)
+
+      new_issue = Issue.last!
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(mutation_response.slice('alert', 'issue')).to eq(
+        'alert' => {
+          'iid' => alert.iid.to_s,
+          'issueIid' => new_issue.iid.to_s
+        },
+        'issue' => {
+          'iid' => new_issue.iid.to_s,
+          'title' => new_issue.title
+        }
+      )
+    end
+  end
+
+  context 'when there is an issue already associated with the alert' do
+    before do
+      AlertManagement::CreateAlertIssueService.new(alert, user).execute
+    end
+
+    it 'responds with an error' do
+      post_graphql_mutation(mutation, current_user: user)
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(mutation_response.slice('errors', 'issue')).to eq(
+        'errors' => ['An issue already exists'],
+        'issue' => nil
+      )
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/alert_management/alerts/set_assignees_spec.rb b/spec/requests/api/graphql/mutations/alert_management/alerts/set_assignees_spec.rb
new file mode 100644
index 00000000000..6663281e093
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/alert_management/alerts/set_assignees_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Setting assignees of an alert' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:alert) { create(:alert_management_alert, project: project) }
+  let(:input) { { assignee_usernames: [current_user.username] } }
+
+  let(:mutation) do
+    graphql_mutation(
+      :alert_set_assignees,
+      { project_path: project.full_path, iid: alert.iid.to_s }.merge(input),
+      <<~QL
+       clientMutationId
+       errors
+       alert {
+         assignees {
+           nodes {
+             username
+           }
+         }
+       }
+      QL
+    )
+  end
+
+  let(:mutation_response) { graphql_mutation_response(:alert_set_assignees) }
+
+  before_all do
+    project.add_developer(current_user)
+  end
+
+  it 'updates the assignee of the alert' do
+    post_graphql_mutation(mutation, current_user: current_user)
+
+    expect(response).to have_gitlab_http_status(:success)
+    expect(mutation_response['alert']['assignees']['nodes'].first['username']).to eq(current_user.username)
+    expect(alert.reload.assignees).to contain_exactly(current_user)
+  end
+
+  context 'with operation_mode specified' do
+    let(:input) do
+      {
+        assignee_usernames: [current_user.username],
+        operation_mode: Types::MutationOperationModeEnum.enum[:remove]
+      }
+    end
+
+    before do
+      alert.assignees = [current_user]
+    end
+
+    it 'updates the assignee of the alert' do
+      post_graphql_mutation(mutation, current_user: current_user)
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(mutation_response['alert']['assignees']['nodes']).to be_empty
+      expect(alert.reload.assignees).to be_empty
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/alert_management/alerts/update_alert_status_spec.rb b/spec/requests/api/graphql/mutations/alert_management/alerts/update_alert_status_spec.rb
index fe50468134c..2a470bda689 100644
--- a/spec/requests/api/graphql/mutations/alert_management/alerts/update_alert_status_spec.rb
+++ b/spec/requests/api/graphql/mutations/alert_management/alerts/update_alert_status_spec.rb
@@ -15,16 +15,16 @@ describe 'Setting the status of an alert' do
       project_path: project.full_path,
       iid: alert.iid.to_s
     }
-    graphql_mutation(:update_alert_status, variables.merge(input),
-                     <<~QL
-                       clientMutationId
-                       errors
-                       alert {
-                         iid
-                         status
-                       }
-                     QL
-    )
+    graphql_mutation(:update_alert_status, variables.merge(input)) do
+      <<~QL
+         clientMutationId
+         errors
+         alert {
+           iid
+           status
+         }
+      QL
+    end
   end
 
   let(:mutation_response) { graphql_mutation_response(:update_alert_status) }
diff --git a/spec/requests/api/graphql/mutations/commits/create_spec.rb b/spec/requests/api/graphql/mutations/commits/create_spec.rb
new file mode 100644
index 00000000000..10a69932948
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/commits/create_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Creation of a new commit' do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let(:input) { { project_path: project.full_path, branch: branch, message: message, actions: actions } }
+  let(:branch) { 'master' }
+  let(:message) { 'Commit message' }
+  let(:actions) do
+    [
+      {
+        action: 'CREATE',
+        filePath: 'NEW_FILE.md',
+        content: 'Hello'
+      }
+    ]
+  end
+
+  let(:mutation) { graphql_mutation(:commit_create, input) }
+  let(:mutation_response) { graphql_mutation_response(:commit_create) }
+
+  context 'the user is not allowed to create a commit' do
+    it_behaves_like 'a mutation that returns top-level errors',
+      errors: ['The resource that you are attempting to access does not exist or you don\'t have permission to perform this action']
+  end
+
+  context 'when user has permissions to create a commit' do
+    before do
+      project.add_developer(current_user)
+    end
+
+    it 'creates a new commit' do
+      post_graphql_mutation(mutation, current_user: current_user)
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(mutation_response['commit']).to include(
+        'title' => message
+      )
+    end
+
+    context 'when branch is not correct' do
+      let(:branch) { 'unknown' }
+
+      it_behaves_like 'a mutation that returns errors in the response',
+        errors: ['You can only create or edit files when you are on a branch']
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/container_expiration_policy/update_spec.rb b/spec/requests/api/graphql/mutations/container_expiration_policy/update_spec.rb
new file mode 100644
index 00000000000..bc256a08f00
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/container_expiration_policy/update_spec.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Updating the container expiration policy' do
+  include GraphqlHelpers
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:project, reload: true) { create(:project) }
+  let_it_be(:user) { create(:user) }
+
+  let(:container_expiration_policy) { project.container_expiration_policy.reload }
+  let(:params) do
+    {
+      project_path: project.full_path,
+      cadence: 'EVERY_THREE_MONTHS',
+      keep_n: 'ONE_HUNDRED_TAGS',
+      older_than: 'FOURTEEN_DAYS'
+    }
+  end
+  let(:mutation) do
+    graphql_mutation(:update_container_expiration_policy, params,
+                     <<~QL
+                       containerExpirationPolicy {
+                         cadence
+                         keepN
+                         nameRegexKeep
+                         nameRegex
+                         olderThan
+                       }
+                       errors
+                     QL
+    )
+  end
+  let(:mutation_response) { graphql_mutation_response(:update_container_expiration_policy) }
+  let(:container_expiration_policy_response) { mutation_response['containerExpirationPolicy'] }
+
+  RSpec.shared_examples 'returning a success' do
+    it_behaves_like 'returning response status', :success
+
+    it 'returns the updated container expiration policy' do
+      subject
+
+      expect(mutation_response['errors']).to be_empty
+      expect(container_expiration_policy_response['cadence']).to eq(params[:cadence])
+      expect(container_expiration_policy_response['keepN']).to eq(params[:keep_n])
+      expect(container_expiration_policy_response['olderThan']).to eq(params[:older_than])
+    end
+  end
+
+  RSpec.shared_examples 'updating the container expiration policy' do
+    it_behaves_like 'updating the container expiration policy attributes', mode: :update, from: { cadence: '1d', keep_n: 10, older_than: '90d' }, to: { cadence: '3month', keep_n: 100, older_than: '14d' }
+
+    it_behaves_like 'returning a success'
+  end
+
+  RSpec.shared_examples 'denying access to container expiration policy' do
+    it_behaves_like 'not creating the container expiration policy'
+
+    it_behaves_like 'returning response status', :success
+
+    it 'returns no response' do
+      subject
+
+      expect(mutation_response).to be_nil
+    end
+  end
+
+  describe 'post graphql mutation' do
+    subject { post_graphql_mutation(mutation, current_user: user) }
+
+    context 'with existing container expiration policy' do
+      where(:user_role, :shared_examples_name) do
+        :maintainer | 'updating the container expiration policy'
+        :developer  | 'updating the container expiration policy'
+        :reporter   | 'denying access to container expiration policy'
+        :guest      | 'denying access to container expiration policy'
+        :anonymous  | 'denying access to container expiration policy'
+      end
+
+      with_them do
+        before do
+          project.send("add_#{user_role}", user) unless user_role == :anonymous
+        end
+
+        it_behaves_like params[:shared_examples_name]
+      end
+    end
+
+    context 'without existing container expiration policy' do
+      let_it_be(:project, reload: true) { create(:project, :without_container_expiration_policy) }
+
+      where(:user_role, :shared_examples_name) do
+        :maintainer | 'creating the container expiration policy'
+        :developer  | 'creating the container expiration policy'
+        :reporter   | 'denying access to container expiration policy'
+        :guest      | 'denying access to container expiration policy'
+        :anonymous  | 'denying access to container expiration policy'
+      end
+
+      with_them do
+        before do
+          project.send("add_#{user_role}", user) unless user_role == :anonymous
+        end
+
+        it_behaves_like params[:shared_examples_name]
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/discussions/toggle_resolve_spec.rb b/spec/requests/api/graphql/mutations/discussions/toggle_resolve_spec.rb
new file mode 100644
index 00000000000..95e967c039d
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/discussions/toggle_resolve_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Toggling the resolve status of a discussion' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let_it_be(:noteable) { create(:merge_request, source_project: project) }
+  let(:discussion) do
+    create(:diff_note_on_merge_request, noteable: noteable, project: project).to_discussion
+  end
+  let(:mutation) do
+    graphql_mutation(:discussion_toggle_resolve, { id: discussion.to_global_id.to_s, resolve: true })
+  end
+  let(:mutation_response) { graphql_mutation_response(:discussion_toggle_resolve) }
+
+  context 'when the user does not have permission' do
+    let_it_be(:current_user) { create(:user) }
+
+    it_behaves_like 'a mutation that returns top-level errors',
+      errors: ["The resource that you are attempting to access does not exist or you don't have permission to perform this action"]
+  end
+
+  context 'when user has permission' do
+    let_it_be(:current_user) { create(:user, developer_projects: [project]) }
+
+    it 'returns the discussion without errors', :aggregate_failures do
+      post_graphql_mutation(mutation, current_user: current_user)
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(mutation_response).to include(
+        'discussion' => be_present,
+        'errors' => be_empty
+      )
+    end
+
+    context 'when an error is encountered' do
+      before do
+        allow_next_instance_of(::Discussions::ResolveService) do |service|
+          allow(service).to receive(:execute).and_raise(ActiveRecord::RecordNotSaved)
+        end
+      end
+
+      it_behaves_like 'a mutation that returns errors in the response',
+        errors: ['Discussion failed to be resolved']
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/jira_import/import_users_spec.rb b/spec/requests/api/graphql/mutations/jira_import/import_users_spec.rb
new file mode 100644
index 00000000000..be0d843d5ff
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/jira_import/import_users_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Importing Jira Users' do
+  include JiraServiceHelper
+  include GraphqlHelpers
+
+  let_it_be(:user)    { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let(:project_path)  { project.full_path }
+  let(:start_at)      { 7 }
+
+  let(:mutation) do
+    variables = {
+      start_at: start_at,
+      project_path: project_path
+    }
+
+    graphql_mutation(:jira_import_users, variables)
+  end
+
+  def mutation_response
+    graphql_mutation_response(:jira_import_users)
+  end
+
+  def jira_import
+    mutation_response['jiraUsers']
+  end
+
+  context 'with anonymous user' do
+    let(:current_user) { nil }
+
+    it_behaves_like 'a mutation that returns top-level errors',
+                    errors: [Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR]
+  end
+
+  context 'with user without permissions' do
+    let(:current_user) { user }
+
+    before do
+      project.add_developer(current_user)
+    end
+
+    it_behaves_like 'a mutation that returns top-level errors',
+                    errors: [Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR]
+  end
+
+  context 'when the user has permissions' do
+    let(:current_user) { user }
+
+    before do
+      project.add_maintainer(current_user)
+    end
+
+    context 'when the project path is invalid' do
+      let(:project_path) { 'foobar' }
+
+      it 'returns an an error' do
+        post_graphql_mutation(mutation, current_user: current_user)
+
+        errors = json_response['errors']
+
+        expect(errors.first['message']).to eq(Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR)
+      end
+    end
+
+    context 'when all params and permissions are ok' do
+      let(:importer) { instance_double(JiraImport::UsersImporter) }
+
+      before do
+        expect(JiraImport::UsersImporter).to receive(:new).with(current_user, project, 7)
+          .and_return(importer)
+      end
+
+      context 'when service returns a successful response' do
+        it 'returns imported users' do
+          users = [{ jira_account_id: '12a', jira_display_name: 'user 1' }]
+          result = ServiceResponse.success(payload: users)
+
+          expect(importer).to receive(:execute).and_return(result)
+
+          post_graphql_mutation(mutation, current_user: current_user)
+
+          expect(jira_import.length).to eq(1)
+          expect(jira_import.first['jiraAccountId']).to eq('12a')
+          expect(jira_import.first['jiraDisplayName']).to eq('user 1')
+        end
+      end
+
+      context 'when service returns an error response' do
+        it 'returns an error messaege' do
+          result = ServiceResponse.error(message: 'Some error')
+
+          expect(importer).to receive(:execute).and_return(result)
+
+          post_graphql_mutation(mutation, current_user: current_user)
+
+          expect(mutation_response['errors']).to eq(['Some error'])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/jira_import/start_spec.rb b/spec/requests/api/graphql/mutations/jira_import/start_spec.rb
index 84110098400..296d33aec5d 100644
--- a/spec/requests/api/graphql/mutations/jira_import/start_spec.rb
+++ b/spec/requests/api/graphql/mutations/jira_import/start_spec.rb
@@ -29,10 +29,6 @@ describe 'Starting a Jira Import' do
   end
 
   context 'when the user does not have permission' do
-    before do
-      stub_feature_flags(jira_issue_import: true)
-    end
-
     shared_examples 'Jira import does not start' do
       it 'does not start the Jira import' do
         post_graphql_mutation(mutation, current_user: current_user)
@@ -83,53 +79,39 @@ describe 'Starting a Jira Import' do
         end
       end
 
-      context 'when feature jira_issue_import feature flag is disabled' do
-        before do
-          stub_feature_flags(jira_issue_import: false)
-        end
-
-        it_behaves_like 'a mutation that returns errors in the response', errors: ['Jira import feature is disabled.']
+      context 'when project has no Jira service' do
+        it_behaves_like 'a mutation that returns errors in the response', errors: ['Jira integration not configured.']
       end
 
-      context 'when feature jira_issue_import feature flag is enabled' do
+      context 'when when project has Jira service' do
+        let!(:service) { create(:jira_service, project: project) }
+
         before do
-          stub_feature_flags(jira_issue_import: true)
-        end
+          project.reload
 
-        context 'when project has no Jira service' do
-          it_behaves_like 'a mutation that returns errors in the response', errors: ['Jira integration not configured.']
+          stub_jira_service_test
         end
 
-        context 'when when project has Jira service' do
-          let!(:service) { create(:jira_service, project: project) }
+        context 'when issues feature are disabled' do
+          let_it_be(:project, reload: true) { create(:project, :issues_disabled) }
 
-          before do
-            project.reload
-
-            stub_jira_service_test
-          end
-
-          context 'when issues feature are disabled' do
-            let_it_be(:project, reload: true) { create(:project, :issues_disabled) }
-
-            it_behaves_like 'a mutation that returns errors in the response', errors: ['Cannot import because issues are not available in this project.']
-          end
+          it_behaves_like 'a mutation that returns errors in the response', errors: ['Cannot import because issues are not available in this project.']
+        end
 
-          context 'when jira_project_key not provided' do
-            let(:jira_project_key) { '' }
+        context 'when jira_project_key not provided' do
+          let(:jira_project_key) { '' }
 
-            it_behaves_like 'a mutation that returns errors in the response', errors: ['Unable to find Jira project to import data from.']
-          end
+          it_behaves_like 'a mutation that returns errors in the response', errors: ['Unable to find Jira project to import data from.']
+        end
 
-          context 'when Jira import successfully scheduled' do
-            it 'schedules a Jira import' do
-              post_graphql_mutation(mutation, current_user: current_user)
+        context 'when Jira import successfully scheduled' do
+          it 'schedules a Jira import' do
+            post_graphql_mutation(mutation, current_user: current_user)
 
-              expect(jira_import['jiraProjectKey']).to eq 'AA'
-              expect(jira_import['scheduledBy']['username']).to eq current_user.username
-              expect(project.latest_jira_import).not_to be_nil
-              expect(project.latest_jira_import).to be_scheduled
-            end
+            expect(jira_import['jiraProjectKey']).to eq 'AA'
+            expect(jira_import['scheduledBy']['username']).to eq current_user.username
+            expect(project.latest_jira_import).not_to be_nil
+            expect(project.latest_jira_import).to be_scheduled
           end
         end
       end
diff --git a/spec/requests/api/graphql/mutations/merge_requests/create_spec.rb b/spec/requests/api/graphql/mutations/merge_requests/create_spec.rb
new file mode 100644
index 00000000000..5c63f655f1d
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/merge_requests/create_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Creation of a new merge request' do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user) }
+  let(:project) { create(:project, :public, :repository) }
+  let(:input) do
+    {
+      project_path: project.full_path,
+      title: title,
+      source_branch: source_branch,
+      target_branch: target_branch
+    }
+  end
+  let(:title) { 'MergeRequest' }
+  let(:source_branch) { 'new_branch' }
+  let(:target_branch) { 'master' }
+
+  let(:mutation) { graphql_mutation(:merge_request_create, input) }
+  let(:mutation_response) { graphql_mutation_response(:merge_request_create) }
+
+  context 'the user is not allowed to create a branch' do
+    it_behaves_like 'a mutation that returns top-level errors',
+      errors: ['The resource that you are attempting to access does not exist or you don\'t have permission to perform this action']
+  end
+
+  context 'when user has permissions to create a merge request' do
+    before do
+      project.add_developer(current_user)
+    end
+
+    it 'creates a new merge request' do
+      post_graphql_mutation(mutation, current_user: current_user)
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(mutation_response['mergeRequest']).to include(
+        'title' => title
+      )
+    end
+
+    context 'when source branch is equal to the target branch' do
+      let(:source_branch) { target_branch }
+
+      it_behaves_like 'a mutation that returns errors in the response',
+        errors: ['Branch conflict You can\'t use same project/branch for source and target']
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/metrics/dashboard/annotations/delete_spec.rb b/spec/requests/api/graphql/mutations/metrics/dashboard/annotations/delete_spec.rb
new file mode 100644
index 00000000000..217f538c53e
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/metrics/dashboard/annotations/delete_spec.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Mutations::Metrics::Dashboard::Annotations::Delete do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:project) { create(:project, :private, :repository) }
+  let_it_be(:environment) { create(:environment, project: project) }
+  let_it_be(:annotation) { create(:metrics_dashboard_annotation, environment: environment) }
+  let(:mutation) do
+    variables = {
+      id: GitlabSchema.id_from_object(annotation).to_s
+    }
+
+    graphql_mutation(:delete_annotation, variables)
+  end
+
+  def mutation_response
+    graphql_mutation_response(:delete_annotation)
+  end
+
+  specify { expect(described_class).to require_graphql_authorizations(:delete_metrics_dashboard_annotation) }
+
+  context 'when the user has permission to delete the annotation' do
+    before do
+      project.add_developer(current_user)
+    end
+
+    context 'with valid params' do
+      it 'deletes the annotation' do
+        expect do
+          post_graphql_mutation(mutation, current_user: current_user)
+        end.to change { Metrics::Dashboard::Annotation.count }.by(-1)
+      end
+    end
+
+    context 'with invalid params' do
+      let(:mutation) do
+        variables = {
+          id: 'invalid_id'
+        }
+
+        graphql_mutation(:delete_annotation, variables)
+      end
+
+      it_behaves_like 'a mutation that returns top-level errors', errors: ['invalid_id is not a valid GitLab id.']
+    end
+
+    context 'when the delete fails' do
+      let(:service_response) { { message: 'Annotation has not been deleted', status: :error, last_step: :delete } }
+
+      before do
+        allow_next_instance_of(Metrics::Dashboard::Annotations::DeleteService) do |delete_service|
+          allow(delete_service).to receive(:execute).and_return(service_response)
+        end
+      end
+      it 'returns the error' do
+        post_graphql_mutation(mutation, current_user: current_user)
+
+        expect(mutation_response['errors']).to eq([service_response[:message]])
+      end
+    end
+  end
+
+  context 'when the user does not have permission to delete the annotation' do
+    before do
+      project.add_reporter(current_user)
+    end
+
+    it_behaves_like 'a mutation that returns top-level errors', errors: [Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR]
+
+    it 'does not delete the annotation' do
+      expect do
+        post_graphql_mutation(mutation, current_user: current_user)
+      end.not_to change { Metrics::Dashboard::Annotation.count }
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/snippets/create_spec.rb b/spec/requests/api/graphql/mutations/snippets/create_spec.rb
index e1e5fe22887..9052f54b171 100644
--- a/spec/requests/api/graphql/mutations/snippets/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/snippets/create_spec.rb
@@ -109,31 +109,21 @@ describe 'Creating a Snippet' do
       context 'when the project path is invalid' do
         let(:project_path) { 'foobar' }
 
-        it 'returns an an error' do
-          subject
-          errors = json_response['errors']
-
-          expect(errors.first['message']).to eq(Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR)
-        end
+        it_behaves_like 'a mutation that returns top-level errors',
+                        errors: [Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR]
       end
 
       context 'when the feature is disabled' do
-        it 'returns an an error' do
+        before do
           project.project_feature.update_attribute(:snippets_access_level, ProjectFeature::DISABLED)
-
-          subject
-          errors = json_response['errors']
-
-          expect(errors.first['message']).to eq(Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR)
         end
+
+        it_behaves_like 'a mutation that returns top-level errors',
+                        errors: [Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR]
       end
     end
 
-    context 'when there are ActiveRecord validation errors' do
-      let(:title) { '' }
-
-      it_behaves_like 'a mutation that returns errors in the response', errors: ["Title can't be blank"]
-
+    shared_examples 'does not create snippet' do
       it 'does not create the Snippet' do
         expect do
           subject
@@ -147,7 +137,21 @@ describe 'Creating a Snippet' do
       end
     end
 
-    context 'when there uploaded files' do
+    context 'when there are ActiveRecord validation errors' do
+      let(:title) { '' }
+
+      it_behaves_like 'a mutation that returns errors in the response', errors: ["Title can't be blank"]
+      it_behaves_like 'does not create snippet'
+    end
+
+    context 'when there non ActiveRecord errors' do
+      let(:file_name) { 'invalid://file/path' }
+
+      it_behaves_like 'a mutation that returns errors in the response', errors: ['Repository Error creating the snippet - Invalid file name']
+      it_behaves_like 'does not create snippet'
+    end
+
+    context 'when there are uploaded files' do
       shared_examples 'expected files argument' do |file_value, expected_value|
         let(:uploaded_files) { file_value }
 
diff --git a/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb b/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb
new file mode 100644
index 00000000000..4c048caaeee
--- /dev/null
+++ b/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'getting Alert Management Alert Assignees' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:first_alert) { create(:alert_management_alert, project: project, assignees: [current_user]) }
+  let_it_be(:second_alert) { create(:alert_management_alert, project: project) }
+
+  let(:params) { {} }
+
+  let(:fields) do
+    <<~QUERY
+      nodes {
+        iid
+        assignees {
+          nodes {
+            username
+          }
+        }
+      }
+    QUERY
+  end
+
+  let(:query) do
+    graphql_query_for(
+      'project',
+      { 'fullPath' => project.full_path },
+      query_graphql_field('alertManagementAlerts', params, fields)
+    )
+  end
+
+  let(:alerts) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') }
+  let(:assignees) { alerts.map { |alert| [alert['iid'], alert['assignees']['nodes']] }.to_h }
+  let(:first_assignees) { assignees[first_alert.iid.to_s] }
+  let(:second_assignees) { assignees[second_alert.iid.to_s] }
+
+  before do
+    project.add_developer(current_user)
+  end
+
+  it 'returns the correct assignees' do
+    post_graphql(query, current_user: current_user)
+
+    expect(first_assignees.length).to eq(1)
+    expect(first_assignees.first).to include('username' => current_user.username)
+    expect(second_assignees).to be_empty
+  end
+
+  it 'applies appropriate filters for non-visible users' do
+    allow(Ability).to receive(:allowed?).and_call_original
+    allow(Ability).to receive(:allowed?).with(current_user, :read_user, current_user).and_return(false)
+
+    post_graphql(query, current_user: current_user)
+
+    expect(first_assignees).to be_empty
+    expect(second_assignees).to be_empty
+  end
+
+  it 'avoids N+1 queries' do
+    base_count = ActiveRecord::QueryRecorder.new do
+      post_graphql(query, current_user: current_user)
+    end
+
+    # An N+1 would mean a new alert would increase the query count
+    third_alert = create(:alert_management_alert, project: project, assignees: [current_user])
+
+    expect { post_graphql(query, current_user: current_user) }.not_to exceed_query_limit(base_count)
+
+    third_assignees = assignees[third_alert.iid.to_s]
+
+    expect(third_assignees.length).to eq(1)
+    expect(third_assignees.first).to include('username' => current_user.username)
+  end
+end
diff --git a/spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb b/spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb
new file mode 100644
index 00000000000..df6bfa8c97b
--- /dev/null
+++ b/spec/requests/api/graphql/project/alert_management/alert/notes_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'getting Alert Management Alert Notes' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:first_alert) { create(:alert_management_alert, project: project, assignees: [current_user]) }
+  let_it_be(:second_alert) { create(:alert_management_alert, project: project) }
+  let_it_be(:first_system_note) { create(:note_on_alert, noteable: first_alert, project: project) }
+  let_it_be(:second_system_note) { create(:note_on_alert, noteable: first_alert, project: project) }
+
+  let(:params) { {} }
+
+  let(:fields) do
+    <<~QUERY
+      nodes {
+        iid
+        notes {
+          nodes {
+            id
+          }
+        }
+      }
+    QUERY
+  end
+
+  let(:query) do
+    graphql_query_for(
+      'project',
+      { 'fullPath' => project.full_path },
+      query_graphql_field('alertManagementAlerts', params, fields)
+    )
+  end
+
+  let(:alerts_result) { graphql_data.dig('project', 'alertManagementAlerts', 'nodes') }
+  let(:notes_result) { alerts_result.map { |alert| [alert['iid'], alert['notes']['nodes']] }.to_h }
+  let(:first_notes_result) { notes_result[first_alert.iid.to_s] }
+  let(:second_notes_result) { notes_result[second_alert.iid.to_s] }
+
+  before do
+    project.add_developer(current_user)
+  end
+
+  it 'returns the notes ordered by createdAt' do
+    post_graphql(query, current_user: current_user)
+
+    expect(first_notes_result.length).to eq(2)
+    expect(first_notes_result.first).to include('id' => first_system_note.to_global_id.to_s)
+    expect(first_notes_result.second).to include('id' => second_system_note.to_global_id.to_s)
+    expect(second_notes_result).to be_empty
+  end
+
+  it 'avoids N+1 queries' do
+    base_count = ActiveRecord::QueryRecorder.new do
+      post_graphql(query, current_user: current_user)
+    end
+
+    # An N+1 would mean a new alert would increase the query count
+    create(:alert_management_alert, project: project)
+
+    expect { post_graphql(query, current_user: current_user) }.not_to exceed_query_limit(base_count)
+    expect(alerts_result.length).to eq(3)
+  end
+end
diff --git a/spec/requests/api/graphql/project/alert_management/alert_status_counts_spec.rb b/spec/requests/api/graphql/project/alert_management/alert_status_counts_spec.rb
index ffd328429ef..a0d1ff7efc5 100644
--- a/spec/requests/api/graphql/project/alert_management/alert_status_counts_spec.rb
+++ b/spec/requests/api/graphql/project/alert_management/alert_status_counts_spec.rb
@@ -56,6 +56,22 @@ describe 'getting Alert Management Alert counts by status' do
           'ignored' => 0
         )
       end
+
+      context 'with search criteria' do
+        let(:params) { { search: alert_1.title } }
+
+        it_behaves_like 'a working graphql query'
+        it 'returns the correct counts for each status' do
+          expect(alert_counts).to eq(
+            'open' => 0,
+            'all' => 1,
+            'triggered' => 0,
+            'acknowledged' => 0,
+            'resolved' => 1,
+            'ignored' => 0
+          )
+        end
+      end
     end
   end
 end
diff --git a/spec/requests/api/graphql/project/alert_management/alerts_spec.rb b/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
index c226e659364..c591895f295 100644
--- a/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
+++ b/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
@@ -10,12 +10,13 @@ describe 'getting Alert Management Alerts' do
   let_it_be(:resolved_alert) { create(:alert_management_alert, :all_fields, :resolved, project: project, issue: nil, severity: :low) }
   let_it_be(:triggered_alert) { create(:alert_management_alert, :all_fields, project: project, severity: :critical, payload: payload) }
   let_it_be(:other_project_alert) { create(:alert_management_alert, :all_fields) }
+
   let(:params) { {} }
 
   let(:fields) do
     <<~QUERY
       nodes {
-        #{all_graphql_fields_for('AlertManagementAlert'.classify)}
+        #{all_graphql_fields_for('AlertManagementAlert', excluded: ['assignees'])}
       }
     QUERY
   end
diff --git a/spec/requests/api/graphql/project/container_expiration_policy_spec.rb b/spec/requests/api/graphql/project/container_expiration_policy_spec.rb
new file mode 100644
index 00000000000..d0563f9ff05
--- /dev/null
+++ b/spec/requests/api/graphql/project/container_expiration_policy_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe 'getting a repository in a project' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:current_user) { project.owner }
+  let_it_be(:container_expiration_policy) { project.container_expiration_policy }
+
+  let(:fields) do
+    <<~QUERY
+      #{all_graphql_fields_for('container_expiration_policy'.classify)}
+    QUERY
+  end
+  let(:query) do
+    graphql_query_for(
+      'project',
+      { 'fullPath' => project.full_path },
+      query_graphql_field('containerExpirationPolicy', {}, fields)
+    )
+  end
+
+  before do
+    stub_config(registry: { enabled: true })
+    post_graphql(query, current_user: current_user)
+  end
+
+  it_behaves_like 'a working graphql query'
+end
diff --git a/spec/requests/api/graphql/project/issues_spec.rb b/spec/requests/api/graphql/project/issues_spec.rb
index 91fce3eed92..3128f527356 100644
--- a/spec/requests/api/graphql/project/issues_spec.rb
+++ b/spec/requests/api/graphql/project/issues_spec.rb
@@ -124,7 +124,7 @@ describe 'getting an issue list for a project' do
       graphql_query_for(
         'project',
         { 'fullPath' => sort_project.full_path },
-        "issues(#{params}) { #{page_info} edges { node { iid dueDate } } }"
+        query_graphql_field('issues', params, "#{page_info} edges { node { iid dueDate} }")
       )
     end
 
diff --git a/spec/requests/api/graphql/project/jira_import_spec.rb b/spec/requests/api/graphql/project/jira_import_spec.rb
index e063068eb1a..7be14696963 100644
--- a/spec/requests/api/graphql/project/jira_import_spec.rb
+++ b/spec/requests/api/graphql/project/jira_import_spec.rb
@@ -7,9 +7,30 @@ describe 'query Jira import data' do
 
   let_it_be(:current_user) { create(:user) }
   let_it_be(:project) { create(:project, :private, :import_started, import_type: 'jira') }
-  let_it_be(:jira_import1) { create(:jira_import_state, :finished, project: project, jira_project_key: 'AA', user: current_user, created_at: 2.days.ago) }
-  let_it_be(:jira_import2) { create(:jira_import_state, :finished, project: project, jira_project_key: 'BB', user: current_user, created_at: 5.days.ago) }
-
+  let_it_be(:jira_import1) do
+    create(
+      :jira_import_state, :finished,
+      project: project,
+      jira_project_key: 'AA',
+      user: current_user,
+      created_at: 2.days.ago,
+      failed_to_import_count: 2,
+      imported_issues_count: 2,
+      total_issue_count: 4
+    )
+  end
+  let_it_be(:jira_import2) do
+    create(
+      :jira_import_state, :finished,
+      project: project,
+      jira_project_key: 'BB',
+      user: current_user,
+      created_at: 5.days.ago,
+      failed_to_import_count: 1,
+      imported_issues_count: 2,
+      total_issue_count: 3
+    )
+  end
   let(:query) do
     %(
       query {
@@ -23,6 +44,9 @@ describe 'query Jira import data' do
               scheduledBy {
                 username
               }
+              importedIssuesCount
+              failedToImportCount
+              totalIssueCount
             }
           }
         }
@@ -64,10 +88,16 @@ describe 'query Jira import data' do
       it 'retuns list of jira imports' do
         jira_proket_keys = jira_imports.map {|ji| ji['jiraProjectKey']}
         usernames = jira_imports.map {|ji| ji.dig('scheduledBy', 'username')}
+        imported_issues_count = jira_imports.map {|ji| ji.dig('importedIssuesCount')}
+        failed_issues_count = jira_imports.map {|ji| ji.dig('failedToImportCount')}
+        total_issue_count = jira_imports.map {|ji| ji.dig('totalIssueCount')}
 
         expect(jira_imports.size).to eq 2
         expect(jira_proket_keys).to eq %w(BB AA)
         expect(usernames).to eq [current_user.username, current_user.username]
+        expect(imported_issues_count).to eq [2, 2]
+        expect(failed_issues_count).to eq [1, 2]
+        expect(total_issue_count).to eq [3, 4]
       end
     end
 
diff --git a/spec/requests/api/graphql/project/jira_projects_spec.rb b/spec/requests/api/graphql/project/jira_projects_spec.rb
new file mode 100644
index 00000000000..d67c89f18c9
--- /dev/null
+++ b/spec/requests/api/graphql/project/jira_projects_spec.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'query Jira projects' do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+
+  include_context 'jira projects request context'
+
+  let(:services) { graphql_data_at(:project, :services, :edges) }
+  let(:jira_projects) { services.first.dig('node', 'projects', 'nodes') }
+  let(:projects_query) { 'projects' }
+  let(:query) do
+    %(
+      query {
+        project(fullPath: "#{project.full_path}") {
+          services(active: true, type: JIRA_SERVICE) {
+            edges {
+              node {
+                ... on JiraService {
+                  %{projects_query} {
+                    nodes {
+                      key
+                      name
+                      projectId
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ) % { projects_query: projects_query }
+  end
+
+  context 'when user does not have access' do
+    it_behaves_like 'unauthorized users cannot read services'
+  end
+
+  context 'when user can access project services' do
+    before do
+      project.add_maintainer(current_user)
+      post_graphql(query, current_user: current_user)
+    end
+
+    it_behaves_like 'a working graphql query'
+
+    it 'retuns list of jira projects' do
+      project_keys = jira_projects.map { |jp| jp['key'] }
+      project_names = jira_projects.map { |jp| jp['name'] }
+      project_ids = jira_projects.map { |jp| jp['projectId'] }
+
+      expect(jira_projects.size).to eq(2)
+      expect(project_keys).to eq(%w(EX ABC))
+      expect(project_names).to eq(%w(Example Alphabetical))
+      expect(project_ids).to eq([10000, 10001])
+    end
+
+    context 'with pagination' do
+      context 'when fetching limited number of projects' do
+        shared_examples_for 'fetches first project' do
+          it 'retuns first project from list of fetched projects' do
+            project_keys = jira_projects.map { |jp| jp['key'] }
+            project_names = jira_projects.map { |jp| jp['name'] }
+            project_ids = jira_projects.map { |jp| jp['projectId'] }
+
+            expect(jira_projects.size).to eq(1)
+            expect(project_keys).to eq(%w(EX))
+            expect(project_names).to eq(%w(Example))
+            expect(project_ids).to eq([10000])
+          end
+        end
+
+        context 'without cursor' do
+          let(:projects_query) { 'projects(first: 1)' }
+
+          it_behaves_like 'fetches first project'
+        end
+
+        context 'with before cursor' do
+          let(:projects_query) { 'projects(before: "Mg==", first: 1)' }
+
+          it_behaves_like 'fetches first project'
+        end
+
+        context 'with after cursor' do
+          let(:projects_query) { 'projects(after: "MA==", first: 1)' }
+
+          it_behaves_like 'fetches first project'
+        end
+      end
+
+      context 'with valid but inexistent after cursor' do
+        let(:projects_query) { 'projects(after: "MTk==")' }
+
+        it 'retuns empty list of jira projects' do
+          expect(jira_projects.size).to eq(0)
+        end
+      end
+
+      context 'with invalid after cursor' do
+        let(:projects_query) { 'projects(after: "invalid==")' }
+
+        it 'treats the invalid cursor as no cursor and returns list of jira projects' do
+          expect(jira_projects.size).to eq(2)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/project/labels_query_spec.rb b/spec/requests/api/graphql/project/labels_query_spec.rb
new file mode 100644
index 00000000000..ecc43e0a3db
--- /dev/null
+++ b/spec/requests/api/graphql/project/labels_query_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'getting project label information' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project, :public) }
+  let_it_be(:label_factory) { :label }
+  let_it_be(:label_attrs) { { project: project } }
+
+  it_behaves_like 'querying a GraphQL type with labels' do
+    let(:path_prefix) { ['project'] }
+
+    def make_query(fields)
+      graphql_query_for('project', { full_path: project.full_path }, fields)
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/project/merge_request_spec.rb b/spec/requests/api/graphql/project/merge_request_spec.rb
index 8d8c31c335d..643532bf2e2 100644
--- a/spec/requests/api/graphql/project/merge_request_spec.rb
+++ b/spec/requests/api/graphql/project/merge_request_spec.rb
@@ -37,6 +37,30 @@ describe 'getting merge request information nested in a project' do
     expect(merge_request_graphql_data['webUrl']).to be_present
   end
 
+  it 'includes author' do
+    post_graphql(query, current_user: current_user)
+
+    expect(merge_request_graphql_data['author']['username']).to eq(merge_request.author.username)
+  end
+
+  it 'includes correct mergedAt value when merged' do
+    time = 1.week.ago
+    merge_request.mark_as_merged
+    merge_request.metrics.update_columns(merged_at: time)
+
+    post_graphql(query, current_user: current_user)
+    retrieved = merge_request_graphql_data['mergedAt']
+
+    expect(Time.zone.parse(retrieved)).to be_within(1.second).of(time)
+  end
+
+  it 'includes nil mergedAt value when not merged' do
+    post_graphql(query, current_user: current_user)
+    retrieved = merge_request_graphql_data['mergedAt']
+
+    expect(retrieved).to be_nil
+  end
+
   context 'permissions on the merge request' do
     it 'includes the permissions for the current user on a public project' do
       expected_permissions = {
diff --git a/spec/requests/api/graphql/project/merge_requests_spec.rb b/spec/requests/api/graphql/project/merge_requests_spec.rb
new file mode 100644
index 00000000000..49fdfe29874
--- /dev/null
+++ b/spec/requests/api/graphql/project/merge_requests_spec.rb
@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'getting merge request listings nested in a project' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project, :repository, :public) }
+  let_it_be(:current_user) { create(:user) }
+
+  let_it_be(:label) { create(:label) }
+  let_it_be(:merge_request_a) { create(:labeled_merge_request, :unique_branches, source_project: project, labels: [label]) }
+  let_it_be(:merge_request_b) { create(:merge_request, :closed, :unique_branches, source_project: project) }
+  let_it_be(:merge_request_c) { create(:labeled_merge_request, :closed, :unique_branches, source_project: project, labels: [label]) }
+  let_it_be(:merge_request_d) { create(:merge_request, :locked, :unique_branches, source_project: project) }
+
+  let(:results) { graphql_data.dig('project', 'mergeRequests', 'nodes') }
+
+  let(:search_params) { nil }
+
+  def query_merge_requests(fields)
+    graphql_query_for(
+      :project,
+      { full_path: project.full_path },
+      query_graphql_field(:merge_requests, search_params, [
+        query_graphql_field(:nodes, nil, fields)
+      ])
+    )
+  end
+
+  let(:query) do
+    query_merge_requests(all_graphql_fields_for('MergeRequest', max_depth: 1))
+  end
+
+  it_behaves_like 'a working graphql query' do
+    before do
+      post_graphql(query, current_user: current_user)
+    end
+  end
+
+  # The following tests are needed to guarantee that we have correctly annotated
+  # all the gitaly calls.  Selecting combinations of fields may mask this due to
+  # memoization.
+  context 'requesting a single field' do
+    let_it_be(:fresh_mr) { create(:merge_request, :unique_branches, source_project: project) }
+    let(:search_params) { { iids: [fresh_mr.iid.to_s] } }
+
+    before do
+      project.repository.expire_branches_cache
+    end
+
+    context 'selecting any single scalar field' do
+      where(:field) do
+        scalar_fields_of('MergeRequest').map { |name| [name] }
+      end
+
+      with_them do
+        it_behaves_like 'a working graphql query' do
+          let(:query) do
+            query_merge_requests([:iid, field].uniq)
+          end
+
+          before do
+            post_graphql(query, current_user: current_user)
+          end
+
+          it 'selects the correct MR' do
+            expect(results).to contain_exactly(a_hash_including('iid' => fresh_mr.iid.to_s))
+          end
+        end
+      end
+    end
+
+    context 'selecting any single nested field' do
+      where(:field, :subfield, :is_connection) do
+        nested_fields_of('MergeRequest').flat_map do |name, field|
+          type = field_type(field)
+          is_connection = type.name.ends_with?('Connection')
+          type = field_type(type.fields['nodes']) if is_connection
+
+          type.fields
+            .select { |_, field| !nested_fields?(field) && !required_arguments?(field) }
+            .map(&:first)
+            .map { |subfield| [name, subfield, is_connection] }
+        end
+      end
+
+      with_them do
+        it_behaves_like 'a working graphql query' do
+          let(:query) do
+            fld = is_connection ? query_graphql_field(:nodes, nil, [subfield]) : subfield
+            query_merge_requests([:iid, query_graphql_field(field, nil, [fld])])
+          end
+
+          before do
+            post_graphql(query, current_user: current_user)
+          end
+
+          it 'selects the correct MR' do
+            expect(results).to contain_exactly(a_hash_including('iid' => fresh_mr.iid.to_s))
+          end
+        end
+      end
+    end
+  end
+
+  shared_examples 'searching with parameters' do
+    let(:expected) do
+      mrs.map { |mr| a_hash_including('iid' => mr.iid.to_s, 'title' => mr.title) }
+    end
+
+    it 'finds the right mrs' do
+      post_graphql(query, current_user: current_user)
+
+      expect(results).to match_array(expected)
+    end
+  end
+
+  context 'there are no search params' do
+    let(:search_params) { nil }
+    let(:mrs) { [merge_request_a, merge_request_b, merge_request_c, merge_request_d] }
+
+    it_behaves_like 'searching with parameters'
+  end
+
+  context 'the search params do not match anything' do
+    let(:search_params) { { iids: %w(foo bar baz) } }
+    let(:mrs) { [] }
+
+    it_behaves_like 'searching with parameters'
+  end
+
+  context 'searching by iids' do
+    let(:search_params) { { iids: mrs.map(&:iid).map(&:to_s) } }
+    let(:mrs) { [merge_request_a, merge_request_c] }
+
+    it_behaves_like 'searching with parameters'
+  end
+
+  context 'searching by state' do
+    let(:search_params) { { state: :closed } }
+    let(:mrs) { [merge_request_b, merge_request_c] }
+
+    it_behaves_like 'searching with parameters'
+  end
+
+  context 'searching by source_branch' do
+    let(:search_params) { { source_branches: mrs.map(&:source_branch) } }
+    let(:mrs) { [merge_request_b, merge_request_c] }
+
+    it_behaves_like 'searching with parameters'
+  end
+
+  context 'searching by target_branch' do
+    let(:search_params) { { target_branches: mrs.map(&:target_branch) } }
+    let(:mrs) { [merge_request_a, merge_request_d] }
+
+    it_behaves_like 'searching with parameters'
+  end
+
+  context 'searching by label' do
+    let(:search_params) { { labels: [label.title] } }
+    let(:mrs) { [merge_request_a, merge_request_c] }
+
+    it_behaves_like 'searching with parameters'
+  end
+
+  context 'searching by combination' do
+    let(:search_params) { { state: :closed, labels: [label.title] } }
+    let(:mrs) { [merge_request_c] }
+
+    it_behaves_like 'searching with parameters'
+  end
+end
diff --git a/spec/requests/api/graphql/project/pipeline_spec.rb b/spec/requests/api/graphql/project/pipeline_spec.rb
new file mode 100644
index 00000000000..bed9a18577f
--- /dev/null
+++ b/spec/requests/api/graphql/project/pipeline_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'getting pipeline information nested in a project' do
+  include GraphqlHelpers
+
+  let(:project) { create(:project, :repository, :public) }
+  let(:pipeline) { create(:ci_pipeline, project: project) }
+  let(:current_user) { create(:user) }
+  let(:pipeline_graphql_data) { graphql_data['project']['pipeline'] }
+
+  let(:query) do
+    graphql_query_for(
+      'project',
+      { 'fullPath' => project.full_path },
+      query_graphql_field('pipeline', iid: pipeline.iid.to_s)
+    )
+  end
+
+  it_behaves_like 'a working graphql query' do
+    before do
+      post_graphql(query, current_user: current_user)
+    end
+  end
+
+  it 'contains pipeline information' do
+    post_graphql(query, current_user: current_user)
+
+    expect(pipeline_graphql_data).not_to be_nil
+  end
+end
diff --git a/spec/requests/api/graphql/project/release_spec.rb b/spec/requests/api/graphql/project/release_spec.rb
new file mode 100644
index 00000000000..f8624a97a2b
--- /dev/null
+++ b/spec/requests/api/graphql/project/release_spec.rb
@@ -0,0 +1,206 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'pp'
+
+describe 'Query.project(fullPath).release(tagName)' do
+  include GraphqlHelpers
+  include Presentable
+
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:milestone_1) { create(:milestone, project: project) }
+  let_it_be(:milestone_2) { create(:milestone, project: project) }
+  let_it_be(:release) { create(:release, :with_evidence, project: project, milestones: [milestone_1, milestone_2]) }
+  let_it_be(:release_link_1) { create(:release_link, release: release) }
+  let_it_be(:release_link_2) { create(:release_link, release: release) }
+  let_it_be(:developer) { create(:user) }
+
+  let(:current_user) { developer }
+
+  def query(rq = release_fields)
+    graphql_query_for(:project, { fullPath: project.full_path },
+      query_graphql_field(:release, { tagName: release.tag }, rq))
+  end
+
+  let(:post_query) { post_graphql(query, current_user: current_user) }
+  let(:path_prefix) { %w[project release] }
+
+  let(:data) { graphql_data.dig(*path) }
+
+  before do
+    project.add_developer(developer)
+  end
+
+  describe 'scalar fields' do
+    let(:path) { path_prefix }
+    let(:release_fields) do
+      query_graphql_field(%{
+        tagName
+        tagPath
+        description
+        descriptionHtml
+        name
+        createdAt
+        releasedAt
+      })
+    end
+
+    before do
+      post_query
+    end
+
+    it 'finds all release data' do
+      expect(data).to eq({
+        'tagName' => release.tag,
+        'tagPath' => project_tag_path(project, release.tag),
+        'description' => release.description,
+        'descriptionHtml' => release.description_html,
+        'name' => release.name,
+        'createdAt' => release.created_at.iso8601,
+        'releasedAt' => release.released_at.iso8601
+      })
+    end
+  end
+
+  describe 'milestones' do
+    let(:path) { path_prefix + %w[milestones nodes] }
+    let(:release_fields) do
+      query_graphql_field(:milestones, nil, 'nodes { id title }')
+    end
+
+    it 'finds all milestones associated to a release' do
+      post_query
+
+      expected = release.milestones.map do |milestone|
+        { 'id' => global_id_of(milestone), 'title' => milestone.title }
+      end
+
+      expect(data).to match_array(expected)
+    end
+  end
+
+  describe 'author' do
+    let(:path) { path_prefix + %w[author] }
+    let(:release_fields) do
+      query_graphql_field(:author, nil, 'id username')
+    end
+
+    it 'finds the author of the release' do
+      post_query
+
+      expect(data).to eq({
+        'id' => global_id_of(release.author),
+        'username' => release.author.username
+      })
+    end
+  end
+
+  describe 'commit' do
+    let(:path) { path_prefix + %w[commit] }
+    let(:release_fields) do
+      query_graphql_field(:commit, nil, 'sha')
+    end
+
+    it 'finds the commit associated with the release' do
+      post_query
+
+      expect(data).to eq({ 'sha' => release.commit.sha })
+    end
+  end
+
+  describe 'assets' do
+    describe 'assetsCount' do
+      let(:path) { path_prefix + %w[assets] }
+      let(:release_fields) do
+        query_graphql_field(:assets, nil, 'assetsCount')
+      end
+
+      it 'returns the number of assets associated to the release' do
+        post_query
+
+        expect(data).to eq({ 'assetsCount' => release.sources.size + release.links.size })
+      end
+    end
+
+    describe 'links' do
+      let(:path) { path_prefix + %w[assets links nodes] }
+      let(:release_fields) do
+        query_graphql_field(:assets, nil,
+          query_graphql_field(:links, nil, 'nodes { id name url external }'))
+      end
+
+      it 'finds all release links' do
+        post_query
+
+        expected = release.links.map do |link|
+          {
+            'id' => global_id_of(link),
+            'name' => link.name,
+            'url' => link.url,
+            'external' => link.external?
+          }
+        end
+
+        expect(data).to match_array(expected)
+      end
+    end
+
+    describe 'sources' do
+      let(:path) { path_prefix + %w[assets sources nodes] }
+      let(:release_fields) do
+        query_graphql_field(:assets, nil,
+          query_graphql_field(:sources, nil, 'nodes { format url }'))
+      end
+
+      it 'finds all release sources' do
+        post_query
+
+        expected = release.sources.map do |source|
+          {
+            'format' => source.format,
+            'url' => source.url
+          }
+        end
+
+        expect(data).to match_array(expected)
+      end
+    end
+
+    describe 'evidences' do
+      let(:path) { path_prefix + %w[evidences] }
+      let(:release_fields) do
+        query_graphql_field(:evidences, nil, 'nodes { id sha filepath collectedAt }')
+      end
+
+      context 'for a developer' do
+        it 'finds all evidence fields' do
+          post_query
+
+          evidence = release.evidences.first.present
+          expected = {
+            'id' => global_id_of(evidence),
+            'sha' => evidence.sha,
+            'filepath' => evidence.filepath,
+            'collectedAt' => evidence.collected_at.utc.iso8601
+          }
+
+          expect(data["nodes"].first).to eq(expected)
+        end
+      end
+
+      context 'for a guest' do
+        let(:current_user) { create :user }
+
+        before do
+          project.add_guest(current_user)
+        end
+
+        it 'denies access' do
+          post_query
+
+          expect(data['node']).to be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/project_query_spec.rb b/spec/requests/api/graphql/project_query_spec.rb
index 035894c8022..9a88b47eea6 100644
--- a/spec/requests/api/graphql/project_query_spec.rb
+++ b/spec/requests/api/graphql/project_query_spec.rb
@@ -62,6 +62,54 @@ describe 'getting project information' do
     end
   end
 
+  describe 'performance' do
+    before do
+      project.add_developer(current_user)
+      mrs = create_list(:merge_request, 10, :closed, :with_head_pipeline,
+                        source_project: project,
+                        author: current_user)
+      mrs.each do |mr|
+        mr.assignees << create(:user)
+        mr.assignees << current_user
+      end
+    end
+
+    def run_query(number)
+      q = <<~GQL
+      query {
+        project(fullPath: "#{project.full_path}") {
+          mergeRequests(first: #{number}) {
+            nodes {
+              assignees { nodes { username } }
+              headPipeline { status }
+            }
+          }
+        }
+      }
+      GQL
+
+      post_graphql(q, current_user: current_user)
+    end
+
+    it 'returns appropriate results' do
+      run_query(2)
+
+      mrs = graphql_data.dig('project', 'mergeRequests', 'nodes')
+
+      expect(mrs.size).to eq(2)
+      expect(mrs).to all(
+        match(
+          a_hash_including(
+            'assignees' => { 'nodes' => all(match(a_hash_including('username' => be_present))) },
+            'headPipeline' => { 'status' => be_present }
+          )))
+    end
+
+    it 'can lookahead to eliminate N+1 queries', :use_clean_rails_memory_store_caching, :request_store do
+      expect { run_query(10) }.to issue_same_number_of_queries_as { run_query(1) }.or_fewer.ignoring_cached_queries
+    end
+  end
+
   context 'when the user does not have access to the project' do
     it 'returns an empty field' do
       post_graphql(query, current_user: current_user)
diff --git a/spec/requests/api/graphql/tasks/task_completion_status_spec.rb b/spec/requests/api/graphql/tasks/task_completion_status_spec.rb
index c727750c0ce..c47406ea534 100644
--- a/spec/requests/api/graphql/tasks/task_completion_status_spec.rb
+++ b/spec/requests/api/graphql/tasks/task_completion_status_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 describe 'getting task completion status information' do
   include GraphqlHelpers
 
-  DESCRIPTION_0_DONE = '- [ ] task 1\n- [ ] task 2'
-  DESCRIPTION_1_DONE = '- [x] task 1\n- [ ] task 2'
-  DESCRIPTION_2_DONE = '- [x] task 1\n- [x] task 2'
+  description_0_done = '- [ ] task 1\n- [ ] task 2'
+  description_1_done = '- [x] task 1\n- [ ] task 2'
+  description_2_done = '- [x] task 1\n- [x] task 2'
 
   let_it_be(:user1) { create(:user) }
   let_it_be(:project) { create(:project, :repository, :public) }
@@ -42,7 +42,7 @@ describe 'getting task completion status information' do
     end
   end
 
-  [DESCRIPTION_0_DONE, DESCRIPTION_1_DONE, DESCRIPTION_2_DONE].each do |desc|
+  [description_0_done, description_1_done, description_2_done].each do |desc|
     context "with description #{desc}" do
       context 'when type is issue' do
         it_behaves_like 'graphql task completion status provider', 'issue' do
diff --git a/spec/requests/api/graphql/user/group_member_query_spec.rb b/spec/requests/api/graphql/user/group_member_query_spec.rb
new file mode 100644
index 00000000000..022ee79297c
--- /dev/null
+++ b/spec/requests/api/graphql/user/group_member_query_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'GroupMember' do
+  include GraphqlHelpers
+
+  let_it_be(:member) { create(:group_member, :developer) }
+  let_it_be(:fields) do
+    <<~HEREDOC
+      nodes {
+        accessLevel {
+          integerValue
+          stringValue
+        }
+        group {
+          id
+        }
+      }
+    HEREDOC
+  end
+  let_it_be(:query) do
+    graphql_query_for('user', { id: member.user.to_global_id.to_s }, query_graphql_field("groupMemberships", {}, fields))
+  end
+
+  before do
+    post_graphql(query, current_user: member.user)
+  end
+
+  it_behaves_like 'a working graphql query'
+  it_behaves_like 'a working membership object query'
+end
diff --git a/spec/requests/api/graphql/user/project_member_query_spec.rb b/spec/requests/api/graphql/user/project_member_query_spec.rb
new file mode 100644
index 00000000000..397d2872189
--- /dev/null
+++ b/spec/requests/api/graphql/user/project_member_query_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'ProjectMember' do
+  include GraphqlHelpers
+
+  let_it_be(:member) { create(:project_member, :developer) }
+  let_it_be(:fields) do
+    <<~HEREDOC
+      nodes {
+        accessLevel {
+          integerValue
+          stringValue
+        }
+        project {
+          id
+        }
+      }
+    HEREDOC
+  end
+  let_it_be(:query) do
+    graphql_query_for('user', { id: member.user.to_global_id.to_s }, query_graphql_field("projectMemberships", {}, fields))
+  end
+
+  before do
+    post_graphql(query, current_user: member.user)
+  end
+
+  it_behaves_like 'a working graphql query'
+  it_behaves_like 'a working membership object query'
+end
diff --git a/spec/requests/api/graphql/user_query_spec.rb b/spec/requests/api/graphql/user_query_spec.rb
new file mode 100644
index 00000000000..5ac94bc7323
--- /dev/null
+++ b/spec/requests/api/graphql/user_query_spec.rb
@@ -0,0 +1,260 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'getting user information' do
+  include GraphqlHelpers
+
+  let(:query) do
+    graphql_query_for(:user, user_params, user_fields)
+  end
+
+  let(:user_fields) { all_graphql_fields_for('User', max_depth: 2) }
+
+  context 'no parameters are provided' do
+    let(:user_params) { nil }
+
+    it 'mentions the missing required parameters' do
+      post_graphql(query)
+
+      expect_graphql_errors_to_include(/username/)
+    end
+  end
+
+  context 'looking up a user by username' do
+    let_it_be(:project_a) { create(:project, :repository) }
+    let_it_be(:project_b) { create(:project, :repository) }
+    let_it_be(:user, reload: true) { create(:user, developer_projects: [project_a, project_b]) }
+    let_it_be(:authorised_user) { create(:user, developer_projects: [project_a, project_b]) }
+    let_it_be(:unauthorized_user) { create(:user) }
+
+    let_it_be(:assigned_mr) do
+      create(:merge_request, :unique_branches,
+             source_project: project_a, assignees: [user])
+    end
+    let_it_be(:assigned_mr_b) do
+      create(:merge_request, :unique_branches,
+             source_project: project_b, assignees: [user])
+    end
+    let_it_be(:assigned_mr_c) do
+      create(:merge_request, :unique_branches,
+             source_project: project_b, assignees: [user])
+    end
+    let_it_be(:authored_mr) do
+      create(:merge_request, :unique_branches,
+             source_project: project_a, author: user)
+    end
+    let_it_be(:authored_mr_b) do
+      create(:merge_request, :unique_branches,
+             source_project: project_b, author: user)
+    end
+    let_it_be(:authored_mr_c) do
+      create(:merge_request, :unique_branches,
+             source_project: project_b, author: user)
+    end
+
+    let(:current_user) { authorised_user }
+    let(:authored_mrs) { graphql_data_at(:user, :authored_merge_requests, :nodes) }
+    let(:assigned_mrs) { graphql_data_at(:user, :assigned_merge_requests, :nodes) }
+    let(:user_params) { { username: user.username } }
+
+    before do
+      post_graphql(query, current_user: current_user)
+    end
+
+    context 'the user is an active user' do
+      it_behaves_like 'a working graphql query'
+
+      it 'can access user profile fields' do
+        presenter = UserPresenter.new(user)
+
+        expect(graphql_data['user']).to match(
+          a_hash_including(
+            'id' => global_id_of(user),
+            'state' => presenter.state,
+            'name' => presenter.name,
+            'username' => presenter.username,
+            'webUrl' => presenter.web_url,
+            'avatarUrl' => presenter.avatar_url
+          ))
+      end
+
+      describe 'assignedMergeRequests' do
+        let(:user_fields) do
+          query_graphql_field(:assigned_merge_requests, mr_args, 'nodes { id }')
+        end
+        let(:mr_args) { nil }
+
+        it_behaves_like 'a working graphql query'
+
+        it 'can be found' do
+          expect(assigned_mrs).to contain_exactly(
+            a_hash_including('id' => global_id_of(assigned_mr)),
+            a_hash_including('id' => global_id_of(assigned_mr_b)),
+            a_hash_including('id' => global_id_of(assigned_mr_c))
+          )
+        end
+
+        context 'applying filters' do
+          context 'filtering by IID without specifying a project' do
+            let(:mr_args) do
+              { iids: [assigned_mr_b.iid.to_s] }
+            end
+
+            it 'return an argument error that mentions the missing fields' do
+              expect_graphql_errors_to_include(/projectPath/)
+            end
+          end
+
+          context 'filtering by project path and IID' do
+            let(:mr_args) do
+              { project_path: project_b.full_path, iids: [assigned_mr_b.iid.to_s] }
+            end
+
+            it 'selects the correct MRs' do
+              expect(assigned_mrs).to contain_exactly(
+                a_hash_including('id' => global_id_of(assigned_mr_b))
+              )
+            end
+          end
+
+          context 'filtering by project path' do
+            let(:mr_args) do
+              { project_path: project_b.full_path }
+            end
+
+            it 'selects the correct MRs' do
+              expect(assigned_mrs).to contain_exactly(
+                a_hash_including('id' => global_id_of(assigned_mr_b)),
+                a_hash_including('id' => global_id_of(assigned_mr_c))
+              )
+            end
+          end
+        end
+
+        context 'the current user does not have access' do
+          let(:current_user) { unauthorized_user }
+
+          it 'cannot be found' do
+            expect(assigned_mrs).to be_empty
+          end
+        end
+      end
+
+      describe 'authoredMergeRequests' do
+        let(:user_fields) do
+          query_graphql_field(:authored_merge_requests, mr_args, 'nodes { id }')
+        end
+        let(:mr_args) { nil }
+
+        it_behaves_like 'a working graphql query'
+
+        it 'can be found' do
+          expect(authored_mrs).to contain_exactly(
+            a_hash_including('id' => global_id_of(authored_mr)),
+            a_hash_including('id' => global_id_of(authored_mr_b)),
+            a_hash_including('id' => global_id_of(authored_mr_c))
+          )
+        end
+
+        context 'applying filters' do
+          context 'filtering by IID without specifying a project' do
+            let(:mr_args) do
+              { iids: [authored_mr_b.iid.to_s] }
+            end
+
+            it 'return an argument error that mentions the missing fields' do
+              expect_graphql_errors_to_include(/projectPath/)
+            end
+          end
+
+          context 'filtering by project path and IID' do
+            let(:mr_args) do
+              { project_path: project_b.full_path, iids: [authored_mr_b.iid.to_s] }
+            end
+
+            it 'selects the correct MRs' do
+              expect(authored_mrs).to contain_exactly(
+                a_hash_including('id' => global_id_of(authored_mr_b))
+              )
+            end
+          end
+
+          context 'filtering by project path' do
+            let(:mr_args) do
+              { project_path: project_b.full_path }
+            end
+
+            it 'selects the correct MRs' do
+              expect(authored_mrs).to contain_exactly(
+                a_hash_including('id' => global_id_of(authored_mr_b)),
+                a_hash_including('id' => global_id_of(authored_mr_c))
+              )
+            end
+          end
+        end
+
+        context 'the current user does not have access' do
+          let(:current_user) { unauthorized_user }
+
+          it 'cannot be found' do
+            expect(authored_mrs).to be_empty
+          end
+        end
+      end
+    end
+
+    context 'the user is private' do
+      before do
+        user.update(private_profile: true)
+        post_graphql(query, current_user: current_user)
+      end
+
+      context 'we only request basic fields' do
+        let(:user_fields) { %i[id name username state web_url avatar_url] }
+
+        it_behaves_like 'a working graphql query'
+      end
+
+      context 'we request the authoredMergeRequests' do
+        let(:user_fields) { 'authoredMergeRequests { nodes { id } }' }
+
+        it_behaves_like 'a working graphql query'
+
+        it 'cannot be found' do
+          expect(authored_mrs).to be_empty
+        end
+
+        context 'the current user is the user' do
+          let(:current_user) { user }
+
+          it 'can be found' do
+            expect(authored_mrs).to include(
+              a_hash_including('id' => global_id_of(authored_mr))
+            )
+          end
+        end
+      end
+
+      context 'we request the assignedMergeRequests' do
+        let(:user_fields) { 'assignedMergeRequests { nodes { id } }' }
+
+        it_behaves_like 'a working graphql query'
+
+        it 'cannot be found' do
+          expect(assigned_mrs).to be_empty
+        end
+
+        context 'the current user is the user' do
+          let(:current_user) { user }
+
+          it 'can be found' do
+            expect(assigned_mrs).to include(
+              a_hash_including('id' => global_id_of(assigned_mr))
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/user_spec.rb b/spec/requests/api/graphql/user_spec.rb
new file mode 100644
index 00000000000..097c75b3541
--- /dev/null
+++ b/spec/requests/api/graphql/user_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'User' do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user) }
+
+  shared_examples 'a working user query' do
+    it_behaves_like 'a working graphql query' do
+      before do
+        post_graphql(query, current_user: current_user)
+      end
+    end
+
+    it 'includes the user' do
+      post_graphql(query, current_user: current_user)
+
+      expect(graphql_data['user']).not_to be_nil
+    end
+
+    it 'returns no user when global restricted_visibility_levels includes PUBLIC' do
+      stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC])
+
+      post_graphql(query)
+
+      expect(graphql_data['user']).to be_nil
+    end
+  end
+
+  context 'when id parameter is used' do
+    let(:query) { graphql_query_for(:user, { id: current_user.to_global_id.to_s }) }
+
+    it_behaves_like 'a working user query'
+  end
+
+  context 'when username parameter is used' do
+    let(:query) { graphql_query_for(:user, { username: current_user.username.to_s }) }
+
+    it_behaves_like 'a working user query'
+  end
+
+  context 'when username and id parameter are used' do
+    let_it_be(:query) { graphql_query_for(:user, { id: current_user.to_global_id.to_s, username: current_user.username }, 'id') }
+
+    it 'displays an error' do
+      post_graphql(query)
+
+      expect(graphql_errors).to include(
+        a_hash_including('message' => a_string_matching(%r{Provide either a single username or id}))
+      )
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/users_spec.rb b/spec/requests/api/graphql/users_spec.rb
new file mode 100644
index 00000000000..1e6d73cbd7d
--- /dev/null
+++ b/spec/requests/api/graphql/users_spec.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Users' do
+  include GraphqlHelpers
+
+  let_it_be(:current_user) { create(:user, created_at: 1.day.ago) }
+  let_it_be(:user1) { create(:user, created_at: 2.days.ago) }
+  let_it_be(:user2) { create(:user, created_at: 3.days.ago) }
+  let_it_be(:user3) { create(:user, created_at: 4.days.ago) }
+
+  describe '.users' do
+    shared_examples 'a working users query' do
+      it_behaves_like 'a working graphql query' do
+        before do
+          post_graphql(query, current_user: current_user)
+        end
+      end
+
+      it 'includes a list of users' do
+        post_graphql(query)
+
+        expect(graphql_data.dig('users', 'nodes')).not_to be_empty
+      end
+    end
+
+    context 'with no arguments' do
+      let_it_be(:query) { graphql_query_for(:users, { usernames: [user1.username] }, 'nodes { id }') }
+
+      it_behaves_like 'a working users query'
+    end
+
+    context 'with a list of usernames' do
+      let(:query) { graphql_query_for(:users, { usernames: [user1.username] }, 'nodes { id }') }
+
+      it_behaves_like 'a working users query'
+    end
+
+    context 'with a list of IDs' do
+      let(:query) { graphql_query_for(:users, { ids: [user1.to_global_id.to_s] }, 'nodes { id }') }
+
+      it_behaves_like 'a working users query'
+    end
+
+    context 'when usernames and ids parameter are used' do
+      let_it_be(:query) { graphql_query_for(:users, { ids: user1.to_global_id.to_s, usernames: user1.username }, 'nodes { id }') }
+
+      it 'displays an error' do
+        post_graphql(query)
+
+        expect(graphql_errors).to include(
+          a_hash_including('message' => a_string_matching(%r{Provide either a list of usernames or ids}))
+        )
+      end
+    end
+  end
+
+  describe 'sorting and pagination' do
+    let_it_be(:data_path) { [:users] }
+
+    def pagination_query(params, page_info)
+      graphql_query_for("users", params, "#{page_info} edges { node { id } }")
+    end
+
+    def pagination_results_data(data)
+      data.map { |user| user.dig('node', 'id') }
+    end
+
+    context 'when sorting by created_at' do
+      let_it_be(:ascending_users) { [user3, user2, user1, current_user].map(&:to_global_id).map(&:to_s) }
+
+      context 'when ascending' do
+        it_behaves_like 'sorted paginated query' do
+          let(:sort_param)       { 'created_asc' }
+          let(:first_param)      { 1 }
+          let(:expected_results) { ascending_users }
+        end
+      end
+
+      context 'when descending' do
+        it_behaves_like 'sorted paginated query' do
+          let(:sort_param)       { 'created_desc' }
+          let(:first_param)      { 1 }
+          let(:expected_results) { ascending_users.reverse }
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/graphql_spec.rb b/spec/requests/api/graphql_spec.rb
index f5c7a820abe..84be5ab0951 100644
--- a/spec/requests/api/graphql_spec.rb
+++ b/spec/requests/api/graphql_spec.rb
@@ -187,4 +187,62 @@ describe 'GraphQL' do
       end
     end
   end
+
+  describe 'keyset pagination' do
+    let_it_be(:project) { create(:project, :public) }
+    let_it_be(:issues) { create_list(:issue, 10, project: project, created_at: Time.now.change(usec: 200)) }
+
+    let(:page_size) { 6 }
+    let(:issues_edges) { %w(data project issues edges) }
+    let(:end_cursor) { %w(data project issues pageInfo endCursor) }
+    let(:query) do
+      <<~GRAPHQL
+        query project($fullPath: ID!, $first: Int, $after: String) {
+            project(fullPath: $fullPath) {
+              issues(first: $first, after: $after) {
+                edges { node { iid } }
+                pageInfo { endCursor }
+              }
+            }
+        }
+      GRAPHQL
+    end
+
+    # TODO: Switch this to use `post_graphql`
+    # This is not performing an actual GraphQL request because the
+    # variables end up being strings when passed through the `post_graphql`
+    # helper.
+    #
+    # https://gitlab.com/gitlab-org/gitlab/-/issues/222432
+    def execute_query(after: nil)
+      GitlabSchema.execute(
+        query,
+        context: { current_user: nil },
+        variables: {
+          fullPath: project.full_path,
+          first: page_size,
+          after: after
+        }
+      )
+    end
+
+    it 'paginates datetimes correctly when they have millisecond data' do
+      # let's make sure we're actually querying a timestamp, just in case
+      expect(Gitlab::Graphql::Pagination::Keyset::QueryBuilder)
+        .to receive(:new).with(anything, anything, hash_including('created_at'), anything).and_call_original
+
+      first_page = execute_query
+      edges = first_page.dig(*issues_edges)
+      cursor = first_page.dig(*end_cursor)
+
+      expect(edges.count).to eq(6)
+      expect(edges.last['node']['iid']).to eq(issues[4].iid.to_s)
+
+      second_page = execute_query(after: cursor)
+      edges = second_page.dig(*issues_edges)
+
+      expect(edges.count).to eq(4)
+      expect(edges.last['node']['iid']).to eq(issues[0].iid.to_s)
+    end
+  end
 end
diff --git a/spec/requests/api/group_export_spec.rb b/spec/requests/api/group_export_spec.rb
index 02ae9d71702..9dd7797c768 100644
--- a/spec/requests/api/group_export_spec.rb
+++ b/spec/requests/api/group_export_spec.rb
@@ -82,6 +82,22 @@ describe API::GroupExport do
         expect(response).to have_gitlab_http_status(:not_found)
       end
     end
+
+    context 'when the requests have exceeded the rate limit' do
+      before do
+        allow(Gitlab::ApplicationRateLimiter)
+          .to receive(:increment)
+          .and_return(Gitlab::ApplicationRateLimiter.rate_limits[:group_download_export][:threshold] + 1)
+      end
+
+      it 'throttles the endpoint' do
+        get api(download_path, user)
+
+        expect(json_response["message"])
+          .to include('error' => 'This endpoint has been requested too many times. Try again later.')
+        expect(response).to have_gitlab_http_status :too_many_requests
+      end
+    end
   end
 
   describe 'POST /groups/:group_id/export' do
@@ -139,5 +155,23 @@ describe API::GroupExport do
         expect(response).to have_gitlab_http_status(:not_found)
       end
     end
+
+    context 'when the requests have exceeded the rate limit' do
+      before do
+        group.add_owner(user)
+
+        allow(Gitlab::ApplicationRateLimiter)
+          .to receive(:increment)
+          .and_return(Gitlab::ApplicationRateLimiter.rate_limits[:group_export][:threshold] + 1)
+      end
+
+      it 'throttles the endpoint' do
+        post api(path, user)
+
+        expect(json_response["message"])
+          .to include('error' => 'This endpoint has been requested too many times. Try again later.')
+        expect(response).to have_gitlab_http_status :too_many_requests
+      end
+    end
   end
 end
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 18feff85482..9a449499576 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -231,6 +231,27 @@ describe API::Groups do
       end
     end
 
+    context "when using top_level_only" do
+      let(:top_level_group) { create(:group, name: 'top-level-group') }
+      let(:subgroup) { create(:group, :nested, name: 'subgroup') }
+      let(:response_groups) { json_response.map { |group| group['name'] } }
+
+      before do
+        top_level_group.add_owner(user1)
+        subgroup.add_owner(user1)
+      end
+
+      it "doesn't return subgroups" do
+        get api("/groups", user1), params: { top_level_only: true }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+        expect(response_groups).to include(top_level_group.name)
+        expect(response_groups).not_to include(subgroup.name)
+      end
+    end
+
     context "when using sorting" do
       let(:group3) { create(:group, name: "a#{group1.name}", path: "z#{group1.path}") }
       let(:group4) { create(:group, name: "same-name", path: "y#{group1.path}") }
@@ -415,6 +436,8 @@ describe API::Groups do
       it "returns one of user1's groups" do
         project = create(:project, namespace: group2, path: 'Foo')
         create(:project_group_link, project: project, group: group1)
+        group = create(:group)
+        link = create(:group_group_link, shared_group: group1, shared_with_group: group)
 
         get api("/groups/#{group1.id}", user1)
 
@@ -439,6 +462,13 @@ describe API::Groups do
         expect(json_response['full_path']).to eq(group1.full_path)
         expect(json_response['parent_id']).to eq(group1.parent_id)
         expect(json_response['created_at']).to be_present
+        expect(json_response['shared_with_groups']).to be_an Array
+        expect(json_response['shared_with_groups'].length).to eq(1)
+        expect(json_response['shared_with_groups'][0]['group_id']).to eq(group.id)
+        expect(json_response['shared_with_groups'][0]['group_name']).to eq(group.name)
+        expect(json_response['shared_with_groups'][0]['group_full_path']).to eq(group.full_path)
+        expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access)
+        expect(json_response['shared_with_groups'][0]).to have_key('expires_at')
         expect(json_response['projects']).to be_an Array
         expect(json_response['projects'].length).to eq(2)
         expect(json_response['shared_projects']).to be_an Array
@@ -505,7 +535,7 @@ describe API::Groups do
           .to contain_exactly(projects[:public].id, projects[:internal].id)
       end
 
-      it 'avoids N+1 queries' do
+      it 'avoids N+1 queries with project links' do
         get api("/groups/#{group1.id}", admin)
 
         control_count = ActiveRecord::QueryRecorder.new do
@@ -518,6 +548,24 @@ describe API::Groups do
           get api("/groups/#{group1.id}", admin)
         end.not_to exceed_query_limit(control_count)
       end
+
+      it 'avoids N+1 queries with shared group links' do
+        # setup at least 1 shared group, so that we record the queries that preload the nested associations too.
+        create(:group_group_link, shared_group: group1, shared_with_group: create(:group))
+
+        control_count = ActiveRecord::QueryRecorder.new do
+          get api("/groups/#{group1.id}", admin)
+        end.count
+
+        # setup "n" more shared groups
+        create(:group_group_link, shared_group: group1, shared_with_group: create(:group))
+        create(:group_group_link, shared_group: group1, shared_with_group: create(:group))
+
+        # test that no of queries for 1 shared group is same as for n shared groups
+        expect do
+          get api("/groups/#{group1.id}", admin)
+        end.not_to exceed_query_limit(control_count)
+      end
     end
 
     context "when authenticated as admin" do
@@ -1507,4 +1555,173 @@ describe API::Groups do
       group2.add_owner(user1)
     end
   end
+
+  describe "POST /groups/:id/share" do
+    shared_examples 'shares group with group' do
+      it "shares group with group" do
+        expires_at = 10.days.from_now.to_date
+
+        expect do
+          post api("/groups/#{group.id}/share", user), params: { group_id: shared_with_group.id, group_access: Gitlab::Access::DEVELOPER, expires_at: expires_at }
+        end.to change { group.shared_with_group_links.count }.by(1)
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['shared_with_groups']).to be_an Array
+        expect(json_response['shared_with_groups'].length).to eq(1)
+        expect(json_response['shared_with_groups'][0]['group_id']).to eq(shared_with_group.id)
+        expect(json_response['shared_with_groups'][0]['group_name']).to eq(shared_with_group.name)
+        expect(json_response['shared_with_groups'][0]['group_full_path']).to eq(shared_with_group.full_path)
+        expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(Gitlab::Access::DEVELOPER)
+        expect(json_response['shared_with_groups'][0]['expires_at']).to eq(expires_at.to_s)
+      end
+
+      it "returns a 400 error when group id is not given" do
+        post api("/groups/#{group.id}/share", user), params: { group_access: Gitlab::Access::DEVELOPER }
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it "returns a 400 error when access level is not given" do
+        post api("/groups/#{group.id}/share", user), params: { group_id: shared_with_group.id }
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it 'returns a 404 error when group does not exist' do
+        post api("/groups/#{group.id}/share", user), params: { group_id: non_existing_record_id, group_access: Gitlab::Access::DEVELOPER }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+
+      it "returns a 400 error when wrong params passed" do
+        post api("/groups/#{group.id}/share", user), params: { group_id: shared_with_group.id, group_access: non_existing_record_access_level }
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response['error']).to eq 'group_access does not have a valid value'
+      end
+
+      it "returns a 409 error when link is not saved" do
+        allow(::Groups::GroupLinks::CreateService).to receive_message_chain(:new, :execute)
+          .and_return({ status: :error, http_status: 409, message: 'error' })
+
+        post api("/groups/#{group.id}/share", user), params: { group_id: shared_with_group.id, group_access: Gitlab::Access::DEVELOPER }
+
+        expect(response).to have_gitlab_http_status(:conflict)
+      end
+    end
+
+    context 'when authenticated as owner' do
+      let(:owner_group) { create(:group) }
+      let(:owner_user) { create(:user) }
+
+      before do
+        owner_group.add_owner(owner_user)
+      end
+
+      it_behaves_like 'shares group with group' do
+        let(:user) { owner_user }
+        let(:group) { owner_group }
+        let(:shared_with_group) { create(:group) }
+      end
+    end
+
+    context 'when the user is not the owner of the group' do
+      let(:group) { create(:group) }
+      let(:user4) { create(:user) }
+      let(:expires_at) { 10.days.from_now.to_date }
+
+      before do
+        group1.add_maintainer(user4)
+      end
+
+      it 'does not create group share' do
+        post api("/groups/#{group1.id}/share", user4), params: { group_id: group.id, group_access: Gitlab::Access::DEVELOPER, expires_at: expires_at }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'when authenticated as admin' do
+      it_behaves_like 'shares group with group' do
+        let(:user) { admin }
+        let(:group) { create(:group) }
+        let(:shared_with_group) { create(:group) }
+      end
+    end
+  end
+
+  describe 'DELETE /groups/:id/share/:group_id' do
+    shared_examples 'deletes group share' do
+      it 'deletes a group share' do
+        expect do
+          delete api("/groups/#{shared_group.id}/share/#{shared_with_group.id}", user)
+
+          expect(response).to have_gitlab_http_status(:no_content)
+          expect(shared_group.shared_with_group_links).to be_empty
+        end.to change { shared_group.shared_with_group_links.count }.by(-1)
+      end
+
+      it 'requires the group id to be an integer' do
+        delete api("/groups/#{shared_group.id}/share/foo", user)
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+
+      it 'returns a 404 error when group link does not exist' do
+        delete api("/groups/#{shared_group.id}/share/#{non_existing_record_id}", user)
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+
+      it 'returns a 404 error when group does not exist' do
+        delete api("/groups/123/share/#{non_existing_record_id}", user)
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'when authenticated as owner' do
+      let(:group_a) { create(:group) }
+
+      before do
+        create(:group_group_link, shared_group: group1, shared_with_group: group_a)
+      end
+
+      it_behaves_like 'deletes group share' do
+        let(:user) { user1 }
+        let(:shared_group) { group1 }
+        let(:shared_with_group) { group_a }
+      end
+    end
+
+    context 'when the user is not the owner of the group' do
+      let(:group_a) { create(:group) }
+      let(:user4) { create(:user) }
+
+      before do
+        group1.add_maintainer(user4)
+        create(:group_group_link, shared_group: group1, shared_with_group: group_a)
+      end
+
+      it 'does not remove group share' do
+        expect do
+          delete api("/groups/#{group1.id}/share/#{group_a.id}", user4)
+
+          expect(response).to have_gitlab_http_status(:no_content)
+        end.not_to change { group1.shared_with_group_links }
+      end
+    end
+
+    context 'when authenticated as admin' do
+      let(:group_b) { create(:group) }
+
+      before do
+        create(:group_group_link, shared_group: group2, shared_with_group: group_b)
+      end
+
+      it_behaves_like 'deletes group share' do
+        let(:user) { admin }
+        let(:shared_group) { group2 }
+        let(:shared_with_group) { group_b }
+      end
+    end
+  end
 end
diff --git a/spec/requests/api/internal/base_spec.rb b/spec/requests/api/internal/base_spec.rb
index 684f0329909..aa5e2367a2b 100644
--- a/spec/requests/api/internal/base_spec.rb
+++ b/spec/requests/api/internal/base_spec.rb
@@ -218,7 +218,15 @@ describe API::Internal::Base do
         get(api('/internal/authorized_keys'), params: { fingerprint: key.fingerprint, secret_token: secret_token })
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response["key"]).to eq(key.key)
+        expect(json_response['id']).to eq(key.id)
+        expect(json_response['key'].split[1]).to eq(key.key.split[1])
+      end
+
+      it 'exposes the comment of the key as a simple identifier of username + hostname' do
+        get(api('/internal/authorized_keys'), params: { fingerprint: key.fingerprint, secret_token: secret_token })
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['key']).to include("#{key.user_name} (#{Gitlab.config.gitlab.host})")
       end
     end
 
@@ -239,11 +247,21 @@ describe API::Internal::Base do
     end
 
     context "sending the key" do
-      it "finds the key" do
-        get(api('/internal/authorized_keys'), params: { key: key.key.split[1], secret_token: secret_token })
+      context "using an existing key" do
+        it "finds the key" do
+          get(api('/internal/authorized_keys'), params: { key: key.key.split[1], secret_token: secret_token })
 
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response["key"]).to eq(key.key)
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response['id']).to eq(key.id)
+          expect(json_response['key'].split[1]).to eq(key.key.split[1])
+        end
+
+        it 'exposes the comment of the key as a simple identifier of username + hostname' do
+          get(api('/internal/authorized_keys'), params: { fingerprint: key.fingerprint, secret_token: secret_token })
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response['key']).to include("#{key.user_name} (#{Gitlab.config.gitlab.host})")
+        end
       end
 
       it "returns 404 with a partial key" do
@@ -396,7 +414,7 @@ describe API::Internal::Base do
 
       context "git pull" do
         before do
-          allow(Feature).to receive(:persisted_names).and_return(%w[gitaly_mep_mep])
+          stub_feature_flags(gitaly_mep_mep: true)
         end
 
         it "has the correct payload" do
diff --git a/spec/requests/api/issues/issues_spec.rb b/spec/requests/api/issues/issues_spec.rb
index 06878f57d43..315396c89c3 100644
--- a/spec/requests/api/issues/issues_spec.rb
+++ b/spec/requests/api/issues/issues_spec.rb
@@ -834,6 +834,12 @@ describe API::Issues do
     end
   end
 
+  describe 'PUT /projects/:id/issues/:issue_id' do
+    it_behaves_like 'issuable update endpoint' do
+      let(:entity) { issue }
+    end
+  end
+
   describe 'DELETE /projects/:id/issues/:issue_iid' do
     it 'rejects a non member from deleting an issue' do
       delete api("/projects/#{project.id}/issues/#{issue.iid}", non_member)
diff --git a/spec/requests/api/issues/put_projects_issues_spec.rb b/spec/requests/api/issues/put_projects_issues_spec.rb
index 2ab8b9d7877..62a4d3b48b2 100644
--- a/spec/requests/api/issues/put_projects_issues_spec.rb
+++ b/spec/requests/api/issues/put_projects_issues_spec.rb
@@ -5,10 +5,6 @@ require 'spec_helper'
 describe API::Issues do
   let_it_be(:user) { create(:user) }
   let_it_be(:owner) { create(:owner) }
-  let_it_be(:project, reload: true) do
-    create(:project, :public, creator_id: owner.id, namespace: owner.namespace)
-  end
-
   let(:user2)             { create(:user) }
   let(:non_member)        { create(:user) }
   let_it_be(:guest)       { create(:user) }
@@ -17,6 +13,11 @@ describe API::Issues do
   let(:admin)             { create(:user, :admin) }
   let(:issue_title)       { 'foo' }
   let(:issue_description) { 'closed' }
+
+  let_it_be(:project, reload: true) do
+    create(:project, :public, creator_id: owner.id, namespace: owner.namespace)
+  end
+
   let!(:closed_issue) do
     create :closed_issue,
       author: user,
@@ -28,6 +29,7 @@ describe API::Issues do
       updated_at: 3.hours.ago,
       closed_at: 1.hour.ago
   end
+
   let!(:confidential_issue) do
     create :issue,
       :confidential,
@@ -37,6 +39,7 @@ describe API::Issues do
       created_at: generate(:past_time),
       updated_at: 2.hours.ago
   end
+
   let!(:issue) do
     create :issue,
       author: user,
@@ -48,18 +51,24 @@ describe API::Issues do
       title: issue_title,
       description: issue_description
   end
+
   let_it_be(:label) do
     create(:label, title: 'label', color: '#FFAABB', project: project)
   end
+
   let!(:label_link) { create(:label_link, label: label, target: issue) }
   let(:milestone) { create(:milestone, title: '1.0.0', project: project) }
+
   let_it_be(:empty_milestone) do
     create(:milestone, title: '2.0.0', project: project)
   end
-  let!(:note) { create(:note_on_issue, author: user, project: project, noteable: issue) }
 
+  let!(:note) { create(:note_on_issue, author: user, project: project, noteable: issue) }
   let(:no_milestone_title) { 'None' }
   let(:any_milestone_title) { 'Any' }
+  let(:updated_title) { 'updated title' }
+  let(:issue_path) { "/projects/#{project.id}/issues/#{issue.iid}" }
+  let(:api_for_user) { api(issue_path, user) }
 
   before_all do
     project.add_reporter(user)
@@ -72,108 +81,97 @@ describe API::Issues do
 
   describe 'PUT /projects/:id/issues/:issue_iid to update only title' do
     it 'updates a project issue' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { title: 'updated title' }
-      expect(response).to have_gitlab_http_status(:ok)
+      put api_for_user, params: { title: updated_title }
 
-      expect(json_response['title']).to eq('updated title')
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['title']).to eq(updated_title)
     end
 
     it 'returns 404 error if issue iid not found' do
-      put api("/projects/#{project.id}/issues/44444", user),
-        params: { title: 'updated title' }
+      put api("/projects/#{project.id}/issues/44444", user), params: { title: updated_title }
+
       expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'returns 404 error if issue id is used instead of the iid' do
-      put api("/projects/#{project.id}/issues/#{issue.id}", user),
-        params: { title: 'updated title' }
+      put api("/projects/#{project.id}/issues/#{issue.id}", user), params: { title: updated_title }
+
       expect(response).to have_gitlab_http_status(:not_found)
     end
 
     it 'allows special label names' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
+      put api_for_user,
         params: {
-          title: 'updated title',
+          title: updated_title,
           labels: 'label, label?, label&foo, ?, &'
         }
 
       expect(response).to have_gitlab_http_status(:ok)
-      expect(json_response['labels']).to include 'label'
-      expect(json_response['labels']).to include 'label?'
-      expect(json_response['labels']).to include 'label&foo'
-      expect(json_response['labels']).to include '?'
-      expect(json_response['labels']).to include '&'
     end
 
     it 'allows special label names with labels param as array' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
+      put api_for_user,
         params: {
-          title: 'updated title',
+          title: updated_title,
           labels: ['label', 'label?', 'label&foo, ?, &']
         }
 
       expect(response).to have_gitlab_http_status(:ok)
-      expect(json_response['labels']).to include 'label'
-      expect(json_response['labels']).to include 'label?'
-      expect(json_response['labels']).to include 'label&foo'
-      expect(json_response['labels']).to include '?'
-      expect(json_response['labels']).to include '&'
+      expect(json_response['labels']).to contain_exactly('label', 'label?', 'label&foo', '?', '&')
     end
 
     context 'confidential issues' do
+      let(:confidential_issue_path) { "/projects/#{project.id}/issues/#{confidential_issue.iid}" }
+
       it 'returns 403 for non project members' do
-        put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", non_member),
-          params: { title: 'updated title' }
+        put api(confidential_issue_path, non_member), params: { title: updated_title }
+
         expect(response).to have_gitlab_http_status(:forbidden)
       end
 
       it 'returns 403 for project members with guest role' do
-        put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", guest),
-          params: { title: 'updated title' }
+        put api(confidential_issue_path, guest), params: { title: updated_title }
+
         expect(response).to have_gitlab_http_status(:forbidden)
       end
 
       it 'updates a confidential issue for project members' do
-        put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", user),
-          params: { title: 'updated title' }
+        put api(confidential_issue_path, user), params: { title: updated_title }
+
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['title']).to eq('updated title')
+        expect(json_response['title']).to eq(updated_title)
       end
 
       it 'updates a confidential issue for author' do
-        put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", author),
-          params: { title: 'updated title' }
+        put api(confidential_issue_path, author), params: { title: updated_title }
+
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['title']).to eq('updated title')
+        expect(json_response['title']).to eq(updated_title)
       end
 
       it 'updates a confidential issue for admin' do
-        put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", admin),
-          params: { title: 'updated title' }
+        put api(confidential_issue_path, admin), params: { title: updated_title }
+
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['title']).to eq('updated title')
+        expect(json_response['title']).to eq(updated_title)
       end
 
       it 'sets an issue to confidential' do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-          params: { confidential: true }
+        put api_for_user, params: { confidential: true }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['confidential']).to be_truthy
       end
 
       it 'makes a confidential issue public' do
-        put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", user),
-          params: { confidential: false }
+        put api(confidential_issue_path, user), params: { confidential: false }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['confidential']).to be_falsy
       end
 
       it 'does not update a confidential issue with wrong confidential flag' do
-        put api("/projects/#{project.id}/issues/#{confidential_issue.iid}", user),
-          params: { confidential: 'foo' }
+        put api(confidential_issue_path, user), params: { confidential: 'foo' }
 
         expect(response).to have_gitlab_http_status(:bad_request)
         expect(json_response['error']).to eq('confidential is invalid')
@@ -185,12 +183,12 @@ describe API::Issues do
     include_context 'includes Spam constants'
 
     def update_issue
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: params
+      put api_for_user, params: params
     end
 
     let(:params) do
       {
-        title: 'updated title',
+        title: updated_title,
         description: 'content here',
         labels: 'label, label2'
       }
@@ -224,7 +222,7 @@ describe API::Issues do
 
       it 'creates a new spam log entry' do
         expect { update_issue }
-          .to log_spam(title: 'updated title', description: 'content here', user_id: user.id, noteable_type: 'Issue')
+          .to log_spam(title: updated_title, description: 'content here', user_id: user.id, noteable_type: 'Issue')
       end
     end
 
@@ -241,7 +239,7 @@ describe API::Issues do
 
       it 'creates a new spam log entry' do
         expect { update_issue }
-          .to log_spam(title: 'updated title', description: 'content here', user_id: user.id, noteable_type: 'Issue')
+          .to log_spam(title: updated_title, description: 'content here', user_id: user.id, noteable_type: 'Issue')
       end
     end
   end
@@ -249,49 +247,39 @@ describe API::Issues do
   describe 'PUT /projects/:id/issues/:issue_iid to update assignee' do
     context 'support for deprecated assignee_id' do
       it 'removes assignee' do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-          params: { assignee_id: 0 }
+        put api_for_user, params: { assignee_id: 0 }
 
         expect(response).to have_gitlab_http_status(:ok)
-
         expect(json_response['assignee']).to be_nil
       end
 
       it 'updates an issue with new assignee' do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-          params: { assignee_id: user2.id }
+        put api_for_user, params: { assignee_id: user2.id }
 
         expect(response).to have_gitlab_http_status(:ok)
-
         expect(json_response['assignee']['name']).to eq(user2.name)
       end
     end
 
     it 'removes assignee' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { assignee_ids: [0] }
+      put api_for_user, params: { assignee_ids: [0] }
 
       expect(response).to have_gitlab_http_status(:ok)
-
       expect(json_response['assignees']).to be_empty
     end
 
     it 'updates an issue with new assignee' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { assignee_ids: [user2.id] }
+      put api_for_user, params: { assignee_ids: [user2.id] }
 
       expect(response).to have_gitlab_http_status(:ok)
-
       expect(json_response['assignees'].first['name']).to eq(user2.name)
     end
 
     context 'single assignee restrictions' do
       it 'updates an issue with several assignees but only one has been applied' do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-          params: { assignee_ids: [user2.id, guest.id] }
+        put api_for_user, params: { assignee_ids: [user2.id, guest.id] }
 
         expect(response).to have_gitlab_http_status(:ok)
-
         expect(json_response['assignees'].size).to eq(1)
       end
     end
@@ -301,16 +289,42 @@ describe API::Issues do
     let!(:label) { create(:label, title: 'dummy', project: project) }
     let!(:label_link) { create(:label_link, label: label, target: issue) }
 
+    it 'adds relevant labels' do
+      put api_for_user, params: { add_labels: '1, 2' }
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['labels']).to contain_exactly(label.title, '1', '2')
+    end
+
+    context 'removes' do
+      let!(:label2) { create(:label, title: 'a-label', project: project) }
+      let!(:label_link2) { create(:label_link, label: label2, target: issue) }
+
+      it 'removes relevant labels' do
+        put api_for_user, params: { remove_labels: label2.title }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['labels']).to eq([label.title])
+      end
+
+      it 'removes all labels' do
+        put api_for_user, params: { remove_labels: "#{label.title}, #{label2.title}" }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['labels']).to be_empty
+      end
+    end
+
     it 'does not update labels if not present' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { title: 'updated title' }
+      put api_for_user, params: { title: updated_title }
+
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['labels']).to eq([label.title])
     end
 
     it 'removes all labels and touches the record' do
       Timecop.travel(1.minute.from_now) do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: { labels: '' }
+        put api_for_user, params: { labels: '' }
       end
 
       expect(response).to have_gitlab_http_status(:ok)
@@ -320,7 +334,7 @@ describe API::Issues do
 
     it 'removes all labels and touches the record with labels param as array' do
       Timecop.travel(1.minute.from_now) do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: { labels: [''] }
+        put api_for_user, params: { labels: [''] }
       end
 
       expect(response).to have_gitlab_http_status(:ok)
@@ -330,20 +344,19 @@ describe API::Issues do
 
     it 'updates labels and touches the record' do
       Timecop.travel(1.minute.from_now) do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-          params: { labels: 'foo,bar' }
+        put api_for_user, params: { labels: 'foo,bar' }
       end
+
       expect(response).to have_gitlab_http_status(:ok)
-      expect(json_response['labels']).to include 'foo'
-      expect(json_response['labels']).to include 'bar'
+      expect(json_response['labels']).to contain_exactly('foo', 'bar')
       expect(json_response['updated_at']).to be > Time.now
     end
 
     it 'updates labels and touches the record with labels param as array' do
       Timecop.travel(1.minute.from_now) do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-          params: { labels: %w(foo bar) }
+        put api_for_user, params: { labels: %w(foo bar) }
       end
+
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['labels']).to include 'foo'
       expect(json_response['labels']).to include 'bar'
@@ -351,36 +364,22 @@ describe API::Issues do
     end
 
     it 'allows special label names' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { labels: 'label:foo, label-bar,label_bar,label/bar,label?bar,label&bar,?,&' }
+      put api_for_user, params: { labels: 'label:foo, label-bar,label_bar,label/bar,label?bar,label&bar,?,&' }
+
       expect(response).to have_gitlab_http_status(:ok)
-      expect(json_response['labels']).to include 'label:foo'
-      expect(json_response['labels']).to include 'label-bar'
-      expect(json_response['labels']).to include 'label_bar'
-      expect(json_response['labels']).to include 'label/bar'
-      expect(json_response['labels']).to include 'label?bar'
-      expect(json_response['labels']).to include 'label&bar'
-      expect(json_response['labels']).to include '?'
-      expect(json_response['labels']).to include '&'
+      expect(json_response['labels']).to contain_exactly('label:foo', 'label-bar', 'label_bar', 'label/bar', 'label?bar', 'label&bar', '?', '&')
     end
 
     it 'allows special label names with labels param as array' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { labels: ['label:foo', 'label-bar', 'label_bar', 'label/bar,label?bar,label&bar,?,&'] }
+      put api_for_user, params: { labels: ['label:foo', 'label-bar', 'label_bar', 'label/bar,label?bar,label&bar,?,&'] }
+
       expect(response).to have_gitlab_http_status(:ok)
-      expect(json_response['labels']).to include 'label:foo'
-      expect(json_response['labels']).to include 'label-bar'
-      expect(json_response['labels']).to include 'label_bar'
-      expect(json_response['labels']).to include 'label/bar'
-      expect(json_response['labels']).to include 'label?bar'
-      expect(json_response['labels']).to include 'label&bar'
-      expect(json_response['labels']).to include '?'
-      expect(json_response['labels']).to include '&'
+      expect(json_response['labels']).to contain_exactly('label:foo', 'label-bar', 'label_bar', 'label/bar', 'label?bar', 'label&bar', '?', '&')
     end
 
     it 'returns 400 if title is too long' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { title: 'g' * 256 }
+      put api_for_user, params: { title: 'g' * 256 }
+
       expect(response).to have_gitlab_http_status(:bad_request)
       expect(json_response['message']['title']).to eq([
         'is too long (maximum is 255 characters)'
@@ -390,16 +389,15 @@ describe API::Issues do
 
   describe 'PUT /projects/:id/issues/:issue_iid to update state and label' do
     it 'updates a project issue' do
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-        params: { labels: 'label2', state_event: 'close' }
-      expect(response).to have_gitlab_http_status(:ok)
+      put api_for_user, params: { labels: 'label2', state_event: 'close' }
 
-      expect(json_response['labels']).to include 'label2'
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['labels']).to contain_exactly('label2')
       expect(json_response['state']).to eq 'closed'
     end
 
     it 'reopens a project isssue' do
-      put api("/projects/#{project.id}/issues/#{closed_issue.iid}", user), params: { state_event: 'reopen' }
+      put api(issue_path, user), params: { state_event: 'reopen' }
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['state']).to eq 'opened'
@@ -411,42 +409,41 @@ describe API::Issues do
       it 'accepts the update date to be set' do
         update_time = 2.weeks.ago
 
-        put api("/projects/#{project.id}/issues/#{issue.iid}", user),
-            params: { title: 'some new title', updated_at: update_time }
+        put api_for_user, params: { title: 'some new title', updated_at: update_time }
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['title']).to include 'some new title'
+        expect(json_response['title']).to eq('some new title')
         expect(Time.parse(json_response['updated_at'])).not_to be_like_time(update_time)
       end
     end
 
     context 'when admin or owner makes the request' do
+      let(:api_for_owner) { api(issue_path, owner) }
+
       it 'not allow to set null for updated_at' do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", owner), params: { updated_at: nil }
+        put api_for_owner, params: { updated_at: nil }
 
         expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'not allow to set blank for updated_at' do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", owner), params: { updated_at: '' }
+        put api_for_owner, params: { updated_at: '' }
 
         expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'not allow to set invalid format for updated_at' do
-        put api("/projects/#{project.id}/issues/#{issue.iid}", owner), params: { updated_at: 'invalid-format' }
+        put api_for_owner, params: { updated_at: 'invalid-format' }
 
         expect(response).to have_gitlab_http_status(:bad_request)
       end
 
       it 'accepts the update date to be set' do
         update_time = 2.weeks.ago
-        put api("/projects/#{project.id}/issues/#{issue.iid}", owner),
-            params: { title: 'some new title', updated_at: update_time }
+        put api_for_owner, params: { title: 'some new title', updated_at: update_time }
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['title']).to include 'some new title'
-
+        expect(json_response['title']).to eq('some new title')
         expect(Time.parse(json_response['updated_at'])).to be_like_time(update_time)
       end
     end
@@ -456,7 +453,7 @@ describe API::Issues do
     it 'creates a new project issue' do
       due_date = 2.weeks.from_now.strftime('%Y-%m-%d')
 
-      put api("/projects/#{project.id}/issues/#{issue.iid}", user), params: { due_date: due_date }
+      put api_for_user, params: { due_date: due_date }
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response['due_date']).to eq(due_date)
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb
index bd8aeb65d3f..18b5c00d64f 100644
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
@@ -271,6 +271,178 @@ describe API::Jobs do
     end
   end
 
+  describe 'GET /projects/:id/pipelines/:pipeline_id/bridges' do
+    let!(:bridge) { create(:ci_bridge, pipeline: pipeline) }
+    let(:downstream_pipeline) { create(:ci_pipeline) }
+
+    let!(:pipeline_source) do
+      create(:ci_sources_pipeline,
+             source_pipeline: pipeline,
+             source_project: project,
+             source_job: bridge,
+             pipeline: downstream_pipeline,
+             project: downstream_pipeline.project)
+    end
+
+    let(:query) { Hash.new }
+
+    before do |example|
+      unless example.metadata[:skip_before_request]
+        get api("/projects/#{project.id}/pipelines/#{pipeline.id}/bridges", api_user), params: query
+      end
+    end
+
+    context 'authorized user' do
+      it 'returns pipeline bridges' do
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+      end
+
+      it 'returns correct values' do
+        expect(json_response).not_to be_empty
+        expect(json_response.first['commit']['id']).to eq project.commit.id
+        expect(json_response.first['id']).to eq bridge.id
+        expect(json_response.first['name']).to eq bridge.name
+        expect(json_response.first['stage']).to eq bridge.stage
+      end
+
+      it 'returns pipeline data' do
+        json_bridge = json_response.first
+
+        expect(json_bridge['pipeline']).not_to be_empty
+        expect(json_bridge['pipeline']['id']).to eq bridge.pipeline.id
+        expect(json_bridge['pipeline']['ref']).to eq bridge.pipeline.ref
+        expect(json_bridge['pipeline']['sha']).to eq bridge.pipeline.sha
+        expect(json_bridge['pipeline']['status']).to eq bridge.pipeline.status
+      end
+
+      it 'returns downstream pipeline data' do
+        json_bridge = json_response.first
+
+        expect(json_bridge['downstream_pipeline']).not_to be_empty
+        expect(json_bridge['downstream_pipeline']['id']).to eq downstream_pipeline.id
+        expect(json_bridge['downstream_pipeline']['ref']).to eq downstream_pipeline.ref
+        expect(json_bridge['downstream_pipeline']['sha']).to eq downstream_pipeline.sha
+        expect(json_bridge['downstream_pipeline']['status']).to eq downstream_pipeline.status
+      end
+
+      context 'filter bridges' do
+        before do
+          create_bridge(pipeline, :pending)
+          create_bridge(pipeline, :running)
+        end
+
+        context 'with one scope element' do
+          let(:query) { { 'scope' => 'pending' } }
+
+          it :skip_before_request do
+            get api("/projects/#{project.id}/pipelines/#{pipeline.id}/bridges", api_user), params: query
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response).to be_an Array
+            expect(json_response.count).to eq 1
+            expect(json_response.first["status"]).to eq "pending"
+          end
+        end
+
+        context 'with array of scope elements' do
+          let(:query) { { scope: %w(pending running) } }
+
+          it :skip_before_request do
+            get api("/projects/#{project.id}/pipelines/#{pipeline.id}/bridges", api_user), params: query
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response).to be_an Array
+            expect(json_response.count).to eq 2
+            json_response.each { |r| expect(%w(pending running).include?(r['status'])).to be true }
+          end
+        end
+      end
+
+      context 'respond 400 when scope contains invalid state' do
+        let(:query) { { scope: %w(unknown running) } }
+
+        it { expect(response).to have_gitlab_http_status(:bad_request) }
+      end
+
+      context 'bridges in different pipelines' do
+        let!(:pipeline2) { create(:ci_empty_pipeline, project: project) }
+        let!(:bridge2) { create(:ci_bridge, pipeline: pipeline2) }
+
+        it 'excludes bridges from other pipelines' do
+          json_response.each { |bridge| expect(bridge['pipeline']['id']).to eq(pipeline.id) }
+        end
+      end
+
+      it 'avoids N+1 queries' do
+        control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+          get api("/projects/#{project.id}/pipelines/#{pipeline.id}/bridges", api_user), params: query
+        end.count
+
+        3.times { create_bridge(pipeline) }
+
+        expect do
+          get api("/projects/#{project.id}/pipelines/#{pipeline.id}/bridges", api_user), params: query
+        end.not_to exceed_all_query_limit(control_count)
+      end
+    end
+
+    context 'unauthorized user' do
+      context 'when user is not logged in' do
+        let(:api_user) { nil }
+
+        it 'does not return bridges' do
+          expect(response).to have_gitlab_http_status(:unauthorized)
+        end
+      end
+
+      context 'when user is guest' do
+        let(:api_user) { guest }
+
+        it 'does not return bridges' do
+          expect(response).to have_gitlab_http_status(:forbidden)
+        end
+      end
+
+      context 'when user has no read access for pipeline' do
+        before do
+          allow(Ability).to receive(:allowed?).and_call_original
+          allow(Ability).to receive(:allowed?).with(api_user, :read_pipeline, pipeline).and_return(false)
+        end
+
+        it 'does not return bridges' do
+          get api("/projects/#{project.id}/pipelines/#{pipeline.id}/bridges", api_user)
+          expect(response).to have_gitlab_http_status(:forbidden)
+        end
+      end
+
+      context 'when user has no read_build access for project' do
+        before do
+          allow(Ability).to receive(:allowed?).and_call_original
+          allow(Ability).to receive(:allowed?).with(api_user, :read_build, project).and_return(false)
+        end
+
+        it 'does not return bridges' do
+          get api("/projects/#{project.id}/pipelines/#{pipeline.id}/bridges", api_user)
+          expect(response).to have_gitlab_http_status(:forbidden)
+        end
+      end
+    end
+
+    def create_bridge(pipeline, status = :created)
+      create(:ci_bridge, status: status, pipeline: pipeline).tap do |bridge|
+        downstream_pipeline = create(:ci_pipeline)
+        create(:ci_sources_pipeline,
+               source_pipeline: pipeline,
+               source_project: pipeline.project,
+               source_job: bridge,
+               pipeline: downstream_pipeline,
+               project: downstream_pipeline.project)
+      end
+    end
+  end
+
   describe 'GET /projects/:id/jobs/:job_id' do
     before do |example|
       unless example.metadata[:skip_before_request]
diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb
index 1f17359a473..697f22e5f29 100644
--- a/spec/requests/api/labels_spec.rb
+++ b/spec/requests/api/labels_spec.rb
@@ -17,7 +17,7 @@ describe API::Labels do
 
   let(:user) { create(:user) }
   let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
-  let!(:label1) { create(:label, title: 'label1', project: project) }
+  let!(:label1) { create(:label, description: 'the best label', title: 'label1', project: project) }
   let!(:priority_label) { create(:label, title: 'bug', project: project, priority: 3) }
 
   route_types = [:deprecated, :rest]
@@ -219,7 +219,7 @@ describe API::Labels do
                                            'closed_issues_count' => 1,
                                            'open_merge_requests_count' => 0,
                                            'name' => label1.name,
-                                           'description' => nil,
+                                           'description' => 'the best label',
                                            'color' => a_string_matching(/^#\h{6}$/),
                                            'text_color' => a_string_matching(/^#\h{6}$/),
                                            'priority' => nil,
diff --git a/spec/requests/api/lsif_data_spec.rb b/spec/requests/api/lsif_data_spec.rb
deleted file mode 100644
index a1516046e3e..00000000000
--- a/spec/requests/api/lsif_data_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe API::LsifData do
-  let_it_be(:user) { create(:user) }
-  let_it_be(:project) { create(:project, :repository) }
-
-  let(:commit) { project.commit }
-
-  describe 'GET lsif/info' do
-    subject do
-      endpoint_path = "/projects/#{project.id}/commits/#{commit.id}/lsif/info"
-
-      get api(endpoint_path, user), params: { paths: ['main.go', 'morestrings/reverse.go'] }
-
-      response
-    end
-
-    context 'user does not have access to the project' do
-      before do
-        project.add_guest(user)
-      end
-
-      it { is_expected.to have_gitlab_http_status(:forbidden) }
-    end
-
-    context 'user has access to the project' do
-      before do
-        project.add_reporter(user)
-      end
-
-      context 'there is no job artifact for the passed commit' do
-        it { is_expected.to have_gitlab_http_status(:not_found) }
-      end
-
-      context 'lsif data is stored as a job artifact' do
-        let!(:pipeline) { create(:ci_pipeline, project: project, sha: commit.id) }
-        let!(:artifact) { create(:ci_job_artifact, :lsif, job: create(:ci_build, pipeline: pipeline)) }
-
-        context 'code_navigation feature is disabled' do
-          before do
-            stub_feature_flags(code_navigation: false)
-          end
-
-          it { is_expected.to have_gitlab_http_status(:not_found) }
-        end
-
-        it 'returns code navigation info for a given path', :aggregate_failures do
-          expect(subject).to have_gitlab_http_status(:ok)
-
-          data_for_main = response.parsed_body['main.go']
-          expect(data_for_main.last).to eq({
-            'end_char' => 18,
-            'end_line' => 8,
-            'start_char' => 13,
-            'start_line' => 8,
-            'definition_url' => project_blob_path(project, "#{commit.id}/morestrings/reverse.go", anchor: 'L5'),
-            'hover' => [{
-              'language' => 'go',
-              'value' => Gitlab::Highlight.highlight(nil, 'func Func2(i int) string', language: 'go')
-            }]
-          })
-
-          data_for_reverse = response.parsed_body['morestrings/reverse.go']
-          expect(data_for_reverse.last).to eq({
-            'end_char' => 9,
-            'end_line' => 7,
-            'start_char' => 8,
-            'start_line' => 7,
-            'definition_url' => project_blob_path(project, "#{commit.id}/morestrings/reverse.go", anchor: 'L6'),
-            'hover' => [{
-              'language' => 'go',
-              'value' => Gitlab::Highlight.highlight(nil, 'var b string', language: 'go')
-            }]
-          })
-        end
-
-        context 'the stored file is too large' do
-          before do
-            allow_any_instance_of(JobArtifactUploader).to receive(:cached_size).and_return(20.megabytes)
-          end
-
-          it { is_expected.to have_gitlab_http_status(:payload_too_large) }
-        end
-
-        context 'the user does not have access to the pipeline' do
-          let(:project) { create(:project, :repository, builds_access_level: ProjectFeature::DISABLED) }
-
-          it { is_expected.to have_gitlab_http_status(:forbidden) }
-        end
-      end
-    end
-  end
-end
diff --git a/spec/requests/api/markdown_spec.rb b/spec/requests/api/markdown_spec.rb
index 09342b06744..53e43430b1f 100644
--- a/spec/requests/api/markdown_spec.rb
+++ b/spec/requests/api/markdown_spec.rb
@@ -52,6 +52,7 @@ describe API::Markdown do
     context "when arguments are valid" do
       let_it_be(:project) { create(:project) }
       let_it_be(:issue) { create(:issue, project: project) }
+      let(:issue_url) { "http://#{Gitlab.config.gitlab.host}/#{issue.project.namespace.path}/#{issue.project.path}/-/issues/#{issue.iid}" }
       let(:text) { ":tada: Hello world! :100: #{issue.to_reference}" }
 
       context "when not using gfm" do
@@ -88,7 +89,7 @@ describe API::Markdown do
                                         .and include('data-name="tada"')
                                         .and include('data-name="100"')
                                         .and include("#1")
-                                        .and exclude("<a href=\"#{IssuesHelper.url_for_issue(issue.iid, project)}\"")
+                                        .and exclude("<a href=\"#{issue_url}\"")
                                         .and exclude("#1</a>")
           end
         end
@@ -104,16 +105,16 @@ describe API::Markdown do
             expect(json_response["html"]).to include("Hello world!")
                                         .and include('data-name="tada"')
                                         .and include('data-name="100"')
-                                        .and include("<a href=\"#{IssuesHelper.url_for_issue(issue.iid, project)}\"")
+                                        .and include("<a href=\"#{issue_url}\"")
                                         .and include("#1</a>")
           end
         end
 
         context 'with a public project and confidential issue' do
-          let(:public_project)     { create(:project, :public) }
-          let(:confidential_issue) { create(:issue, :confidential, project: public_project, title: 'Confidential title') }
+          let(:public_project) { create(:project, :public) }
+          let(:issue) { create(:issue, :confidential, project: public_project, title: 'Confidential title') }
 
-          let(:text)   { ":tada: Hello world! :100: #{confidential_issue.to_reference}" }
+          let(:text)   { ":tada: Hello world! :100: #{issue.to_reference}" }
           let(:params) { { text: text, gfm: true, project: public_project.full_path } }
 
           shared_examples 'user without proper access' do
@@ -141,7 +142,7 @@ describe API::Markdown do
           end
 
           context 'when logged in as author' do
-            let(:user) { confidential_issue.author }
+            let(:user) { issue.author }
 
             it 'renders the title or link' do
               expect(response).to have_gitlab_http_status(:created)
@@ -149,7 +150,7 @@ describe API::Markdown do
               expect(json_response["html"]).to include('Hello world!')
                                           .and include('data-name="tada"')
                                           .and include('data-name="100"')
-                                          .and include("<a href=\"#{IssuesHelper.url_for_issue(confidential_issue.iid, public_project)}\"")
+                                          .and include("<a href=\"#{issue_url}\"")
                                           .and include("#1</a>")
             end
           end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 14b22de9661..7a0077f853a 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -1654,6 +1654,12 @@ describe API::MergeRequests do
     end
   end
 
+  describe 'PUT /projects/:id/merge_reuests/:merge_request_iid' do
+    it_behaves_like 'issuable update endpoint' do
+      let(:entity) { merge_request }
+    end
+  end
+
   describe "POST /projects/:id/merge_requests/:merge_request_iid/context_commits" do
     let(:merge_request_iid)  { merge_request.iid }
     let(:authenticated_user) { user }
@@ -2023,6 +2029,34 @@ describe API::MergeRequests do
       end
     end
 
+    context "with a merge request that has force_remove_source_branch enabled" do
+      let(:source_repository) { merge_request.source_project.repository }
+      let(:source_branch) { merge_request.source_branch }
+
+      before do
+        merge_request.update(merge_params: { 'force_remove_source_branch' => true })
+      end
+
+      it 'removes the source branch' do
+        put(
+          api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user)
+        )
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(source_repository.branch_exists?(source_branch)).to be_falsy
+      end
+
+      it 'does not remove the source branch' do
+        put(
+          api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/merge", user),
+          params: { should_remove_source_branch: false }
+        )
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(source_repository.branch_exists?(source_branch)).to be_truthy
+      end
+    end
+
     context "performing a ff-merge with squash" do
       let(:merge_request) { create(:merge_request, :rebased, source_project: project, squash: true) }
 
diff --git a/spec/requests/api/oauth_tokens_spec.rb b/spec/requests/api/oauth_tokens_spec.rb
index 80eae97f41a..5e775841f12 100644
--- a/spec/requests/api/oauth_tokens_spec.rb
+++ b/spec/requests/api/oauth_tokens_spec.rb
@@ -3,16 +3,22 @@
 require 'spec_helper'
 
 describe 'OAuth tokens' do
+  include HttpBasicAuthHelpers
+
   context 'Resource Owner Password Credentials' do
-    def request_oauth_token(user)
-      post '/oauth/token', params: { username: user.username, password: user.password, grant_type: 'password' }
+    def request_oauth_token(user, headers = {})
+      post '/oauth/token',
+         params: { username: user.username, password: user.password, grant_type: 'password' },
+         headers: headers
     end
 
+    let_it_be(:client) { create(:oauth_application) }
+
     context 'when user has 2FA enabled' do
       it 'does not create an access token' do
         user = create(:user, :two_factor)
 
-        request_oauth_token(user)
+        request_oauth_token(user, client_basic_auth_header(client))
 
         expect(response).to have_gitlab_http_status(:unauthorized)
         expect(json_response['error']).to eq('invalid_grant')
@@ -20,13 +26,46 @@ describe 'OAuth tokens' do
     end
 
     context 'when user does not have 2FA enabled' do
-      it 'creates an access token' do
-        user = create(:user)
+      # NOTE: using ROPS grant flow without client credentials will be deprecated
+      # and removed in the next version of Doorkeeper.
+      # See https://gitlab.com/gitlab-org/gitlab/-/issues/219137
+      context 'when no client credentials provided' do
+        it 'creates an access token' do
+          user = create(:user)
+
+          request_oauth_token(user)
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response['access_token']).not_to be_nil
+        end
+      end
+
+      context 'when client credentials provided' do
+        context 'with valid credentials' do
+          it 'creates an access token' do
+            user = create(:user)
+
+            request_oauth_token(user, client_basic_auth_header(client))
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response['access_token']).not_to be_nil
+          end
+        end
+
+        context 'with invalid credentials' do
+          it 'does not create an access token' do
+            # NOTE: remove this after update to Doorkeeper 5.5 or newer, see
+            # https://gitlab.com/gitlab-org/gitlab/-/issues/219137
+            pending 'Enable this example after upgrading Doorkeeper to 5.5 or newer'
+
+            user = create(:user)
 
-        request_oauth_token(user)
+            request_oauth_token(user, basic_auth_header(client.uid, 'invalid secret'))
 
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['access_token']).not_to be_nil
+            expect(response).to have_gitlab_http_status(:unauthorized)
+            expect(json_response['error']).to eq('invalid_client')
+          end
+        end
       end
     end
 
@@ -40,7 +79,7 @@ describe 'OAuth tokens' do
       before do
         user.block
 
-        request_oauth_token(user)
+        request_oauth_token(user, client_basic_auth_header(client))
       end
 
       include_examples 'does not create an access token'
@@ -50,7 +89,7 @@ describe 'OAuth tokens' do
       before do
         user.ldap_block
 
-        request_oauth_token(user)
+        request_oauth_token(user, client_basic_auth_header(client))
       end
 
       include_examples 'does not create an access token'
@@ -60,7 +99,7 @@ describe 'OAuth tokens' do
       before do
         user.update!(confirmed_at: nil)
 
-        request_oauth_token(user)
+        request_oauth_token(user, client_basic_auth_header(client))
       end
 
       include_examples 'does not create an access token'
diff --git a/spec/requests/api/project_container_repositories_spec.rb b/spec/requests/api/project_container_repositories_spec.rb
index 91905635c3f..471fc99117b 100644
--- a/spec/requests/api/project_container_repositories_spec.rb
+++ b/spec/requests/api/project_container_repositories_spec.rb
@@ -223,6 +223,40 @@ describe API::ProjectContainerRepositories do
           expect(response).to have_gitlab_http_status(:accepted)
         end
       end
+
+      context 'with invalid regex' do
+        let(:invalid_regex) { '*v10.' }
+        let(:lease_key) { "container_repository:cleanup_tags:#{root_repository.id}" }
+
+        RSpec.shared_examples 'rejecting the invalid regex' do |param_name|
+          it 'does not enqueue a job' do
+            expect(CleanupContainerRepositoryWorker).not_to receive(:perform_async)
+
+            subject
+          end
+
+          it_behaves_like 'returning response status', :bad_request
+
+          it 'returns an error message' do
+            subject
+
+            expect(json_response['error']).to include("#{param_name} is an invalid regexp")
+          end
+        end
+
+        before do
+          stub_last_activity_update
+          stub_exclusive_lease(lease_key, timeout: 1.hour)
+        end
+
+        %i[name_regex_delete name_regex name_regex_keep].each do |param_name|
+          context "for #{param_name}" do
+            let(:params) { { param_name => invalid_regex } }
+
+            it_behaves_like 'rejecting the invalid regex', param_name
+          end
+        end
+      end
     end
   end
 
diff --git a/spec/requests/api/project_events_spec.rb b/spec/requests/api/project_events_spec.rb
index 489b83de434..f65c62f9402 100644
--- a/spec/requests/api/project_events_spec.rb
+++ b/spec/requests/api/project_events_spec.rb
@@ -7,7 +7,7 @@ describe API::ProjectEvents do
   let(:non_member) { create(:user) }
   let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) }
   let(:closed_issue) { create(:closed_issue, project: private_project, author: user) }
-  let!(:closed_issue_event) { create(:event, project: private_project, author: user, target: closed_issue, action: Event::CLOSED, created_at: Date.new(2016, 12, 30)) }
+  let!(:closed_issue_event) { create(:event, project: private_project, author: user, target: closed_issue, action: :closed, created_at: Date.new(2016, 12, 30)) }
 
   describe 'GET /projects/:id/events' do
     context 'when unauthenticated ' do
@@ -29,9 +29,9 @@ describe API::ProjectEvents do
     context 'with inaccessible events' do
       let(:public_project) { create(:project, :public, creator_id: user.id, namespace: user.namespace) }
       let(:confidential_issue) { create(:closed_issue, confidential: true, project: public_project, author: user) }
-      let!(:confidential_event) { create(:event, project: public_project, author: user, target: confidential_issue, action: Event::CLOSED) }
+      let!(:confidential_event) { create(:event, project: public_project, author: user, target: confidential_issue, action: :closed) }
       let(:public_issue) { create(:closed_issue, project: public_project, author: user) }
-      let!(:public_event) { create(:event, project: public_project, author: user, target: public_issue, action: Event::CLOSED) }
+      let!(:public_event) { create(:event, project: public_project, author: user, target: public_issue, action: :closed) }
 
       it 'returns only accessible events' do
         get api("/projects/#{public_project.id}/events", non_member)
@@ -53,19 +53,19 @@ describe API::ProjectEvents do
 
       before do
         create(:event,
+               :closed,
                project: public_project,
                target: create(:issue, project: public_project, title: 'Issue 1'),
-               action: Event::CLOSED,
                created_at: Date.parse('2018-12-10'))
         create(:event,
+               :closed,
                project: public_project,
                target: create(:issue, confidential: true, project: public_project, title: 'Confidential event'),
-               action: Event::CLOSED,
                created_at: Date.parse('2018-12-11'))
         create(:event,
+               :closed,
                project: public_project,
                target: create(:issue, project: public_project, title: 'Issue 2'),
-               action: Event::CLOSED,
                created_at: Date.parse('2018-12-12'))
       end
 
diff --git a/spec/requests/api/project_export_spec.rb b/spec/requests/api/project_export_spec.rb
index ad872b88664..58034322a13 100644
--- a/spec/requests/api/project_export_spec.rb
+++ b/spec/requests/api/project_export_spec.rb
@@ -44,19 +44,6 @@ describe API::ProjectExport, :clean_gitlab_redis_cache do
     it_behaves_like '404 response'
   end
 
-  shared_examples_for 'when rate limit is exceeded' do
-    before do
-      allow(::Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(true)
-    end
-
-    it 'prevents requesting project export' do
-      request
-
-      expect(response).to have_gitlab_http_status(:too_many_requests)
-      expect(json_response['message']['error']).to eq('This endpoint has been requested too many times. Try again later.')
-    end
-  end
-
   describe 'GET /projects/:project_id/export' do
     shared_examples_for 'get project export status not found' do
       it_behaves_like '404 response' do
@@ -247,7 +234,18 @@ describe API::ProjectExport, :clean_gitlab_redis_cache do
         context 'when rate limit is exceeded' do
           let(:request) { get api(download_path, admin) }
 
-          include_examples 'when rate limit is exceeded'
+          before do
+            allow(Gitlab::ApplicationRateLimiter)
+              .to receive(:increment)
+              .and_return(Gitlab::ApplicationRateLimiter.rate_limits[:project_download_export][:threshold] + 1)
+          end
+
+          it 'prevents requesting project export' do
+            request
+
+            expect(response).to have_gitlab_http_status(:too_many_requests)
+            expect(json_response['message']['error']).to eq('This endpoint has been requested too many times. Try again later.')
+          end
         end
       end
 
@@ -360,10 +358,19 @@ describe API::ProjectExport, :clean_gitlab_redis_cache do
 
         it_behaves_like 'post project export start'
 
-        context 'when rate limit is exceeded' do
-          let(:request) { post api(path, admin) }
+        context 'when rate limit is exceeded across projects' do
+          before do
+            allow(Gitlab::ApplicationRateLimiter)
+              .to receive(:increment)
+              .and_return(Gitlab::ApplicationRateLimiter.rate_limits[:project_export][:threshold] + 1)
+          end
+
+          it 'prevents requesting project export' do
+            post api(path, admin)
 
-          include_examples 'when rate limit is exceeded'
+            expect(response).to have_gitlab_http_status(:too_many_requests)
+            expect(json_response['message']['error']).to eq('This endpoint has been requested too many times. Try again later.')
+          end
         end
       end
 
diff --git a/spec/requests/api/project_repository_storage_moves_spec.rb b/spec/requests/api/project_repository_storage_moves_spec.rb
index 7ceea0178f3..40966e31d0d 100644
--- a/spec/requests/api/project_repository_storage_moves_spec.rb
+++ b/spec/requests/api/project_repository_storage_moves_spec.rb
@@ -5,12 +5,45 @@ require 'spec_helper'
 describe API::ProjectRepositoryStorageMoves do
   include AccessMatchersForRequest
 
-  let(:user) { create(:admin) }
-  let!(:storage_move) { create(:project_repository_storage_move, :scheduled) }
+  let_it_be(:user) { create(:admin) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, project: project) }
 
-  describe 'GET /project_repository_storage_moves' do
+  shared_examples 'get single project repository storage move' do
+    let(:project_repository_storage_move_id) { storage_move.id }
+
+    def get_project_repository_storage_move
+      get api(url, user)
+    end
+
+    it 'returns a project repository storage move' do
+      get_project_repository_storage_move
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to match_response_schema('public_api/v4/project_repository_storage_move')
+      expect(json_response['id']).to eq(storage_move.id)
+      expect(json_response['state']).to eq(storage_move.human_state_name)
+    end
+
+    context 'non-existent project repository storage move' do
+      let(:project_repository_storage_move_id) { non_existing_record_id }
+
+      it 'returns not found' do
+        get_project_repository_storage_move
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    describe 'permissions' do
+      it { expect { get_project_repository_storage_move }.to be_allowed_for(:admin) }
+      it { expect { get_project_repository_storage_move }.to be_denied_for(:user) }
+    end
+  end
+
+  shared_examples 'get project repository storage move list' do
     def get_project_repository_storage_moves
-      get api('/project_repository_storage_moves', user)
+      get api(url, user)
     end
 
     it 'returns project repository storage moves' do
@@ -30,16 +63,16 @@ describe API::ProjectRepositoryStorageMoves do
 
       control = ActiveRecord::QueryRecorder.new { get_project_repository_storage_moves }
 
-      create(:project_repository_storage_move, :scheduled)
+      create(:project_repository_storage_move, :scheduled, project: project)
 
       expect { get_project_repository_storage_moves }.not_to exceed_query_limit(control)
     end
 
     it 'returns the most recently created first' do
-      storage_move_oldest = create(:project_repository_storage_move, :scheduled, created_at: 2.days.ago)
-      storage_move_middle = create(:project_repository_storage_move, :scheduled, created_at: 1.day.ago)
+      storage_move_oldest = create(:project_repository_storage_move, :scheduled, project: project, created_at: 2.days.ago)
+      storage_move_middle = create(:project_repository_storage_move, :scheduled, project: project, created_at: 1.day.ago)
 
-      get api('/project_repository_storage_moves', user)
+      get_project_repository_storage_moves
 
       json_ids = json_response.map {|storage_move| storage_move['id'] }
       expect(json_ids).to eq([
@@ -55,35 +88,68 @@ describe API::ProjectRepositoryStorageMoves do
     end
   end
 
-  describe 'GET /project_repository_storage_moves/:id' do
-    let(:project_repository_storage_move_id) { storage_move.id }
+  describe 'GET /project_repository_storage_moves' do
+    it_behaves_like 'get project repository storage move list' do
+      let(:url) { '/project_repository_storage_moves' }
+    end
+  end
 
-    def get_project_repository_storage_move
-      get api("/project_repository_storage_moves/#{project_repository_storage_move_id}", user)
+  describe 'GET /project_repository_storage_moves/:repository_storage_move_id' do
+    it_behaves_like 'get single project repository storage move' do
+      let(:url) { "/project_repository_storage_moves/#{project_repository_storage_move_id}" }
     end
+  end
 
-    it 'returns a project repository storage move' do
-      get_project_repository_storage_move
+  describe 'GET /projects/:id/repository_storage_moves' do
+    it_behaves_like 'get project repository storage move list' do
+      let(:url) { "/projects/#{project.id}/repository_storage_moves" }
+    end
+  end
 
-      expect(response).to have_gitlab_http_status(:ok)
-      expect(response).to match_response_schema('public_api/v4/project_repository_storage_move')
-      expect(json_response['id']).to eq(storage_move.id)
-      expect(json_response['state']).to eq(storage_move.human_state_name)
+  describe 'GET /projects/:id/repository_storage_moves/:repository_storage_move_id' do
+    it_behaves_like 'get single project repository storage move' do
+      let(:url) { "/projects/#{project.id}/repository_storage_moves/#{project_repository_storage_move_id}" }
     end
+  end
 
-    context 'non-existent project repository storage move' do
-      let(:project_repository_storage_move_id) { non_existing_record_id }
+  describe 'POST /projects/:id/repository_storage_moves' do
+    let(:url) { "/projects/#{project.id}/repository_storage_moves" }
+    let(:destination_storage_name) { 'test_second_storage' }
 
-      it 'returns not found' do
-        get_project_repository_storage_move
+    def create_project_repository_storage_move
+      post api(url, user), params: { destination_storage_name: destination_storage_name }
+    end
 
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
+    before do
+      stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
+    end
+
+    it 'schedules a project repository storage move' do
+      create_project_repository_storage_move
+
+      storage_move = project.repository_storage_moves.last
+
+      expect(response).to have_gitlab_http_status(:created)
+      expect(response).to match_response_schema('public_api/v4/project_repository_storage_move')
+      expect(json_response['id']).to eq(storage_move.id)
+      expect(json_response['state']).to eq('scheduled')
+      expect(json_response['source_storage_name']).to eq('default')
+      expect(json_response['destination_storage_name']).to eq(destination_storage_name)
     end
 
     describe 'permissions' do
-      it { expect { get_project_repository_storage_move }.to be_allowed_for(:admin) }
-      it { expect { get_project_repository_storage_move }.to be_denied_for(:user) }
+      it { expect { create_project_repository_storage_move }.to be_allowed_for(:admin) }
+      it { expect { create_project_repository_storage_move }.to be_denied_for(:user) }
+    end
+
+    context 'destination_storage_name is missing' do
+      let(:destination_storage_name) { nil }
+
+      it 'returns a validation error' do
+        create_project_repository_storage_move
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
     end
   end
 end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 3abcf1cb7ed..c3f29ec47a9 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -597,6 +597,10 @@ describe API::Projects do
           expect(response.header).to include('Links')
           expect(response.header['Links']).to include('pagination=keyset')
           expect(response.header['Links']).to include("id_after=#{public_project.id}")
+
+          expect(response.header).to include('Link')
+          expect(response.header['Link']).to include('pagination=keyset')
+          expect(response.header['Link']).to include("id_after=#{public_project.id}")
         end
 
         it 'contains only the first project with per_page = 1' do
@@ -613,12 +617,17 @@ describe API::Projects do
           expect(response.header).to include('Links')
           expect(response.header['Links']).to include('pagination=keyset')
           expect(response.header['Links']).to include("id_after=#{project3.id}")
+
+          expect(response.header).to include('Link')
+          expect(response.header['Link']).to include('pagination=keyset')
+          expect(response.header['Link']).to include("id_after=#{project3.id}")
         end
 
         it 'does not include a next link when the page does not have any records' do
           get api('/projects', current_user), params: params.merge(id_after: Project.maximum(:id))
 
           expect(response.header).not_to include('Links')
+          expect(response.header).not_to include('Link')
         end
 
         it 'returns an empty array when the page does not have any records' do
@@ -644,6 +653,10 @@ describe API::Projects do
           expect(response.header).to include('Links')
           expect(response.header['Links']).to include('pagination=keyset')
           expect(response.header['Links']).to include("id_before=#{project3.id}")
+
+          expect(response.header).to include('Link')
+          expect(response.header['Link']).to include('pagination=keyset')
+          expect(response.header['Link']).to include("id_before=#{project3.id}")
         end
 
         it 'contains only the last project with per_page = 1' do
@@ -672,6 +685,11 @@ describe API::Projects do
               match[1]
             end
 
+            link = response.header['Link']
+            url = link&.match(/<[^>]+(\/projects\?[^>]+)>; rel="next"/) do |match|
+              match[1]
+            end
+
             ids += Gitlab::Json.parse(response.body).map { |p| p['id'] }
           end
 
@@ -746,7 +764,8 @@ describe API::Projects do
         resolve_outdated_diff_discussions: false,
         remove_source_branch_after_merge: true,
         autoclose_referenced_issues: true,
-        only_allow_merge_if_pipeline_succeeds: false,
+        only_allow_merge_if_pipeline_succeeds: true,
+        allow_merge_on_skipped_pipeline: true,
         request_access_enabled: true,
         only_allow_merge_if_all_discussions_are_resolved: false,
         ci_config_path: 'a/custom/path',
@@ -894,6 +913,22 @@ describe API::Projects do
       expect(json_response['only_allow_merge_if_pipeline_succeeds']).to be_truthy
     end
 
+    it 'sets a project as not allowing merge when pipeline is skipped' do
+      project_params = attributes_for(:project, allow_merge_on_skipped_pipeline: false)
+
+      post api('/projects', user), params: project_params
+
+      expect(json_response['allow_merge_on_skipped_pipeline']).to be_falsey
+    end
+
+    it 'sets a project as allowing merge when pipeline is skipped' do
+      project_params = attributes_for(:project, allow_merge_on_skipped_pipeline: true)
+
+      post api('/projects', user), params: project_params
+
+      expect(json_response['allow_merge_on_skipped_pipeline']).to be_truthy
+    end
+
     it 'sets a project as allowing merge even if discussions are unresolved' do
       project = attributes_for(:project, only_allow_merge_if_all_discussions_are_resolved: false)
 
@@ -1227,16 +1262,36 @@ describe API::Projects do
 
     it 'sets a project as allowing merge even if build fails' do
       project = attributes_for(:project, only_allow_merge_if_pipeline_succeeds: false)
+
       post api("/projects/user/#{user.id}", admin), params: project
+
       expect(json_response['only_allow_merge_if_pipeline_succeeds']).to be_falsey
     end
 
     it 'sets a project as allowing merge only if pipeline succeeds' do
       project = attributes_for(:project, only_allow_merge_if_pipeline_succeeds: true)
+
       post api("/projects/user/#{user.id}", admin), params: project
+
       expect(json_response['only_allow_merge_if_pipeline_succeeds']).to be_truthy
     end
 
+    it 'sets a project as not allowing merge when pipeline is skipped' do
+      project = attributes_for(:project, allow_merge_on_skipped_pipeline: false)
+
+      post api("/projects/user/#{user.id}", admin), params: project
+
+      expect(json_response['allow_merge_on_skipped_pipeline']).to be_falsey
+    end
+
+    it 'sets a project as allowing merge when pipeline is skipped' do
+      project = attributes_for(:project, allow_merge_on_skipped_pipeline: true)
+
+      post api("/projects/user/#{user.id}", admin), params: project
+
+      expect(json_response['allow_merge_on_skipped_pipeline']).to be_truthy
+    end
+
     it 'sets a project as allowing merge even if discussions are unresolved' do
       project = attributes_for(:project, only_allow_merge_if_all_discussions_are_resolved: false)
 
@@ -1376,6 +1431,7 @@ describe API::Projects do
         expect(json_response['shared_with_groups'][0]['group_name']).to eq(group.name)
         expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access)
         expect(json_response['only_allow_merge_if_pipeline_succeeds']).to eq(project.only_allow_merge_if_pipeline_succeeds)
+        expect(json_response['allow_merge_on_skipped_pipeline']).to eq(project.allow_merge_on_skipped_pipeline)
         expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to eq(project.only_allow_merge_if_all_discussions_are_resolved)
       end
     end
@@ -1443,6 +1499,7 @@ describe API::Projects do
         expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access)
         expect(json_response['shared_with_groups'][0]).to have_key('expires_at')
         expect(json_response['only_allow_merge_if_pipeline_succeeds']).to eq(project.only_allow_merge_if_pipeline_succeeds)
+        expect(json_response['allow_merge_on_skipped_pipeline']).to eq(project.allow_merge_on_skipped_pipeline)
         expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to eq(project.only_allow_merge_if_all_discussions_are_resolved)
         expect(json_response['ci_default_git_depth']).to eq(project.ci_default_git_depth)
         expect(json_response['merge_method']).to eq(project.merge_method.to_s)
@@ -2055,10 +2112,12 @@ describe API::Projects do
   end
 
   describe "POST /projects/:id/share" do
-    let(:group) { create(:group) }
+    let_it_be(:group) { create(:group, :private) }
+    let_it_be(:group_user) { create(:user) }
 
     before do
       group.add_developer(user)
+      group.add_developer(group_user)
     end
 
     it "shares project with group" do
@@ -2074,6 +2133,14 @@ describe API::Projects do
       expect(json_response['expires_at']).to eq(expires_at.to_s)
     end
 
+    it 'updates project authorization' do
+      expect do
+        post api("/projects/#{project.id}/share", user), params: { group_id: group.id, group_access: Gitlab::Access::DEVELOPER }
+      end.to(
+        change { group_user.can?(:read_project, project) }.from(false).to(true)
+      )
+    end
+
     it "returns a 400 error when group id is not given" do
       post api("/projects/#{project.id}/share", user), params: { group_access: Gitlab::Access::DEVELOPER }
       expect(response).to have_gitlab_http_status(:bad_request)
@@ -2123,9 +2190,12 @@ describe API::Projects do
 
   describe 'DELETE /projects/:id/share/:group_id' do
     context 'for a valid group' do
-      let(:group) { create(:group, :public) }
+      let_it_be(:group) { create(:group, :private) }
+      let_it_be(:group_user) { create(:user) }
 
       before do
+        group.add_developer(group_user)
+
         create(:project_group_link, group: group, project: project)
       end
 
@@ -2136,6 +2206,14 @@ describe API::Projects do
         expect(project.project_group_links).to be_empty
       end
 
+      it 'updates project authorization' do
+        expect do
+          delete api("/projects/#{project.id}/share/#{group.id}", user)
+        end.to(
+          change { group_user.can?(:read_project, project) }.from(true).to(false)
+        )
+      end
+
       it_behaves_like '412 response' do
         let(:request) { api("/projects/#{project.id}/share/#{group.id}", user) }
       end
@@ -2438,6 +2516,21 @@ describe API::Projects do
         expect(json_response['container_expiration_policy']['keep_n']).to eq(1)
         expect(json_response['container_expiration_policy']['name_regex_keep']).to eq('foo.*')
       end
+
+      it "doesn't update container_expiration_policy with invalid regex" do
+        project_param = {
+          container_expiration_policy_attributes: {
+            cadence: '1month',
+            keep_n: 1,
+            name_regex_keep: '['
+          }
+        }
+
+        put api("/projects/#{project3.id}", user4), params: project_param
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response['message']['container_expiration_policy.name_regex_keep']).to contain_exactly('not valid RE2 syntax: missing ]: [')
+      end
     end
 
     context 'when authenticated as project developer' do
@@ -2477,11 +2570,11 @@ describe API::Projects do
 
         let(:admin) { create(:admin) }
 
-        it 'returns 500 when repository storage is unknown' do
+        it 'returns 400 when repository storage is unknown' do
           put(api("/projects/#{new_project.id}", admin), params: { repository_storage: unknown_storage })
 
-          expect(response).to have_gitlab_http_status(:internal_server_error)
-          expect(json_response['message']).to match('ArgumentError')
+          expect(response).to have_gitlab_http_status(:bad_request)
+          expect(json_response['message']['repository_storage_moves']).to eq(['is invalid'])
         end
 
         it 'returns 200 when repository storage has changed' do
diff --git a/spec/requests/api/releases_spec.rb b/spec/requests/api/releases_spec.rb
index 237782a681c..f4cb7f25990 100644
--- a/spec/requests/api/releases_spec.rb
+++ b/spec/requests/api/releases_spec.rb
@@ -10,7 +10,6 @@ describe API::Releases do
   let(:guest) { create(:user) }
   let(:non_project_member) { create(:user) }
   let(:commit) { create(:commit, project: project) }
-  let(:last_release) { project.releases.last }
 
   before do
     project.add_maintainer(maintainer)
@@ -733,109 +732,6 @@ describe API::Releases do
         expect(response).to have_gitlab_http_status(:conflict)
       end
     end
-
-    context 'Evidence collection' do
-      let(:params) do
-        {
-          name: 'New release',
-          tag_name: 'v0.1',
-          description: 'Super nice release',
-          released_at: released_at
-        }.compact
-      end
-
-      around do |example|
-        Timecop.freeze { example.run }
-      end
-
-      subject do
-        post api("/projects/#{project.id}/releases", maintainer), params: params
-      end
-
-      context 'historical release' do
-        let(:released_at) { 3.weeks.ago }
-
-        it 'does not execute CreateEvidenceWorker' do
-          expect { subject }.not_to change(CreateEvidenceWorker.jobs, :size)
-        end
-
-        it 'does not create an Evidence object', :sidekiq_inline do
-          expect { subject }.not_to change(Releases::Evidence, :count)
-        end
-
-        it 'is a historical release' do
-          subject
-
-          expect(last_release.historical_release?).to be_truthy
-        end
-
-        it 'is not an upcoming release' do
-          subject
-
-          expect(last_release.upcoming_release?).to be_falsy
-        end
-      end
-
-      context 'immediate release' do
-        let(:released_at) { nil }
-
-        it 'sets `released_at` to the current dttm' do
-          subject
-
-          expect(last_release.updated_at).to be_like_time(Time.now)
-        end
-
-        it 'queues CreateEvidenceWorker' do
-          expect { subject }.to change(CreateEvidenceWorker.jobs, :size).by(1)
-        end
-
-        it 'creates Evidence', :sidekiq_inline do
-          expect { subject }.to change(Releases::Evidence, :count).by(1)
-        end
-
-        it 'is not a historical release' do
-          subject
-
-          expect(last_release.historical_release?).to be_falsy
-        end
-
-        it 'is not an upcoming release' do
-          subject
-
-          expect(last_release.upcoming_release?).to be_falsy
-        end
-      end
-
-      context 'upcoming release' do
-        let(:released_at) { 1.day.from_now }
-
-        it 'queues CreateEvidenceWorker' do
-          expect { subject }.to change(CreateEvidenceWorker.jobs, :size).by(1)
-        end
-
-        it 'queues CreateEvidenceWorker at the released_at timestamp' do
-          subject
-
-          expect(CreateEvidenceWorker.jobs.last['at']).to eq(released_at.to_i)
-        end
-
-        it 'creates Evidence', :sidekiq_inline do
-          expect { subject }.to change(Releases::Evidence, :count).by(1)
-        end
-
-        it 'is not a historical release' do
-          subject
-
-          expect(last_release.historical_release?).to be_falsy
-        end
-
-        it 'is an upcoming release' do
-          subject
-
-          expect(last_release.upcoming_release?).to be_truthy
-        end
-      end
-    end
   end
 
   describe 'PUT /projects/:id/releases/:tag_name' do
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb
index 0c66bfd6c4d..55243e83017 100644
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
@@ -177,6 +177,12 @@ describe API::Repositories do
         expect(headers['Content-Disposition']).to eq 'inline'
       end
 
+      it_behaves_like 'uncached response' do
+        before do
+          get api(route, current_user)
+        end
+      end
+
       context 'when sha does not exist' do
         it_behaves_like '404 response' do
           let(:request) { get api(route.sub(sample_blob.oid, 'abcd9876'), current_user) }
@@ -278,7 +284,7 @@ describe API::Repositories do
 
       context "when hotlinking detection is enabled" do
         before do
-          Feature.enable(:repository_archive_hotlinking_interception)
+          stub_feature_flags(repository_archive_hotlinking_interception: true)
         end
 
         it_behaves_like "hotlink interceptor" do
diff --git a/spec/requests/api/resource_milestone_events_spec.rb b/spec/requests/api/resource_milestone_events_spec.rb
new file mode 100644
index 00000000000..b2e92fde5ee
--- /dev/null
+++ b/spec/requests/api/resource_milestone_events_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe API::ResourceMilestoneEvents do
+  let!(:user) { create(:user) }
+  let!(:project) { create(:project, :public, namespace: user.namespace) }
+  let!(:milestone) { create(:milestone, project: project) }
+
+  before do
+    project.add_developer(user)
+  end
+
+  context 'when eventable is an Issue' do
+    it_behaves_like 'resource_milestone_events API', 'projects', 'issues', 'iid' do
+      let(:parent) { project }
+      let(:eventable) { create(:issue, project: project, author: user) }
+    end
+  end
+
+  context 'when eventable is a Merge Request' do
+    it_behaves_like 'resource_milestone_events API', 'projects', 'merge_requests', 'iid' do
+      let(:parent) { project }
+      let(:eventable) { create(:merge_request, source_project: project, target_project: project, author: user) }
+    end
+  end
+end
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 7284f33f3af..774615757b9 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -648,6 +648,44 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
             end
           end
 
+          context 'when job is for a release' do
+            let!(:job) { create(:ci_build, :release_options, pipeline: pipeline) }
+
+            context 'when `release_steps` is passed by the runner' do
+              it 'exposes release info' do
+                request_job info: { features: { release_steps: true } }
+
+                expect(response).to have_gitlab_http_status(:created)
+                expect(response.headers).not_to have_key('X-GitLab-Last-Update')
+                expect(json_response['steps']).to eq([
+                  {
+                    "name" => "script",
+                    "script" => ["make changelog | tee release_changelog.txt"],
+                    "timeout" => 3600,
+                    "when" => "on_success",
+                    "allow_failure" => false
+                  },
+                  {
+                    "name" => "release",
+                    "script" =>
+                    "release-cli create --ref \"$CI_COMMIT_SHA\" --name \"Release $CI_COMMIT_SHA\" --tag-name \"release-$CI_COMMIT_SHA\" --description \"Created using the release-cli $EXTRA_DESCRIPTION\"",
+                    "timeout" => 3600,
+                    "when" => "on_success",
+                    "allow_failure" => false
+                  }
+                ])
+              end
+            end
+
+            context 'when `release_steps` is not passed by the runner' do
+              it 'drops the job' do
+                request_job
+
+                expect(response).to have_gitlab_http_status(:no_content)
+              end
+            end
+          end
+
           context 'when job is made for merge request' do
             let(:pipeline) { create(:ci_pipeline, source: :merge_request_event, project: project, ref: 'feature', merge_request: merge_request) }
             let!(:job) { create(:ci_build, pipeline: pipeline, name: 'spinach', ref: 'feature', stage: 'test', stage_idx: 0) }
@@ -1055,6 +1093,65 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           post api('/jobs/request'), params: new_params, headers: { 'User-Agent' => user_agent }
         end
       end
+
+      context 'for web-ide job' do
+        let_it_be(:user) { create(:user) }
+        let_it_be(:project) { create(:project, :repository) }
+
+        let(:runner) { create(:ci_runner, :project, projects: [project]) }
+        let(:service) { Ci::CreateWebIdeTerminalService.new(project, user, ref: 'master').execute }
+        let(:pipeline) { service[:pipeline] }
+        let(:build) { pipeline.builds.first }
+        let(:job) { {} }
+        let(:config_content) do
+          'terminal: { image: ruby, services: [mysql], before_script: [ls], tags: [tag-1], variables: { KEY: value } }'
+        end
+
+        before do
+          stub_webide_config_file(config_content)
+          project.add_maintainer(user)
+
+          pipeline
+        end
+
+        context 'when runner has matching tag' do
+          before do
+            runner.update!(tag_list: ['tag-1'])
+          end
+
+          it 'successfully picks job' do
+            request_job
+
+            build.reload
+
+            expect(build).to be_running
+            expect(build.runner).to eq(runner)
+
+            expect(response).to have_gitlab_http_status(:created)
+            expect(json_response).to include(
+              "id" => build.id,
+              "variables" => include("key" => 'KEY', "value" => 'value', "public" => true, "masked" => false),
+              "image" => a_hash_including("name" => 'ruby'),
+              "services" => all(a_hash_including("name" => 'mysql')),
+              "job_info" => a_hash_including("name" => 'terminal', "stage" => 'terminal'))
+          end
+        end
+
+        context 'when runner does not have matching tags' do
+          it 'does not pick a job' do
+            request_job
+
+            build.reload
+
+            expect(build).to be_pending
+            expect(response).to have_gitlab_http_status(:no_content)
+          end
+        end
+
+        def request_job(token = runner.token, **params)
+          post api('/jobs/request'), params: params.merge(token: token)
+        end
+      end
     end
 
     describe 'PUT /api/v4/jobs/:id' do
@@ -1070,6 +1167,10 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
         let(:send_request) { update_job(state: 'success') }
       end
 
+      it 'updates runner info' do
+        expect { update_job(state: 'success') }.to change { runner.reload.contacted_at }
+      end
+
       context 'when status is given' do
         it 'mark job as succeeded' do
           update_job(state: 'success')
@@ -1235,6 +1336,12 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
         let(:send_request) { patch_the_trace }
       end
 
+      it 'updates runner info' do
+        runner.update!(contacted_at: 1.year.ago)
+
+        expect { patch_the_trace }.to change { runner.reload.contacted_at }
+      end
+
       context 'when request is valid' do
         it 'gets correct response' do
           expect(response).to have_gitlab_http_status(:accepted)
@@ -1496,6 +1603,10 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
               let(:send_request) { subject }
             end
 
+            it 'updates runner info' do
+              expect { subject }.to change { runner.reload.contacted_at }
+            end
+
             shared_examples 'authorizes local file' do
               it 'succeeds' do
                 subject
@@ -1634,6 +1745,35 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           end
         end
 
+        context 'authorize uploading of an lsif artifact' do
+          before do
+            stub_feature_flags(code_navigation: job.project)
+          end
+
+          it 'adds ProcessLsif header' do
+            authorize_artifacts_with_token_in_headers(artifact_type: :lsif)
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response['ProcessLsif']).to be_truthy
+          end
+
+          it 'fails to authorize too large artifact' do
+            authorize_artifacts_with_token_in_headers(artifact_type: :lsif, filesize: 30.megabytes)
+
+            expect(response).to have_gitlab_http_status(:payload_too_large)
+          end
+
+          context 'code_navigation feature flag is disabled' do
+            it 'does not add ProcessLsif header' do
+              stub_feature_flags(code_navigation: false)
+
+              authorize_artifacts_with_token_in_headers(artifact_type: :lsif)
+
+              expect(response).to have_gitlab_http_status(:forbidden)
+            end
+          end
+        end
+
         def authorize_artifacts(params = {}, request_headers = headers)
           post api("/jobs/#{job.id}/artifacts/authorize"), params: params, headers: request_headers
         end
@@ -1655,6 +1795,10 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           end
         end
 
+        it 'updates runner info' do
+          expect { upload_artifacts(file_upload, headers_with_token) }.to change { runner.reload.contacted_at }
+        end
+
         context 'when artifacts are being stored inside of tmp path' do
           before do
             # by configuring this path we allow to pass temp file from any path
@@ -2140,6 +2284,10 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           let(:send_request) { download_artifact }
         end
 
+        it 'updates runner info' do
+          expect { download_artifact }.to change { runner.reload.contacted_at }
+        end
+
         context 'when job has artifacts' do
           let(:job) { create(:ci_build) }
           let(:store) { JobArtifactUploader::Store::LOCAL }
@@ -2207,7 +2355,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           end
         end
 
-        context 'when job does not has artifacts' do
+        context 'when job does not have artifacts' do
           it 'responds with not found' do
             download_artifact
 
diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb
index 261e54da6a8..67c258260bf 100644
--- a/spec/requests/api/runners_spec.rb
+++ b/spec/requests/api/runners_spec.rb
@@ -326,32 +326,6 @@ describe API::Runners do
         expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
-
-    context 'FF hide_token_from_runners_api is enabled' do
-      before do
-        stub_feature_flags(hide_token_from_runners_api: true)
-      end
-
-      it "does not return runner's token" do
-        get api("/runners/#{shared_runner.id}", admin)
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response).not_to have_key('token')
-      end
-    end
-
-    context 'FF hide_token_from_runners_api is disabled' do
-      before do
-        stub_feature_flags(hide_token_from_runners_api: false)
-      end
-
-      it "returns runner's token" do
-        get api("/runners/#{shared_runner.id}", admin)
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response).to have_key('token')
-      end
-    end
   end
 
   describe 'PUT /runners/:id' do
diff --git a/spec/requests/api/search_spec.rb b/spec/requests/api/search_spec.rb
index 3894e0bf2d1..a02d804ee9b 100644
--- a/spec/requests/api/search_spec.rb
+++ b/spec/requests/api/search_spec.rb
@@ -15,6 +15,14 @@ describe API::Search do
     it { expect(json_response.size).to eq(size) }
   end
 
+  shared_examples 'ping counters' do |scope:, search: ''|
+    it 'increases usage ping searches counter' do
+      expect(Gitlab::UsageDataCounters::SearchCounter).to receive(:count).with(:all_searches)
+
+      get api(endpoint, user), params: { scope: scope, search: search }
+    end
+  end
+
   shared_examples 'pagination' do |scope:, search: ''|
     it 'returns a different result for each page' do
       get api(endpoint, user), params: { scope: scope, search: search, page: 1, per_page: 1 }
@@ -75,6 +83,8 @@ describe API::Search do
         it_behaves_like 'response is correct', schema: 'public_api/v4/projects'
 
         it_behaves_like 'pagination', scope: :projects
+
+        it_behaves_like 'ping counters', scope: :projects
       end
 
       context 'for issues scope' do
@@ -86,6 +96,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/issues'
 
+        it_behaves_like 'ping counters', scope: :issues
+
         describe 'pagination' do
           before do
             create(:issue, project: project, title: 'another issue')
@@ -104,6 +116,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/merge_requests'
 
+        it_behaves_like 'ping counters', scope: :merge_requests
+
         describe 'pagination' do
           before do
             create(:merge_request, source_project: repo_project, title: 'another mr', target_branch: 'another_branch')
@@ -125,6 +139,8 @@ describe API::Search do
 
           it_behaves_like 'response is correct', schema: 'public_api/v4/milestones'
 
+          it_behaves_like 'ping counters', scope: :milestones
+
           describe 'pagination' do
             before do
               create(:milestone, project: project, title: 'another milestone')
@@ -161,6 +177,8 @@ describe API::Search do
 
         it_behaves_like 'pagination', scope: :users
 
+        it_behaves_like 'ping counters', scope: :users
+
         context 'when users search feature is disabled' do
           before do
             stub_feature_flags(users_search: false)
@@ -183,6 +201,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/snippets'
 
+        it_behaves_like 'ping counters', scope: :snippet_titles
+
         describe 'pagination' do
           before do
             create(:snippet, :public, title: 'another snippet', content: 'snippet content')
@@ -248,6 +268,8 @@ describe API::Search do
         it_behaves_like 'response is correct', schema: 'public_api/v4/projects'
 
         it_behaves_like 'pagination', scope: :projects
+
+        it_behaves_like 'ping counters', scope: :projects
       end
 
       context 'for issues scope' do
@@ -259,6 +281,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/issues'
 
+        it_behaves_like 'ping counters', scope: :issues
+
         describe 'pagination' do
           before do
             create(:issue, project: project, title: 'another issue')
@@ -277,6 +301,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/merge_requests'
 
+        it_behaves_like 'ping counters', scope: :merge_requests
+
         describe 'pagination' do
           before do
             create(:merge_request, source_project: repo_project, title: 'another mr', target_branch: 'another_branch')
@@ -295,6 +321,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/milestones'
 
+        it_behaves_like 'ping counters', scope: :milestones
+
         describe 'pagination' do
           before do
             create(:milestone, project: project, title: 'another milestone')
@@ -326,6 +354,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/user/basics'
 
+        it_behaves_like 'ping counters', scope: :users
+
         describe 'pagination' do
           before do
             create(:group_member, :developer, group: group)
@@ -395,7 +425,7 @@ describe API::Search do
       end
     end
 
-    context 'when user does can not see the project' do
+    context 'when user can not see the project' do
       it 'returns 404 error' do
         project.update!(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
 
@@ -415,6 +445,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/issues'
 
+        it_behaves_like 'ping counters', scope: :issues
+
         describe 'pagination' do
           before do
             create(:issue, project: project, title: 'another issue')
@@ -435,6 +467,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/merge_requests'
 
+        it_behaves_like 'ping counters', scope: :merge_requests
+
         describe 'pagination' do
           before do
             create(:merge_request, source_project: repo_project, title: 'another mr', target_branch: 'another_branch')
@@ -456,6 +490,8 @@ describe API::Search do
 
           it_behaves_like 'response is correct', schema: 'public_api/v4/milestones'
 
+          it_behaves_like 'ping counters', scope: :milestones
+
           describe 'pagination' do
             before do
               create(:milestone, project: project, title: 'another milestone')
@@ -491,6 +527,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/user/basics'
 
+        it_behaves_like 'ping counters', scope: :users
+
         describe 'pagination' do
           before do
             create(:project_member, :developer, project: project)
@@ -521,6 +559,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/notes'
 
+        it_behaves_like 'ping counters', scope: :notes
+
         describe 'pagination' do
           before do
             mr = create(:merge_request, source_project: project, target_branch: 'another_branch')
@@ -542,6 +582,8 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
 
+        it_behaves_like 'ping counters', scope: :wiki_blobs
+
         describe 'pagination' do
           before do
             create(:wiki_page, wiki: wiki, title: 'home 2', content: 'Another page')
@@ -561,6 +603,8 @@ describe API::Search do
         it_behaves_like 'response is correct', schema: 'public_api/v4/commits_details'
 
         it_behaves_like 'pagination', scope: :commits, search: 'merge'
+
+        it_behaves_like 'ping counters', scope: :commits
       end
 
       context 'for commits scope with project path as id' do
@@ -582,6 +626,8 @@ describe API::Search do
 
         it_behaves_like 'pagination', scope: :blobs, search: 'monitors'
 
+        it_behaves_like 'ping counters', scope: :blobs
+
         context 'filters' do
           it 'by filename' do
             get api(endpoint, user), params: { scope: 'blobs', search: 'mon filename:PROCESS.md' }
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index a5b95bc59a5..e6dd1fecb69 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -38,6 +38,8 @@ describe API::Settings, 'Settings' do
       expect(json_response).not_to have_key('performance_bar_allowed_group_path')
       expect(json_response).not_to have_key('performance_bar_enabled')
       expect(json_response['snippet_size_limit']).to eq(50.megabytes)
+      expect(json_response['spam_check_endpoint_enabled']).to be_falsey
+      expect(json_response['spam_check_endpoint_url']).to be_nil
     end
   end
 
@@ -50,7 +52,7 @@ describe API::Settings, 'Settings' do
         storages = Gitlab.config.repositories.storages
                      .merge({ 'custom' => 'tmp/tests/custom_repositories' })
         allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
-        Feature.get(:sourcegraph).enable
+        stub_feature_flags(sourcegraph: true)
       end
 
       it "updates application settings" do
@@ -90,7 +92,9 @@ describe API::Settings, 'Settings' do
             push_event_activities_limit: 2,
             snippet_size_limit: 5,
             issues_create_limit: 300,
-            raw_blob_request_limit: 300
+            raw_blob_request_limit: 300,
+            spam_check_endpoint_enabled: true,
+            spam_check_endpoint_url: 'https://example.com/spam_check'
           }
 
         expect(response).to have_gitlab_http_status(:ok)
@@ -129,6 +133,8 @@ describe API::Settings, 'Settings' do
         expect(json_response['snippet_size_limit']).to eq(5)
         expect(json_response['issues_create_limit']).to eq(300)
         expect(json_response['raw_blob_request_limit']).to eq(300)
+        expect(json_response['spam_check_endpoint_enabled']).to be_truthy
+        expect(json_response['spam_check_endpoint_url']).to eq('https://example.com/spam_check')
       end
     end
 
@@ -390,5 +396,14 @@ describe API::Settings, 'Settings' do
         expect(json_response['error']).to eq('sourcegraph_url is missing')
       end
     end
+
+    context "missing spam_check_endpoint_url value when spam_check_endpoint_enabled is true" do
+      it "returns a blank parameter error message" do
+        put api("/application/settings", admin), params: { spam_check_endpoint_enabled: true }
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response['error']).to eq('spam_check_endpoint_url is missing')
+      end
+    end
   end
 end
diff --git a/spec/requests/api/suggestions_spec.rb b/spec/requests/api/suggestions_spec.rb
index df3f72e3447..ffb8c811622 100644
--- a/spec/requests/api/suggestions_spec.rb
+++ b/spec/requests/api/suggestions_spec.rb
@@ -7,8 +7,7 @@ describe API::Suggestions do
   let(:user) { create(:user) }
 
   let(:merge_request) do
-    create(:merge_request, source_project: project,
-                           target_project: project)
+    create(:merge_request, source_project: project, target_project: project)
   end
 
   let(:position) do
@@ -19,26 +18,45 @@ describe API::Suggestions do
                                diff_refs: merge_request.diff_refs)
   end
 
+  let(:position2) do
+    Gitlab::Diff::Position.new(old_path: "files/ruby/popen.rb",
+                               new_path: "files/ruby/popen.rb",
+                               old_line: nil,
+                               new_line: 15,
+                               diff_refs: merge_request.diff_refs)
+  end
+
   let(:diff_note) do
+    create(:diff_note_on_merge_request,
+           noteable: merge_request,
+           position: position,
+           project: project)
+  end
+
+  let(:diff_note2) do
     create(:diff_note_on_merge_request, noteable: merge_request,
-                                        position: position,
-                                        project: project)
+           position: position2,
+           project: project)
+  end
+
+  let(:suggestion) do
+    create(:suggestion, note: diff_note,
+           from_content: "      raise RuntimeError, \"System commands must be given as an array of strings\"\n",
+           to_content: "      raise RuntimeError, 'Explosion'\n      # explosion?")
+  end
+
+  let(:unappliable_suggestion) do
+    create(:suggestion, :unappliable, note: diff_note2)
   end
 
   describe "PUT /suggestions/:id/apply" do
     let(:url) { "/suggestions/#{suggestion.id}/apply" }
 
     context 'when successfully applies patch' do
-      let(:suggestion) do
-        create(:suggestion, note: diff_note,
-                            from_content: "      raise RuntimeError, \"System commands must be given as an array of strings\"\n",
-                            to_content: "      raise RuntimeError, 'Explosion'\n      # explosion?")
-      end
-
-      it 'returns 200 with json content' do
+      it 'renders an ok response and returns json content' do
         project.add_maintainer(user)
 
-        put api(url, user), params: { id: suggestion.id }
+        put api(url, user)
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response)
@@ -48,31 +66,105 @@ describe API::Suggestions do
     end
 
     context 'when not able to apply patch' do
-      let(:suggestion) do
-        create(:suggestion, :unappliable, note: diff_note)
-      end
+      let(:url) { "/suggestions/#{unappliable_suggestion.id}/apply" }
 
-      it 'returns 400 with json content' do
+      it 'renders a bad request error and returns json content' do
         project.add_maintainer(user)
 
-        put api(url, user), params: { id: suggestion.id }
+        put api(url, user)
 
         expect(response).to have_gitlab_http_status(:bad_request)
-        expect(json_response).to eq({ 'message' => 'Suggestion is not appliable' })
+        expect(json_response).to eq({ 'message' => 'A suggestion is not applicable.' })
+      end
+    end
+
+    context 'when suggestion is not found' do
+      let(:url) { "/suggestions/foo-123/apply" }
+
+      it 'renders a not found error and returns json content' do
+        project.add_maintainer(user)
+
+        put api(url, user)
+
+        expect(response).to have_gitlab_http_status(:not_found)
+        expect(json_response).to eq({ 'message' => 'Suggestion is not applicable as the suggestion was not found.' })
       end
     end
 
     context 'when unauthorized' do
-      let(:suggestion) do
-        create(:suggestion, note: diff_note,
-                            from_content: "      raise RuntimeError, \"System commands must be given as an array of strings\"\n",
-                            to_content: "      raise RuntimeError, 'Explosion'\n      # explosion?")
+      it 'renders a forbidden error and returns json content' do
+        project.add_reporter(user)
+
+        put api(url, user)
+
+        expect(response).to have_gitlab_http_status(:forbidden)
+        expect(json_response).to eq({ 'message' => '403 Forbidden' })
       end
+    end
+  end
+
+  describe "PUT /suggestions/batch_apply" do
+    let(:suggestion2) do
+      create(:suggestion, note: diff_note2,
+             from_content: "      \"PWD\" => path\n",
+             to_content: "      *** FOO ***\n")
+    end
 
-      it 'returns 403 with json content' do
+    let(:url) { "/suggestions/batch_apply" }
+
+    context 'when successfully applies multiple patches as a batch' do
+      it 'renders an ok response and returns json content' do
+        project.add_maintainer(user)
+
+        put api(url, user), params: { ids: [suggestion.id, suggestion2.id] }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response).to all(include('id', 'from_line', 'to_line',
+                                             'appliable', 'applied',
+                                             'from_content', 'to_content'))
+      end
+    end
+
+    context 'when not able to apply one or more of the patches' do
+      it 'renders a bad request error and returns json content' do
+        project.add_maintainer(user)
+
+        put api(url, user),
+            params: { ids: [suggestion.id, unappliable_suggestion.id] }
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response).to eq({ 'message' => 'A suggestion is not applicable.' })
+      end
+    end
+
+    context 'with missing suggestions' do
+      it 'renders a not found error and returns json content if any suggestion is not found' do
+        project.add_maintainer(user)
+
+        put api(url, user), params: { ids: [suggestion.id, 'foo-123'] }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+        expect(json_response)
+          .to eq({ 'message' => 'Suggestions are not applicable as one or more suggestions were not found.' })
+      end
+
+      it 'renders a bad request error and returns json content when no suggestions are provided' do
+        project.add_maintainer(user)
+
+        put api(url, user), params: {}
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+        expect(json_response)
+          .to eq({ 'error' => "ids is missing" })
+      end
+    end
+
+    context 'when unauthorized' do
+      it 'renders a forbidden error and returns json content' do
         project.add_reporter(user)
 
-        put api(url, user), params: { id: suggestion.id }
+        put api(url, user),
+            params: { ids: [suggestion.id, suggestion2.id] }
 
         expect(response).to have_gitlab_http_status(:forbidden)
         expect(json_response).to eq({ 'message' => '403 Forbidden' })
diff --git a/spec/requests/api/terraform/state_spec.rb b/spec/requests/api/terraform/state_spec.rb
index 844cd948411..ec9db5566e3 100644
--- a/spec/requests/api/terraform/state_spec.rb
+++ b/spec/requests/api/terraform/state_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe API::Terraform::State do
+  include HttpBasicAuthHelpers
+
   let_it_be(:project) { create(:project) }
   let_it_be(:developer) { create(:user, developer_projects: [project]) }
   let_it_be(:maintainer) { create(:user, maintainer_projects: [project]) }
@@ -10,7 +12,7 @@ describe API::Terraform::State do
   let!(:state) { create(:terraform_state, :with_file, project: project) }
 
   let(:current_user) { maintainer }
-  let(:auth_header) { basic_auth_header(current_user) }
+  let(:auth_header) { user_basic_auth_header(current_user) }
   let(:project_id) { project.id }
   let(:state_name) { state.name }
   let(:state_path) { "/projects/#{project_id}/terraform/state/#{state_name}" }
@@ -23,7 +25,7 @@ describe API::Terraform::State do
     subject(:request) { get api(state_path), headers: auth_header }
 
     context 'without authentication' do
-      let(:auth_header) { basic_auth_header('failing_token') }
+      let(:auth_header) { basic_auth_header('bad', 'token') }
 
       it 'returns 401 if user is not authenticated' do
         request
@@ -32,34 +34,71 @@ describe API::Terraform::State do
       end
     end
 
-    context 'with maintainer permissions' do
-      let(:current_user) { maintainer }
+    context 'personal acceess token authentication' do
+      context 'with maintainer permissions' do
+        let(:current_user) { maintainer }
 
-      it 'returns terraform state belonging to a project of given state name' do
-        request
+        it 'returns terraform state belonging to a project of given state name' do
+          request
 
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(response.body).to eq(state.file.read)
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response.body).to eq(state.file.read)
+        end
+
+        context 'for a project that does not exist' do
+          let(:project_id) { '0000' }
+
+          it 'returns not found' do
+            request
+
+            expect(response).to have_gitlab_http_status(:not_found)
+          end
+        end
       end
 
-      context 'for a project that does not exist' do
-        let(:project_id) { '0000' }
+      context 'with developer permissions' do
+        let(:current_user) { developer }
 
-        it 'returns not found' do
+        it 'returns forbidden if the user cannot access the state' do
           request
 
-          expect(response).to have_gitlab_http_status(:not_found)
+          expect(response).to have_gitlab_http_status(:forbidden)
         end
       end
     end
 
-    context 'with developer permissions' do
-      let(:current_user) { developer }
+    context 'job token authentication' do
+      let(:auth_header) { job_basic_auth_header(job) }
 
-      it 'returns forbidden if the user cannot access the state' do
-        request
+      context 'with maintainer permissions' do
+        let(:job) { create(:ci_build, project: project, user: maintainer) }
 
-        expect(response).to have_gitlab_http_status(:forbidden)
+        it 'returns terraform state belonging to a project of given state name' do
+          request
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response.body).to eq(state.file.read)
+        end
+
+        context 'for a project that does not exist' do
+          let(:project_id) { '0000' }
+
+          it 'returns not found' do
+            request
+
+            expect(response).to have_gitlab_http_status(:not_found)
+          end
+        end
+      end
+
+      context 'with developer permissions' do
+        let(:job) { create(:ci_build, project: project, user: developer) }
+
+        it 'returns forbidden if the user cannot access the state' do
+          request
+
+          expect(response).to have_gitlab_http_status(:forbidden)
+        end
       end
     end
   end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 4a0f0eea088..e780f67bcab 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -3,18 +3,186 @@
 require 'spec_helper'
 
 describe API::Users, :do_not_mock_admin_mode do
-  let(:user)  { create(:user, username: 'user.with.dot') }
-  let(:admin) { create(:admin) }
-  let(:key) { create(:key, user: user) }
-  let(:gpg_key) { create(:gpg_key, user: user) }
-  let(:email) { create(:email, user: user) }
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:user, reload: true) { create(:user, username: 'user.with.dot') }
+  let_it_be(:key) { create(:key, user: user) }
+  let_it_be(:gpg_key) { create(:gpg_key, user: user) }
+  let_it_be(:email) { create(:email, user: user) }
   let(:omniauth_user) { create(:omniauth_user) }
-  let(:ldap_user) { create(:omniauth_user, provider: 'ldapmain') }
   let(:ldap_blocked_user) { create(:omniauth_user, provider: 'ldapmain', state: 'ldap_blocked') }
-  let(:not_existing_user_id) { (User.maximum('id') || 0 ) + 10 }
-  let(:not_existing_pat_id) { (PersonalAccessToken.maximum('id') || 0 ) + 10 }
   let(:private_user) { create(:user, private_profile: true) }
 
+  context 'admin notes' do
+    let_it_be(:admin) { create(:admin, note: '2019-10-06 | 2FA added | user requested | www.gitlab.com') }
+    let_it_be(:user, reload: true) { create(:user, note: '2018-11-05 | 2FA removed | user requested | www.gitlab.com') }
+
+    describe 'POST /users' do
+      context 'when unauthenticated' do
+        it 'return authentication error' do
+          post api('/users')
+
+          expect(response).to have_gitlab_http_status(:unauthorized)
+        end
+      end
+
+      context 'when authenticated' do
+        context 'as an admin' do
+          it 'contains the note of the user' do
+            optional_attributes = { note: 'Awesome Note' }
+            attributes = attributes_for(:user).merge(optional_attributes)
+
+            post api('/users', admin), params: attributes
+
+            expect(response).to have_gitlab_http_status(:created)
+            expect(json_response['note']).to eq(optional_attributes[:note])
+          end
+        end
+
+        context 'as a regular user' do
+          it 'does not allow creating new user' do
+            post api('/users', user), params: attributes_for(:user)
+
+            expect(response).to have_gitlab_http_status(:forbidden)
+          end
+        end
+      end
+    end
+
+    describe 'GET /users/:id' do
+      context 'when unauthenticated' do
+        it 'does not contain the note of the user' do
+          get api("/users/#{user.id}")
+
+          expect(json_response).not_to have_key('note')
+        end
+      end
+
+      context 'when authenticated' do
+        context 'as an admin' do
+          it 'contains the note of the user' do
+            get api("/users/#{user.id}", admin)
+
+            expect(json_response).to have_key('note')
+            expect(json_response['note']).to eq(user.note)
+          end
+        end
+
+        context 'as a regular user' do
+          it 'does not contain the note of the user' do
+            get api("/users/#{user.id}", user)
+
+            expect(json_response).not_to have_key('note')
+          end
+        end
+      end
+    end
+
+    describe "PUT /users/:id" do
+      context 'when user is an admin' do
+        it "updates note of the user" do
+          new_note = '2019-07-07 | Email changed | user requested | www.gitlab.com'
+
+          expect do
+            put api("/users/#{user.id}", admin), params: { note: new_note }
+          end.to change { user.reload.note }
+                   .from('2018-11-05 | 2FA removed | user requested | www.gitlab.com')
+                   .to(new_note)
+
+          expect(response).to have_gitlab_http_status(:success)
+          expect(json_response['note']).to eq(new_note)
+        end
+      end
+
+      context 'when user is not an admin' do
+        it "cannot update their own note" do
+          expect do
+            put api("/users/#{user.id}", user), params: { note: 'new note' }
+          end.not_to change { user.reload.note }
+
+          expect(response).to have_gitlab_http_status(:forbidden)
+        end
+      end
+    end
+
+    describe 'GET /users/' do
+      context 'when unauthenticated' do
+        it "does not contain the note of users" do
+          get api("/users"), params: { username: user.username }
+
+          expect(json_response.first).not_to have_key('note')
+        end
+      end
+
+      context 'when authenticated' do
+        context 'as a regular user' do
+          it 'does not contain the note of users' do
+            get api("/users", user), params: { username: user.username }
+
+            expect(json_response.first).not_to have_key('note')
+          end
+        end
+
+        context 'as an admin' do
+          it 'contains the note of users' do
+            get api("/users", admin), params: { username: user.username }
+
+            expect(response).to have_gitlab_http_status(:success)
+            expect(json_response.first).to have_key('note')
+            expect(json_response.first['note']).to eq '2018-11-05 | 2FA removed | user requested | www.gitlab.com'
+          end
+        end
+      end
+    end
+
+    describe 'GET /user' do
+      context 'when authenticated' do
+        context 'as an admin' do
+          context 'accesses their own profile' do
+            it 'contains the note of the user' do
+              get api("/user", admin)
+
+              expect(json_response).to have_key('note')
+              expect(json_response['note']).to eq(admin.note)
+            end
+          end
+
+          context 'sudo' do
+            let(:admin_personal_access_token) { create(:personal_access_token, user: admin, scopes: %w[api sudo]).token }
+
+            context 'accesses the profile of another regular user' do
+              it 'does not contain the note of the user' do
+                get api("/user?private_token=#{admin_personal_access_token}&sudo=#{user.id}")
+
+                expect(json_response['id']).to eq(user.id)
+                expect(json_response).not_to have_key('note')
+              end
+            end
+
+            context 'accesses the profile of another admin' do
+              let(:admin_2) {create(:admin, note: '2010-10-10 | 2FA added | admin requested | www.gitlab.com')}
+
+              it 'contains the note of the user' do
+                get api("/user?private_token=#{admin_personal_access_token}&sudo=#{admin_2.id}")
+
+                expect(json_response['id']).to eq(admin_2.id)
+                expect(json_response).to have_key('note')
+                expect(json_response['note']).to eq(admin_2.note)
+              end
+            end
+          end
+        end
+
+        context 'as a regular user' do
+          it 'does not contain the note of the user' do
+            get api("/user", user)
+
+            expect(json_response).not_to have_key('note')
+          end
+        end
+      end
+    end
+  end
+
   shared_examples 'rendering user status' do
     it 'returns the status if there was one' do
       create(:user_status, user: user)
@@ -257,8 +425,9 @@ describe API::Users, :do_not_mock_admin_mode do
       end
 
       it 'returns the correct order when sorted by id' do
-        admin
-        user
+        # order of let_it_be definitions:
+        # - admin
+        # - user
 
         get api('/users', admin), params: { order_by: 'id', sort: 'asc' }
 
@@ -269,8 +438,6 @@ describe API::Users, :do_not_mock_admin_mode do
       end
 
       it 'returns users with 2fa enabled' do
-        admin
-        user
         user_with_2fa = create(:user, :two_factor_via_otp)
 
         get api('/users', admin), params: { two_factor: 'enabled' }
@@ -298,18 +465,6 @@ describe API::Users, :do_not_mock_admin_mode do
         expect(response).to have_gitlab_http_status(:bad_request)
       end
     end
-
-    context "when authenticated and ldap is enabled" do
-      it "returns non-ldap user" do
-        create :omniauth_user, provider: "ldapserver1"
-
-        get api("/users", user), params: { skip_ldap: "true" }
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response).to be_an Array
-        expect(json_response.first["username"]).to eq user.username
-      end
-    end
   end
 
   describe "GET /users/:id" do
@@ -492,10 +647,6 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe "POST /users" do
-    before do
-      admin
-    end
-
     it "creates user" do
       expect do
         post api("/users", admin), params: attributes_for(:user, projects_limit: 3)
@@ -734,8 +885,6 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe "PUT /users/:id" do
-    let_it_be(:admin_user) { create(:admin) }
-
     it "returns 200 OK on success" do
       put api("/users/#{user.id}", admin), params: { bio: 'new test bio' }
 
@@ -752,8 +901,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it "updates user with empty bio" do
-      user.bio = 'previous bio'
-      user.save!
+      user.update!(bio: 'previous bio')
 
       put api("/users/#{user.id}", admin), params: { bio: '' }
 
@@ -870,7 +1018,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it "updates private profile to false when nil is given" do
-      user.update(private_profile: true)
+      user.update!(private_profile: true)
 
       put api("/users/#{user.id}", admin), params: { private_profile: nil }
 
@@ -879,7 +1027,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it "does not modify private profile when field is not provided" do
-      user.update(private_profile: true)
+      user.update!(private_profile: true)
 
       put api("/users/#{user.id}", admin), params: {}
 
@@ -891,7 +1039,7 @@ describe API::Users, :do_not_mock_admin_mode do
       theme = Gitlab::Themes.each.find { |t| t.id != Gitlab::Themes.default.id }
       scheme = Gitlab::ColorSchemes.each.find { |t| t.id != Gitlab::ColorSchemes.default.id }
 
-      user.update(theme_id: theme.id, color_scheme_id: scheme.id)
+      user.update!(theme_id: theme.id, color_scheme_id: scheme.id)
 
       put api("/users/#{user.id}", admin), params: {}
 
@@ -901,6 +1049,8 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it "does not update admin status" do
+      admin_user = create(:admin)
+
       put api("/users/#{admin_user.id}", admin), params: { can_create_group: false }
 
       expect(response).to have_gitlab_http_status(:ok)
@@ -1071,10 +1221,6 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe "POST /users/:id/keys" do
-    before do
-      admin
-    end
-
     it "does not create invalid ssh key" do
       post api("/users/#{user.id}/keys", admin), params: { title: "invalid key" }
 
@@ -1096,6 +1242,16 @@ describe API::Users, :do_not_mock_admin_mode do
       end.to change { user.keys.count }.by(1)
     end
 
+    it 'creates SSH key with `expires_at` attribute' do
+      optional_attributes = { expires_at: '2016-01-21T00:00:00.000Z' }
+      attributes = attributes_for(:key).merge(optional_attributes)
+
+      post api("/users/#{user.id}/keys", admin), params: attributes
+
+      expect(response).to have_gitlab_http_status(:created)
+      expect(json_response['expires_at']).to eq(optional_attributes[:expires_at])
+    end
+
     it "returns 400 for invalid ID" do
       post api("/users/0/keys", admin)
       expect(response).to have_gitlab_http_status(:bad_request)
@@ -1104,9 +1260,7 @@ describe API::Users, :do_not_mock_admin_mode do
 
   describe 'GET /user/:id/keys' do
     it 'returns 404 for non-existing user' do
-      user_id = not_existing_user_id
-
-      get api("/users/#{user_id}/keys")
+      get api("/users/#{non_existing_record_id}/keys")
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 User Not Found')
@@ -1114,7 +1268,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it 'returns array of ssh keys' do
       user.keys << key
-      user.save
 
       get api("/users/#{user.id}/keys")
 
@@ -1123,11 +1276,41 @@ describe API::Users, :do_not_mock_admin_mode do
       expect(json_response).to be_an Array
       expect(json_response.first['title']).to eq(key.title)
     end
+
+    it 'returns array of ssh keys with comments replaced with'\
+      'a simple identifier of username + hostname' do
+      get api("/users/#{user.id}/keys")
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to include_pagination_headers
+      expect(json_response).to be_an Array
+
+      keys = json_response.map { |key_detail| key_detail['key'] }
+      expect(keys).to all(include("#{user.name} (#{Gitlab.config.gitlab.host}"))
+    end
+
+    context 'N+1 queries' do
+      before do
+        get api("/users/#{user.id}/keys")
+      end
+
+      it 'avoids N+1 queries', :request_store do
+        control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+          get api("/users/#{user.id}/keys")
+        end.count
+
+        create_list(:key, 2, user: user)
+
+        expect do
+          get api("/users/#{user.id}/keys")
+        end.not_to exceed_all_query_limit(control_count)
+      end
+    end
   end
 
   describe 'GET /user/:user_id/keys' do
     it 'returns 404 for non-existing user' do
-      get api("/users/#{not_existing_user_id}/keys")
+      get api("/users/#{non_existing_record_id}/keys")
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 User Not Found')
@@ -1135,7 +1318,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it 'returns array of ssh keys' do
       user.keys << key
-      user.save
 
       get api("/users/#{user.username}/keys")
 
@@ -1147,13 +1329,9 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'DELETE /user/:id/keys/:key_id' do
-    before do
-      admin
-    end
-
     context 'when unauthenticated' do
       it 'returns authentication error' do
-        delete api("/users/#{user.id}/keys/42")
+        delete api("/users/#{user.id}/keys/#{non_existing_record_id}")
         expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
@@ -1161,7 +1339,6 @@ describe API::Users, :do_not_mock_admin_mode do
     context 'when authenticated' do
       it 'deletes existing key' do
         user.keys << key
-        user.save
 
         expect do
           delete api("/users/#{user.id}/keys/#{key.id}", admin)
@@ -1176,14 +1353,14 @@ describe API::Users, :do_not_mock_admin_mode do
 
       it 'returns 404 error if user not found' do
         user.keys << key
-        user.save
+
         delete api("/users/0/keys/#{key.id}", admin)
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'returns 404 error if key not foud' do
-        delete api("/users/#{user.id}/keys/42", admin)
+        delete api("/users/#{user.id}/keys/#{non_existing_record_id}", admin)
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 Key Not Found')
       end
@@ -1191,10 +1368,6 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'POST /users/:id/keys' do
-    before do
-      admin
-    end
-
     it 'does not create invalid GPG key' do
       post api("/users/#{user.id}/gpg_keys", admin)
 
@@ -1203,7 +1376,8 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it 'creates GPG key' do
-      key_attrs = attributes_for :gpg_key
+      key_attrs = attributes_for :gpg_key, key: GpgHelpers::User2.public_key
+
       expect do
         post api("/users/#{user.id}/gpg_keys", admin), params: key_attrs
 
@@ -1219,10 +1393,6 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'GET /user/:id/gpg_keys' do
-    before do
-      admin
-    end
-
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get api("/users/#{user.id}/gpg_keys")
@@ -1240,7 +1410,7 @@ describe API::Users, :do_not_mock_admin_mode do
       end
 
       it 'returns 404 error if key not foud' do
-        delete api("/users/#{user.id}/gpg_keys/42", admin)
+        delete api("/users/#{user.id}/gpg_keys/#{non_existing_record_id}", admin)
 
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 GPG Key Not Found')
@@ -1248,7 +1418,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
       it 'returns array of GPG keys' do
         user.gpg_keys << gpg_key
-        user.save
 
         get api("/users/#{user.id}/gpg_keys", admin)
 
@@ -1261,13 +1430,9 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'DELETE /user/:id/gpg_keys/:key_id' do
-    before do
-      admin
-    end
-
     context 'when unauthenticated' do
       it 'returns authentication error' do
-        delete api("/users/#{user.id}/keys/42")
+        delete api("/users/#{user.id}/keys/#{non_existing_record_id}")
 
         expect(response).to have_gitlab_http_status(:unauthorized)
       end
@@ -1276,7 +1441,6 @@ describe API::Users, :do_not_mock_admin_mode do
     context 'when authenticated' do
       it 'deletes existing key' do
         user.gpg_keys << gpg_key
-        user.save
 
         expect do
           delete api("/users/#{user.id}/gpg_keys/#{gpg_key.id}", admin)
@@ -1287,7 +1451,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
       it 'returns 404 error if user not found' do
         user.keys << key
-        user.save
 
         delete api("/users/0/gpg_keys/#{gpg_key.id}", admin)
 
@@ -1296,7 +1459,7 @@ describe API::Users, :do_not_mock_admin_mode do
       end
 
       it 'returns 404 error if key not foud' do
-        delete api("/users/#{user.id}/gpg_keys/42", admin)
+        delete api("/users/#{user.id}/gpg_keys/#{non_existing_record_id}", admin)
 
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 GPG Key Not Found')
@@ -1305,13 +1468,9 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'POST /user/:id/gpg_keys/:key_id/revoke' do
-    before do
-      admin
-    end
-
     context 'when unauthenticated' do
       it 'returns authentication error' do
-        post api("/users/#{user.id}/gpg_keys/42/revoke")
+        post api("/users/#{user.id}/gpg_keys/#{non_existing_record_id}/revoke")
 
         expect(response).to have_gitlab_http_status(:unauthorized)
       end
@@ -1320,7 +1479,6 @@ describe API::Users, :do_not_mock_admin_mode do
     context 'when authenticated' do
       it 'revokes existing key' do
         user.gpg_keys << gpg_key
-        user.save
 
         expect do
           post api("/users/#{user.id}/gpg_keys/#{gpg_key.id}/revoke", admin)
@@ -1331,7 +1489,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
       it 'returns 404 error if user not found' do
         user.gpg_keys << gpg_key
-        user.save
 
         post api("/users/0/gpg_keys/#{gpg_key.id}/revoke", admin)
 
@@ -1340,7 +1497,7 @@ describe API::Users, :do_not_mock_admin_mode do
       end
 
       it 'returns 404 error if key not foud' do
-        post api("/users/#{user.id}/gpg_keys/42/revoke", admin)
+        post api("/users/#{user.id}/gpg_keys/#{non_existing_record_id}/revoke", admin)
 
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 GPG Key Not Found')
@@ -1349,10 +1506,6 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe "POST /users/:id/emails" do
-    before do
-      admin
-    end
-
     it "does not create invalid email" do
       post api("/users/#{user.id}/emails", admin), params: {}
 
@@ -1390,10 +1543,6 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'GET /user/:id/emails' do
-    before do
-      admin
-    end
-
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get api("/users/#{user.id}/emails")
@@ -1410,7 +1559,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
       it 'returns array of emails' do
         user.emails << email
-        user.save
 
         get api("/users/#{user.id}/emails", admin)
 
@@ -1429,13 +1577,9 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'DELETE /user/:id/emails/:email_id' do
-    before do
-      admin
-    end
-
     context 'when unauthenticated' do
       it 'returns authentication error' do
-        delete api("/users/#{user.id}/emails/42")
+        delete api("/users/#{user.id}/emails/#{non_existing_record_id}")
         expect(response).to have_gitlab_http_status(:unauthorized)
       end
     end
@@ -1443,7 +1587,6 @@ describe API::Users, :do_not_mock_admin_mode do
     context 'when authenticated' do
       it 'deletes existing email' do
         user.emails << email
-        user.save
 
         expect do
           delete api("/users/#{user.id}/emails/#{email.id}", admin)
@@ -1458,14 +1601,14 @@ describe API::Users, :do_not_mock_admin_mode do
 
       it 'returns 404 error if user not found' do
         user.emails << email
-        user.save
+
         delete api("/users/0/emails/#{email.id}", admin)
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 User Not Found')
       end
 
       it 'returns 404 error if email not foud' do
-        delete api("/users/#{user.id}/emails/42", admin)
+        delete api("/users/#{user.id}/emails/#{non_existing_record_id}", admin)
         expect(response).to have_gitlab_http_status(:not_found)
         expect(json_response['message']).to eq('404 Email Not Found')
       end
@@ -1479,19 +1622,16 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe "DELETE /users/:id" do
-    let!(:namespace) { user.namespace }
-    let!(:issue) { create(:issue, author: user) }
-
-    before do
-      admin
-    end
+    let_it_be(:issue) { create(:issue, author: user) }
 
     it "deletes user", :sidekiq_might_not_need_inline do
+      namespace_id = user.namespace.id
+
       perform_enqueued_jobs { delete api("/users/#{user.id}", admin) }
 
       expect(response).to have_gitlab_http_status(:no_content)
       expect { User.find(user.id) }.to raise_error ActiveRecord::RecordNotFound
-      expect { Namespace.find(namespace.id) }.to raise_error ActiveRecord::RecordNotFound
+      expect { Namespace.find(namespace_id) }.to raise_error ActiveRecord::RecordNotFound
     end
 
     context "sole owner of a group" do
@@ -1560,11 +1700,11 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe "GET /user" do
-    let(:personal_access_token) { create(:personal_access_token, user: user).token }
-
     shared_examples 'get user info' do |version|
       context 'with regular user' do
         context 'with personal access token' do
+          let(:personal_access_token) { create(:personal_access_token, user: user).token }
+
           it 'returns 403 without private token when sudo is defined' do
             get api("/user?private_token=#{personal_access_token}&sudo=123", version: version)
 
@@ -1632,7 +1772,6 @@ describe API::Users, :do_not_mock_admin_mode do
     context "when authenticated" do
       it "returns array of ssh keys" do
         user.keys << key
-        user.save
 
         get api("/user/keys", user)
 
@@ -1642,6 +1781,36 @@ describe API::Users, :do_not_mock_admin_mode do
         expect(json_response.first["title"]).to eq(key.title)
       end
 
+      it 'returns array of ssh keys with comments replaced with'\
+        'a simple identifier of username + hostname' do
+        get api("/user/keys", user)
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+
+        keys = json_response.map { |key_detail| key_detail['key'] }
+        expect(keys).to all(include("#{user.name} (#{Gitlab.config.gitlab.host}"))
+      end
+
+      context 'N+1 queries' do
+        before do
+          get api("/user/keys", user)
+        end
+
+        it 'avoids N+1 queries', :request_store do
+          control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+            get api("/user/keys", user)
+          end.count
+
+          create_list(:key, 2, user: user)
+
+          expect do
+            get api("/user/keys", user)
+          end.not_to exceed_all_query_limit(control_count)
+        end
+      end
+
       context "scopes" do
         let(:path) { "/user/keys" }
         let(:api_call) { method(:api) }
@@ -1654,14 +1823,21 @@ describe API::Users, :do_not_mock_admin_mode do
   describe "GET /user/keys/:key_id" do
     it "returns single key" do
       user.keys << key
-      user.save
+
       get api("/user/keys/#{key.id}", user)
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response["title"]).to eq(key.title)
     end
 
+    it 'exposes SSH key comment as a simple identifier of username + hostname' do
+      get api("/user/keys/#{key.id}", user)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['key']).to include("#{key.user_name} (#{Gitlab.config.gitlab.host})")
+    end
+
     it "returns 404 Not Found within invalid ID" do
-      get api("/user/keys/42", user)
+      get api("/user/keys/#{non_existing_record_id}", user)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Key Not Found')
@@ -1669,8 +1845,8 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it "returns 404 error if admin accesses user's ssh key" do
       user.keys << key
-      user.save
       admin
+
       get api("/user/keys/#{key.id}", admin)
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Key Not Found')
@@ -1699,6 +1875,16 @@ describe API::Users, :do_not_mock_admin_mode do
       expect(response).to have_gitlab_http_status(:created)
     end
 
+    it 'creates SSH key with `expires_at` attribute' do
+      optional_attributes = { expires_at: '2016-01-21T00:00:00.000Z' }
+      attributes = attributes_for(:key).merge(optional_attributes)
+
+      post api("/user/keys", user), params: attributes
+
+      expect(response).to have_gitlab_http_status(:created)
+      expect(json_response['expires_at']).to eq(optional_attributes[:expires_at])
+    end
+
     it "returns a 401 error if unauthorized" do
       post api("/user/keys"), params: { title: 'some title', key: 'some key' }
       expect(response).to have_gitlab_http_status(:unauthorized)
@@ -1727,7 +1913,6 @@ describe API::Users, :do_not_mock_admin_mode do
   describe "DELETE /user/keys/:key_id" do
     it "deletes existed key" do
       user.keys << key
-      user.save
 
       expect do
         delete api("/user/keys/#{key.id}", user)
@@ -1741,7 +1926,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it "returns 404 if key ID not found" do
-      delete api("/user/keys/42", user)
+      delete api("/user/keys/#{non_existing_record_id}", user)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Key Not Found')
@@ -1749,7 +1934,7 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it "returns 401 error if unauthorized" do
       user.keys << key
-      user.save
+
       delete api("/user/keys/#{key.id}")
       expect(response).to have_gitlab_http_status(:unauthorized)
     end
@@ -1773,7 +1958,6 @@ describe API::Users, :do_not_mock_admin_mode do
     context 'when authenticated' do
       it 'returns array of GPG keys' do
         user.gpg_keys << gpg_key
-        user.save
 
         get api('/user/gpg_keys', user)
 
@@ -1795,7 +1979,6 @@ describe API::Users, :do_not_mock_admin_mode do
   describe 'GET /user/gpg_keys/:key_id' do
     it 'returns a single key' do
       user.gpg_keys << gpg_key
-      user.save
 
       get api("/user/gpg_keys/#{gpg_key.id}", user)
 
@@ -1804,7 +1987,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it 'returns 404 Not Found within invalid ID' do
-      get api('/user/gpg_keys/42', user)
+      get api("/user/gpg_keys/#{non_existing_record_id}", user)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 GPG Key Not Found')
@@ -1812,7 +1995,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it "returns 404 error if admin accesses user's GPG key" do
       user.gpg_keys << gpg_key
-      user.save
 
       get api("/user/gpg_keys/#{gpg_key.id}", admin)
 
@@ -1836,7 +2018,8 @@ describe API::Users, :do_not_mock_admin_mode do
 
   describe 'POST /user/gpg_keys' do
     it 'creates a GPG key' do
-      key_attrs = attributes_for :gpg_key
+      key_attrs = attributes_for :gpg_key, key: GpgHelpers::User2.public_key
+
       expect do
         post api('/user/gpg_keys', user), params: key_attrs
 
@@ -1861,7 +2044,6 @@ describe API::Users, :do_not_mock_admin_mode do
   describe 'POST /user/gpg_keys/:key_id/revoke' do
     it 'revokes existing GPG key' do
       user.gpg_keys << gpg_key
-      user.save
 
       expect do
         post api("/user/gpg_keys/#{gpg_key.id}/revoke", user)
@@ -1871,7 +2053,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it 'returns 404 if key ID not found' do
-      post api('/user/gpg_keys/42/revoke', user)
+      post api("/user/gpg_keys/#{non_existing_record_id}/revoke", user)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 GPG Key Not Found')
@@ -1879,7 +2061,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it 'returns 401 error if unauthorized' do
       user.gpg_keys << gpg_key
-      user.save
 
       post api("/user/gpg_keys/#{gpg_key.id}/revoke")
 
@@ -1896,7 +2077,6 @@ describe API::Users, :do_not_mock_admin_mode do
   describe 'DELETE /user/gpg_keys/:key_id' do
     it 'deletes existing GPG key' do
       user.gpg_keys << gpg_key
-      user.save
 
       expect do
         delete api("/user/gpg_keys/#{gpg_key.id}", user)
@@ -1906,7 +2086,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it 'returns 404 if key ID not found' do
-      delete api('/user/gpg_keys/42', user)
+      delete api("/user/gpg_keys/#{non_existing_record_id}", user)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 GPG Key Not Found')
@@ -1914,7 +2094,6 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it 'returns 401 error if unauthorized' do
       user.gpg_keys << gpg_key
-      user.save
 
       delete api("/user/gpg_keys/#{gpg_key.id}")
 
@@ -1939,7 +2118,6 @@ describe API::Users, :do_not_mock_admin_mode do
     context "when authenticated" do
       it "returns array of emails" do
         user.emails << email
-        user.save
 
         get api("/user/emails", user)
 
@@ -1961,22 +2139,22 @@ describe API::Users, :do_not_mock_admin_mode do
   describe "GET /user/emails/:email_id" do
     it "returns single email" do
       user.emails << email
-      user.save
+
       get api("/user/emails/#{email.id}", user)
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response["email"]).to eq(email.email)
     end
 
     it "returns 404 Not Found within invalid ID" do
-      get api("/user/emails/42", user)
+      get api("/user/emails/#{non_existing_record_id}", user)
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Email Not Found')
     end
 
     it "returns 404 error if admin accesses user's email" do
       user.emails << email
-      user.save
       admin
+
       get api("/user/emails/#{email.id}", admin)
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Email Not Found')
@@ -2021,7 +2199,6 @@ describe API::Users, :do_not_mock_admin_mode do
   describe "DELETE /user/emails/:email_id" do
     it "deletes existed email" do
       user.emails << email
-      user.save
 
       expect do
         delete api("/user/emails/#{email.id}", user)
@@ -2035,7 +2212,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it "returns 404 if email ID not found" do
-      delete api("/user/emails/42", user)
+      delete api("/user/emails/#{non_existing_record_id}", user)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Email Not Found')
@@ -2043,7 +2220,7 @@ describe API::Users, :do_not_mock_admin_mode do
 
     it "returns 401 error if unauthorized" do
       user.emails << email
-      user.save
+
       delete api("/user/emails/#{email.id}")
       expect(response).to have_gitlab_http_status(:unauthorized)
     end
@@ -2149,7 +2326,7 @@ describe API::Users, :do_not_mock_admin_mode do
       context 'performed by an admin user' do
         context 'for an active user' do
           let(:activity) { {} }
-          let(:user) { create(:user, username: 'user.with.dot', **activity) }
+          let(:user) { create(:user, **activity) }
 
           context 'with no recent activity' do
             let(:activity) { { last_activity_on: ::User::MINIMUM_INACTIVE_DAYS.next.days.ago } }
@@ -2234,10 +2411,6 @@ describe API::Users, :do_not_mock_admin_mode do
   describe 'POST /users/:id/block' do
     let(:blocked_user) { create(:user, state: 'blocked') }
 
-    before do
-      admin
-    end
-
     it 'blocks existing user' do
       post api("/users/#{user.id}/block", admin)
 
@@ -2280,10 +2453,6 @@ describe API::Users, :do_not_mock_admin_mode do
     let(:blocked_user) { create(:user, state: 'blocked') }
     let(:deactivated_user) { create(:user, state: 'deactivated') }
 
-    before do
-      admin
-    end
-
     it 'unblocks existing user' do
       post api("/users/#{user.id}/unblock", admin)
       expect(response).to have_gitlab_http_status(:created)
@@ -2477,21 +2646,21 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'GET /users/:user_id/impersonation_tokens' do
-    let!(:active_personal_access_token) { create(:personal_access_token, user: user) }
-    let!(:revoked_personal_access_token) { create(:personal_access_token, :revoked, user: user) }
-    let!(:expired_personal_access_token) { create(:personal_access_token, :expired, user: user) }
-    let!(:impersonation_token) { create(:personal_access_token, :impersonation, user: user) }
-    let!(:revoked_impersonation_token) { create(:personal_access_token, :impersonation, :revoked, user: user) }
+    let_it_be(:active_personal_access_token) { create(:personal_access_token, user: user) }
+    let_it_be(:revoked_personal_access_token) { create(:personal_access_token, :revoked, user: user) }
+    let_it_be(:expired_personal_access_token) { create(:personal_access_token, :expired, user: user) }
+    let_it_be(:impersonation_token) { create(:personal_access_token, :impersonation, user: user) }
+    let_it_be(:revoked_impersonation_token) { create(:personal_access_token, :impersonation, :revoked, user: user) }
 
     it 'returns a 404 error if user not found' do
-      get api("/users/#{not_existing_user_id}/impersonation_tokens", admin)
+      get api("/users/#{non_existing_record_id}/impersonation_tokens", admin)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it 'returns a 403 error when authenticated as normal user' do
-      get api("/users/#{not_existing_user_id}/impersonation_tokens", user)
+      get api("/users/#{non_existing_record_id}/impersonation_tokens", user)
 
       expect(response).to have_gitlab_http_status(:forbidden)
       expect(json_response['message']).to eq('403 Forbidden')
@@ -2540,7 +2709,7 @@ describe API::Users, :do_not_mock_admin_mode do
     end
 
     it 'returns a 404 error if user not found' do
-      post api("/users/#{not_existing_user_id}/impersonation_tokens", admin),
+      post api("/users/#{non_existing_record_id}/impersonation_tokens", admin),
         params: {
           name: name,
           expires_at: expires_at
@@ -2584,18 +2753,18 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'GET /users/:user_id/impersonation_tokens/:impersonation_token_id' do
-    let!(:personal_access_token) { create(:personal_access_token, user: user) }
-    let!(:impersonation_token) { create(:personal_access_token, :impersonation, user: user) }
+    let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
+    let_it_be(:impersonation_token) { create(:personal_access_token, :impersonation, user: user) }
 
     it 'returns 404 error if user not found' do
-      get api("/users/#{not_existing_user_id}/impersonation_tokens/1", admin)
+      get api("/users/#{non_existing_record_id}/impersonation_tokens/1", admin)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it 'returns a 404 error if impersonation token not found' do
-      get api("/users/#{user.id}/impersonation_tokens/#{not_existing_pat_id}", admin)
+      get api("/users/#{user.id}/impersonation_tokens/#{non_existing_record_id}", admin)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Impersonation Token Not Found')
@@ -2625,18 +2794,18 @@ describe API::Users, :do_not_mock_admin_mode do
   end
 
   describe 'DELETE /users/:user_id/impersonation_tokens/:impersonation_token_id' do
-    let!(:personal_access_token) { create(:personal_access_token, user: user) }
-    let!(:impersonation_token) { create(:personal_access_token, :impersonation, user: user) }
+    let_it_be(:personal_access_token) { create(:personal_access_token, user: user) }
+    let_it_be(:impersonation_token) { create(:personal_access_token, :impersonation, user: user) }
 
     it 'returns a 404 error if user not found' do
-      delete api("/users/#{not_existing_user_id}/impersonation_tokens/1", admin)
+      delete api("/users/#{non_existing_record_id}/impersonation_tokens/1", admin)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 User Not Found')
     end
 
     it 'returns a 404 error if impersonation token not found' do
-      delete api("/users/#{user.id}/impersonation_tokens/#{not_existing_pat_id}", admin)
+      delete api("/users/#{user.id}/impersonation_tokens/#{non_existing_record_id}", admin)
 
       expect(response).to have_gitlab_http_status(:not_found)
       expect(json_response['message']).to eq('404 Impersonation Token Not Found')
diff --git a/spec/requests/groups/registry/repositories_controller_spec.rb b/spec/requests/groups/registry/repositories_controller_spec.rb
index 25bd7aa862e..ab59b006be7 100644
--- a/spec/requests/groups/registry/repositories_controller_spec.rb
+++ b/spec/requests/groups/registry/repositories_controller_spec.rb
@@ -8,7 +8,7 @@ describe Groups::Registry::RepositoriesController do
 
   before do
     stub_container_registry_config(enabled: true)
-
+    stub_container_registry_tags(repository: :any, tags: [])
     group.add_reporter(user)
     login_as(user)
   end
diff --git a/spec/requests/import/gitlab_groups_controller_spec.rb b/spec/requests/import/gitlab_groups_controller_spec.rb
new file mode 100644
index 00000000000..35f2bf0c2f7
--- /dev/null
+++ b/spec/requests/import/gitlab_groups_controller_spec.rb
@@ -0,0 +1,258 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::GitlabGroupsController do
+  include WorkhorseHelpers
+
+  let(:import_path) { "#{Dir.tmpdir}/gitlab_groups_controller_spec" }
+  let(:workhorse_token) { JWT.encode({ 'iss' => 'gitlab-workhorse' }, Gitlab::Workhorse.secret, 'HS256') }
+  let(:workhorse_headers) do
+    { 'GitLab-Workhorse' => '1.0', Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER => workhorse_token }
+  end
+
+  before do
+    allow_next_instance_of(Gitlab::ImportExport) do |import_export|
+      expect(import_export).to receive(:storage_path).and_return(import_path)
+    end
+
+    stub_uploads_object_storage(ImportExportUploader)
+  end
+
+  after do
+    FileUtils.rm_rf(import_path, secure: true)
+  end
+
+  describe 'POST create' do
+    subject(:import_request) { upload_archive(file_upload, workhorse_headers, request_params) }
+
+    let_it_be(:user) { create(:user) }
+
+    let(:file) { File.join('spec', %w[fixtures group_export.tar.gz]) }
+    let(:file_upload) { fixture_file_upload(file) }
+
+    before do
+      login_as(user)
+    end
+
+    def upload_archive(file, headers = {}, params = {})
+      workhorse_finalize(
+        import_gitlab_group_path,
+        method: :post,
+        file_key: :file,
+        params: params.merge(file: file),
+        headers: headers,
+        send_rewritten_field: true
+      )
+    end
+
+    context 'when importing without a parent group' do
+      let(:request_params) { { path: 'test-group-import', name: 'test-group-import' } }
+
+      it 'successfully creates the group' do
+        expect { import_request }.to change { Group.count }.by 1
+
+        group = Group.find_by(name: 'test-group-import')
+
+        expect(response).to have_gitlab_http_status(:found)
+        expect(response).to redirect_to(group_path(group))
+        expect(flash[:notice]).to include('is being imported')
+      end
+
+      it 'imports the group data', :sidekiq_inline do
+        allow(GroupImportWorker).to receive(:perform_async).and_call_original
+
+        import_request
+
+        group = Group.find_by(name: 'test-group-import')
+
+        expect(GroupImportWorker).to have_received(:perform_async).with(user.id, group.id)
+
+        expect(group.description).to eq 'A voluptate non sequi temporibus quam at.'
+        expect(group.visibility_level).to eq Gitlab::VisibilityLevel::PRIVATE
+      end
+    end
+
+    context 'when importing to a parent group' do
+      let(:request_params) { { path: 'test-group-import', name: 'test-group-import', parent_id: parent_group.id } }
+      let(:parent_group) { create(:group) }
+
+      before do
+        parent_group.add_owner(user)
+      end
+
+      it 'creates a new group under the parent' do
+        expect { import_request }
+          .to change { parent_group.children.reload.size }.by 1
+
+        expect(response).to have_gitlab_http_status(:found)
+      end
+
+      shared_examples 'is created with the parent visibility level' do |visibility_level|
+        before do
+          parent_group.update!(visibility_level: visibility_level)
+        end
+
+        it "imports a #{Gitlab::VisibilityLevel.level_name(visibility_level)} group" do
+          import_request
+
+          group = parent_group.children.find_by(name: 'test-group-import')
+          expect(group.visibility_level).to eq visibility_level
+        end
+      end
+
+      [
+        Gitlab::VisibilityLevel::PUBLIC,
+        Gitlab::VisibilityLevel::INTERNAL,
+        Gitlab::VisibilityLevel::PRIVATE
+      ].each do |visibility_level|
+        context "when the parent is #{Gitlab::VisibilityLevel.level_name(visibility_level)}" do
+          include_examples 'is created with the parent visibility level', visibility_level
+        end
+      end
+    end
+
+    context 'when supplied invalid params' do
+      subject(:import_request) do
+        upload_archive(
+          file_upload,
+          workhorse_headers,
+          { path: '', name: '' }
+        )
+      end
+
+      it 'responds with an error' do
+        expect { import_request }.not_to change { Group.count }
+
+        expect(flash[:alert])
+          .to include('Group could not be imported', "Name can't be blank", 'Group URL is too short')
+      end
+    end
+
+    context 'when the user is not authorized to create groups' do
+      let(:request_params) { { path: 'test-group-import', name: 'test-group-import' } }
+      let(:user) { create(:user, can_create_group: false) }
+
+      it 'returns an error' do
+        expect { import_request }.not_to change { Group.count }
+
+        expect(flash[:alert]).to eq 'Group could not be imported: You don’t have permission to create groups.'
+      end
+    end
+
+    context 'when the requests exceed the rate limit' do
+      let(:request_params) { { path: 'test-group-import', name: 'test-group-import' } }
+
+      before do
+        allow(Gitlab::ApplicationRateLimiter).to receive(:throttled?).and_return(true)
+      end
+
+      it 'throttles the requests' do
+        import_request
+
+        expect(response).to have_gitlab_http_status(:found)
+        expect(flash[:alert]).to eq 'This endpoint has been requested too many times. Try again later.'
+      end
+    end
+
+    context 'when group import FF is disabled' do
+      let(:request_params) { { path: 'test-group-import', name: 'test-group-import' } }
+
+      before do
+        stub_feature_flags(group_import_export: false)
+      end
+
+      it 'returns an error' do
+        expect { import_request }.not_to change { Group.count }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'when the parent group is invalid' do
+      let(:request_params) { { path: 'test-group-import', name: 'test-group-import', parent_id: -1 } }
+
+      it 'does not create a new group' do
+        expect { import_request }.not_to change { Group.count }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'when the user is not an owner of the parent group' do
+      let(:request_params) { { path: 'test-group-import', name: 'test-group-import', parent_id: parent_group.id } }
+      let(:parent_group) { create(:group) }
+
+      it 'returns an error' do
+        expect { import_request }.not_to change { parent_group.children.reload.count }
+
+        expect(flash[:alert]).to include "You don’t have permission to create a subgroup in this group"
+      end
+    end
+  end
+
+  describe 'POST authorize' do
+    let_it_be(:user) { create(:user) }
+
+    before do
+      login_as(user)
+    end
+
+    context 'when using a workhorse header' do
+      subject(:authorize_request) { post authorize_import_gitlab_group_path, headers: workhorse_headers }
+
+      it 'authorizes the request' do
+        authorize_request
+
+        expect(response).to have_gitlab_http_status :ok
+        expect(response.media_type).to eq Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE
+        expect(json_response['TempPath']).to eq ImportExportUploader.workhorse_local_upload_path
+      end
+    end
+
+    context 'when the request bypasses gitlab-workhorse' do
+      subject(:authorize_request) { post authorize_import_gitlab_group_path }
+
+      it 'rejects the request' do
+        expect { authorize_request }.to raise_error(JWT::DecodeError)
+      end
+    end
+
+    context 'when direct upload is enabled' do
+      subject(:authorize_request) { post authorize_import_gitlab_group_path, headers: workhorse_headers }
+
+      before do
+        stub_uploads_object_storage(ImportExportUploader, enabled: true, direct_upload: true)
+      end
+
+      it 'accepts the request and stores the files' do
+        authorize_request
+
+        expect(response).to have_gitlab_http_status :ok
+        expect(response.media_type).to eq Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE
+        expect(json_response).not_to have_key 'TempPath'
+
+        expect(json_response['RemoteObject'].keys)
+          .to include('ID', 'GetURL', 'StoreURL', 'DeleteURL', 'MultipartUpload')
+      end
+    end
+
+    context 'when direct upload is disabled' do
+      subject(:authorize_request) { post authorize_import_gitlab_group_path, headers: workhorse_headers }
+
+      before do
+        stub_uploads_object_storage(ImportExportUploader, enabled: true, direct_upload: false)
+      end
+
+      it 'handles the local file' do
+        authorize_request
+
+        expect(response).to have_gitlab_http_status :ok
+        expect(response.media_type).to eq Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE
+
+        expect(json_response['TempPath']).to eq ImportExportUploader.workhorse_local_upload_path
+        expect(json_response['RemoteObject']).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/requests/user_spoofs_ip_spec.rb b/spec/requests/user_spoofs_ip_spec.rb
new file mode 100644
index 00000000000..8da15665132
--- /dev/null
+++ b/spec/requests/user_spoofs_ip_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'User spoofs their IP' do
+  it 'raises a 400 error' do
+    get '/nonexistent', headers: { 'Client-Ip' => '1.2.3.4', 'X-Forwarded-For' => '5.6.7.8' }
+
+    expect(response).to have_gitlab_http_status(:bad_request)
+    expect(response.body).to eq('Bad Request')
+  end
+end
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index f8e1ccac912..6150a9637c7 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -482,8 +482,6 @@ describe 'project routing' do
       let(:controller) { 'project_members' }
       let(:controller_path) { '/-/project_members' }
     end
-
-    it_behaves_like 'redirecting a legacy project path', "/gitlab/gitlabhq/-/settings/members", "/gitlab/gitlabhq/-/project_members"
   end
 
   #     project_milestones    GET    /:project_id/milestones(.:format)          milestones#index
diff --git a/spec/rubocop/cop/active_record_association_reload_spec.rb b/spec/rubocop/cop/active_record_association_reload_spec.rb
index 3cd7a35f12f..d9c8069f0c3 100644
--- a/spec/rubocop/cop/active_record_association_reload_spec.rb
+++ b/spec/rubocop/cop/active_record_association_reload_spec.rb
@@ -11,7 +11,7 @@ describe RuboCop::Cop::ActiveRecordAssociationReload do
 
   context 'when using ActiveRecord::Base' do
     it 'registers an offense on reload usage' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
         users = User.all
         users.reload
               ^^^^^^ Use reset instead of reload. For more details check the https://gitlab.com/gitlab-org/gitlab-foss/issues/60218.
@@ -19,7 +19,7 @@ describe RuboCop::Cop::ActiveRecordAssociationReload do
     end
 
     it 'does not register an offense on reset usage' do
-      expect_no_offenses(<<~PATTERN.strip_indent)
+      expect_no_offenses(<<~PATTERN)
         users = User.all
         users.reset
       PATTERN
@@ -28,7 +28,7 @@ describe RuboCop::Cop::ActiveRecordAssociationReload do
 
   context 'when using ActiveRecord::Relation' do
     it 'registers an offense on reload usage' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
         user = User.new
         user.reload
              ^^^^^^ Use reset instead of reload. For more details check the https://gitlab.com/gitlab-org/gitlab-foss/issues/60218.
@@ -36,7 +36,7 @@ describe RuboCop::Cop::ActiveRecordAssociationReload do
     end
 
     it 'does not register an offense on reset usage' do
-      expect_no_offenses(<<~PATTERN.strip_indent)
+      expect_no_offenses(<<~PATTERN)
         user = User.new
         user.reset
       PATTERN
@@ -45,14 +45,14 @@ describe RuboCop::Cop::ActiveRecordAssociationReload do
 
   context 'when using on self' do
     it 'registers an offense on reload usage' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
         reload
         ^^^^^^ Use reset instead of reload. For more details check the https://gitlab.com/gitlab-org/gitlab-foss/issues/60218.
       PATTERN
     end
 
     it 'does not register an offense on reset usage' do
-      expect_no_offenses(<<~PATTERN.strip_indent)
+      expect_no_offenses(<<~PATTERN)
         reset
       PATTERN
     end
diff --git a/spec/rubocop/cop/avoid_route_redirect_leading_slash_spec.rb b/spec/rubocop/cop/avoid_route_redirect_leading_slash_spec.rb
index c9eb61ccc72..207c3420fbd 100644
--- a/spec/rubocop/cop/avoid_route_redirect_leading_slash_spec.rb
+++ b/spec/rubocop/cop/avoid_route_redirect_leading_slash_spec.rb
@@ -14,14 +14,14 @@ describe RuboCop::Cop::AvoidRouteRedirectLeadingSlash do
   end
 
   it 'registers an offense when redirect has a leading slash' do
-    expect_offense(<<~PATTERN.strip_indent)
+    expect_offense(<<~PATTERN)
       root to: redirect("/-/route")
                ^^^^^^^^^^^^^^^^^^^^ Do not use a leading "/" in route redirects
     PATTERN
   end
 
   it 'does not register an offense when redirect does not have a leading slash' do
-    expect_no_offenses(<<~PATTERN.strip_indent)
+    expect_no_offenses(<<~PATTERN)
       root to: redirect("-/route")
     PATTERN
   end
diff --git a/spec/rubocop/cop/default_scope_spec.rb b/spec/rubocop/cop/default_scope_spec.rb
new file mode 100644
index 00000000000..9520915f900
--- /dev/null
+++ b/spec/rubocop/cop/default_scope_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rubocop'
+require 'rubocop/rspec/support'
+require_relative '../../../rubocop/cop/default_scope'
+
+describe RuboCop::Cop::DefaultScope do
+  include CopHelper
+
+  subject(:cop) { described_class.new }
+
+  it 'does not flag the use of default_scope with a send receiver' do
+    inspect_source('foo.default_scope')
+
+    expect(cop.offenses.size).to eq(0)
+  end
+
+  it 'flags the use of default_scope with a constant receiver' do
+    inspect_source('User.default_scope')
+
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'flags the use of default_scope with a nil receiver' do
+    inspect_source('class Foo ; default_scope ; end')
+
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'flags the use of default_scope when passing arguments' do
+    inspect_source('class Foo ; default_scope(:foo) ; end')
+
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'flags the use of default_scope when passing a block' do
+    inspect_source('class Foo ; default_scope { :foo } ; end')
+
+    expect(cop.offenses.size).to eq(1)
+  end
+
+  it 'ignores the use of default_scope with a local variable receiver' do
+    inspect_source('users = User.all ; users.default_scope')
+
+    expect(cop.offenses.size).to eq(0)
+  end
+end
diff --git a/spec/rubocop/cop/destroy_all_spec.rb b/spec/rubocop/cop/destroy_all_spec.rb
index ac8aa56e040..d06c0b2f3cf 100644
--- a/spec/rubocop/cop/destroy_all_spec.rb
+++ b/spec/rubocop/cop/destroy_all_spec.rb
@@ -11,13 +11,13 @@ describe RuboCop::Cop::DestroyAll do
   subject(:cop) { described_class.new }
 
   it 'flags the use of destroy_all with a send receiver' do
-    inspect_source('foo.destroy_all # rubocop: disable DestroyAll')
+    inspect_source('foo.destroy_all # rubocop: disable Cop/DestroyAll')
 
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'flags the use of destroy_all with a constant receiver' do
-    inspect_source('User.destroy_all # rubocop: disable DestroyAll')
+    inspect_source('User.destroy_all # rubocop: disable Cop/DestroyAll')
 
     expect(cop.offenses.size).to eq(1)
   end
@@ -31,7 +31,7 @@ describe RuboCop::Cop::DestroyAll do
   it 'flags the use of destroy_all with a local variable receiver' do
     inspect_source(<<~RUBY)
     users = User.all
-    users.destroy_all # rubocop: disable DestroyAll
+    users.destroy_all # rubocop: disable Cop/DestroyAll
     RUBY
 
     expect(cop.offenses.size).to eq(1)
diff --git a/spec/rubocop/cop/filename_length_spec.rb b/spec/rubocop/cop/filename_length_spec.rb
index 1a665440cbc..b1cc845787a 100644
--- a/spec/rubocop/cop/filename_length_spec.rb
+++ b/spec/rubocop/cop/filename_length_spec.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 require 'rubocop'
 require 'rubocop/rspec/support'
 require_relative '../../../rubocop/cop/filename_length'
-require_relative '../../support/helpers/expect_offense'
 
-describe RuboCop::Cop::FilenameLength do
+describe RuboCop::Cop::FilenameLength, type: :rubocop do
   subject(:cop) { described_class.new }
 
   it 'does not flag files with names 100 characters long' do
diff --git a/spec/rubocop/cop/gitlab/bulk_insert_spec.rb b/spec/rubocop/cop/gitlab/bulk_insert_spec.rb
new file mode 100644
index 00000000000..937c709218f
--- /dev/null
+++ b/spec/rubocop/cop/gitlab/bulk_insert_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'rubocop'
+require 'rubocop/rspec/support'
+require_relative '../../../../rubocop/cop/gitlab/bulk_insert'
+
+describe RuboCop::Cop::Gitlab::BulkInsert do
+  include CopHelper
+
+  subject(:cop) { described_class.new }
+
+  it 'flags the use of Gitlab::Database.bulk_insert' do
+    expect_offense(<<~SOURCE)
+    Gitlab::Database.bulk_insert('merge_request_diff_files', rows)
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use the `BulkInsertSafe` concern, instead of using `Gitlab::Database.bulk_insert`. See https://docs.gitlab.com/ee/development/insert_into_tables_in_batches.html
+    SOURCE
+  end
+end
diff --git a/spec/rubocop/cop/gitlab/change_timezone_spec.rb b/spec/rubocop/cop/gitlab/change_timezone_spec.rb
index af76559a9fa..1e4b4048cf4 100644
--- a/spec/rubocop/cop/gitlab/change_timezone_spec.rb
+++ b/spec/rubocop/cop/gitlab/change_timezone_spec.rb
@@ -12,7 +12,7 @@ describe RuboCop::Cop::Gitlab::ChangeTimezone do
 
   context 'Time.zone=' do
     it 'registers an offense with no 2nd argument' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
         Time.zone = 'Awkland'
         ^^^^^^^^^^^^^^^^^^^^^ Do not change timezone in the runtime (application or rspec), it could result in silently modifying other behavior.
       PATTERN
diff --git a/spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb b/spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb
index 0ff06b431eb..bf0434e7afe 100644
--- a/spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb
+++ b/spec/rubocop/cop/gitlab/const_get_inherit_false_spec.rb
@@ -12,7 +12,7 @@ describe RuboCop::Cop::Gitlab::ConstGetInheritFalse do
 
   context 'Object.const_get' do
     it 'registers an offense with no 2nd argument' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
         Object.const_get(:CONSTANT)
                ^^^^^^^^^ Use inherit=false when using const_get.
       PATTERN
@@ -24,7 +24,7 @@ describe RuboCop::Cop::Gitlab::ConstGetInheritFalse do
 
     context 'inherit=false' do
       it 'does not register an offense' do
-        expect_no_offenses(<<~PATTERN.strip_indent)
+        expect_no_offenses(<<~PATTERN)
         Object.const_get(:CONSTANT, false)
         PATTERN
       end
@@ -32,7 +32,7 @@ describe RuboCop::Cop::Gitlab::ConstGetInheritFalse do
 
     context 'inherit=true' do
       it 'registers an offense' do
-        expect_offense(<<~PATTERN.strip_indent)
+        expect_offense(<<~PATTERN)
         Object.const_get(:CONSTANT, true)
                ^^^^^^^^^ Use inherit=false when using const_get.
         PATTERN
@@ -46,7 +46,7 @@ describe RuboCop::Cop::Gitlab::ConstGetInheritFalse do
 
   context 'const_get for a nested class' do
     it 'registers an offense on reload usage' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
         Nested::Blog.const_get(:CONSTANT)
                      ^^^^^^^^^ Use inherit=false when using const_get.
       PATTERN
@@ -58,7 +58,7 @@ describe RuboCop::Cop::Gitlab::ConstGetInheritFalse do
 
     context 'inherit=false' do
       it 'does not register an offense' do
-        expect_no_offenses(<<~PATTERN.strip_indent)
+        expect_no_offenses(<<~PATTERN)
         Nested::Blog.const_get(:CONSTANT, false)
         PATTERN
       end
@@ -66,7 +66,7 @@ describe RuboCop::Cop::Gitlab::ConstGetInheritFalse do
 
     context 'inherit=true' do
       it 'registers an offense if inherit is true' do
-        expect_offense(<<~PATTERN.strip_indent)
+        expect_offense(<<~PATTERN)
         Nested::Blog.const_get(:CONSTANT, true)
                      ^^^^^^^^^ Use inherit=false when using const_get.
         PATTERN
diff --git a/spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb b/spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb
index 87dd2f14b31..3a0a74a4713 100644
--- a/spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb
+++ b/spec/rubocop/cop/gitlab/duplicate_spec_location_spec.rb
@@ -20,7 +20,7 @@ describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
 
   context 'Non-EE spec file' do
     it 'registers no offenses' do
-      expect_no_offenses(<<~SOURCE.strip_indent, full_path('spec/foo_spec.rb'))
+      expect_no_offenses(<<~SOURCE, full_path('spec/foo_spec.rb'))
         describe 'Foo' do
         end
       SOURCE
@@ -29,7 +29,7 @@ describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
 
   context 'Non-EE application file' do
     it 'registers no offenses' do
-      expect_no_offenses(<<~SOURCE.strip_indent, full_path('app/models/blog_post.rb'))
+      expect_no_offenses(<<~SOURCE, full_path('app/models/blog_post.rb'))
         class BlogPost
         end
       SOURCE
@@ -38,7 +38,7 @@ describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
 
   context 'EE application file' do
     it 'registers no offenses' do
-      expect_no_offenses(<<~SOURCE.strip_indent, full_path('ee/app/models/blog_post.rb'))
+      expect_no_offenses(<<~SOURCE, full_path('ee/app/models/blog_post.rb'))
         class BlogPost
         end
       SOURCE
@@ -49,7 +49,7 @@ describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
     let(:spec_file_path) { full_path('ee/spec/controllers/foo_spec.rb') }
 
     it 'registers no offenses' do
-      expect_no_offenses(<<~SOURCE.strip_indent, spec_file_path)
+      expect_no_offenses(<<~SOURCE, spec_file_path)
         describe 'Foo' do
         end
       SOURCE
@@ -65,7 +65,7 @@ describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
       end
 
       it 'marks the describe as offending' do
-        expect_offense(<<~SOURCE.strip_indent, spec_file_path)
+        expect_offense(<<~SOURCE, spec_file_path)
           describe 'Foo' do
           ^^^^^^^^^^^^^^ Duplicate spec location in `ee/spec/controllers/ee/foo_spec.rb`.
           end
@@ -78,7 +78,7 @@ describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
     let(:spec_file_path) { full_path('ee/spec/controllers/ee/foo_spec.rb') }
 
     it 'registers no offenses' do
-      expect_no_offenses(<<~SOURCE.strip_indent, spec_file_path)
+      expect_no_offenses(<<~SOURCE, spec_file_path)
         describe 'Foo' do
         end
       SOURCE
@@ -94,7 +94,7 @@ describe RuboCop::Cop::Gitlab::DuplicateSpecLocation do
       end
 
       it 'marks the describe as offending' do
-        expect_offense(<<~SOURCE.strip_indent, spec_file_path)
+        expect_offense(<<~SOURCE, spec_file_path)
           describe 'Foo' do
           ^^^^^^^^^^^^^^ Duplicate spec location in `ee/spec/controllers/foo_spec.rb`.
           end
diff --git a/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb b/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb
index 3cb1dbbbc2c..f047baa3bc2 100644
--- a/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb
+++ b/spec/rubocop/cop/inject_enterprise_edition_module_spec.rb
@@ -170,6 +170,20 @@ describe RuboCop::Cop::InjectEnterpriseEditionModule do
     SOURCE
   end
 
+  it 'does not flag the use of `prepend_if_ee EE` as long as all injections are at the end of the file' do
+    expect_no_offenses(<<~SOURCE)
+    class Foo
+    end
+
+    Foo.include_if_ee('EE::Foo')
+    Foo.prepend_if_ee('EE::Foo')
+
+    Foo.include(Bar)
+    # comment on prepending Bar
+    Foo.prepend(Bar)
+    SOURCE
+  end
+
   it 'autocorrects offenses by just disabling the Cop' do
     source = <<~SOURCE
     class Foo
diff --git a/spec/rubocop/cop/migration/add_index_spec.rb b/spec/rubocop/cop/migration/add_index_spec.rb
index 0c3f87e5bf8..ca1aadb381b 100644
--- a/spec/rubocop/cop/migration/add_index_spec.rb
+++ b/spec/rubocop/cop/migration/add_index_spec.rb
@@ -18,7 +18,7 @@ describe RuboCop::Cop::Migration::AddIndex do
     end
 
     it 'registers an offense when add_index is used' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
         def change
           add_index :table, :column
           ^^^^^^^^^ `add_index` requires downtime, use `add_concurrent_index` instead
@@ -29,7 +29,7 @@ describe RuboCop::Cop::Migration::AddIndex do
 
   context 'outside of migration' do
     it 'registers no offense' do
-      expect_no_offenses(<<~PATTERN.strip_indent)
+      expect_no_offenses(<<~PATTERN)
         def change
           add_index :table, :column
         end
diff --git a/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb b/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb
index 514260a4306..39ca9ace73d 100644
--- a/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb
+++ b/spec/rubocop/cop/migration/add_limit_to_text_columns_spec.rb
@@ -73,6 +73,27 @@ describe RuboCop::Cop::Migration::AddLimitToTextColumns do
       end
     end
 
+    context 'when text array columns are defined without a limit' do
+      it 'registers no offense' do
+        expect_no_offenses(<<~RUBY)
+          class TestTextLimits < ActiveRecord::Migration[6.0]
+            DOWNTIME = false
+
+            def up
+              create_table :test_text_limits, id: false do |t|
+                t.integer :test_id, null: false
+                t.text :name, array: true, default: [], null: false
+              end
+
+              add_column :test_text_limits, :email, :text, array: true
+              add_column_with_default :test_text_limits, :role, :text, default: [], array: true
+              change_column_type_concurrently :test_text_limits, :test_id, :text, array: true
+            end
+          end
+        RUBY
+      end
+    end
+
     # Make sure that the cop is properly checking for an `add_text_limit`
     # over the same {table, attribute} as the one that triggered the offence
     context 'when the limit is defined for a same name attribute but different table' do
diff --git a/spec/rubocop/cop/migration/drop_table_spec.rb b/spec/rubocop/cop/migration/drop_table_spec.rb
new file mode 100644
index 00000000000..4fe7fc8c5a5
--- /dev/null
+++ b/spec/rubocop/cop/migration/drop_table_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require 'rubocop'
+require 'rubocop/rspec/support'
+
+require_relative '../../../../rubocop/cop/migration/drop_table'
+
+describe RuboCop::Cop::Migration::DropTable do
+  include CopHelper
+
+  subject(:cop) { described_class.new }
+
+  context 'when in deployment migration' do
+    before do
+      allow(cop).to receive(:in_deployment_migration?).and_return(true)
+    end
+
+    it 'registers an offense' do
+      expect_offense(<<~PATTERN)
+        def change
+          drop_table :table
+          ^^^^^^^^^^ #{described_class::MSG}
+
+          add_column(:users, :username, :text)
+
+          execute "DROP TABLE table"
+          ^^^^^^^ #{described_class::MSG}
+
+          execute "CREATE UNIQUE INDEX email_index ON users (email);"
+        end
+      PATTERN
+    end
+  end
+
+  context 'when in post-deployment migration' do
+    before do
+      allow(cop).to receive(:in_post_deployment_migration?).and_return(true)
+    end
+
+    it 'registers no offense' do
+      expect_no_offenses(<<~PATTERN)
+        def change
+          drop_table :table
+          execute "DROP TABLE table"
+        end
+      PATTERN
+    end
+  end
+
+  context 'when outside of migration' do
+    it 'registers no offense' do
+      expect_no_offenses(<<~PATTERN)
+        def change
+          drop_table :table
+          execute "DROP TABLE table"
+        end
+      PATTERN
+    end
+  end
+end
diff --git a/spec/rubocop/cop/migration/prevent_strings_spec.rb b/spec/rubocop/cop/migration/prevent_strings_spec.rb
index 2702ce1c090..d0e97874aed 100644
--- a/spec/rubocop/cop/migration/prevent_strings_spec.rb
+++ b/spec/rubocop/cop/migration/prevent_strings_spec.rb
@@ -90,6 +90,27 @@ describe RuboCop::Cop::Migration::PreventStrings do
       end
     end
 
+    context 'when the string data type is used for arrays' do
+      it 'registers no offense' do
+        expect_no_offenses(<<~RUBY)
+          class TestStringArrays < ActiveRecord::Migration[6.0]
+            DOWNTIME = false
+
+            def up
+              create_table :test_string_arrays, id: false do |t|
+                t.integer :test_id, null: false
+                t.string :name, array: true, default: [], null: false
+              end
+
+              add_column :test_string_arrays, :email, :string, array: true
+              add_column_with_default :test_string_arrays, :role, :string, default: [], array: true
+              change_column_type_concurrently :test_string_arrays, :test_id, :string, array: true
+            end
+          end
+        RUBY
+      end
+    end
+
     context 'on down' do
       it 'registers no offense' do
         expect_no_offenses(<<~RUBY)
diff --git a/spec/rubocop/cop/migration/update_large_table_spec.rb b/spec/rubocop/cop/migration/update_large_table_spec.rb
deleted file mode 100644
index 30cd84108df..00000000000
--- a/spec/rubocop/cop/migration/update_large_table_spec.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-require 'rubocop'
-require 'rubocop/rspec/support'
-
-require_relative '../../../../rubocop/cop/migration/update_large_table'
-
-describe RuboCop::Cop::Migration::UpdateLargeTable do
-  include CopHelper
-
-  subject(:cop) { described_class.new }
-
-  context 'in migration' do
-    before do
-      allow(cop).to receive(:in_migration?).and_return(true)
-    end
-
-    shared_examples 'large tables' do |update_method|
-      described_class::BLACKLISTED_TABLES.each do |table|
-        it "registers an offense for the #{table} table" do
-          inspect_source("#{update_method} :#{table}, :column, default: true")
-
-          aggregate_failures do
-            expect(cop.offenses.size).to eq(1)
-            expect(cop.offenses.map(&:line)).to eq([1])
-          end
-        end
-      end
-    end
-
-    context 'for the add_column_with_default method' do
-      include_examples 'large tables', 'add_column_with_default'
-    end
-
-    context 'for the change_column_type_concurrently method' do
-      include_examples 'large tables', 'change_column_type_concurrently'
-    end
-
-    context 'for the rename_column_concurrently method' do
-      include_examples 'large tables', 'rename_column_concurrently'
-    end
-
-    context 'for the update_column_in_batches method' do
-      include_examples 'large tables', 'update_column_in_batches'
-    end
-
-    it 'registers no offense for non-blacklisted tables' do
-      inspect_source("add_column_with_default :table, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-
-    it 'registers no offense for non-blacklisted methods' do
-      table = described_class::BLACKLISTED_TABLES.sample
-
-      inspect_source("some_other_method :#{table}, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-  end
-
-  context 'outside of migration' do
-    let(:table) { described_class::BLACKLISTED_TABLES.sample }
-
-    it 'registers no offense for add_column_with_default' do
-      inspect_source("add_column_with_default :#{table}, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-
-    it 'registers no offense for change_column_type_concurrently' do
-      inspect_source("change_column_type_concurrently :#{table}, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-
-    it 'registers no offense for rename_column_concurrently' do
-      inspect_source("rename_column_concurrently :#{table}, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-
-    it 'registers no offense for update_column_concurrently' do
-      inspect_source("update_column_concurrently :#{table}, :column, default: true")
-
-      expect(cop.offenses).to be_empty
-    end
-  end
-end
diff --git a/spec/rubocop/cop/performance/ar_count_each_spec.rb b/spec/rubocop/cop/performance/ar_count_each_spec.rb
index f934a1fde48..534fa55dd45 100644
--- a/spec/rubocop/cop/performance/ar_count_each_spec.rb
+++ b/spec/rubocop/cop/performance/ar_count_each_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 require 'fast_spec_helper'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/performance/ar_count_each.rb'
 
-describe RuboCop::Cop::Performance::ARCountEach do
+describe RuboCop::Cop::Performance::ARCountEach, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
diff --git a/spec/rubocop/cop/performance/ar_exists_and_present_blank_spec.rb b/spec/rubocop/cop/performance/ar_exists_and_present_blank_spec.rb
index ce4fdac56b0..da44004f947 100644
--- a/spec/rubocop/cop/performance/ar_exists_and_present_blank_spec.rb
+++ b/spec/rubocop/cop/performance/ar_exists_and_present_blank_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 require 'fast_spec_helper'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/performance/ar_exists_and_present_blank.rb'
 
-describe RuboCop::Cop::Performance::ARExistsAndPresentBlank do
+describe RuboCop::Cop::Performance::ARExistsAndPresentBlank, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
diff --git a/spec/rubocop/cop/performance/readlines_each_spec.rb b/spec/rubocop/cop/performance/readlines_each_spec.rb
index 5b3691e2342..e71aaaf3056 100644
--- a/spec/rubocop/cop/performance/readlines_each_spec.rb
+++ b/spec/rubocop/cop/performance/readlines_each_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 require 'fast_spec_helper'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/performance/readlines_each'
 
-describe RuboCop::Cop::Performance::ReadlinesEach do
+describe RuboCop::Cop::Performance::ReadlinesEach, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
diff --git a/spec/rubocop/cop/put_group_routes_under_scope_spec.rb b/spec/rubocop/cop/put_group_routes_under_scope_spec.rb
index fc4d0015dde..c77412f91b4 100644
--- a/spec/rubocop/cop/put_group_routes_under_scope_spec.rb
+++ b/spec/rubocop/cop/put_group_routes_under_scope_spec.rb
@@ -14,7 +14,7 @@ describe RuboCop::Cop::PutGroupRoutesUnderScope do
   end
 
   it 'registers an offense when route is outside scope' do
-    expect_offense(<<~PATTERN.strip_indent)
+    expect_offense(<<~PATTERN)
       scope(path: 'groups/*group_id/-', module: :groups) do
         resource :issues
       end
@@ -25,7 +25,7 @@ describe RuboCop::Cop::PutGroupRoutesUnderScope do
   end
 
   it 'does not register an offense when resource inside the scope' do
-    expect_no_offenses(<<~PATTERN.strip_indent)
+    expect_no_offenses(<<~PATTERN)
       scope(path: 'groups/*group_id/-', module: :groups) do
         resource :issues
         resource :notes
@@ -34,7 +34,7 @@ describe RuboCop::Cop::PutGroupRoutesUnderScope do
   end
 
   it 'does not register an offense when resource is deep inside the scope' do
-    expect_no_offenses(<<~PATTERN.strip_indent)
+    expect_no_offenses(<<~PATTERN)
       scope(path: 'groups/*group_id/-', module: :groups) do
         resource :issues
         resource :projects do
diff --git a/spec/rubocop/cop/put_project_routes_under_scope_spec.rb b/spec/rubocop/cop/put_project_routes_under_scope_spec.rb
index b0f1e52f397..80ac4cc52e9 100644
--- a/spec/rubocop/cop/put_project_routes_under_scope_spec.rb
+++ b/spec/rubocop/cop/put_project_routes_under_scope_spec.rb
@@ -14,7 +14,7 @@ describe RuboCop::Cop::PutProjectRoutesUnderScope do
   end
 
   it 'registers an offense when route is outside scope' do
-    expect_offense(<<~PATTERN.strip_indent)
+    expect_offense(<<~PATTERN)
       scope '-' do
         resource :issues
       end
@@ -25,7 +25,7 @@ describe RuboCop::Cop::PutProjectRoutesUnderScope do
   end
 
   it 'does not register an offense when resource inside the scope' do
-    expect_no_offenses(<<~PATTERN.strip_indent)
+    expect_no_offenses(<<~PATTERN)
       scope '-' do
         resource :issues
         resource :notes
@@ -34,7 +34,7 @@ describe RuboCop::Cop::PutProjectRoutesUnderScope do
   end
 
   it 'does not register an offense when resource is deep inside the scope' do
-    expect_no_offenses(<<~PATTERN.strip_indent)
+    expect_no_offenses(<<~PATTERN)
       scope '-' do
         resource :issues
         resource :projects do
diff --git a/spec/rubocop/cop/rspec/empty_line_after_shared_example_spec.rb b/spec/rubocop/cop/rspec/empty_line_after_shared_example_spec.rb
deleted file mode 100644
index cee593fe535..00000000000
--- a/spec/rubocop/cop/rspec/empty_line_after_shared_example_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-require_relative '../../../../rubocop/cop/rspec/empty_line_after_shared_example'
-
-describe RuboCop::Cop::RSpec::EmptyLineAfterSharedExample do
-  subject(:cop) { described_class.new }
-
-  it 'flags a missing empty line after `it_behaves_like` block' do
-    expect_offense(<<-RUBY)
-      RSpec.describe Foo do
-        it_behaves_like 'does this' do
-        end
-        ^^^ Add an empty line after `it_behaves_like` block.
-        it_behaves_like 'does that' do
-        end
-      end
-    RUBY
-
-    expect_correction(<<-RUBY)
-      RSpec.describe Foo do
-        it_behaves_like 'does this' do
-        end
-
-        it_behaves_like 'does that' do
-        end
-      end
-    RUBY
-  end
-
-  it 'ignores one-line shared examples before shared example blocks' do
-    expect_no_offenses(<<-RUBY)
-      RSpec.describe Foo do
-        it_behaves_like 'does this'
-        it_behaves_like 'does that' do
-        end
-      end
-    RUBY
-  end
-
-  it 'flags a missing empty line after `shared_examples`' do
-    expect_offense(<<-RUBY)
-      RSpec.context 'foo' do
-        shared_examples do
-        end
-        ^^^ Add an empty line after `shared_examples` block.
-        shared_examples 'something gets done' do
-        end
-      end
-    RUBY
-
-    expect_correction(<<-RUBY)
-      RSpec.context 'foo' do
-        shared_examples do
-        end
-
-        shared_examples 'something gets done' do
-        end
-      end
-    RUBY
-  end
-
-  it 'ignores consecutive one-liners' do
-    expect_no_offenses(<<-RUBY)
-      RSpec.describe Foo do
-        it_behaves_like 'do this'
-        it_behaves_like 'do that'
-      end
-    RUBY
-  end
-
-  it 'flags mixed one-line and multi-line shared examples' do
-    expect_offense(<<-RUBY)
-      RSpec.context 'foo' do
-        it_behaves_like 'do this'
-        it_behaves_like 'do that'
-        it_behaves_like 'does this' do
-        end
-        ^^^ Add an empty line after `it_behaves_like` block.
-        it_behaves_like 'do this'
-        it_behaves_like 'do that'
-      end
-    RUBY
-  end
-end
diff --git a/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb b/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb
index 938916d8d75..d3d323b6643 100644
--- a/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb
+++ b/spec/rubocop/cop/rspec/modify_sidekiq_middleware_spec.rb
@@ -2,10 +2,9 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/rspec/modify_sidekiq_middleware'
 
-describe RuboCop::Cop::RSpec::ModifySidekiqMiddleware do
+describe RuboCop::Cop::RSpec::ModifySidekiqMiddleware, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
diff --git a/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb b/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb
index 258144d4000..ee6b6d39cb4 100644
--- a/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb
+++ b/spec/rubocop/cop/rspec/top_level_describe_path_spec.rb
@@ -15,7 +15,7 @@ describe RuboCop::Cop::RSpec::TopLevelDescribePath do
 
   context 'when the file ends in _spec.rb' do
     it 'registers no offenses' do
-      expect_no_offenses(<<~SOURCE.strip_indent, 'spec/foo_spec.rb')
+      expect_no_offenses(<<~SOURCE, 'spec/foo_spec.rb')
         describe 'Foo' do
         end
       SOURCE
@@ -24,7 +24,7 @@ describe RuboCop::Cop::RSpec::TopLevelDescribePath do
 
   context 'when the file is a frontend fixture' do
     it 'registers no offenses' do
-      expect_no_offenses(<<~SOURCE.strip_indent, 'spec/frontend/fixtures/foo.rb')
+      expect_no_offenses(<<~SOURCE, 'spec/frontend/fixtures/foo.rb')
         describe 'Foo' do
         end
       SOURCE
@@ -34,7 +34,7 @@ describe RuboCop::Cop::RSpec::TopLevelDescribePath do
   context 'when the describe is in a shared example' do
     context 'with shared_examples' do
       it 'registers no offenses' do
-        expect_no_offenses(<<~SOURCE.strip_indent, 'spec/foo.rb')
+        expect_no_offenses(<<~SOURCE, 'spec/foo.rb')
           shared_examples 'Foo' do
             describe '#bar' do
             end
@@ -45,7 +45,7 @@ describe RuboCop::Cop::RSpec::TopLevelDescribePath do
 
     context 'with shared_examples_for' do
       it 'registers no offenses' do
-        expect_no_offenses(<<~SOURCE.strip_indent, 'spec/foo.rb')
+        expect_no_offenses(<<~SOURCE, 'spec/foo.rb')
           shared_examples_for 'Foo' do
             describe '#bar' do
             end
@@ -57,7 +57,7 @@ describe RuboCop::Cop::RSpec::TopLevelDescribePath do
 
   context 'when the describe is at the top level' do
     it 'marks the describe as offending' do
-      expect_offense(<<~SOURCE.strip_indent, 'spec/foo.rb')
+      expect_offense(<<~SOURCE, 'spec/foo.rb')
         describe 'Foo' do
         ^^^^^^^^^^^^^^ #{described_class::MESSAGE}
         end
diff --git a/spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb b/spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb
index 8107cfa8957..61603d0100e 100644
--- a/spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb
+++ b/spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb
@@ -2,17 +2,16 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/scalability/bulk_perform_with_context'
 
-describe RuboCop::Cop::Scalability::BulkPerformWithContext do
+describe RuboCop::Cop::Scalability::BulkPerformWithContext, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
   subject(:cop) { described_class.new }
 
   it "adds an offense when calling bulk_perform_async" do
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       Worker.bulk_perform_async(args)
     CODE
 
@@ -20,7 +19,7 @@ describe RuboCop::Cop::Scalability::BulkPerformWithContext do
   end
 
   it "adds an offense when calling bulk_perform_in" do
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       diffs.each_batch(of: BATCH_SIZE) do |relation, index|
         ids = relation.pluck_primary_key.map { |id| [id] }
         DeleteDiffFilesWorker.bulk_perform_in(index * 5.minutes, ids)
@@ -33,7 +32,7 @@ describe RuboCop::Cop::Scalability::BulkPerformWithContext do
   it "does not add an offense for migrations" do
     allow(cop).to receive(:in_migration?).and_return(true)
 
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       Worker.bulk_perform_in(args)
     CODE
 
@@ -43,7 +42,7 @@ describe RuboCop::Cop::Scalability::BulkPerformWithContext do
   it "does not add an offence for specs" do
     allow(cop).to receive(:in_spec?).and_return(true)
 
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       Worker.bulk_perform_in(args)
     CODE
 
@@ -51,7 +50,7 @@ describe RuboCop::Cop::Scalability::BulkPerformWithContext do
   end
 
   it "does not add an offense for scheduling BackgroundMigrations" do
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       BackgroundMigrationWorker.bulk_perform_in(args)
     CODE
 
diff --git a/spec/rubocop/cop/scalability/cron_worker_context_spec.rb b/spec/rubocop/cop/scalability/cron_worker_context_spec.rb
index 460514d9bed..e917d33b1e5 100644
--- a/spec/rubocop/cop/scalability/cron_worker_context_spec.rb
+++ b/spec/rubocop/cop/scalability/cron_worker_context_spec.rb
@@ -2,17 +2,16 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/scalability/cron_worker_context'
 
-describe RuboCop::Cop::Scalability::CronWorkerContext do
+describe RuboCop::Cop::Scalability::CronWorkerContext, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
   subject(:cop) { described_class.new }
 
   it 'adds an offense when including CronjobQueue' do
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       class SomeWorker
         include CronjobQueue
       end
@@ -22,14 +21,14 @@ describe RuboCop::Cop::Scalability::CronWorkerContext do
   end
 
   it 'does not add offenses for other workers' do
-    expect_no_offenses(<<~CODE.strip_indent)
+    expect_no_offenses(<<~CODE)
       class SomeWorker
       end
     CODE
   end
 
   it 'does not add an offense when the class defines a context' do
-    expect_no_offenses(<<~CODE.strip_indent)
+    expect_no_offenses(<<~CODE)
       class SomeWorker
         include CronjobQueue
 
@@ -39,7 +38,7 @@ describe RuboCop::Cop::Scalability::CronWorkerContext do
   end
 
   it 'does not add an offense when the worker calls `with_context`' do
-    expect_no_offenses(<<~CODE.strip_indent)
+    expect_no_offenses(<<~CODE)
       class SomeWorker
         include CronjobQueue
 
@@ -53,7 +52,7 @@ describe RuboCop::Cop::Scalability::CronWorkerContext do
   end
 
   it 'does not add an offense when the worker calls `bulk_perform_async_with_contexts`' do
-    expect_no_offenses(<<~CODE.strip_indent)
+    expect_no_offenses(<<~CODE)
       class SomeWorker
         include CronjobQueue
 
@@ -67,7 +66,7 @@ describe RuboCop::Cop::Scalability::CronWorkerContext do
   end
 
   it 'does not add an offense when the worker calls `bulk_perform_in_with_contexts`' do
-    expect_no_offenses(<<~CODE.strip_indent)
+    expect_no_offenses(<<~CODE)
       class SomeWorker
         include CronjobQueue
 
diff --git a/spec/rubocop/cop/scalability/file_uploads_spec.rb b/spec/rubocop/cop/scalability/file_uploads_spec.rb
index a35d423581c..b0be9ac2b51 100644
--- a/spec/rubocop/cop/scalability/file_uploads_spec.rb
+++ b/spec/rubocop/cop/scalability/file_uploads_spec.rb
@@ -2,10 +2,9 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/scalability/file_uploads'
 
-describe RuboCop::Cop::Scalability::FileUploads do
+describe RuboCop::Cop::Scalability::FileUploads, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
@@ -15,7 +14,7 @@ describe RuboCop::Cop::Scalability::FileUploads do
 
   context 'with required params' do
     it 'detects File in types array' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
       params do
         requires :certificate, allow_blank: false, types: [String, File]
                                                                    ^^^^ #{message}
@@ -24,7 +23,7 @@ describe RuboCop::Cop::Scalability::FileUploads do
     end
 
     it 'detects File as type argument' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
       params do
         requires :attachment, type: File
                                     ^^^^ #{message}
@@ -35,7 +34,7 @@ describe RuboCop::Cop::Scalability::FileUploads do
 
   context 'with optional params' do
     it 'detects File in types array' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
       params do
         optional :certificate, allow_blank: false, types: [String, File]
                                                                    ^^^^ #{message}
@@ -44,7 +43,7 @@ describe RuboCop::Cop::Scalability::FileUploads do
     end
 
     it 'detects File as type argument' do
-      expect_offense(<<~PATTERN.strip_indent)
+      expect_offense(<<~PATTERN)
       params do
         optional :attachment, type: File
                                     ^^^^ #{message}
diff --git a/spec/rubocop/cop/scalability/idempotent_worker_spec.rb b/spec/rubocop/cop/scalability/idempotent_worker_spec.rb
index 7abd602f8bc..73cacc984e9 100644
--- a/spec/rubocop/cop/scalability/idempotent_worker_spec.rb
+++ b/spec/rubocop/cop/scalability/idempotent_worker_spec.rb
@@ -2,10 +2,9 @@
 
 require 'fast_spec_helper'
 require 'rubocop'
-require_relative '../../../support/helpers/expect_offense'
 require_relative '../../../../rubocop/cop/scalability/idempotent_worker'
 
-describe RuboCop::Cop::Scalability::IdempotentWorker do
+describe RuboCop::Cop::Scalability::IdempotentWorker, type: :rubocop do
   include CopHelper
   include ExpectOffense
 
@@ -18,7 +17,7 @@ describe RuboCop::Cop::Scalability::IdempotentWorker do
   end
 
   it 'adds an offense when not defining idempotent method' do
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       class SomeWorker
       end
     CODE
@@ -27,7 +26,7 @@ describe RuboCop::Cop::Scalability::IdempotentWorker do
   end
 
   it 'adds an offense when not defining idempotent method' do
-    inspect_source(<<~CODE.strip_indent)
+    inspect_source(<<~CODE)
       class SomeWorker
         idempotent!
       end
diff --git a/spec/serializers/build_artifact_entity_spec.rb b/spec/serializers/build_artifact_entity_spec.rb
index c8995cbc5a2..afa2aa3d254 100644
--- a/spec/serializers/build_artifact_entity_spec.rb
+++ b/spec/serializers/build_artifact_entity_spec.rb
@@ -3,17 +3,18 @@
 require 'spec_helper'
 
 describe BuildArtifactEntity do
-  let(:job) { create(:ci_build, :artifacts, name: 'test:job', artifacts_expire_at: 1.hour.from_now) }
+  let(:job) { create(:ci_build) }
+  let(:artifact) { create(:ci_job_artifact, :codequality, expire_at: 1.hour.from_now, job: job) }
 
   let(:entity) do
-    described_class.new(job, request: double)
+    described_class.new(artifact, request: double)
   end
 
   describe '#as_json' do
     subject { entity.as_json }
 
     it 'contains job name' do
-      expect(subject[:name]).to eq 'test:job'
+      expect(subject[:name]).to eq "test:codequality"
     end
 
     it 'exposes information about expiration of artifacts' do
@@ -22,7 +23,7 @@ describe BuildArtifactEntity do
 
     it 'contains paths to the artifacts' do
       expect(subject[:path])
-        .to include "jobs/#{job.id}/artifacts/download"
+        .to include "jobs/#{job.id}/artifacts/download?file_type=codequality"
 
       expect(subject[:keep_path])
         .to include "jobs/#{job.id}/artifacts/keep"
diff --git a/spec/serializers/ci/dag_job_entity_spec.rb b/spec/serializers/ci/dag_job_entity_spec.rb
index 19b849c3879..eaaf39d6bfc 100644
--- a/spec/serializers/ci/dag_job_entity_spec.rb
+++ b/spec/serializers/ci/dag_job_entity_spec.rb
@@ -16,14 +16,23 @@ describe Ci::DagJobEntity do
     end
 
     context 'when job is stage scheduled' do
+      it 'contains the name scheduling_type' do
+        expect(subject[:scheduling_type]).to eq 'stage'
+      end
+
       it 'does not expose needs' do
         expect(subject).not_to include(:needs)
       end
     end
 
     context 'when job is dag scheduled' do
+      let(:job) { create(:ci_build, scheduling_type: 'dag') }
+
+      it 'contains the name scheduling_type' do
+        expect(subject[:scheduling_type]).to eq 'dag'
+      end
+
       context 'when job has needs' do
-        let(:job) { create(:ci_build, scheduling_type: 'dag') }
         let!(:need) { create(:ci_build_need, build: job, name: 'compile') }
 
         it 'exposes the array of needs' do
@@ -32,8 +41,6 @@ describe Ci::DagJobEntity do
       end
 
       context 'when job has empty needs' do
-        let(:job) { create(:ci_build, scheduling_type: 'dag') }
-
         it 'exposes an empty array of needs' do
           expect(subject[:needs]).to eq []
         end
diff --git a/spec/serializers/ci/dag_pipeline_entity_spec.rb b/spec/serializers/ci/dag_pipeline_entity_spec.rb
index 4645451e146..fab8798effc 100644
--- a/spec/serializers/ci/dag_pipeline_entity_spec.rb
+++ b/spec/serializers/ci/dag_pipeline_entity_spec.rb
@@ -32,13 +32,14 @@ describe Ci::DagPipelineEntity do
       end
     end
 
-    context 'when pipeline has parallel jobs and DAG needs' do
+    context 'when pipeline has parallel jobs, DAG needs and GenericCommitStatus' do
       let!(:stage_build)  { create(:ci_stage_entity, name: 'build',  position: 1, pipeline: pipeline) }
       let!(:stage_test)   { create(:ci_stage_entity, name: 'test',   position: 2, pipeline: pipeline) }
       let!(:stage_deploy) { create(:ci_stage_entity, name: 'deploy', position: 3, pipeline: pipeline) }
 
-      let!(:job_build_1) { create(:ci_build, name: 'build 1', stage: 'build', pipeline: pipeline) }
-      let!(:job_build_2) { create(:ci_build, name: 'build 2', stage: 'build', pipeline: pipeline) }
+      let!(:job_build_1)   { create(:ci_build, name: 'build 1', stage: 'build', pipeline: pipeline) }
+      let!(:job_build_2)   { create(:ci_build, name: 'build 2', stage: 'build', pipeline: pipeline) }
+      let!(:commit_status) { create(:generic_commit_status, stage: 'build', pipeline: pipeline) }
 
       let!(:job_rspec_1) { create(:ci_build, name: 'rspec 1/2', stage: 'test', pipeline: pipeline) }
       let!(:job_rspec_2) { create(:ci_build, name: 'rspec 2/2', stage: 'test', pipeline: pipeline) }
@@ -75,22 +76,52 @@ describe Ci::DagPipelineEntity do
             {
               name: 'build',
               groups: [
-                { name: 'build 1', size: 1, jobs: [{ name: 'build 1' }] },
-                { name: 'build 2', size: 1, jobs: [{ name: 'build 2' }] }
+                {
+                  name: 'build 1', size: 1, jobs: [
+                    { name: 'build 1', scheduling_type: 'stage' }
+                  ]
+                },
+                {
+                  name: 'build 2', size: 1, jobs: [
+                    { name: 'build 2', scheduling_type: 'stage' }
+                  ]
+                },
+                {
+                  name: 'generic', size: 1, jobs: [
+                    { name: 'generic', scheduling_type: nil }
+                  ]
+                }
               ]
             },
             {
               name: 'test',
               groups: [
-                { name: 'jest', size: 1, jobs: [{ name: 'jest', needs: ['build 1'] }] },
-                { name: 'rspec', size: 2, jobs: [{ name: 'rspec 1/2' }, { name: 'rspec 2/2' }] }
+                {
+                  name: 'jest', size: 1, jobs: [
+                    { name: 'jest', scheduling_type: 'dag', needs: ['build 1'] }
+                  ]
+                },
+                {
+                  name: 'rspec', size: 2, jobs: [
+                    { name: 'rspec 1/2', scheduling_type: 'stage' },
+                    { name: 'rspec 2/2', scheduling_type: 'stage' }
+                  ]
+                }
               ]
             },
             {
               name: 'deploy',
               groups: [
-                { name: 'deploy_js', size: 1, jobs: [{ name: 'deploy_js', needs: ['jest'] }] },
-                { name: 'deploy_ruby', size: 1, jobs: [{ name: 'deploy_ruby', needs: ['rspec 1/2', 'rspec 2/2'] }] }
+                {
+                  name: 'deploy_js', size: 1, jobs: [
+                    { name: 'deploy_js', scheduling_type: 'dag', needs: ['jest'] }
+                  ]
+                },
+                {
+                  name: 'deploy_ruby', size: 1, jobs: [
+                    { name: 'deploy_ruby', scheduling_type: 'dag', needs: ['rspec 1/2', 'rspec 2/2'] }
+                  ]
+                }
               ]
             }
           ]
diff --git a/spec/serializers/ci/daily_build_group_report_result_entity_spec.rb b/spec/serializers/ci/daily_build_group_report_result_entity_spec.rb
new file mode 100644
index 00000000000..cc35b3bc8b8
--- /dev/null
+++ b/spec/serializers/ci/daily_build_group_report_result_entity_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::DailyBuildGroupReportResultEntity do
+  let(:report_result) { double(date: '2020-05-20', group_name: 'rspec', data: { 'coverage' => 79.1 }) }
+  let(:entity) { described_class.new(report_result, param_type: param_type) }
+  let(:param_type) { 'coverage' }
+
+  describe '#as_json' do
+    subject { entity.as_json }
+
+    it { is_expected.to include(:date) }
+
+    it { is_expected.not_to include(:group_name) }
+
+    it { is_expected.to include(:coverage) }
+
+    context 'when given param_type is not allowed' do
+      let(:param_type) { 'something_else' }
+
+      it { is_expected.not_to include(:coverage) }
+      it { is_expected.not_to include(:something_else) }
+    end
+  end
+end
diff --git a/spec/serializers/ci/daily_build_group_report_result_serializer_spec.rb b/spec/serializers/ci/daily_build_group_report_result_serializer_spec.rb
new file mode 100644
index 00000000000..4a781971ae0
--- /dev/null
+++ b/spec/serializers/ci/daily_build_group_report_result_serializer_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::DailyBuildGroupReportResultSerializer do
+  let(:report_result) do
+    [
+      double(date: '2020-05-20', group_name: 'rspec', data: { 'coverage' => 79.1 }),
+      double(date: '2020-05-20', group_name: 'karma', data: { 'coverage' => 90.1 }),
+      double(date: '2020-05-19', group_name: 'rspec', data: { 'coverage' => 77.1 }),
+      double(date: '2020-05-19', group_name: 'karma', data: { 'coverage' => 89.1 })
+    ]
+  end
+  let(:serializer) { described_class.new.represent(report_result, param_type: 'coverage') }
+
+  describe '#to_json' do
+    let(:json) { Gitlab::Json.parse(serializer.to_json) }
+
+    it 'returns an array of group results' do
+      expect(json).to eq([
+        {
+          'group_name' => 'rspec',
+          'data' => [
+            { 'date' => '2020-05-20', 'coverage' => 79.1 },
+            { 'date' => '2020-05-19', 'coverage' => 77.1 }
+          ]
+        },
+        {
+          'group_name' => 'karma',
+          'data' => [
+            { 'date' => '2020-05-20', 'coverage' => 90.1 },
+            { 'date' => '2020-05-19', 'coverage' => 89.1 }
+          ]
+        }
+      ])
+    end
+  end
+end
diff --git a/spec/serializers/cluster_serializer_spec.rb b/spec/serializers/cluster_serializer_spec.rb
index 39551649ff0..b7d7307d40b 100644
--- a/spec/serializers/cluster_serializer_spec.rb
+++ b/spec/serializers/cluster_serializer_spec.rb
@@ -16,6 +16,7 @@ describe ClusterSerializer do
         :name,
         :nodes,
         :path,
+        :provider_type,
         :status)
     end
   end
diff --git a/spec/serializers/commit_entity_spec.rb b/spec/serializers/commit_entity_spec.rb
index 03e1c89a5e6..6abe8504b93 100644
--- a/spec/serializers/commit_entity_spec.rb
+++ b/spec/serializers/commit_entity_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe CommitEntity do
-  SIGNATURE_HTML = 'TEST'.freeze
+  let(:signature_html) { 'TEST' }
 
   let(:entity) do
     described_class.new(commit, request: request)
@@ -16,7 +16,7 @@ describe CommitEntity do
 
   before do
     render = double('render')
-    allow(render).to receive(:call).and_return(SIGNATURE_HTML)
+    allow(render).to receive(:call).and_return(signature_html)
 
     allow(request).to receive(:project).and_return(project)
     allow(request).to receive(:render).and_return(render)
@@ -83,7 +83,7 @@ describe CommitEntity do
 
       it 'exposes "signature_html"' do
         expect(request.render).to receive(:call)
-        expect(subject.fetch(:signature_html)).to be SIGNATURE_HTML
+        expect(subject.fetch(:signature_html)).to be signature_html
       end
     end
 
diff --git a/spec/serializers/container_repository_entity_spec.rb b/spec/serializers/container_repository_entity_spec.rb
index 96c80331f41..1f85c6e6a46 100644
--- a/spec/serializers/container_repository_entity_spec.rb
+++ b/spec/serializers/container_repository_entity_spec.rb
@@ -13,12 +13,14 @@ describe ContainerRepositoryEntity do
 
   before do
     stub_container_registry_config(enabled: true)
+    stub_container_registry_tags(repository: :any,
+      tags: %w[stable latest])
     allow(request).to receive(:project).and_return(project)
     allow(request).to receive(:current_user).and_return(user)
   end
 
   it 'exposes required informations' do
-    expect(subject).to include(:id, :path, :location, :tags_path)
+    expect(subject).to include(:id, :path, :location, :tags_path, :tags_count)
   end
 
   context 'when project is not preset in the request' do
diff --git a/spec/serializers/diffs_entity_spec.rb b/spec/serializers/diffs_entity_spec.rb
index 482f9e76c62..435d8a6aff2 100644
--- a/spec/serializers/diffs_entity_spec.rb
+++ b/spec/serializers/diffs_entity_spec.rb
@@ -68,5 +68,15 @@ describe DiffsEntity do
         end
       end
     end
+
+    context 'when code_navigation feature flag is disabled' do
+      it 'does not include code navigation properties' do
+        stub_feature_flags(code_navigation: false)
+
+        expect(Gitlab::CodeNavigationPath).not_to receive(:new)
+
+        expect(subject).not_to include(:definition_path_prefix)
+      end
+    end
   end
 end
diff --git a/spec/serializers/evidences/evidence_entity_spec.rb b/spec/serializers/evidences/evidence_entity_spec.rb
index 531708e3be6..fa13bd21edd 100644
--- a/spec/serializers/evidences/evidence_entity_spec.rb
+++ b/spec/serializers/evidences/evidence_entity_spec.rb
@@ -3,12 +3,66 @@
 require 'spec_helper'
 
 describe Evidences::EvidenceEntity do
-  let(:evidence) { build(:evidence) }
-  let(:entity) { described_class.new(evidence) }
+  let_it_be(:project) { create(:project) }
+  let(:release) { create(:release, project: project) }
+  let(:evidence) { build(:evidence, release: release) }
+  let(:schema_file) { 'evidences/evidence' }
 
-  subject { entity.as_json }
+  subject { described_class.new(evidence).as_json }
 
   it 'exposes the expected fields' do
     expect(subject.keys).to contain_exactly(:release)
   end
+
+  context 'when a release is associated to a milestone' do
+    let(:milestone) { create(:milestone, project: project) }
+    let(:release) { create(:release, project: project, milestones: [milestone]) }
+
+    context 'when a milestone has no issue associated with it' do
+      it 'creates a valid JSON object' do
+        expect(subject[:release][:milestones].first[:issues]).to be_empty
+        expect(subject.to_json).to match_schema(schema_file)
+      end
+    end
+
+    context 'when a milestone has no description' do
+      let(:milestone) { create(:milestone, project: project, description: nil) }
+
+      it 'creates a valid JSON object' do
+        expect(subject[:release][:milestones].first[:description]).to be_nil
+        expect(subject.to_json).to match_schema(schema_file)
+      end
+    end
+
+    context 'when a milestone has no due_date' do
+      let(:milestone) { create(:milestone, project: project, due_date: nil) }
+
+      it 'creates a valid JSON object' do
+        expect(subject[:release][:milestones].first[:due_date]).to be_nil
+        expect(subject.to_json).to match_schema(schema_file)
+      end
+    end
+
+    context 'when a milestone has an issue' do
+      context 'when the issue has no description' do
+        let(:issue) { create(:issue, project: project, description: nil, state: 'closed') }
+
+        before do
+          milestone.issues << issue
+        end
+
+        it 'creates a valid JSON object' do
+          expect(subject[:release][:milestones].first[:issues].first[:title]).to be_present
+          expect(subject.to_json).to match_schema(schema_file)
+        end
+      end
+    end
+  end
+
+  context 'when a release is not associated to any milestone' do
+    it 'creates a valid JSON object' do
+      expect(subject[:release][:milestones]).to be_empty
+      expect(subject.to_json).to match_schema(schema_file)
+    end
+  end
 end
diff --git a/spec/serializers/import/bitbucket_provider_repo_entity_spec.rb b/spec/serializers/import/bitbucket_provider_repo_entity_spec.rb
new file mode 100644
index 00000000000..ed3ef26db65
--- /dev/null
+++ b/spec/serializers/import/bitbucket_provider_repo_entity_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::BitbucketProviderRepoEntity do
+  let(:repo_data) do
+    {
+      'name' => 'repo_name',
+      'full_name' => 'owner/repo_name',
+      'links' => {
+        'clone' => [
+          {
+            'href' => 'https://bitbucket.org/owner/repo_name',
+            'name' => 'https'
+          }
+        ]
+      }
+    }
+  end
+  let(:repo) { Bitbucket::Representation::Repo.new(repo_data) }
+
+  subject { described_class.new(repo).as_json }
+
+  it_behaves_like 'exposes required fields for import entity' do
+    let(:expected_values) do
+      {
+        id: 'owner/repo_name',
+        full_name: 'owner/repo_name',
+        sanitized_name: 'repo_name',
+        provider_link: 'https://bitbucket.org/owner/repo_name'
+      }
+    end
+  end
+end
diff --git a/spec/serializers/import/bitbucket_server_provider_repo_entity_spec.rb b/spec/serializers/import/bitbucket_server_provider_repo_entity_spec.rb
new file mode 100644
index 00000000000..9891809cc67
--- /dev/null
+++ b/spec/serializers/import/bitbucket_server_provider_repo_entity_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::BitbucketServerProviderRepoEntity do
+  let(:repo_data) do
+    {
+      'name' => 'test',
+      'project' => {
+        'name' => 'demo'
+      },
+      'links' => {
+        'self' => [
+          {
+            'href' => 'http://local.bitbucket.server/demo/test.git',
+            'name' => 'http'
+          }
+        ]
+      }
+    }
+  end
+  let(:repo) { BitbucketServer::Representation::Repo.new(repo_data) }
+
+  subject { described_class.new(repo).as_json }
+
+  it_behaves_like 'exposes required fields for import entity' do
+    let(:expected_values) do
+      {
+        id: 'demo/test',
+        full_name: 'demo/test',
+        sanitized_name: 'test',
+        provider_link: 'http://local.bitbucket.server/demo/test.git'
+      }
+    end
+  end
+end
diff --git a/spec/serializers/import/fogbugz_provider_repo_entity_spec.rb b/spec/serializers/import/fogbugz_provider_repo_entity_spec.rb
new file mode 100644
index 00000000000..b9029b67aab
--- /dev/null
+++ b/spec/serializers/import/fogbugz_provider_repo_entity_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::FogbugzProviderRepoEntity do
+  let(:provider_url) { 'https://demo.fogbugz.com/' }
+  let(:repo_data) do
+    {
+      'ixProject' => 'foo',
+      'sProject' => 'demo'
+    }
+  end
+  let(:repo) { Gitlab::FogbugzImport::Repository.new(repo_data) }
+
+  subject { described_class.represent(repo, { provider_url: provider_url }).as_json }
+
+  it_behaves_like 'exposes required fields for import entity' do
+    let(:expected_values) do
+      {
+        id: 'foo',
+        full_name: 'demo',
+        sanitized_name: 'demo',
+        provider_link: 'https://demo.fogbugz.com/demo'
+      }
+    end
+  end
+end
diff --git a/spec/serializers/import/githubish_provider_repo_entity_spec.rb b/spec/serializers/import/githubish_provider_repo_entity_spec.rb
new file mode 100644
index 00000000000..c6a07b2d64a
--- /dev/null
+++ b/spec/serializers/import/githubish_provider_repo_entity_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::GithubishProviderRepoEntity do
+  let(:provider_url) { 'https://github.com/' }
+  let(:repo) do
+    {
+      id: 1,
+      full_name: 'full/name',
+      name: 'name'
+    }
+  end
+
+  subject { described_class.represent(repo, { provider_url: provider_url }).as_json }
+
+  it_behaves_like 'exposes required fields for import entity' do
+    let(:expected_values) do
+      {
+        id: 1,
+        full_name: 'full/name',
+        sanitized_name: 'name',
+        provider_link: 'https://github.com/full/name'
+      }
+    end
+  end
+end
diff --git a/spec/serializers/import/gitlab_provider_repo_entity_spec.rb b/spec/serializers/import/gitlab_provider_repo_entity_spec.rb
new file mode 100644
index 00000000000..3f862c16fe2
--- /dev/null
+++ b/spec/serializers/import/gitlab_provider_repo_entity_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::GitlabProviderRepoEntity do
+  let(:repo_data) do
+    {
+      'id' => 1,
+      'path_with_namespace' => 'demo/test',
+      'path' => 'test',
+      'web_url' => 'https://gitlab.com/demo/test'
+    }
+  end
+
+  subject { described_class.new(repo_data).as_json }
+
+  it_behaves_like 'exposes required fields for import entity' do
+    let(:expected_values) do
+      {
+        id: 1,
+        full_name: 'demo/test',
+        sanitized_name: 'test',
+        provider_link: 'https://gitlab.com/demo/test'
+      }
+    end
+  end
+end
diff --git a/spec/serializers/import/provider_repo_serializer_spec.rb b/spec/serializers/import/provider_repo_serializer_spec.rb
new file mode 100644
index 00000000000..9bf55e6c65d
--- /dev/null
+++ b/spec/serializers/import/provider_repo_serializer_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::ProviderRepoSerializer do
+  using RSpec::Parameterized::TableSyntax
+
+  describe '#represent' do
+    where(:provider, :class_name) do
+      :github           | 'Import::GithubishProviderRepoEntity'
+      :gitea            | 'Import::GithubishProviderRepoEntity'
+      :bitbucket        | 'Import::BitbucketProviderRepoEntity'
+      :bitbucket_server | 'Import::BitbucketServerProviderRepoEntity'
+      :fogbugz          | 'Import::FogbugzProviderRepoEntity'
+    end
+
+    with_them do
+      it 'uses correct entity class' do
+        opts = { provider: provider }
+        expect(class_name.constantize).to receive(:represent)
+        described_class.new.represent({}, opts)
+      end
+    end
+
+    it 'raises an error if invalid provider supplied' do
+      expect { described_class.new.represent({}, { provider: :invalid })}.to raise_error { NotImplementedError }
+    end
+  end
+end
diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb
index 40a0f09d1f3..039fb311bfc 100644
--- a/spec/serializers/merge_request_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_widget_entity_spec.rb
@@ -178,7 +178,7 @@ describe MergeRequestWidgetEntity do
     project.add_maintainer(user)
 
     expect(subject[:new_project_pipeline_path])
-      .to eq("/#{resource.project.full_path}/pipelines/new")
+      .to eq("/#{resource.project.full_path}/-/pipelines/new")
   end
 
   describe 'when source project is deleted' do
diff --git a/spec/serializers/paginated_diff_entity_spec.rb b/spec/serializers/paginated_diff_entity_spec.rb
index 77569aaa4bc..a6b83cb4286 100644
--- a/spec/serializers/paginated_diff_entity_spec.rb
+++ b/spec/serializers/paginated_diff_entity_spec.rb
@@ -30,4 +30,14 @@ describe PaginatedDiffEntity do
       total_pages: 7
     )
   end
+
+  context 'when code_navigation feature flag is disabled' do
+    it 'does not execute Gitlab::CodeNavigationPath' do
+      stub_feature_flags(code_navigation: false)
+
+      expect(Gitlab::CodeNavigationPath).not_to receive(:new)
+
+      subject
+    end
+  end
 end
diff --git a/spec/serializers/pipeline_details_entity_spec.rb b/spec/serializers/pipeline_details_entity_spec.rb
index a154bcac635..849dab102c2 100644
--- a/spec/serializers/pipeline_details_entity_spec.rb
+++ b/spec/serializers/pipeline_details_entity_spec.rb
@@ -173,44 +173,5 @@ describe PipelineDetailsEntity do
         expect(subject[:triggered].first[:project]).not_to be_nil
       end
     end
-
-    context 'when pipeline has expiring archive artifacts' do
-      let(:pipeline) { create(:ci_empty_pipeline) }
-      let!(:build_1) { create(:ci_build, :artifacts, pipeline: pipeline, artifacts_expire_at: 2.days.from_now, name: 'build_1') }
-      let!(:build_2) { create(:ci_build, :artifacts, pipeline: pipeline, artifacts_expire_at: 2.days.from_now, name: 'build_2') }
-      let!(:build_3) { create(:ci_build, :artifacts, pipeline: pipeline, artifacts_expire_at: 2.days.from_now, name: 'build_3') }
-
-      let(:names) { subject[:details][:artifacts].map { |a| a[:name] } }
-
-      context 'and preload_job_artifacts_archive is not defined in the options' do
-        it 'defaults to true and eager loads the job_artifacts_archive' do
-          recorder = ActiveRecord::QueryRecorder.new do
-            expect(names).to match_array(%w[build_1 build_2 build_3])
-          end
-
-          expected_queries = Gitlab.ee? ? 42 : 29
-
-          # This makes only one query to fetch all job artifacts
-          expect(recorder.count).to eq(expected_queries)
-        end
-      end
-
-      context 'and preload_job_artifacts_archive is set to false' do
-        let(:entity) do
-          described_class.represent(pipeline, request: request, preload_job_artifacts_archive: false)
-        end
-
-        it 'does not eager load the job_artifacts_archive' do
-          recorder = ActiveRecord::QueryRecorder.new do
-            expect(names).to match_array(%w[build_1 build_2 build_3])
-          end
-
-          expected_queries = Gitlab.ee? ? 44 : 31
-
-          # This makes one query for each job artifact
-          expect(recorder.count).to eq(expected_queries)
-        end
-      end
-    end
   end
 end
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 4e4cc9c35e6..c8f25423f85 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -10,10 +10,6 @@ describe PipelineSerializer do
     described_class.new(current_user: user, project: project)
   end
 
-  before do
-    stub_feature_flags(ci_pipeline_persisted_stages: true)
-  end
-
   subject { serializer.represent(resource) }
 
   describe '#represent' do
diff --git a/spec/serializers/provider_repo_entity_spec.rb b/spec/serializers/provider_repo_entity_spec.rb
deleted file mode 100644
index 9a1160d16d5..00000000000
--- a/spec/serializers/provider_repo_entity_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe ProviderRepoEntity do
-  include ImportHelper
-
-  let(:provider_repo) { { id: 1, full_name: 'full/name', name: 'name', owner: { login: 'owner' } } }
-  let(:provider) { :github }
-  let(:provider_url) { 'https://github.com' }
-  let(:entity) { described_class.represent(provider_repo, provider: provider, provider_url: provider_url) }
-
-  describe '#as_json' do
-    subject { entity.as_json }
-
-    it 'includes required fields' do
-      expect(subject[:id]).to eq(provider_repo[:id])
-      expect(subject[:full_name]).to eq(provider_repo[:full_name])
-      expect(subject[:owner_name]).to eq(provider_repo[:owner][:login])
-      expect(subject[:sanitized_name]).to eq(sanitize_project_name(provider_repo[:name]))
-      expect(subject[:provider_link]).to eq(provider_project_link_url(provider_url, provider_repo[:full_name]))
-    end
-  end
-end
diff --git a/spec/serializers/provider_repo_serializer_spec.rb b/spec/serializers/provider_repo_serializer_spec.rb
deleted file mode 100644
index f2be30c36d9..00000000000
--- a/spec/serializers/provider_repo_serializer_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe ProviderRepoSerializer do
-  it 'represents ProviderRepoEntity entities' do
-    expect(described_class.entity_class).to eq(ProviderRepoEntity)
-  end
-end
diff --git a/spec/serializers/service_field_entity_spec.rb b/spec/serializers/service_field_entity_spec.rb
new file mode 100644
index 00000000000..277890d143a
--- /dev/null
+++ b/spec/serializers/service_field_entity_spec.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ServiceFieldEntity do
+  let(:request) { double('request') }
+
+  subject { described_class.new(field, request: request, service: service).as_json }
+
+  before do
+    allow(request).to receive(:service).and_return(service)
+  end
+
+  describe '#as_json' do
+    context 'Jira Service' do
+      let(:service) { create(:jira_service) }
+
+      context 'field with type text' do
+        let(:field) { service.global_fields.find { |field| field[:name] == 'username' } }
+
+        it 'exposes correct attributes' do
+          expected_hash = {
+            type: 'text',
+            name: 'username',
+            title: 'Username or Email',
+            placeholder: 'Use a username for server version and an email for cloud version',
+            required: true,
+            choices: nil,
+            help: nil,
+            value: 'jira_username'
+          }
+
+          is_expected.to eq(expected_hash)
+        end
+      end
+
+      context 'field with type password' do
+        let(:field) { service.global_fields.find { |field| field[:name] == 'password' } }
+
+        it 'exposes correct attributes but hides password' do
+          expected_hash = {
+            type: 'password',
+            name: 'password',
+            title: 'Password or API token',
+            placeholder: 'Use a password for server version and an API token for cloud version',
+            required: true,
+            choices: nil,
+            help: nil,
+            value: 'true'
+          }
+
+          is_expected.to eq(expected_hash)
+        end
+      end
+    end
+
+    context 'EmailsOnPush Service' do
+      let(:service) { create(:emails_on_push_service) }
+
+      context 'field with type checkbox' do
+        let(:field) { service.global_fields.find { |field| field[:name] == 'send_from_committer_email' } }
+
+        it 'exposes correct attributes' do
+          expected_hash = {
+            type: 'checkbox',
+            name: 'send_from_committer_email',
+            title: 'Send from committer',
+            placeholder: nil,
+            required: nil,
+            choices: nil,
+            value: true
+          }
+
+          is_expected.to include(expected_hash)
+          expect(subject[:help]).to include("Send notifications from the committer's email address if the domain is part of the domain GitLab is running on")
+        end
+      end
+
+      context 'field with type select' do
+        let(:field) { service.global_fields.find { |field| field[:name] == 'branches_to_be_notified' } }
+
+        it 'exposes correct attributes' do
+          expected_hash = {
+            type: 'select',
+            name: 'branches_to_be_notified',
+            title: nil,
+            placeholder: nil,
+            required: nil,
+            choices: [['All branches', 'all'], ['Default branch', 'default'], ['Protected branches', 'protected'], ['Default branch and protected branches', 'default_and_protected']],
+            help: nil,
+            value: nil
+          }
+
+          is_expected.to eq(expected_hash)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/serializers/web_ide_terminal_entity_spec.rb b/spec/serializers/web_ide_terminal_entity_spec.rb
new file mode 100644
index 00000000000..e163afa14ed
--- /dev/null
+++ b/spec/serializers/web_ide_terminal_entity_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe WebIdeTerminalEntity do
+  let(:build) { create(:ci_build) }
+  let(:entity) { described_class.new(WebIdeTerminal.new(build)) }
+
+  subject { entity.as_json }
+
+  it { is_expected.to have_key(:id) }
+  it { is_expected.to have_key(:status) }
+  it { is_expected.to have_key(:show_path) }
+  it { is_expected.to have_key(:cancel_path) }
+  it { is_expected.to have_key(:retry_path) }
+  it { is_expected.to have_key(:terminal_path) }
+  it { is_expected.to have_key(:services) }
+  it { is_expected.to have_key(:proxy_websocket_path) }
+
+  context 'when feature flag build_service_proxy is disabled' do
+    before do
+      stub_feature_flags(build_service_proxy: false)
+    end
+
+    it { is_expected.not_to have_key(:proxy_websocket_path) }
+  end
+end
diff --git a/spec/serializers/web_ide_terminal_serializer_spec.rb b/spec/serializers/web_ide_terminal_serializer_spec.rb
new file mode 100644
index 00000000000..01133deaf84
--- /dev/null
+++ b/spec/serializers/web_ide_terminal_serializer_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe WebIdeTerminalSerializer do
+  let(:build) { create(:ci_build) }
+
+  subject { described_class.new.represent(WebIdeTerminal.new(build)) }
+
+  it 'represents WebIdeTerminalEntity entities' do
+    expect(described_class.entity_class).to eq(WebIdeTerminalEntity)
+  end
+
+  it 'accepts WebIdeTerminal as a resource' do
+    expect(subject[:id]).to eq build.id
+  end
+
+  context 'when resource is a build' do
+    subject { described_class.new.represent(build) }
+
+    it 'transforms it into a WebIdeTerminal resource' do
+      expect(WebIdeTerminal).to receive(:new)
+
+      subject
+    end
+  end
+end
diff --git a/spec/services/admin/propagate_integration_service_spec.rb b/spec/services/admin/propagate_integration_service_spec.rb
new file mode 100644
index 00000000000..843b78a41e9
--- /dev/null
+++ b/spec/services/admin/propagate_integration_service_spec.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Admin::PropagateIntegrationService do
+  describe '.propagate' do
+    let(:excluded_attributes) { %w[id project_id inherit_from_id instance created_at updated_at title description] }
+    let!(:project) { create(:project) }
+    let!(:instance_integration) do
+      JiraService.create!(
+        instance: true,
+        active: true,
+        push_events: true,
+        url: 'http://update-jira.instance.com',
+        username: 'user',
+        password: 'secret'
+      )
+    end
+
+    let!(:inherited_integration) do
+      JiraService.create!(
+        project: create(:project),
+        inherit_from_id: instance_integration.id,
+        instance: false,
+        active: true,
+        push_events: false,
+        url: 'http://jira.instance.com',
+        username: 'user',
+        password: 'secret'
+      )
+    end
+
+    let!(:not_inherited_integration) do
+      JiraService.create!(
+        project: create(:project),
+        inherit_from_id: nil,
+        instance: false,
+        active: true,
+        push_events: false,
+        url: 'http://jira.instance.com',
+        username: 'user',
+        password: 'secret'
+      )
+    end
+
+    let!(:another_inherited_integration) do
+      BambooService.create!(
+        project: create(:project),
+        inherit_from_id: instance_integration.id,
+        instance: false,
+        active: true,
+        push_events: false,
+        bamboo_url: 'http://gitlab.com',
+        username: 'mic',
+        password: 'password',
+        build_key: 'build'
+      )
+    end
+
+    shared_examples 'inherits settings from integration' do
+      it 'updates the inherited integrations' do
+        described_class.propagate(integration: instance_integration, overwrite: overwrite)
+
+        expect(integration.reload.inherit_from_id).to eq(instance_integration.id)
+        expect(integration.attributes.except(*excluded_attributes))
+          .to eq(instance_integration.attributes.except(*excluded_attributes))
+      end
+
+      context 'integration with data fields' do
+        let(:excluded_attributes) { %w[id service_id created_at updated_at] }
+
+        it 'updates the data fields from inherited integrations' do
+          described_class.propagate(integration: instance_integration, overwrite: overwrite)
+
+          expect(integration.reload.data_fields.attributes.except(*excluded_attributes))
+            .to eq(instance_integration.data_fields.attributes.except(*excluded_attributes))
+        end
+      end
+    end
+
+    shared_examples 'does not inherit settings from integration' do
+      it 'does not update the not inherited integrations' do
+        described_class.propagate(integration: instance_integration, overwrite: overwrite)
+
+        expect(integration.reload.attributes.except(*excluded_attributes))
+          .not_to eq(instance_integration.attributes.except(*excluded_attributes))
+      end
+    end
+
+    context 'update only inherited integrations' do
+      let(:overwrite) { false }
+
+      it_behaves_like 'inherits settings from integration' do
+        let(:integration) { inherited_integration }
+      end
+
+      it_behaves_like 'does not inherit settings from integration' do
+        let(:integration) { not_inherited_integration }
+      end
+
+      it_behaves_like 'does not inherit settings from integration' do
+        let(:integration) { another_inherited_integration }
+      end
+
+      it_behaves_like 'inherits settings from integration' do
+        let(:integration) { project.jira_service }
+      end
+    end
+
+    context 'update all integrations' do
+      let(:overwrite) { true }
+
+      it_behaves_like 'inherits settings from integration' do
+        let(:integration) { inherited_integration }
+      end
+
+      it_behaves_like 'inherits settings from integration' do
+        let(:integration) { not_inherited_integration }
+      end
+
+      it_behaves_like 'does not inherit settings from integration' do
+        let(:integration) { another_inherited_integration }
+      end
+
+      it_behaves_like 'inherits settings from integration' do
+        let(:integration) { project.jira_service }
+      end
+    end
+
+    it 'updates project#has_external_issue_tracker for issue tracker services' do
+      described_class.propagate(integration: instance_integration, overwrite: true)
+
+      expect(project.reload.has_external_issue_tracker).to eq(true)
+    end
+
+    it 'updates project#has_external_wiki for external wiki services' do
+      instance_integration = ExternalWikiService.create!(
+        instance: true,
+        active: true,
+        push_events: false,
+        external_wiki_url: 'http://external-wiki-url.com'
+      )
+
+      described_class.propagate(integration: instance_integration, overwrite: true)
+
+      expect(project.reload.has_external_wiki).to eq(true)
+    end
+  end
+end
diff --git a/spec/services/alert_management/alerts/update_service_spec.rb b/spec/services/alert_management/alerts/update_service_spec.rb
new file mode 100644
index 00000000000..e185e67c5cf
--- /dev/null
+++ b/spec/services/alert_management/alerts/update_service_spec.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe AlertManagement::Alerts::UpdateService do
+  let_it_be(:user_with_permissions) { create(:user) }
+  let_it_be(:user_without_permissions) { create(:user) }
+  let_it_be(:alert, reload: true) { create(:alert_management_alert) }
+  let_it_be(:project) { alert.project }
+
+  let(:current_user) { user_with_permissions }
+  let(:params) { {} }
+
+  let(:service) { described_class.new(alert, current_user, params) }
+
+  before_all do
+    project.add_developer(user_with_permissions)
+  end
+
+  describe '#execute' do
+    subject(:response) { service.execute }
+
+    context 'when the current_user is nil' do
+      let(:current_user) { nil }
+
+      it 'results in an error' do
+        expect(response).to be_error
+        expect(response.message).to eq('You have no permissions')
+      end
+    end
+
+    context 'when user does not have permission to update alerts' do
+      let(:current_user) { user_without_permissions }
+
+      it 'results in an error' do
+        expect(response).to be_error
+        expect(response.message).to eq('You have no permissions')
+      end
+    end
+
+    context 'when no parameters are included' do
+      it 'results in an error' do
+        expect(response).to be_error
+        expect(response.message).to eq('Please provide attributes to update')
+      end
+    end
+
+    context 'when an error occures during update' do
+      let(:params) { { title: nil } }
+
+      it 'results in an error' do
+        expect { response }.not_to change { alert.reload.notes.count }
+        expect(response).to be_error
+        expect(response.message).to eq("Title can't be blank")
+      end
+    end
+
+    context 'when a model attribute is included without assignees' do
+      let(:params) { { title: 'This is an updated alert.' } }
+
+      it 'updates the attribute' do
+        original_title = alert.title
+
+        expect { response }.to change { alert.title }.from(original_title).to(params[:title])
+        expect(response).to be_success
+      end
+
+      it 'skips adding a todo' do
+        expect { response }.not_to change(Todo, :count)
+      end
+    end
+
+    context 'when assignees are included' do
+      let(:params) { { assignees: [user_with_permissions] } }
+
+      after do
+        alert.assignees = []
+      end
+
+      it 'assigns the user' do
+        expect { response }.to change { alert.reload.assignees }.from([]).to(params[:assignees])
+        expect(response).to be_success
+      end
+
+      it 'creates a system note for the assignment' do
+        expect { response }.to change { alert.reload.notes.count }.by(1)
+      end
+
+      it 'adds a todo' do
+        expect { response }.to change { Todo.where(user: user_with_permissions).count }.by(1)
+      end
+
+      context 'when current user is not the assignee' do
+        let(:assignee_user) { create(:user) }
+        let(:params) { { assignees: [assignee_user] } }
+
+        it 'skips adding todo for assignee without permission to read alert' do
+          expect { response }.not_to change(Todo, :count)
+        end
+
+        context 'when assignee has read permission' do
+          before do
+            project.add_developer(assignee_user)
+          end
+
+          it 'adds a todo' do
+            response
+
+            expect(Todo.first.author).to eq(current_user)
+          end
+        end
+
+        context 'when current_user is nil' do
+          let(:current_user) { nil }
+
+          it 'skips adding todo if current_user is nil' do
+            project.add_developer(assignee_user)
+
+            expect { response }.not_to change(Todo, :count)
+          end
+        end
+      end
+
+      context 'with multiple users included' do
+        let(:params) { { assignees: [user_with_permissions, user_without_permissions] } }
+
+        it 'assigns the first permissioned user' do
+          expect { response }.to change { alert.reload.assignees }.from([]).to([user_with_permissions])
+          expect(response).to be_success
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/alert_management/create_alert_issue_service_spec.rb b/spec/services/alert_management/create_alert_issue_service_spec.rb
index 62afe777165..9bc8b731dc1 100644
--- a/spec/services/alert_management/create_alert_issue_service_spec.rb
+++ b/spec/services/alert_management/create_alert_issue_service_spec.rb
@@ -94,11 +94,7 @@ RSpec.describe AlertManagement::CreateAlertIssueService do
       end
 
       context 'when alert cannot be updated' do
-        before do
-          # invalidate alert
-          too_many_hosts = Array.new(AlertManagement::Alert::HOSTS_MAX_LENGTH + 1) { |_| 'host' }
-          alert.update_columns(hosts: too_many_hosts)
-        end
+        let(:alert) { create(:alert_management_alert, :with_validation_errors, :triggered, project: project, payload: payload) }
 
         it 'responds with error' do
           expect(execute).to be_error
@@ -122,17 +118,6 @@ RSpec.describe AlertManagement::CreateAlertIssueService do
           expect(execute.message).to eq(_('An issue already exists'))
         end
       end
-
-      context 'when alert_management_create_alert_issue feature flag is disabled' do
-        before do
-          stub_feature_flags(alert_management_create_alert_issue: false)
-        end
-
-        it 'responds with error' do
-          expect(execute).to be_error
-          expect(execute.message).to eq(_('You have no permissions'))
-        end
-      end
     end
 
     context 'when a user is not allowed to create an issue' do
diff --git a/spec/services/alert_management/process_prometheus_alert_service_spec.rb b/spec/services/alert_management/process_prometheus_alert_service_spec.rb
index 73f9f103902..5b4da5e9077 100644
--- a/spec/services/alert_management/process_prometheus_alert_service_spec.rb
+++ b/spec/services/alert_management/process_prometheus_alert_service_spec.rb
@@ -5,8 +5,12 @@ require 'spec_helper'
 RSpec.describe AlertManagement::ProcessPrometheusAlertService do
   let_it_be(:project) { create(:project) }
 
+  before do
+    allow(ProjectServiceWorker).to receive(:perform_async)
+  end
+
   describe '#execute' do
-    subject { described_class.new(project, nil, payload).execute }
+    subject(:execute) { described_class.new(project, nil, payload).execute }
 
     context 'when alert payload is valid' do
       let(:parsed_alert) { Gitlab::Alerting::Alert.new(project: project, payload: payload) }
@@ -37,12 +41,22 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
         context 'when alert with the same fingerprint already exists' do
           let!(:alert) { create(:alert_management_alert, :resolved, project: project, fingerprint: parsed_alert.gitlab_fingerprint) }
 
+          it 'increases alert events count' do
+            expect { execute }.to change { alert.reload.events }.by(1)
+          end
+
           context 'when status can be changed' do
             it 'changes status to triggered' do
-              expect { subject }.to change { alert.reload.triggered? }.to(true)
+              expect { execute }.to change { alert.reload.triggered? }.to(true)
             end
           end
 
+          it 'does not executes the alert service hooks' do
+            expect(alert).not_to receive(:execute_services)
+
+            subject
+          end
+
           context 'when status change did not succeed' do
             before do
               allow(AlertManagement::Alert).to receive(:for_fingerprint).and_return([alert])
@@ -56,7 +70,7 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
                 alert_id: alert.id
               )
 
-              subject
+              execute
             end
           end
 
@@ -66,7 +80,15 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
         context 'when alert does not exist' do
           context 'when alert can be created' do
             it 'creates a new alert' do
-              expect { subject }.to change { AlertManagement::Alert.where(project: project).count }.by(1)
+              expect { execute }.to change { AlertManagement::Alert.where(project: project).count }.by(1)
+            end
+
+            it 'executes the alert service hooks' do
+              slack_service = create(:service, type: 'SlackService', project: project, alert_events: true, active: true)
+
+              subject
+
+              expect(ProjectServiceWorker).to have_received(:perform_async).with(slack_service.id, an_instance_of(Hash))
             end
           end
 
@@ -85,7 +107,7 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
                 alert_errors: { hosts: ['hosts array is over 255 chars'] }
               )
 
-              subject
+              execute
             end
           end
 
@@ -99,7 +121,7 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
 
         context 'when status can be changed' do
           it 'resolves an existing alert' do
-            expect { subject }.to change { alert.reload.resolved? }.to(true)
+            expect { execute }.to change { alert.reload.resolved? }.to(true)
           end
         end
 
@@ -116,7 +138,7 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
               alert_id: alert.id
             )
 
-            subject
+            execute
           end
         end
 
@@ -128,8 +150,8 @@ RSpec.describe AlertManagement::ProcessPrometheusAlertService do
       let(:payload) { {} }
 
       it 'responds with bad_request' do
-        expect(subject).to be_error
-        expect(subject.http_status).to eq(:bad_request)
+        expect(execute).to be_error
+        expect(execute.http_status).to eq(:bad_request)
       end
     end
   end
diff --git a/spec/services/audit_event_service_spec.rb b/spec/services/audit_event_service_spec.rb
index 96df6689bb0..dc86735805c 100644
--- a/spec/services/audit_event_service_spec.rb
+++ b/spec/services/audit_event_service_spec.rb
@@ -4,12 +4,16 @@ require 'spec_helper'
 
 describe AuditEventService do
   let(:project) { create(:project) }
-  let(:user) { create(:user) }
+  let(:user) { create(:user, :with_sign_ins) }
   let(:project_member) { create(:project_member, user: user) }
   let(:service) { described_class.new(user, project, { action: :destroy }) }
   let(:logger) { instance_double(Gitlab::AuditJsonLogger) }
 
   describe '#security_event' do
+    before do
+      stub_licensed_features(admin_audit_log: false)
+    end
+
     it 'creates an event and logs to a file' do
       expect(service).to receive(:file_logger).and_return(logger)
       expect(logger).to receive(:info).with(author_id: user.id,
diff --git a/spec/services/authorized_project_update/project_create_service_spec.rb b/spec/services/authorized_project_update/project_create_service_spec.rb
index 49ea538d909..5b3e36af766 100644
--- a/spec/services/authorized_project_update/project_create_service_spec.rb
+++ b/spec/services/authorized_project_update/project_create_service_spec.rb
@@ -56,21 +56,47 @@ describe AuthorizedProjectUpdate::ProjectCreateService do
     end
 
     context 'membership overrides' do
-      before do
-        create(:group_member, access_level: Gitlab::Access::REPORTER, group: group_parent, user: group_user)
-        create(:group_member, access_level: Gitlab::Access::DEVELOPER, group: group, user: group_user)
-        ProjectAuthorization.delete_all
+      context 'group hierarchy' do
+        before do
+          create(:group_member, access_level: Gitlab::Access::REPORTER, group: group_parent, user: group_user)
+          create(:group_member, access_level: Gitlab::Access::DEVELOPER, group: group, user: group_user)
+          ProjectAuthorization.delete_all
+        end
+
+        it 'creates project authorization' do
+          expect { service.execute }.to(
+            change { ProjectAuthorization.count }.from(0).to(1))
+
+          project_authorization = ProjectAuthorization.where(
+            project_id: group_project.id,
+            user_id: group_user.id,
+            access_level: Gitlab::Access::DEVELOPER)
+          expect(project_authorization).to exist
+        end
       end
 
-      it 'creates project authorization' do
-        expect { service.execute }.to(
-          change { ProjectAuthorization.count }.from(0).to(1))
+      context 'group sharing' do
+        let!(:shared_with_group) { create(:group) }
 
-        project_authorization = ProjectAuthorization.where(
-          project_id: group_project.id,
-          user_id: group_user.id,
-          access_level: Gitlab::Access::DEVELOPER)
-        expect(project_authorization).to exist
+        before do
+          create(:group_member, access_level: Gitlab::Access::REPORTER, group: group, user: group_user)
+          create(:group_member, access_level: Gitlab::Access::MAINTAINER, group: shared_with_group, user: group_user)
+
+          create(:group_group_link, shared_group: group, shared_with_group: shared_with_group, group_access: Gitlab::Access::DEVELOPER)
+
+          ProjectAuthorization.delete_all
+        end
+
+        it 'creates project authorization' do
+          expect { service.execute }.to(
+            change { ProjectAuthorization.count }.from(0).to(1))
+
+          project_authorization = ProjectAuthorization.where(
+            project_id: group_project.id,
+            user_id: group_user.id,
+            access_level: Gitlab::Access::DEVELOPER)
+          expect(project_authorization).to exist
+        end
       end
     end
 
diff --git a/spec/services/auto_merge/base_service_spec.rb b/spec/services/auto_merge/base_service_spec.rb
index 0a6bcb1badc..e08e1d670bf 100644
--- a/spec/services/auto_merge/base_service_spec.rb
+++ b/spec/services/auto_merge/base_service_spec.rb
@@ -82,9 +82,9 @@ describe AutoMerge::BaseService do
       end
     end
 
-    context 'when failed to save' do
+    context 'when failed to save merge request' do
       before do
-        allow(merge_request).to receive(:save) { false }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
       end
 
       it 'does not yield block' do
@@ -94,6 +94,39 @@ describe AutoMerge::BaseService do
       it 'returns failed' do
         is_expected.to eq(:failed)
       end
+
+      it 'tracks the exception' do
+        expect(Gitlab::ErrorTracking)
+          .to receive(:track_exception).with(kind_of(ActiveRecord::RecordInvalid),
+                                             merge_request_id: merge_request.id)
+
+        subject
+      end
+    end
+
+    context 'when exception happens in yield block' do
+      def execute_with_error_in_yield
+        service.execute(merge_request) { raise 'Something went wrong' }
+      end
+
+      it 'returns failed status' do
+        expect(execute_with_error_in_yield).to eq(:failed)
+      end
+
+      it 'rollback the transaction' do
+        execute_with_error_in_yield
+
+        merge_request.reload
+        expect(merge_request).not_to be_auto_merge_enabled
+      end
+
+      it 'tracks the exception' do
+        expect(Gitlab::ErrorTracking)
+          .to receive(:track_exception).with(kind_of(RuntimeError),
+                                             merge_request_id: merge_request.id)
+
+        execute_with_error_in_yield
+      end
     end
   end
 
@@ -162,7 +195,7 @@ describe AutoMerge::BaseService do
 
     context 'when failed to save' do
       before do
-        allow(merge_request).to receive(:save) { false }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
       end
 
       it 'does not yield block' do
@@ -178,9 +211,9 @@ describe AutoMerge::BaseService do
 
     it_behaves_like 'Canceled or Dropped'
 
-    context 'when failed to save' do
+    context 'when failed to save merge request' do
       before do
-        allow(merge_request).to receive(:save) { false }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
       end
 
       it 'returns error status' do
@@ -188,6 +221,33 @@ describe AutoMerge::BaseService do
         expect(subject[:message]).to eq("Can't cancel the automatic merge")
       end
     end
+
+    context 'when exception happens in yield block' do
+      def cancel_with_error_in_yield
+        service.cancel(merge_request) { raise 'Something went wrong' }
+      end
+
+      it 'returns error' do
+        result = cancel_with_error_in_yield
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq("Can't cancel the automatic merge")
+      end
+
+      it 'rollback the transaction' do
+        cancel_with_error_in_yield
+
+        merge_request.reload
+        expect(merge_request).to be_auto_merge_enabled
+      end
+
+      it 'tracks the exception' do
+        expect(Gitlab::ErrorTracking)
+          .to receive(:track_exception).with(kind_of(RuntimeError),
+                                             merge_request_id: merge_request.id)
+
+        cancel_with_error_in_yield
+      end
+    end
   end
 
   describe '#abort' do
@@ -200,7 +260,7 @@ describe AutoMerge::BaseService do
 
     context 'when failed to save' do
       before do
-        allow(merge_request).to receive(:save) { false }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
       end
 
       it 'returns error status' do
@@ -208,5 +268,32 @@ describe AutoMerge::BaseService do
         expect(subject[:message]).to eq("Can't abort the automatic merge")
       end
     end
+
+    context 'when exception happens in yield block' do
+      def abort_with_error_in_yield
+        service.abort(merge_request, reason) { raise 'Something went wrong' }
+      end
+
+      it 'returns error' do
+        result = abort_with_error_in_yield
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to eq("Can't abort the automatic merge")
+      end
+
+      it 'rollback the transaction' do
+        abort_with_error_in_yield
+
+        merge_request.reload
+        expect(merge_request).to be_auto_merge_enabled
+      end
+
+      it 'tracks the exception' do
+        expect(Gitlab::ErrorTracking)
+          .to receive(:track_exception).with(kind_of(RuntimeError),
+                                             merge_request_id: merge_request.id)
+
+        abort_with_error_in_yield
+      end
+    end
   end
 end
diff --git a/spec/services/ci/build_report_result_service_spec.rb b/spec/services/ci/build_report_result_service_spec.rb
new file mode 100644
index 00000000000..dbdfc774314
--- /dev/null
+++ b/spec/services/ci/build_report_result_service_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::BuildReportResultService do
+  describe "#execute" do
+    subject(:build_report_result) { described_class.new.execute(build) }
+
+    context 'when build is finished' do
+      let(:build) { create(:ci_build, :success, :test_reports) }
+
+      it 'creates a build report result entry', :aggregate_failures do
+        expect(build_report_result.tests_name).to eq("test")
+        expect(build_report_result.tests_success).to eq(2)
+        expect(build_report_result.tests_failed).to eq(2)
+        expect(build_report_result.tests_errored).to eq(0)
+        expect(build_report_result.tests_skipped).to eq(0)
+        expect(build_report_result.tests_duration).to eq(0.010284)
+        expect(Ci::BuildReportResult.count).to eq(1)
+      end
+
+      context 'when feature is disable' do
+        it 'does not persist the data' do
+          stub_feature_flags(build_report_summary: false)
+
+          subject
+
+          expect(Ci::BuildReportResult.count).to eq(0)
+        end
+      end
+
+      context 'when data has already been persisted' do
+        it 'raises an error and do not persist the same data twice' do
+          expect { 2.times { described_class.new.execute(build) } }.to raise_error(ActiveRecord::RecordNotUnique)
+
+          expect(Ci::BuildReportResult.count).to eq(1)
+        end
+      end
+    end
+
+    context 'when build is running and test report does not exist' do
+      let(:build) { create(:ci_build, :running) }
+
+      it 'does not persist data' do
+        subject
+
+        expect(Ci::BuildReportResult.count).to eq(0)
+      end
+    end
+  end
+end
diff --git a/spec/services/ci/create_cross_project_pipeline_service_spec.rb b/spec/services/ci/create_cross_project_pipeline_service_spec.rb
index 5c59aaa4ce9..9e2497854bc 100644
--- a/spec/services/ci/create_cross_project_pipeline_service_spec.rb
+++ b/spec/services/ci/create_cross_project_pipeline_service_spec.rb
@@ -487,10 +487,11 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
       end
 
       it 'does not create a pipeline and drops the bridge' do
-        service.execute(bridge)
+        expect { service.execute(bridge) }.not_to change(downstream_project.ci_pipelines, :count)
 
         expect(bridge.reload).to be_failed
         expect(bridge.failure_reason).to eq('downstream_pipeline_creation_failed')
+        expect(bridge.options[:downstream_errors]).to eq(['Reference not found'])
       end
     end
 
@@ -509,10 +510,35 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
       end
 
       it 'does not create a pipeline and drops the bridge' do
-        service.execute(bridge)
+        expect { service.execute(bridge) }.not_to change(downstream_project.ci_pipelines, :count)
+
+        expect(bridge.reload).to be_failed
+        expect(bridge.failure_reason).to eq('downstream_pipeline_creation_failed')
+        expect(bridge.options[:downstream_errors]).to eq(['No stages / jobs for this pipeline.'])
+      end
+    end
+
+    context 'when downstream pipeline has invalid YAML' do
+      before do
+        stub_ci_pipeline_yaml_file(config)
+      end
+
+      let(:config) do
+        <<-EOY
+          test:
+            stage: testx
+            script: echo 1
+        EOY
+      end
+
+      it 'creates the pipeline but drops the bridge' do
+        expect { service.execute(bridge) }.to change(downstream_project.ci_pipelines, :count).by(1)
 
         expect(bridge.reload).to be_failed
         expect(bridge.failure_reason).to eq('downstream_pipeline_creation_failed')
+        expect(bridge.options[:downstream_errors]).to eq(
+          ['test job: chosen stage does not exist; available stages are .pre, build, test, deploy, .post']
+        )
       end
     end
   end
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 681ce9669e2..b9456d5fcd4 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -77,6 +77,18 @@ describe Ci::CreatePipelineService do
         pipeline
       end
 
+      it 'records pipeline size in a prometheus histogram' do
+        histogram = spy('pipeline size histogram')
+
+        allow(Gitlab::Ci::Pipeline::Chain::Metrics)
+          .to receive(:new).and_return(histogram)
+
+        execute_service
+
+        expect(histogram).to have_received(:observe)
+          .with({ source: 'push' }, 5)
+      end
+
       context 'when merge requests already exist for this source branch' do
         let(:merge_request_1) do
           create(:merge_request, source_branch: 'feature', target_branch: "master", source_project: project)
diff --git a/spec/services/ci/create_web_ide_terminal_service_spec.rb b/spec/services/ci/create_web_ide_terminal_service_spec.rb
new file mode 100644
index 00000000000..2cc67c7cd1d
--- /dev/null
+++ b/spec/services/ci/create_web_ide_terminal_service_spec.rb
@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::CreateWebIdeTerminalService do
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let(:ref) { 'master' }
+
+  describe '#execute' do
+    subject { described_class.new(project, user, ref: ref).execute }
+
+    context 'for maintainer' do
+      shared_examples 'be successful' do
+        it 'returns a success with pipeline object' do
+          is_expected.to include(status: :success)
+
+          expect(subject[:pipeline]).to be_a(Ci::Pipeline)
+          expect(subject[:pipeline]).to be_persisted
+          expect(subject[:pipeline].stages.count).to eq(1)
+          expect(subject[:pipeline].builds.count).to eq(1)
+        end
+      end
+
+      before do
+        project.add_maintainer(user)
+      end
+
+      context 'when web-ide has valid configuration' do
+        before do
+          stub_webide_config_file(config_content)
+        end
+
+        context 'for empty configuration' do
+          let(:config_content) do
+            'terminal: {}'
+          end
+
+          it_behaves_like 'be successful'
+        end
+
+        context 'for configuration with container image' do
+          let(:config_content) do
+            'terminal: { image: ruby }'
+          end
+
+          it_behaves_like 'be successful'
+        end
+
+        context 'for configuration with ports' do
+          let(:config_content) do
+            <<-EOS
+              terminal:
+                image:
+                  name: ruby:2.7
+                  ports:
+                    - 80
+                script: rspec
+                services:
+                  - name: test
+                    alias: test
+                    ports:
+                      - 8080
+            EOS
+          end
+
+          it_behaves_like 'be successful'
+        end
+      end
+    end
+
+    context 'error handling' do
+      shared_examples 'having an error' do |message|
+        it 'returns an error' do
+          is_expected.to eq(
+            status: :error,
+            message: message
+          )
+        end
+      end
+
+      shared_examples 'having insufficient permissions' do
+        it_behaves_like 'having an error', 'Insufficient permissions to create a terminal'
+      end
+
+      context 'when user is developer' do
+        before do
+          project.add_developer(user)
+        end
+
+        it_behaves_like 'having insufficient permissions'
+      end
+
+      context 'when user is maintainer' do
+        before do
+          project.add_maintainer(user)
+        end
+
+        context 'when terminal is already running' do
+          let!(:webide_pipeline) { create(:ci_pipeline, :webide, :running, project: project, user: user) }
+
+          it_behaves_like 'having an error', 'There is already a terminal running'
+        end
+
+        context 'when ref is non-existing' do
+          let(:ref) { 'non-existing-ref' }
+
+          it_behaves_like 'having an error', 'Ref does not exist'
+        end
+
+        context 'when ref is a tag' do
+          let(:ref) { 'v1.0.0' }
+
+          it_behaves_like 'having an error', 'Ref needs to be a branch'
+        end
+
+        context 'when terminal config is missing' do
+          let(:ref) { 'v1.0.0' }
+
+          it_behaves_like 'having an error', 'Ref needs to be a branch'
+        end
+
+        context 'when webide config is present' do
+          before do
+            stub_webide_config_file(config_content)
+          end
+
+          context 'config has invalid content' do
+            let(:config_content) { 'invalid' }
+
+            it_behaves_like 'having an error', 'Invalid configuration format'
+          end
+
+          context 'config is valid, but does not have terminal' do
+            let(:config_content) { '{}' }
+
+            it_behaves_like 'having an error', 'Terminal is not configured'
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/ci/expire_pipeline_cache_service_spec.rb b/spec/services/ci/expire_pipeline_cache_service_spec.rb
index 78e1ba0109a..2962e9dd31e 100644
--- a/spec/services/ci/expire_pipeline_cache_service_spec.rb
+++ b/spec/services/ci/expire_pipeline_cache_service_spec.rb
@@ -10,9 +10,9 @@ describe Ci::ExpirePipelineCacheService do
 
   describe '#execute' do
     it 'invalidates Etag caching for project pipelines path' do
-      pipelines_path = "/#{project.full_path}/pipelines.json"
+      pipelines_path = "/#{project.full_path}/-/pipelines.json"
       new_mr_pipelines_path = "/#{project.full_path}/-/merge_requests/new.json"
-      pipeline_path = "/#{project.full_path}/pipelines/#{pipeline.id}.json"
+      pipeline_path = "/#{project.full_path}/-/pipelines/#{pipeline.id}.json"
 
       expect_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch).with(pipelines_path)
       expect_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch).with(new_mr_pipelines_path)
diff --git a/spec/services/ci/generate_terraform_reports_service_spec.rb b/spec/services/ci/generate_terraform_reports_service_spec.rb
index 4d2c60bed2c..008ecf17b3e 100644
--- a/spec/services/ci/generate_terraform_reports_service_spec.rb
+++ b/spec/services/ci/generate_terraform_reports_service_spec.rb
@@ -12,15 +12,23 @@ describe Ci::GenerateTerraformReportsService do
 
     context 'when head pipeline has terraform reports' do
       it 'returns status and data' do
-        result = subject.execute(nil, merge_request.head_pipeline)
-
-        expect(result).to match(
-          status: :parsed,
-          data: match(
-            a_hash_including('tfplan.json' => a_hash_including('create' => 0, 'update' => 1, 'delete' => 0))
-          ),
-          key: an_instance_of(Array)
-        )
+        pipeline = merge_request.head_pipeline
+        result = subject.execute(nil, pipeline)
+
+        pipeline.builds.each do |build|
+          expect(result).to match(
+            status: :parsed,
+            data: match(
+              a_hash_including(build.id.to_s => hash_including(
+                'create' => 0,
+                'delete' => 0,
+                'update' => 1,
+                'job_name' => build.options.dig(:artifacts, :name).to_s
+              ))
+            ),
+            key: an_instance_of(Array)
+          )
+        end
       end
     end
 
diff --git a/spec/services/ci/pipeline_bridge_status_service_spec.rb b/spec/services/ci/pipeline_bridge_status_service_spec.rb
index 0b6ae976d97..7e79d222349 100644
--- a/spec/services/ci/pipeline_bridge_status_service_spec.rb
+++ b/spec/services/ci/pipeline_bridge_status_service_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Ci::PipelineBridgeStatusService do
   let(:user) { build(:user) }
-  let(:project) { build(:project) }
+  let_it_be(:project) { create(:project) }
   let(:pipeline) { build(:ci_pipeline, project: project) }
 
   describe '#execute' do
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index 0aa603b24ae..90c53d4a346 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -30,7 +30,7 @@ describe Ci::RetryBuildService do
        created_at updated_at started_at finished_at queued_at erased_by
        erased_at auto_canceled_by job_artifacts job_artifacts_archive
        job_artifacts_metadata job_artifacts_trace job_artifacts_junit
-       job_artifacts_sast job_artifacts_dependency_scanning
+       job_artifacts_sast job_artifacts_secret_detection job_artifacts_dependency_scanning
        job_artifacts_container_scanning job_artifacts_dast
        job_artifacts_license_management job_artifacts_license_scanning
        job_artifacts_performance job_artifacts_lsif
@@ -38,7 +38,8 @@ describe Ci::RetryBuildService do
        job_artifacts_codequality job_artifacts_metrics scheduled_at
        job_variables waiting_for_resource_at job_artifacts_metrics_referee
        job_artifacts_network_referee job_artifacts_dotenv
-       job_artifacts_cobertura needs job_artifacts_accessibility].freeze
+       job_artifacts_cobertura needs job_artifacts_accessibility
+       job_artifacts_requirements].freeze
 
   ignore_accessors =
     %i[type lock_version target_url base_tags trace_sections
@@ -49,7 +50,7 @@ describe Ci::RetryBuildService do
        metadata runner_session trace_chunks upstream_pipeline_id
        artifacts_file artifacts_metadata artifacts_size commands
        resource resource_group_id processed security_scans author
-       pipeline_id].freeze
+       pipeline_id report_results].freeze
 
   shared_examples 'build duplication' do
     let(:another_pipeline) { create(:ci_empty_pipeline, project: project) }
diff --git a/spec/services/ci/update_ci_ref_status_service_spec.rb b/spec/services/ci/update_ci_ref_status_service_spec.rb
deleted file mode 100644
index 8b60586318d..00000000000
--- a/spec/services/ci/update_ci_ref_status_service_spec.rb
+++ /dev/null
@@ -1,169 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Ci::UpdateCiRefStatusService do
-  describe '#call' do
-    subject { described_class.new(pipeline) }
-
-    shared_examples 'creates ci_ref' do
-      it 'creates a ci_ref with the pipeline attributes' do
-        expect do
-          expect(subject.call).to eq(true)
-        end.to change { Ci::Ref.count }.by(1)
-
-        created_ref = pipeline.reload.ref_status
-        %w[ref tag project status].each do |attr|
-          expect(created_ref[attr]).to eq(pipeline[attr])
-        end
-      end
-
-      it 'calls PipelineNotificationWorker pasing the ref_status' do
-        expect(PipelineNotificationWorker).to receive(:perform_async).with(pipeline.id, ref_status: pipeline.status)
-
-        subject.call
-      end
-    end
-
-    shared_examples 'updates ci_ref' do
-      where(:ref_status, :pipeline_status, :next_status) do
-        [
-          %w[failed success fixed],
-          %w[failed failed failed],
-          %w[success success success],
-          %w[success failed failed]
-        ]
-      end
-
-      with_them do
-        let(:ci_ref) { create(:ci_ref, status: ref_status) }
-        let(:pipeline) { create(:ci_pipeline, status: pipeline_status, project: ci_ref.project, ref: ci_ref.ref) }
-
-        it 'sets ci_ref.status to next_status' do
-          expect do
-            expect(subject.call).to eq(true)
-            expect(ci_ref.reload.status).to eq(next_status)
-          end.not_to change { Ci::Ref.count }
-        end
-
-        it 'calls PipelineNotificationWorker pasing the ref_status' do
-          expect(PipelineNotificationWorker).to receive(:perform_async).with(pipeline.id, ref_status: next_status)
-
-          subject.call
-        end
-      end
-    end
-
-    shared_examples 'does a noop' do
-      it "doesn't change ci_ref" do
-        expect do
-          expect do
-            expect(subject.call).to eq(false)
-          end.not_to change { ci_ref.reload.status }
-        end.not_to change { Ci::Ref.count }
-      end
-
-      it "doesn't call PipelineNotificationWorker" do
-        expect(PipelineNotificationWorker).not_to receive(:perform_async)
-
-        subject.call
-      end
-    end
-
-    context "ci_ref doesn't exists" do
-      let(:pipeline) { create(:ci_pipeline, :success, ref: 'new-ref') }
-
-      it_behaves_like 'creates ci_ref'
-
-      context 'when an ActiveRecord::RecordNotUnique validation is raised' do
-        let(:ci_ref) { create(:ci_ref, status: 'failed') }
-        let(:pipeline) { create(:ci_pipeline, status: :success, project: ci_ref.project, ref: ci_ref.ref) }
-
-        it 'reloads the ci_ref and retries once' do
-          subject.instance_variable_set("@ref", subject.send(:build_ref))
-
-          expect do
-            expect(subject.call).to eq(true)
-          end.not_to change { Ci::Ref.count }
-          expect(ci_ref.reload.status).to eq('fixed')
-        end
-
-        it 'raises error on multiple retries' do
-          allow_any_instance_of(Ci::Ref).to receive(:update)
-            .and_raise(ActiveRecord::RecordNotUnique)
-
-          expect { subject.call }.to raise_error(ActiveRecord::RecordNotUnique)
-        end
-      end
-    end
-
-    context 'ci_ref exists' do
-      let!(:ci_ref) { create(:ci_ref, status: 'failed') }
-      let(:pipeline) { ci_ref.pipelines.first }
-
-      it_behaves_like 'updates ci_ref'
-
-      context 'pipeline status is invalid' do
-        let!(:pipeline) { create(:ci_pipeline, :running, project: ci_ref.project, ref: ci_ref.ref, tag: ci_ref.tag) }
-
-        it_behaves_like 'does a noop'
-      end
-
-      context 'newer pipeline finished' do
-        let(:newer_pipeline) { create(:ci_pipeline, :success, project: ci_ref.project, ref: ci_ref.ref, tag: ci_ref.tag) }
-
-        before do
-          ci_ref.update!(last_updated_by_pipeline: newer_pipeline)
-        end
-
-        it_behaves_like 'does a noop'
-      end
-
-      context 'pipeline is retried' do
-        before do
-          ci_ref.update!(last_updated_by_pipeline: pipeline)
-        end
-
-        it_behaves_like 'updates ci_ref'
-      end
-
-      context 'ref is stale' do
-        let(:pipeline1) { create(:ci_pipeline, :success, project: ci_ref.project, ref: ci_ref.ref, tag: ci_ref.tag) }
-        let(:pipeline2) { create(:ci_pipeline, :success, project: ci_ref.project, ref: ci_ref.ref, tag: ci_ref.tag) }
-
-        it 'reloads the ref and retry' do
-          service1 = described_class.new(pipeline1)
-          service2 = described_class.new(pipeline2)
-
-          service2.send(:ref)
-          service1.call
-          expect(ci_ref.reload.status).to eq('fixed')
-          expect do
-            expect(service2.call).to eq(true)
-            # We expect 'success' in this case rather than 'fixed' because
-            # the ref is correctly reloaded on stale error.
-            expect(ci_ref.reload.status).to eq('success')
-          end.not_to change { Ci::Ref.count }
-        end
-
-        it 'aborts when a newer pipeline finished' do
-          service1 = described_class.new(pipeline1)
-          service2 = described_class.new(pipeline2)
-
-          service2.call
-          expect do
-            expect(service1.call).to eq(false)
-            expect(ci_ref.reload.status).to eq('fixed')
-          end.not_to change { Ci::Ref.count }
-        end
-      end
-
-      context 'ref exists as both tag/branch and tag' do
-        let(:pipeline) { create(:ci_pipeline, :failed, project: ci_ref.project, ref: ci_ref.ref, tag: true) }
-        let!(:branch_pipeline) { create(:ci_pipeline, :success, project: ci_ref.project, ref: ci_ref.ref, tag: false) }
-
-        it_behaves_like 'creates ci_ref'
-      end
-    end
-  end
-end
diff --git a/spec/services/ci/web_ide_config_service_spec.rb b/spec/services/ci/web_ide_config_service_spec.rb
new file mode 100644
index 00000000000..7522103ccb7
--- /dev/null
+++ b/spec/services/ci/web_ide_config_service_spec.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::WebIdeConfigService do
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let(:sha) { 'sha' }
+
+  describe '#execute' do
+    subject { described_class.new(project, user, sha: sha).execute }
+
+    context 'when insufficient permission' do
+      it 'returns an error' do
+        is_expected.to include(
+          status: :error,
+          message: 'Insufficient permissions to read configuration')
+      end
+    end
+
+    context 'for developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      context 'when file is missing' do
+        it 'returns an error' do
+          is_expected.to include(
+            status: :error,
+            message: "Failed to load Web IDE config file '.gitlab/.gitlab-webide.yml' for sha")
+        end
+      end
+
+      context 'when file is present' do
+        before do
+          allow(project.repository).to receive(:blob_data_at).with('sha', anything) do
+            config_content
+          end
+        end
+
+        context 'content is not valid' do
+          let(:config_content) { 'invalid content' }
+
+          it 'returns an error' do
+            is_expected.to include(
+              status: :error,
+              message: "Invalid configuration format")
+          end
+        end
+
+        context 'content is valid, but terminal not defined' do
+          let(:config_content) { '{}' }
+
+          it 'returns success' do
+            is_expected.to include(
+              status: :success,
+              terminal: nil)
+          end
+        end
+
+        context 'content is valid, with enabled terminal' do
+          let(:config_content) { 'terminal: {}' }
+
+          it 'returns success' do
+            is_expected.to include(
+              status: :success,
+              terminal: {
+                tag_list: [],
+                yaml_variables: [],
+                options: { script: ["sleep 60"] }
+              })
+          end
+        end
+
+        context 'content is valid, with custom terminal' do
+          let(:config_content) { 'terminal: { before_script: [ls] }' }
+
+          it 'returns success' do
+            is_expected.to include(
+              status: :success,
+              terminal: {
+                tag_list: [],
+                yaml_variables: [],
+                options: { before_script: ["ls"], script: ["sleep 60"] }
+              })
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb b/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb
index ffb658330d3..9dede1947f8 100644
--- a/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb
+++ b/spec/services/clusters/applications/check_uninstall_progress_service_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Clusters::Applications::CheckUninstallProgressService do
-  RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze
+  reschedule_phases = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze
 
   let(:application) { create(:clusters_applications_prometheus, :uninstalling) }
   let(:service) { described_class.new(application) }
@@ -42,7 +42,7 @@ describe Clusters::Applications::CheckUninstallProgressService do
   end
 
   context 'when application is uninstalling' do
-    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'a not yet terminated installation', phase }
+    reschedule_phases.each { |phase| it_behaves_like 'a not yet terminated installation', phase }
 
     context 'when installation POD succeeded' do
       let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED }
diff --git a/spec/services/clusters/applications/prometheus_config_service_spec.rb b/spec/services/clusters/applications/prometheus_config_service_spec.rb
index 993a697b543..b9032e665ec 100644
--- a/spec/services/clusters/applications/prometheus_config_service_spec.rb
+++ b/spec/services/clusters/applications/prometheus_config_service_spec.rb
@@ -90,23 +90,25 @@ describe Clusters::Applications::PrometheusConfigService do
             create(:prometheus_alert,
                    project: project,
                    environment: production,
-                   prometheus_metric: metric)
+                   prometheus_metric: metric,
+                   operator: PrometheusAlert.operators['gt'],
+                   threshold: 0)
           end
 
           let(:metric) do
             create(:prometheus_metric, query: query, project: project)
           end
 
-          let(:query) { '%{ci_environment_slug}' }
+          let(:query) { 'up{environment="{{ci_environment_slug}}"}' }
 
           it 'substitutes query variables' do
             expect(Gitlab::Prometheus::QueryVariables)
               .to receive(:call)
-              .with(production)
+              .with(production, start_time: nil, end_time: nil)
               .and_call_original
 
             expr = groups.dig(0, 'rules', 0, 'expr')
-            expect(expr).to include(production.name)
+            expect(expr).to eq("up{environment=\"#{production.slug}\"} > 0.0")
           end
         end
 
@@ -127,13 +129,15 @@ describe Clusters::Applications::PrometheusConfigService do
           end
 
           it 'substitutes query variables once per environment' do
+            allow(Gitlab::Prometheus::QueryVariables).to receive(:call).and_call_original
+
             expect(Gitlab::Prometheus::QueryVariables)
               .to receive(:call)
-              .with(production)
+              .with(production, start_time: nil, end_time: nil)
 
             expect(Gitlab::Prometheus::QueryVariables)
               .to receive(:call)
-              .with(staging)
+              .with(staging, start_time: nil, end_time: nil)
 
             subject
           end
diff --git a/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb b/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
index f14c929554a..bb0b107eba6 100644
--- a/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
+++ b/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
@@ -85,13 +85,25 @@ describe Clusters::ParseClusterApplicationsArtifactService do
         end
       end
 
-      context 'job has no deployment cluster' do
+      context 'job has no deployment' do
         let(:job) { build(:ci_build) }
 
         it 'returns an error' do
           result = described_class.new(job, user).execute(artifact)
 
           expect(result[:status]).to eq(:error)
+          expect(result[:message]).to eq('No deployment found for this job')
+        end
+      end
+
+      context 'job has no deployment cluster' do
+        let(:deployment) { create(:deployment) }
+        let(:job) { deployment.deployable }
+
+        it 'returns an error' do
+          result = described_class.new(job, user).execute(artifact)
+
+          expect(result[:status]).to eq(:error)
           expect(result[:message]).to eq('No deployment cluster found for this job')
         end
       end
diff --git a/spec/services/concerns/exclusive_lease_guard_spec.rb b/spec/services/concerns/exclusive_lease_guard_spec.rb
new file mode 100644
index 00000000000..a38facc7520
--- /dev/null
+++ b/spec/services/concerns/exclusive_lease_guard_spec.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ExclusiveLeaseGuard, :clean_gitlab_redis_shared_state do
+  subject :subject_class do
+    Class.new do
+      include ExclusiveLeaseGuard
+
+      def self.name
+        'ExclusiveLeaseGuardTestClass'
+      end
+
+      def call(&block)
+        try_obtain_lease do
+          internal_method(&block)
+        end
+      end
+
+      def internal_method
+        yield
+      end
+
+      def lease_timeout
+        1.second
+      end
+    end
+  end
+
+  describe '#try_obtain_lease' do
+    let(:subject) { subject_class.new }
+
+    it 'obtains the lease, calls internal_method and releases the lease', :aggregate_failures do
+      expect(subject).to receive(:internal_method).and_call_original
+
+      subject.call do
+        expect(subject.exclusive_lease.exists?).to be_truthy
+      end
+
+      expect(subject.exclusive_lease.exists?).to be_falsey
+    end
+
+    context 'when the lease is already obtained' do
+      before do
+        subject.exclusive_lease.try_obtain
+      end
+
+      after do
+        subject.exclusive_lease.cancel
+      end
+
+      it 'does not call internal_method but logs error', :aggregate_failures do
+        expect(subject).not_to receive(:internal_method)
+        expect(Gitlab::AppLogger).to receive(:error).with('Cannot obtain an exclusive lease. There must be another instance already in execution.')
+
+        subject.call
+      end
+    end
+
+    context 'with overwritten lease_release?' do
+      subject :overwritten_subject_class do
+        Class.new(subject_class) do
+          def lease_release?
+            false
+          end
+        end
+      end
+
+      let(:subject) { overwritten_subject_class.new }
+
+      it 'does not release the lease after execution', :aggregate_failures do
+        subject.call do
+          expect(subject.exclusive_lease.exists?).to be_truthy
+        end
+
+        expect(subject.exclusive_lease.exists?).to be_truthy
+      end
+    end
+  end
+
+  describe '#exclusive_lease' do
+    it 'uses the class name as lease key' do
+      expect(Gitlab::ExclusiveLease).to receive(:new).with('exclusive_lease_guard_test_class', timeout: 1.second)
+
+      subject_class.new.exclusive_lease
+    end
+
+    context 'with overwritten lease_key' do
+      subject :overwritten_class do
+        Class.new(subject_class) do
+          def lease_key
+            'other_lease_key'
+          end
+        end
+      end
+
+      it 'uses the custom lease key' do
+        expect(Gitlab::ExclusiveLease).to receive(:new).with('other_lease_key', timeout: 1.second)
+
+        overwritten_class.new.exclusive_lease
+      end
+    end
+  end
+
+  describe '#release_lease' do
+    it 'sends a cancel message to ExclusiveLease' do
+      expect(Gitlab::ExclusiveLease).to receive(:cancel).with('exclusive_lease_guard_test_class', 'some_uuid')
+
+      subject_class.new.release_lease('some_uuid')
+    end
+  end
+
+  describe '#renew_lease!' do
+    let(:subject) { subject_class.new }
+
+    it 'sends a renew message to the exclusive_lease instance' do
+      expect(subject.exclusive_lease).to receive(:renew)
+      subject.renew_lease!
+    end
+  end
+end
diff --git a/spec/services/container_expiration_policies/update_service_spec.rb b/spec/services/container_expiration_policies/update_service_spec.rb
new file mode 100644
index 00000000000..ec178f3830f
--- /dev/null
+++ b/spec/services/container_expiration_policies/update_service_spec.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ContainerExpirationPolicies::UpdateService do
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:project, reload: true) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:params) { { cadence: '3month', keep_n: 100, older_than: '14d', extra_key: 'will_not_be_processed' } }
+
+  let(:container_expiration_policy) { project.container_expiration_policy }
+
+  describe '#execute' do
+    subject { described_class.new(container: project, current_user: user, params: params).execute }
+
+    RSpec.shared_examples 'returning a success' do
+      it 'returns a success' do
+        result = subject
+
+        expect(result.payload[:container_expiration_policy]).to be_present
+        expect(result.success?).to be_truthy
+      end
+    end
+
+    RSpec.shared_examples 'returning an error' do |message, http_status|
+      it 'returns an error' do
+        result = subject
+
+        expect(result.message).to eq(message)
+        expect(result.status).to eq(:error)
+        expect(result.http_status).to eq(http_status)
+      end
+    end
+
+    RSpec.shared_examples 'updating the container expiration policy' do
+      it_behaves_like 'updating the container expiration policy attributes', mode: :update, from: { cadence: '1d', keep_n: 10, older_than: '90d' }, to: { cadence: '3month', keep_n: 100, older_than: '14d' }
+
+      it_behaves_like 'returning a success'
+
+      context 'with invalid params' do
+        let_it_be(:params) { { cadence: '20d' } }
+
+        it_behaves_like 'not creating the container expiration policy'
+
+        it "doesn't update the cadence" do
+          expect { subject }
+            .not_to change { container_expiration_policy.reload.cadence }
+        end
+
+        it_behaves_like 'returning an error', 'Cadence is not included in the list', 400
+      end
+    end
+
+    RSpec.shared_examples 'denying access to container expiration policy' do
+      context 'with existing container expiration policy' do
+        it_behaves_like 'not creating the container expiration policy'
+
+        it_behaves_like 'returning an error', 'Access Denied', 403
+      end
+    end
+
+    context 'with existing container expiration policy' do
+      where(:user_role, :shared_examples_name) do
+        :maintainer | 'updating the container expiration policy'
+        :developer  | 'updating the container expiration policy'
+        :reporter   | 'denying access to container expiration policy'
+        :guest      | 'denying access to container expiration policy'
+        :anonymous  | 'denying access to container expiration policy'
+      end
+
+      with_them do
+        before do
+          project.send("add_#{user_role}", user) unless user_role == :anonymous
+        end
+
+        it_behaves_like params[:shared_examples_name]
+      end
+    end
+
+    context 'without existing container expiration policy' do
+      let_it_be(:project, reload: true) { create(:project, :without_container_expiration_policy) }
+
+      where(:user_role, :shared_examples_name) do
+        :maintainer | 'creating the container expiration policy'
+        :developer  | 'creating the container expiration policy'
+        :reporter   | 'denying access to container expiration policy'
+        :guest      | 'denying access to container expiration policy'
+        :anonymous  | 'denying access to container expiration policy'
+      end
+
+      with_them do
+        before do
+          project.send("add_#{user_role}", user) unless user_role == :anonymous
+        end
+
+        it_behaves_like params[:shared_examples_name]
+      end
+    end
+  end
+end
diff --git a/spec/services/container_expiration_policy_service_spec.rb b/spec/services/container_expiration_policy_service_spec.rb
index b2f2b2e1236..97715b990ef 100644
--- a/spec/services/container_expiration_policy_service_spec.rb
+++ b/spec/services/container_expiration_policy_service_spec.rb
@@ -27,5 +27,20 @@ describe ContainerExpirationPolicyService do
 
       expect(container_expiration_policy.next_run_at).to be > Time.zone.now
     end
+
+    context 'with an invalid container expiration policy' do
+      before do
+        allow(container_expiration_policy).to receive(:valid?).and_return(false)
+      end
+
+      it 'disables it' do
+        expect(container_expiration_policy).not_to receive(:schedule_next_run!)
+        expect(CleanupContainerRepositoryWorker).not_to receive(:perform_async)
+
+        expect { subject }
+          .to change { container_expiration_policy.reload.enabled }.from(true).to(false)
+          .and raise_error(ContainerExpirationPolicyService::InvalidPolicyError)
+      end
+    end
   end
 end
diff --git a/spec/services/design_management/delete_designs_service_spec.rb b/spec/services/design_management/delete_designs_service_spec.rb
index 2c0c1570cb4..bf5d6b443e6 100644
--- a/spec/services/design_management/delete_designs_service_spec.rb
+++ b/spec/services/design_management/delete_designs_service_spec.rb
@@ -56,6 +56,10 @@ describe DesignManagement::DeleteDesignsService do
       let(:enabled) { false }
 
       it_behaves_like "a service error"
+
+      it 'does not create any events in the activity stream' do
+        expect { run_service rescue nil }.not_to change { Event.count }
+      end
     end
 
     context "when the feature is available" do
@@ -72,7 +76,9 @@ describe DesignManagement::DeleteDesignsService do
 
         it 'does not log any events' do
           counter = ::Gitlab::UsageDataCounters::DesignsCounter
-          expect { run_service rescue nil }.not_to change { counter.totals }
+
+          expect { run_service rescue nil }
+            .not_to change { [counter.totals, Event.count] }
         end
       end
 
@@ -92,6 +98,12 @@ describe DesignManagement::DeleteDesignsService do
           expect { run_service }.to change { counter.read(:delete) }.by(1)
         end
 
+        it 'creates an event in the activity stream' do
+          expect { run_service }
+            .to change { Event.count }.by(1)
+            .and change { Event.destroyed_action.for_design.count }.by(1)
+        end
+
         it 'informs the new-version-worker' do
           expect(::DesignManagement::NewVersionWorker).to receive(:perform_async).with(Integer)
 
@@ -129,14 +141,14 @@ describe DesignManagement::DeleteDesignsService do
 
         let!(:designs) { create_designs(2) }
 
-        it 'removes those designs' do
+        it 'makes the correct changes' do
+          counter = ::Gitlab::UsageDataCounters::DesignsCounter
+
           expect { run_service }
             .to change { issue.designs.current.count }.from(3).to(1)
-        end
-
-        it 'logs the correct number of deletion events' do
-          counter = ::Gitlab::UsageDataCounters::DesignsCounter
-          expect { run_service }.to change { counter.read(:delete) }.by(2)
+            .and change { counter.read(:delete) }.by(2)
+            .and change { Event.count }.by(2)
+            .and change { Event.destroyed_action.for_design.count }.by(2)
         end
 
         it_behaves_like "a success"
diff --git a/spec/services/design_management/save_designs_service_spec.rb b/spec/services/design_management/save_designs_service_spec.rb
index 013d5473860..3be3ac9daca 100644
--- a/spec/services/design_management/save_designs_service_spec.rb
+++ b/spec/services/design_management/save_designs_service_spec.rb
@@ -65,6 +65,10 @@ describe DesignManagement::SaveDesignsService do
       end
 
       it_behaves_like 'a service error'
+
+      it 'does not create an event in the activity stream' do
+        expect { run_service }.not_to change { Event.count }
+      end
     end
 
     context 'when the feature is available' do
@@ -89,6 +93,12 @@ describe DesignManagement::SaveDesignsService do
         expect { run_service }.to change { counter.read(:create) }.by(1)
       end
 
+      it 'creates an event in the activity stream' do
+        expect { run_service }
+          .to change { Event.count }.by(1)
+          .and change { Event.for_design.created_action.count }.by(1)
+      end
+
       it 'creates a commit in the repository' do
         run_service
 
@@ -166,9 +176,12 @@ describe DesignManagement::SaveDesignsService do
           expect(updated_designs.first.versions.size).to eq(2)
         end
 
-        it 'increments the update counter' do
+        it 'records the correct events' do
           counter = Gitlab::UsageDataCounters::DesignsCounter
-          expect { run_service }.to change { counter.read(:update) }.by 1
+          expect { run_service }
+            .to change { counter.read(:update) }.by(1)
+            .and change { Event.count }.by(1)
+            .and change { Event.for_design.updated_action.count }.by(1)
         end
 
         context 'when uploading a new design' do
@@ -217,6 +230,14 @@ describe DesignManagement::SaveDesignsService do
             .and change { counter.read(:update) }.by(1)
         end
 
+        it 'creates the correct activity stream events' do
+          expect { run_service }
+            .to change { Event.count }.by(2)
+            .and change { Event.for_design.count }.by(2)
+            .and change { Event.created_action.count }.by(1)
+            .and change { Event.updated_action.count }.by(1)
+        end
+
         it 'creates a single commit' do
           commit_count = -> do
             design_repository.expire_all_method_caches
diff --git a/spec/services/discussions/resolve_service_spec.rb b/spec/services/discussions/resolve_service_spec.rb
index 2e9a7a293d1..7461934b455 100644
--- a/spec/services/discussions/resolve_service_spec.rb
+++ b/spec/services/discussions/resolve_service_spec.rb
@@ -4,28 +4,24 @@ require 'spec_helper'
 
 describe Discussions::ResolveService do
   describe '#execute' do
-    let(:discussion) { create(:diff_note_on_merge_request).to_discussion }
-    let(:project) { merge_request.project }
-    let(:merge_request) { discussion.noteable }
-    let(:user) { create(:user) }
-    let(:service) { described_class.new(discussion.noteable.project, user, merge_request: merge_request) }
-
-    before do
-      project.add_maintainer(user)
-    end
+    let_it_be(:project) { create(:project, :repository) }
+    let_it_be(:user) { create(:user, developer_projects: [project]) }
+    let_it_be(:merge_request) { create(:merge_request, :merge_when_pipeline_succeeds, source_project: project) }
+    let(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
+    let(:service) { described_class.new(project, user, one_or_more_discussions: discussion) }
 
     it "doesn't resolve discussions the user can't resolve" do
       expect(discussion).to receive(:can_resolve?).with(user).and_return(false)
 
-      service.execute(discussion)
+      service.execute
 
-      expect(discussion.resolved?).to be(false)
+      expect(discussion).not_to be_resolved
     end
 
     it 'resolves the discussion' do
-      service.execute(discussion)
+      service.execute
 
-      expect(discussion.resolved?).to be(true)
+      expect(discussion).to be_resolved
     end
 
     it 'executes the notification service' do
@@ -33,24 +29,83 @@ describe Discussions::ResolveService do
         expect(instance).to receive(:execute).with(discussion.noteable)
       end
 
-      service.execute(discussion)
+      service.execute
+    end
+
+    it 'schedules an auto-merge' do
+      expect(AutoMergeProcessWorker).to receive(:perform_async).with(discussion.noteable.id)
+
+      service.execute
+    end
+
+    context 'with a project that requires all discussion to be resolved' do
+      before do
+        project.update(only_allow_merge_if_all_discussions_are_resolved: true)
+      end
+
+      after do
+        project.update(only_allow_merge_if_all_discussions_are_resolved: false)
+      end
+
+      let_it_be(:other_discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
+
+      it 'does not schedule an auto-merge' do
+        expect(AutoMergeProcessWorker).not_to receive(:perform_async)
+
+        service.execute
+      end
+
+      it 'schedules an auto-merge' do
+        expect(AutoMergeProcessWorker).to receive(:perform_async)
+
+        described_class.new(project, user, one_or_more_discussions: [discussion, other_discussion]).execute
+      end
     end
 
     it 'adds a system note to the discussion' do
       issue = create(:issue, project: project)
 
       expect(SystemNoteService).to receive(:discussion_continued_in_issue).with(discussion, project, user, issue)
-      service = described_class.new(project, user, merge_request: merge_request, follow_up_issue: issue)
-      service.execute(discussion)
+      service = described_class.new(project, user, one_or_more_discussions: discussion, follow_up_issue: issue)
+      service.execute
     end
 
     it 'can resolve multiple discussions at once' do
-      other_discussion = create(:diff_note_on_merge_request, noteable: discussion.noteable, project: discussion.noteable.source_project).to_discussion
+      other_discussion = create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion
+      service = described_class.new(project, user, one_or_more_discussions: [discussion, other_discussion])
+      service.execute
 
-      service.execute([discussion, other_discussion])
+      expect([discussion, other_discussion]).to all(be_resolved)
+    end
+
+    it 'raises an argument error if discussions do not belong to the same noteable' do
+      other_merge_request = create(:merge_request)
+      other_discussion = create(:diff_note_on_merge_request,
+                                noteable: other_merge_request,
+                                project: other_merge_request.source_project).to_discussion
+      expect do
+        described_class.new(project, user, one_or_more_discussions: [discussion, other_discussion])
+      end.to raise_error(
+        ArgumentError,
+        'Discussions must be all for the same noteable'
+      )
+    end
 
-      expect(discussion.resolved?).to be(true)
-      expect(other_discussion.resolved?).to be(true)
+    context 'when discussion is not for a merge request' do
+      let_it_be(:design) { create(:design, :with_file, issue: create(:issue, project: project)) }
+      let(:discussion) { create(:diff_note_on_design, noteable: design, project: project).to_discussion }
+
+      it 'does not execute the notification service' do
+        expect(MergeRequests::ResolvedDiscussionNotificationService).not_to receive(:new)
+
+        service.execute
+      end
+
+      it 'does not schedule an auto-merge' do
+        expect(AutoMergeProcessWorker).not_to receive(:perform_async)
+
+        service.execute
+      end
     end
   end
 end
diff --git a/spec/services/draft_notes/create_service_spec.rb b/spec/services/draft_notes/create_service_spec.rb
new file mode 100644
index 00000000000..8f244ed386b
--- /dev/null
+++ b/spec/services/draft_notes/create_service_spec.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe DraftNotes::CreateService do
+  let(:merge_request) { create(:merge_request) }
+  let(:project) { merge_request.target_project }
+  let(:user) { merge_request.author }
+
+  def create_draft(params)
+    described_class.new(merge_request, user, params).execute
+  end
+
+  it 'creates a simple draft note' do
+    draft = create_draft(note: 'This is a test')
+
+    expect(draft).to be_an_instance_of(DraftNote)
+    expect(draft.note).to eq('This is a test')
+    expect(draft.author).to eq(user)
+    expect(draft.project).to eq(merge_request.target_project)
+    expect(draft.discussion_id).to be_nil
+  end
+
+  it 'cannot resolve when there is nothing to resolve' do
+    draft = create_draft(note: 'Not a reply!', resolve_discussion: true)
+
+    expect(draft.errors[:base]).to include('User is not allowed to resolve thread')
+    expect(draft).not_to be_persisted
+  end
+
+  context 'in a thread' do
+    it 'creates a draft note with discussion_id' do
+      discussion = create(:discussion_note_on_merge_request, noteable: merge_request, project: project).discussion
+
+      draft = create_draft(note: 'A reply!', in_reply_to_discussion_id: discussion.reply_id)
+
+      expect(draft.note).to eq('A reply!')
+      expect(draft.discussion_id).to eq(discussion.reply_id)
+      expect(draft.resolve_discussion).to be_falsey
+    end
+
+    it 'creates a draft that resolves the thread' do
+      discussion = create(:discussion_note_on_merge_request, noteable: merge_request, project: project).discussion
+
+      draft = create_draft(note: 'A reply!', in_reply_to_discussion_id: discussion.reply_id, resolve_discussion: true)
+
+      expect(draft.note).to eq('A reply!')
+      expect(draft.discussion_id).to eq(discussion.reply_id)
+      expect(draft.resolve_discussion).to be true
+    end
+  end
+
+  it 'creates a draft note with a position in a diff' do
+    diff_refs = project.commit(RepoHelpers.sample_commit.id).try(:diff_refs)
+
+    position = Gitlab::Diff::Position.new(
+      old_path: "files/ruby/popen.rb",
+      new_path: "files/ruby/popen.rb",
+      old_line: nil,
+      new_line: 14,
+      diff_refs: diff_refs
+    )
+
+    draft = create_draft(note: 'Comment on diff', position: position.to_json)
+
+    expect(draft.note).to eq('Comment on diff')
+    expect(draft.original_position.to_json).to eq(position.to_json)
+  end
+
+  context 'diff highlight cache clearing' do
+    context 'when diff file is unfolded and it is not a reply' do
+      it 'clears diff highlighting cache' do
+        expect_next_instance_of(DraftNote) do |draft|
+          allow(draft).to receive_message_chain(:diff_file, :unfolded?) { true }
+        end
+
+        expect(merge_request).to receive_message_chain(:diffs, :clear_cache)
+
+        create_draft(note: 'This is a test')
+      end
+    end
+
+    context 'when diff file is not unfolded and it is not a reply' do
+      it 'clears diff highlighting cache' do
+        expect_next_instance_of(DraftNote) do |draft|
+          allow(draft).to receive_message_chain(:diff_file, :unfolded?) { false }
+        end
+
+        expect(merge_request).not_to receive(:diffs)
+
+        create_draft(note: 'This is a test')
+      end
+    end
+  end
+end
diff --git a/spec/services/draft_notes/destroy_service_spec.rb b/spec/services/draft_notes/destroy_service_spec.rb
new file mode 100644
index 00000000000..d0bf88dcdbe
--- /dev/null
+++ b/spec/services/draft_notes/destroy_service_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe DraftNotes::DestroyService do
+  let(:merge_request) { create(:merge_request) }
+  let(:project) { merge_request.target_project }
+  let(:user) { merge_request.author }
+
+  def destroy(draft_note = nil)
+    DraftNotes::DestroyService.new(merge_request, user).execute(draft_note)
+  end
+
+  it 'destroys a single draft note' do
+    drafts = create_list(:draft_note, 2, merge_request: merge_request, author: user)
+
+    expect { destroy(drafts.first) }
+      .to change { DraftNote.count }.by(-1)
+
+    expect(DraftNote.count).to eq(1)
+  end
+
+  it 'destroys all draft notes for a user in a merge request' do
+    create_list(:draft_note, 2, merge_request: merge_request, author: user)
+
+    expect { destroy }.to change { DraftNote.count }.by(-2)
+    expect(DraftNote.count).to eq(0)
+  end
+
+  context 'diff highlight cache clearing' do
+    context 'when destroying all draft notes of a user' do
+      it 'clears highlighting cache if unfold required for any' do
+        drafts = create_list(:draft_note, 2, merge_request: merge_request, author: user)
+
+        allow_any_instance_of(DraftNote).to receive_message_chain(:diff_file, :unfolded?) { true }
+        expect(merge_request).to receive_message_chain(:diffs, :clear_cache)
+
+        destroy(drafts.first)
+      end
+    end
+
+    context 'when destroying one draft note' do
+      it 'clears highlighting cache if unfold required' do
+        create_list(:draft_note, 2, merge_request: merge_request, author: user)
+
+        allow_any_instance_of(DraftNote).to receive_message_chain(:diff_file, :unfolded?) { true }
+        expect(merge_request).to receive_message_chain(:diffs, :clear_cache)
+
+        destroy
+      end
+    end
+  end
+end
diff --git a/spec/services/draft_notes/publish_service_spec.rb b/spec/services/draft_notes/publish_service_spec.rb
new file mode 100644
index 00000000000..4ebae2f9aa2
--- /dev/null
+++ b/spec/services/draft_notes/publish_service_spec.rb
@@ -0,0 +1,261 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe DraftNotes::PublishService do
+  include RepoHelpers
+
+  let(:merge_request) { create(:merge_request) }
+  let(:project) { merge_request.target_project }
+  let(:user) { merge_request.author }
+  let(:commit) { project.commit(sample_commit.id) }
+
+  let(:position) do
+    Gitlab::Diff::Position.new(
+      old_path: "files/ruby/popen.rb",
+      new_path: "files/ruby/popen.rb",
+      old_line: nil,
+      new_line: 14,
+      diff_refs: commit.diff_refs
+    )
+  end
+
+  def publish(draft: nil)
+    DraftNotes::PublishService.new(merge_request, user).execute(draft)
+  end
+
+  context 'single draft note' do
+    let(:commit_id) { nil }
+    let!(:drafts) { create_list(:draft_note, 2, merge_request: merge_request, author: user, commit_id: commit_id, position: position) }
+
+    it 'publishes' do
+      expect { publish(draft: drafts.first) }.to change { DraftNote.count }.by(-1).and change { Note.count }.by(1)
+      expect(DraftNote.count).to eq(1)
+    end
+
+    it 'does not skip notification', :sidekiq_might_not_need_inline do
+      expect(Notes::CreateService).to receive(:new).with(project, user, drafts.first.publish_params).and_call_original
+      expect_next_instance_of(NotificationService) do |notification_service|
+        expect(notification_service).to receive(:new_note)
+      end
+
+      result = publish(draft: drafts.first)
+
+      expect(result[:status]).to eq(:success)
+    end
+
+    context 'commit_id is set' do
+      let(:commit_id) { commit.id }
+
+      it 'creates note from draft with commit_id' do
+        result = publish(draft: drafts.first)
+
+        expect(result[:status]).to eq(:success)
+        expect(merge_request.notes.first.commit_id).to eq(commit_id)
+      end
+    end
+  end
+
+  context 'multiple draft notes' do
+    let(:commit_id) { nil }
+
+    before do
+      create(:draft_note, merge_request: merge_request, author: user, note: 'first note', commit_id: commit_id, position: position)
+      create(:draft_note, merge_request: merge_request, author: user, note: 'second note', commit_id: commit_id, position: position)
+    end
+
+    context 'when review fails to create' do
+      before do
+        expect_next_instance_of(Review) do |review|
+          allow(review).to receive(:save!).and_raise(ActiveRecord::RecordInvalid.new(review))
+        end
+      end
+
+      it 'does not publish any draft note' do
+        expect { publish }.not_to change { DraftNote.count }
+      end
+
+      it 'returns an error' do
+        result = publish
+
+        expect(result[:status]).to eq(:error)
+        expect(result[:message]).to match(/Unable to save Review/)
+      end
+    end
+
+    it 'returns success' do
+      result = publish
+
+      expect(result[:status]).to eq(:success)
+    end
+
+    it 'publishes all draft notes for a user in a merge request' do
+      expect { publish }.to change { DraftNote.count }.by(-2).and change { Note.count }.by(2).and change { Review.count }.by(1)
+      expect(DraftNote.count).to eq(0)
+
+      notes = merge_request.notes.order(id: :asc)
+      expect(notes.first.note).to eq('first note')
+      expect(notes.last.note).to eq('second note')
+    end
+
+    it 'sends batch notification' do
+      expect_next_instance_of(NotificationService) do |notification_service|
+        expect(notification_service).to receive_message_chain(:async, :new_review).with(kind_of(Review))
+      end
+
+      publish
+    end
+
+    context 'commit_id is set' do
+      let(:commit_id) { commit.id }
+
+      it 'creates note from draft with commit_id' do
+        result = publish
+
+        expect(result[:status]).to eq(:success)
+
+        merge_request.notes.each do |note|
+          expect(note.commit_id).to eq(commit_id)
+        end
+      end
+    end
+  end
+
+  context 'draft notes with suggestions' do
+    let(:project) { create(:project, :repository) }
+    let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
+
+    let(:suggestion_note) do
+      <<-MARKDOWN.strip_heredoc
+        ```suggestion
+          foo
+        ```
+      MARKDOWN
+    end
+
+    let!(:draft) { create(:draft_note_on_text_diff, note: suggestion_note, merge_request: merge_request, author: user) }
+
+    it 'creates a suggestion with correct content' do
+      expect { publish(draft: draft) }.to change { Suggestion.count }.by(1)
+        .and change { DiffNote.count }.from(0).to(1)
+
+      suggestion = Suggestion.last
+
+      expect(suggestion.from_line).to eq(14)
+      expect(suggestion.to_line).to eq(14)
+      expect(suggestion.from_content).to eq("    vars = {\n")
+      expect(suggestion.to_content).to eq("  foo\n")
+    end
+
+    context 'when the diff is changed' do
+      let(:file_path) { 'files/ruby/popen.rb' }
+      let(:branch_name) { project.default_branch }
+      let(:commit) { project.repository.commit }
+
+      def update_file(file_path, new_content)
+        params = {
+          file_path: file_path,
+          commit_message: "Update File",
+          file_content: new_content,
+          start_project: project,
+          start_branch: project.default_branch,
+          branch_name: branch_name
+        }
+
+        Files::UpdateService.new(project, user, params).execute
+      end
+
+      before do
+        project.add_developer(user)
+      end
+
+      it 'creates a suggestion based on the latest diff content and positions' do
+        diff_file = merge_request.diffs(paths: [file_path]).diff_files.first
+        raw_data = diff_file.new_blob.data
+
+        # Add a line break to the beginning of the file
+        result = update_file(file_path, raw_data.prepend("\n"))
+        oldrev = merge_request.diff_head_sha
+        newrev = result[:result]
+
+        expect(newrev).to be_present
+
+        # Generates new MR revision at DB level
+        refresh = MergeRequests::RefreshService.new(project, user)
+        refresh.execute(oldrev, newrev, merge_request.source_branch_ref)
+
+        expect { publish(draft: draft) }.to change { Suggestion.count }.by(1)
+          .and change { DiffNote.count }.from(0).to(1)
+
+        suggestion = Suggestion.last
+
+        expect(suggestion.from_line).to eq(15)
+        expect(suggestion.to_line).to eq(15)
+        expect(suggestion.from_content).to eq("    vars = {\n")
+        expect(suggestion.to_content).to eq("  foo\n")
+      end
+    end
+  end
+
+  it 'only publishes the draft notes belonging to the current user' do
+    other_user = create(:user)
+    project.add_maintainer(other_user)
+
+    create_list(:draft_note, 2, merge_request: merge_request, author: user)
+    create_list(:draft_note, 2, merge_request: merge_request, author: other_user)
+
+    expect { publish }.to change { DraftNote.count }.by(-2).and change { Note.count }.by(2)
+    expect(DraftNote.count).to eq(2)
+  end
+
+  context 'with quick actions' do
+    it 'performs quick actions' do
+      other_user = create(:user)
+      project.add_developer(other_user)
+
+      create(:draft_note, merge_request: merge_request,
+                          author: user,
+                          note: "thanks\n/assign #{other_user.to_reference}")
+
+      expect { publish }.to change { DraftNote.count }.by(-1).and change { Note.count }.by(2)
+      expect(merge_request.reload.assignees).to match_array([other_user])
+      expect(merge_request.notes.last).to be_system
+    end
+
+    it 'does not create a note if it only contains quick actions' do
+      create(:draft_note, merge_request: merge_request, author: user, note: "/assign #{user.to_reference}")
+
+      expect { publish }.to change { DraftNote.count }.by(-1).and change { Note.count }.by(1)
+      expect(merge_request.reload.assignees).to eq([user])
+      expect(merge_request.notes.last).to be_system
+    end
+  end
+
+  context 'with drafts that resolve threads' do
+    let!(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
+    let!(:draft_note) { create(:draft_note, merge_request: merge_request, author: user, resolve_discussion: true, discussion_id: note.discussion.reply_id) }
+
+    it 'resolves the thread' do
+      publish(draft: draft_note)
+
+      expect(note.discussion.resolved?).to be true
+    end
+
+    it 'sends notifications if all threads are resolved' do
+      expect_next_instance_of(MergeRequests::ResolvedDiscussionNotificationService) do |instance|
+        expect(instance).to receive(:execute).with(merge_request)
+      end
+
+      publish
+    end
+  end
+
+  context 'user cannot create notes' do
+    before do
+      allow(Ability).to receive(:allowed?).with(user, :create_note, merge_request).and_return(false)
+    end
+
+    it 'returns an error' do
+      expect(publish[:status]).to eq(:error)
+    end
+  end
+end
diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb
index 987b4ad68f7..73c089334ed 100644
--- a/spec/services/event_create_service_spec.rb
+++ b/spec/services/event_create_service_spec.rb
@@ -5,6 +5,9 @@ require 'spec_helper'
 describe EventCreateService do
   let(:service) { described_class.new }
 
+  let_it_be(:user, reload: true) { create :user }
+  let_it_be(:project) { create(:project) }
+
   describe 'Issues' do
     describe '#open_issue' do
       let(:issue) { create(:issue) }
@@ -13,6 +16,7 @@ describe EventCreateService do
 
       it "creates new event" do
         expect { service.open_issue(issue, issue.author) }.to change { Event.count }
+        expect { service.open_issue(issue, issue.author) }.to change { ResourceStateEvent.count }
       end
     end
 
@@ -23,6 +27,7 @@ describe EventCreateService do
 
       it "creates new event" do
         expect { service.close_issue(issue, issue.author) }.to change { Event.count }
+        expect { service.close_issue(issue, issue.author) }.to change { ResourceStateEvent.count }
       end
     end
 
@@ -33,6 +38,7 @@ describe EventCreateService do
 
       it "creates new event" do
         expect { service.reopen_issue(issue, issue.author) }.to change { Event.count }
+        expect { service.reopen_issue(issue, issue.author) }.to change { ResourceStateEvent.count }
       end
     end
   end
@@ -45,6 +51,7 @@ describe EventCreateService do
 
       it "creates new event" do
         expect { service.open_mr(merge_request, merge_request.author) }.to change { Event.count }
+        expect { service.open_mr(merge_request, merge_request.author) }.to change { ResourceStateEvent.count }
       end
     end
 
@@ -55,6 +62,7 @@ describe EventCreateService do
 
       it "creates new event" do
         expect { service.close_mr(merge_request, merge_request.author) }.to change { Event.count }
+        expect { service.close_mr(merge_request, merge_request.author) }.to change { ResourceStateEvent.count }
       end
     end
 
@@ -65,6 +73,7 @@ describe EventCreateService do
 
       it "creates new event" do
         expect { service.merge_mr(merge_request, merge_request.author) }.to change { Event.count }
+        expect { service.merge_mr(merge_request, merge_request.author) }.to change { ResourceStateEvent.count }
       end
     end
 
@@ -75,13 +84,12 @@ describe EventCreateService do
 
       it "creates new event" do
         expect { service.reopen_mr(merge_request, merge_request.author) }.to change { Event.count }
+        expect { service.reopen_mr(merge_request, merge_request.author) }.to change { ResourceStateEvent.count }
       end
     end
   end
 
   describe 'Milestone' do
-    let(:user) { create :user }
-
     describe '#open_milestone' do
       let(:milestone) { create(:milestone) }
 
@@ -167,7 +175,7 @@ describe EventCreateService do
             wiki_page?: true,
             valid?: true,
             persisted?: true,
-            action: action,
+            action: action.to_s,
             wiki_page: wiki_page,
             author: user
           )
@@ -193,7 +201,7 @@ describe EventCreateService do
       end
     end
 
-    (Event::ACTIONS.values - Event::WIKI_ACTIONS).each do |bad_action|
+    (Event.actions.keys - Event::WIKI_ACTIONS).each do |bad_action|
       context "The action is #{bad_action}" do
         it 'raises an error' do
           expect { service.wiki_event(meta, user, bad_action) }.to raise_error(described_class::IllegalActionError)
@@ -203,9 +211,6 @@ describe EventCreateService do
   end
 
   describe '#push', :clean_gitlab_redis_shared_state do
-    let(:project) { create(:project) }
-    let(:user) { create(:user) }
-
     let(:push_data) do
       {
         commits: [
@@ -227,9 +232,6 @@ describe EventCreateService do
   end
 
   describe '#bulk_push', :clean_gitlab_redis_shared_state do
-    let(:project) { create(:project) }
-    let(:user) { create(:user) }
-
     let(:push_data) do
       {
         action: :created,
@@ -244,9 +246,6 @@ describe EventCreateService do
   end
 
   describe 'Project' do
-    let(:user) { create :user }
-    let(:project) { create(:project) }
-
     describe '#join_project' do
       subject { service.join_project(project, user) }
 
@@ -261,4 +260,81 @@ describe EventCreateService do
       it { expect { subject }.to change { Event.count }.from(0).to(1) }
     end
   end
+
+  describe 'design events' do
+    let_it_be(:design) { create(:design, project: project) }
+    let_it_be(:author) { user }
+
+    shared_examples 'feature flag gated multiple event creation' do
+      context 'the feature flag is off' do
+        before do
+          stub_feature_flags(design_activity_events: false)
+        end
+
+        specify { expect(result).to be_empty }
+        specify { expect { result }.not_to change { Event.count } }
+        specify { expect { result }.not_to exceed_query_limit(0) }
+      end
+
+      context 'the feature flag is enabled for a single project' do
+        before do
+          stub_feature_flags(design_activity_events: project)
+        end
+
+        specify { expect(result).not_to be_empty }
+        specify { expect { result }.to change { Event.count }.by(1) }
+      end
+    end
+
+    describe '#save_designs' do
+      let_it_be(:updated) { create_list(:design, 5) }
+      let_it_be(:created) { create_list(:design, 3) }
+
+      let(:result) { service.save_designs(author, create: created, update: updated) }
+
+      specify { expect { result }.to change { Event.count }.by(8) }
+
+      specify { expect { result }.not_to exceed_query_limit(1) }
+
+      it 'creates 3 created design events' do
+        ids = result.pluck('id')
+        events = Event.created_action.where(id: ids)
+
+        expect(events.map(&:design)).to match_array(created)
+      end
+
+      it 'creates 5 created design events' do
+        ids = result.pluck('id')
+        events = Event.updated_action.where(id: ids)
+
+        expect(events.map(&:design)).to match_array(updated)
+      end
+
+      it_behaves_like 'feature flag gated multiple event creation' do
+        let(:project) { created.first.project }
+      end
+    end
+
+    describe '#destroy_designs' do
+      let_it_be(:designs) { create_list(:design, 5) }
+      let_it_be(:author) { create(:user) }
+
+      let(:result) { service.destroy_designs(designs, author) }
+
+      specify { expect { result }.to change { Event.count }.by(5) }
+
+      specify { expect { result }.not_to exceed_query_limit(1) }
+
+      it 'creates 5 destroyed design events' do
+        ids = result.pluck('id')
+        events = Event.destroyed_action.where(id: ids)
+
+        expect(events.map(&:design)).to match_array(designs)
+      end
+
+      it_behaves_like 'feature flag gated multiple event creation' do
+        let(:project) { designs.first.project }
+      end
+    end
+  end
 end
diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb
index ae0506ad442..908b9772c40 100644
--- a/spec/services/git/branch_hooks_service_spec.rb
+++ b/spec/services/git/branch_hooks_service_spec.rb
@@ -91,7 +91,7 @@ describe Git::BranchHooksService do
   end
 
   describe 'Push Event' do
-    let(:event) { Event.find_by_action(Event::PUSHED) }
+    let(:event) { Event.pushed_action.first }
 
     before do
       service.execute
@@ -101,7 +101,7 @@ describe Git::BranchHooksService do
       it 'generates a push event with one commit' do
         expect(event).to be_an_instance_of(PushEvent)
         expect(event.project).to eq(project)
-        expect(event.action).to eq(Event::PUSHED)
+        expect(event).to be_pushed_action
         expect(event.push_event_payload).to be_an_instance_of(PushEventPayload)
         expect(event.push_event_payload.commit_from).to eq(oldrev)
         expect(event.push_event_payload.commit_to).to eq(newrev)
@@ -117,7 +117,7 @@ describe Git::BranchHooksService do
       it 'generates a push event with more than one commit' do
         expect(event).to be_an_instance_of(PushEvent)
         expect(event.project).to eq(project)
-        expect(event.action).to eq(Event::PUSHED)
+        expect(event).to be_pushed_action
         expect(event.push_event_payload).to be_an_instance_of(PushEventPayload)
         expect(event.push_event_payload.commit_from).to be_nil
         expect(event.push_event_payload.commit_to).to eq(newrev)
@@ -133,7 +133,7 @@ describe Git::BranchHooksService do
       it 'generates a push event with no commits' do
         expect(event).to be_an_instance_of(PushEvent)
         expect(event.project).to eq(project)
-        expect(event.action).to eq(Event::PUSHED)
+        expect(event).to be_pushed_action
         expect(event.push_event_payload).to be_an_instance_of(PushEventPayload)
         expect(event.push_event_payload.commit_from).to eq(oldrev)
         expect(event.push_event_payload.commit_to).to be_nil
diff --git a/spec/services/git/wiki_push_service/change_spec.rb b/spec/services/git/wiki_push_service/change_spec.rb
index 547874270ab..4da3f0fc738 100644
--- a/spec/services/git/wiki_push_service/change_spec.rb
+++ b/spec/services/git/wiki_push_service/change_spec.rb
@@ -89,20 +89,20 @@ describe Git::WikiPushService::Change do
     context 'the page is deleted' do
       let(:operation) { :deleted }
 
-      it { is_expected.to have_attributes(event_action: Event::DESTROYED) }
+      it { is_expected.to have_attributes(event_action: :destroyed) }
     end
 
     context 'the page is added' do
       let(:operation) { :added }
 
-      it { is_expected.to have_attributes(event_action: Event::CREATED) }
+      it { is_expected.to have_attributes(event_action: :created) }
     end
 
     %i[renamed modified].each do |op|
       context "the page is #{op}" do
         let(:operation) { op }
 
-        it { is_expected.to have_attributes(event_action: Event::UPDATED) }
+        it { is_expected.to have_attributes(event_action: :updated) }
       end
     end
   end
diff --git a/spec/services/git/wiki_push_service_spec.rb b/spec/services/git/wiki_push_service_spec.rb
index cdb1dc5a435..b2234c81c24 100644
--- a/spec/services/git/wiki_push_service_spec.rb
+++ b/spec/services/git/wiki_push_service_spec.rb
@@ -54,7 +54,7 @@ describe Git::WikiPushService, services: true do
       it 'handles all known actions' do
         run_service
 
-        expect(Event.last(count).pluck(:action)).to match_array(Event::WIKI_ACTIONS)
+        expect(Event.last(count).pluck(:action)).to match_array(Event::WIKI_ACTIONS.map(&:to_s))
       end
     end
 
@@ -77,7 +77,7 @@ describe Git::WikiPushService, services: true do
       it 'creates appropriate events' do
         run_service
 
-        expect(Event.last(2)).to all(have_attributes(wiki_page?: true, action: Event::CREATED))
+        expect(Event.last(2)).to all(have_attributes(wiki_page?: true, action: 'created'))
       end
     end
 
@@ -100,7 +100,7 @@ describe Git::WikiPushService, services: true do
       it 'creates a wiki page creation event' do
         expect { run_service }.to change(Event, :count).by(1)
 
-        expect(Event.last).to have_attributes(wiki_page?: true, action: Event::CREATED)
+        expect(Event.last).to have_attributes(wiki_page?: true, action: 'created')
       end
 
       it 'creates one metadata record' do
@@ -129,7 +129,7 @@ describe Git::WikiPushService, services: true do
 
         expect(Event.last).to have_attributes(
           wiki_page?: true,
-          action: Event::CREATED
+          action: 'created'
         )
       end
     end
@@ -158,7 +158,7 @@ describe Git::WikiPushService, services: true do
 
         expect(Event.last).to have_attributes(
           wiki_page?: true,
-          action: Event::UPDATED
+          action: 'updated'
         )
       end
     end
@@ -182,7 +182,7 @@ describe Git::WikiPushService, services: true do
 
         expect(Event.last).to have_attributes(
           wiki_page?: true,
-          action: Event::UPDATED
+          action: 'updated'
         )
       end
     end
@@ -206,7 +206,7 @@ describe Git::WikiPushService, services: true do
 
         expect(Event.last).to have_attributes(
           wiki_page?: true,
-          action: Event::DESTROYED
+          action: 'destroyed'
         )
       end
     end
@@ -218,7 +218,7 @@ describe Git::WikiPushService, services: true do
       message = 'something went very very wrong'
       allow_next_instance_of(WikiPages::EventCreateService, current_user) do |service|
         allow(service).to receive(:execute)
-          .with(String, WikiPage, Integer)
+          .with(String, WikiPage, Symbol)
           .and_return(ServiceResponse.error(message: message))
       end
 
diff --git a/spec/services/groups/group_links/destroy_service_spec.rb b/spec/services/groups/group_links/destroy_service_spec.rb
index 284bcd0df2e..8989f024262 100644
--- a/spec/services/groups/group_links/destroy_service_spec.rb
+++ b/spec/services/groups/group_links/destroy_service_spec.rb
@@ -8,14 +8,20 @@ describe Groups::GroupLinks::DestroyService, '#execute' do
   let_it_be(:group) { create(:group, :private) }
   let_it_be(:shared_group) { create(:group, :private) }
   let_it_be(:project) { create(:project, group: shared_group) }
+  let_it_be(:owner) { create(:user) }
 
-  subject { described_class.new(nil, nil) }
+  before do
+    group.add_developer(owner)
+    shared_group.add_owner(owner)
+  end
+
+  subject { described_class.new(shared_group, owner) }
 
   context 'single link' do
     let!(:link) { create(:group_group_link, shared_group: shared_group, shared_with_group: group) }
 
     it 'destroys link' do
-      expect { subject.execute(link) }.to change { GroupGroupLink.count }.from(1).to(0)
+      expect { subject.execute(link) }.to change { shared_group.shared_with_group_links.count }.from(1).to(0)
     end
 
     it 'revokes project authorization' do
diff --git a/spec/services/groups/import_export/export_service_spec.rb b/spec/services/groups/import_export/export_service_spec.rb
index 7bad68b4e00..ea49b26cc7c 100644
--- a/spec/services/groups/import_export/export_service_spec.rb
+++ b/spec/services/groups/import_export/export_service_spec.rb
@@ -103,12 +103,14 @@ describe Groups::ImportExport::ExportService do
       end
 
       it 'logs the error' do
-        expect(shared.logger).to receive(:error).with(
-          group_id:   group.id,
-          group_name: group.name,
-          error:      expected_message,
-          message:    'Group Import/Export: Export failed'
-        )
+        expect_next_instance_of(Gitlab::Export::Logger) do |logger|
+          expect(logger).to receive(:error).with(
+            group_id: group.id,
+            group_name: group.name,
+            errors: expected_message,
+            message: 'Group Export failed'
+          )
+        end
 
         expect { service.execute }.to raise_error(Gitlab::ImportExport::Error)
       end
@@ -132,7 +134,7 @@ describe Groups::ImportExport::ExportService do
           expect { service.execute }.to raise_error(Gitlab::ImportExport::Error)
 
           expect(group.import_export_upload).to be_nil
-          expect(File.exist?(shared.archive_path)).to eq(false)
+          expect(Dir.exist?(shared.base_path)).to eq(false)
         end
 
         it 'notifies the user about failed group export' do
@@ -157,12 +159,13 @@ describe Groups::ImportExport::ExportService do
           expect { service.execute }.to raise_error(Gitlab::ImportExport::Error)
 
           expect(group.import_export_upload).to be_nil
-          expect(File.exist?(shared.archive_path)).to eq(false)
+          expect(Dir.exist?(shared.base_path)).to eq(false)
         end
 
         it 'notifies logger' do
           allow(service).to receive_message_chain(:tree_exporter, :save).and_return(false)
-          expect(shared.logger).to receive(:error)
+
+          expect(service.instance_variable_get(:@logger)).to receive(:error)
 
           expect { service.execute }.to raise_error(Gitlab::ImportExport::Error)
         end
diff --git a/spec/services/groups/import_export/import_service_spec.rb b/spec/services/groups/import_export/import_service_spec.rb
index 256e0a1b3c5..1f7eaccbdbd 100644
--- a/spec/services/groups/import_export/import_service_spec.rb
+++ b/spec/services/groups/import_export/import_service_spec.rb
@@ -3,6 +3,47 @@
 require 'spec_helper'
 
 describe Groups::ImportExport::ImportService do
+  describe '#async_execute' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:group) { create(:group) }
+
+    context 'when the job can be successfully scheduled' do
+      subject(:import_service) { described_class.new(group: group, user: user) }
+
+      it 'enqueues an import job' do
+        expect(GroupImportWorker).to receive(:perform_async).with(user.id, group.id)
+
+        import_service.async_execute
+      end
+
+      it 'marks the group import as in progress' do
+        import_service.async_execute
+
+        expect(group.import_state.in_progress?).to eq true
+      end
+
+      it 'returns truthy' do
+        expect(import_service.async_execute).to be_truthy
+      end
+    end
+
+    context 'when the job cannot be scheduled' do
+      subject(:import_service) { described_class.new(group: group, user: user) }
+
+      before do
+        allow(GroupImportWorker).to receive(:perform_async).and_return(nil)
+      end
+
+      it 'returns falsey' do
+        expect(import_service.async_execute).to be_falsey
+      end
+
+      it 'does not mark the group import as created' do
+        expect { import_service.async_execute }.not_to change { group.import_state }
+      end
+    end
+  end
+
   context 'with group_import_ndjson feature flag disabled' do
     let(:user) { create(:admin) }
     let(:group) { create(:group) }
@@ -60,6 +101,7 @@ describe Groups::ImportExport::ImportService do
         allow(Gitlab::Import::Logger).to receive(:build).and_return(import_logger)
         allow(import_logger).to receive(:error)
         allow(import_logger).to receive(:info)
+        allow(FileUtils).to receive(:rm_rf).and_call_original
       end
 
       context 'when user has correct permissions' do
@@ -73,6 +115,16 @@ describe Groups::ImportExport::ImportService do
           expect(group.import_export_upload.import_file.file).to be_nil
         end
 
+        it 'removes tmp files' do
+          shared = Gitlab::ImportExport::Shared.new(group)
+          allow(Gitlab::ImportExport::Shared).to receive(:new).and_return(shared)
+
+          subject
+
+          expect(FileUtils).to have_received(:rm_rf).with(shared.base_path)
+          expect(Dir.exist?(shared.base_path)).to eq(false)
+        end
+
         it 'logs the import success' do
           expect(import_logger).to receive(:info).with(
             group_id:   group.id,
@@ -160,6 +212,7 @@ describe Groups::ImportExport::ImportService do
         allow(Gitlab::Import::Logger).to receive(:build).and_return(import_logger)
         allow(import_logger).to receive(:error)
         allow(import_logger).to receive(:info)
+        allow(FileUtils).to receive(:rm_rf).and_call_original
       end
 
       context 'when user has correct permissions' do
@@ -173,6 +226,16 @@ describe Groups::ImportExport::ImportService do
           expect(group.import_export_upload.import_file.file).to be_nil
         end
 
+        it 'removes tmp files' do
+          shared = Gitlab::ImportExport::Shared.new(group)
+          allow(Gitlab::ImportExport::Shared).to receive(:new).and_return(shared)
+
+          subject
+
+          expect(FileUtils).to have_received(:rm_rf).with(shared.base_path)
+          expect(Dir.exist?(shared.base_path)).to eq(false)
+        end
+
         it 'logs the import success' do
           expect(import_logger).to receive(:info).with(
             group_id:   group.id,
diff --git a/spec/services/groups/transfer_service_spec.rb b/spec/services/groups/transfer_service_spec.rb
index bbf5bbbf814..d7f6bececfe 100644
--- a/spec/services/groups/transfer_service_spec.rb
+++ b/spec/services/groups/transfer_service_spec.rb
@@ -216,6 +216,15 @@ describe Groups::TransferService do
         end
       end
 
+      context 'when a group is transferred to its subgroup' do
+        let(:new_parent_group) { create(:group, parent: group) }
+
+        it 'does not execute the transfer' do
+          expect(transfer_service.execute(new_parent_group)).to be_falsy
+          expect(transfer_service.error).to match(/Cannot transfer group to one of its subgroup/)
+        end
+      end
+
       context 'when transferring a group with group descendants' do
         let!(:subgroup1) { create(:group, :private, parent: group) }
         let!(:subgroup2) { create(:group, :internal, parent: group) }
diff --git a/spec/services/import/github_service_spec.rb b/spec/services/import/github_service_spec.rb
new file mode 100644
index 00000000000..461b17e0e33
--- /dev/null
+++ b/spec/services/import/github_service_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Import::GithubService do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:token) { 'complex-token' }
+  let_it_be(:access_params) { { github_access_token: 'github-complex-token' } }
+  let_it_be(:client) { Gitlab::LegacyGithubImport::Client.new(token) }
+  let_it_be(:params) { { repo_id: 123, new_name: 'new_repo', target_namespace: 'root' } }
+
+  let(:subject) { described_class.new(client, user, params) }
+
+  before do
+    allow(subject).to receive(:authorized?).and_return(true)
+  end
+
+  context 'do not raise an exception on input error' do
+    let(:exception) { Octokit::ClientError.new(status: 404, body: 'Not Found') }
+
+    before do
+      expect(client).to receive(:repo).and_raise(exception)
+    end
+
+    it 'logs the original error' do
+      expect(Gitlab::Import::Logger).to receive(:error).with({
+        message: 'Import failed due to a GitHub error',
+        status: 404,
+        error: 'Not Found'
+      }).and_call_original
+
+      subject.execute(access_params, :github)
+    end
+
+    it 'returns an error' do
+      result = subject.execute(access_params, :github)
+
+      expect(result).to include(
+        message: 'Import failed due to a GitHub error: Not Found',
+        status: :error,
+        http_status: :unprocessable_entity
+      )
+    end
+  end
+
+  it 'raises an exception for unknown error causes' do
+    exception = StandardError.new('Not Implemented')
+
+    expect(client).to receive(:repo).and_raise(exception)
+
+    expect(Gitlab::Import::Logger).not_to receive(:error)
+
+    expect { subject.execute(access_params, :github) }.to raise_error(exception)
+  end
+end
diff --git a/spec/services/integrations/test/project_service_spec.rb b/spec/services/integrations/test/project_service_spec.rb
new file mode 100644
index 00000000000..fdb43ca345a
--- /dev/null
+++ b/spec/services/integrations/test/project_service_spec.rb
@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Integrations::Test::ProjectService do
+  let(:user) { double('user') }
+
+  describe '#execute' do
+    let(:project) { create(:project) }
+    let(:integration) { create(:slack_service, project: project) }
+    let(:event) { nil }
+    let(:sample_data) { { data: 'sample' } }
+    let(:success_result) { { success: true, result: {} } }
+
+    subject { described_class.new(integration, user, event).execute }
+
+    context 'without event specified' do
+      it 'tests the integration with default data' do
+        allow(Gitlab::DataBuilder::Push).to receive(:build_sample).and_return(sample_data)
+
+        expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+        expect(subject).to eq(success_result)
+      end
+
+      context 'PipelinesEmailService' do
+        let(:integration) { create(:pipelines_email_service, project: project) }
+
+        it_behaves_like 'tests for integration with pipeline data'
+      end
+    end
+
+    context 'with event specified' do
+      context 'event not supported by integration' do
+        let(:integration) { create(:jira_service, project: project) }
+        let(:event) { 'push' }
+
+        it 'returns error message' do
+          expect(subject).to include({ status: :error, message: 'Testing not available for this event' })
+        end
+      end
+
+      context 'push' do
+        let(:event) { 'push' }
+
+        it 'executes integration' do
+          allow(Gitlab::DataBuilder::Push).to receive(:build_sample).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'tag_push' do
+        let(:event) { 'tag_push' }
+
+        it 'executes integration' do
+          allow(Gitlab::DataBuilder::Push).to receive(:build_sample).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'note' do
+        let(:event) { 'note' }
+
+        it 'returns error message if not enough data' do
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the project has notes.' })
+        end
+
+        it 'executes integration' do
+          allow(project).to receive(:notes).and_return([Note.new])
+          allow(Gitlab::DataBuilder::Note).to receive(:build).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'issue' do
+        let(:event) { 'issue' }
+        let(:issue) { build(:issue) }
+
+        it 'returns error message if not enough data' do
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the project has issues.' })
+        end
+
+        it 'executes integration' do
+          allow(project).to receive(:issues).and_return([issue])
+          allow(issue).to receive(:to_hook_data).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'confidential_issue' do
+        let(:event) { 'confidential_issue' }
+        let(:issue) { build(:issue) }
+
+        it 'returns error message if not enough data' do
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the project has issues.' })
+        end
+
+        it 'executes integration' do
+          allow(project).to receive(:issues).and_return([issue])
+          allow(issue).to receive(:to_hook_data).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'merge_request' do
+        let(:event) { 'merge_request' }
+
+        it 'returns error message if not enough data' do
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the project has merge requests.' })
+        end
+
+        it 'executes integration' do
+          create(:merge_request, source_project: project)
+          allow_any_instance_of(MergeRequest).to receive(:to_hook_data).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'deployment' do
+        let(:project) { create(:project, :test_repo) }
+        let(:event) { 'deployment' }
+
+        it 'returns error message if not enough data' do
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the project has deployments.' })
+        end
+
+        it 'executes integration' do
+          create(:deployment, project: project)
+          allow(Gitlab::DataBuilder::Deployment).to receive(:build).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'pipeline' do
+        let(:event) { 'pipeline' }
+
+        it 'returns error message if not enough data' do
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the project has CI pipelines.' })
+        end
+
+        it 'executes integration' do
+          create(:ci_empty_pipeline, project: project)
+          allow(Gitlab::DataBuilder::Pipeline).to receive(:build).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+
+      context 'wiki_page' do
+        let(:project) { create(:project, :wiki_repo) }
+        let(:event) { 'wiki_page' }
+
+        it 'returns error message if wiki disabled' do
+          allow(project).to receive(:wiki_enabled?).and_return(false)
+
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the wiki is enabled and has pages.' })
+        end
+
+        it 'returns error message if not enough data' do
+          expect(integration).not_to receive(:test)
+          expect(subject).to include({ status: :error, message: 'Ensure the wiki is enabled and has pages.' })
+        end
+
+        it 'executes integration' do
+          create(:wiki_page, wiki: project.wiki)
+          allow(Gitlab::DataBuilder::WikiPage).to receive(:build).and_return(sample_data)
+
+          expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+          expect(subject).to eq(success_result)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/issuable/bulk_update_service_spec.rb b/spec/services/issuable/bulk_update_service_spec.rb
index f82a3cee1d9..c791c454d70 100644
--- a/spec/services/issuable/bulk_update_service_spec.rb
+++ b/spec/services/issuable/bulk_update_service_spec.rb
@@ -42,13 +42,11 @@ describe Issuable::BulkUpdateService do
     let(:issue_no_labels) { create(:issue, project: project) }
     let(:issues) { [issue_all_labels, issue_bug_and_regression, issue_bug_and_merge_requests, issue_no_labels] }
 
-    let(:labels) { [] }
     let(:add_labels) { [] }
     let(:remove_labels) { [] }
 
     let(:bulk_update_params) do
       {
-        label_ids:        labels.map(&:id),
         add_label_ids:    add_labels.map(&:id),
         remove_label_ids: remove_labels.map(&:id)
       }
@@ -58,27 +56,6 @@ describe Issuable::BulkUpdateService do
       bulk_update(issues, bulk_update_params)
     end
 
-    context 'when label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_no_labels] }
-      let(:labels) { [bug, regression] }
-
-      it 'updates the labels of all issues passed to the labels passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(match_array(labels.map(&:id)))
-      end
-
-      it 'does not update issues not passed in' do
-        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
-      end
-
-      context 'when those label IDs are empty' do
-        let(:labels) { [] }
-
-        it 'updates the issues passed to have no labels' do
-          expect(issues.map(&:reload).map(&:label_ids)).to all(be_empty)
-        end
-      end
-    end
-
     context 'when add_label_ids are passed' do
       let(:issues) { [issue_all_labels, issue_bug_and_merge_requests, issue_no_labels] }
       let(:add_labels) { [bug, regression, merge_requests] }
@@ -122,69 +99,21 @@ describe Issuable::BulkUpdateService do
         expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
       end
     end
+  end
 
-    context 'when add_label_ids and label_ids are passed' do
-      let(:issues) { [issue_all_labels, issue_bug_and_regression, issue_bug_and_merge_requests] }
-      let(:labels) { [merge_requests] }
-      let(:add_labels) { [regression] }
-
-      it 'adds the label IDs to all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(regression.id))
-      end
-
-      it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(bug.id))
-      end
-
-      it 'does not update issues not passed in' do
-        expect(issue_no_labels.label_ids).to be_empty
-      end
-    end
-
-    context 'when remove_label_ids and label_ids are passed' do
-      let(:issues) { [issue_no_labels, issue_bug_and_regression] }
-      let(:labels) { [merge_requests] }
-      let(:remove_labels) { [regression] }
-
-      it 'removes the label IDs from all issues passed' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(regression.id)
-      end
-
-      it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(merge_requests.id)
-      end
-
-      it 'does not update issues not passed in' do
-        expect(issue_all_labels.label_ids).to contain_exactly(bug.id, regression.id, merge_requests.id)
-      end
-    end
-
-    context 'when add_label_ids, remove_label_ids, and label_ids are passed' do
-      let(:issues) { [issue_bug_and_merge_requests, issue_no_labels] }
-      let(:labels) { [regression] }
-      let(:add_labels) { [bug] }
-      let(:remove_labels) { [merge_requests] }
-
-      it 'adds the label IDs to all issues passed' do
-        expect(issues.map(&:reload).map(&:label_ids)).to all(include(bug.id))
-      end
+  context 'with issuables at a project level' do
+    let(:parent) { project }
 
-      it 'removes the label IDs from all issues passed' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(merge_requests.id)
-      end
+    context 'with unpermitted attributes' do
+      let(:issues) { create_list(:issue, 2, project: project) }
+      let(:label) { create(:label, project: project) }
 
-      it 'ignores the label IDs parameter' do
-        expect(issues.map(&:reload).flat_map(&:label_ids)).not_to include(regression.id)
-      end
+      it 'does not update the issues' do
+        bulk_update(issues, label_ids: [label.id])
 
-      it 'does not update issues not passed in' do
-        expect(issue_bug_and_regression.label_ids).to contain_exactly(bug.id, regression.id)
+        expect(issues.map(&:reload).map(&:label_ids)).not_to include(label.id)
       end
     end
-  end
-
-  context 'with issuables at a project level' do
-    let(:parent) { project }
 
     describe 'close issues' do
       let(:issues) { create_list(:issue, 2, project: project) }
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index 6fc1928d47b..78eba565de4 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -224,11 +224,26 @@ describe Issues::CloseService do
         expect(email.subject).to include(issue.title)
       end
 
-      it 'creates system note about issue reassign' do
-        close_issue
+      context 'when resource state events are disabled' do
+        before do
+          stub_feature_flags(track_resource_state_change_events: false)
+        end
+
+        it 'creates system note about the issue being closed' do
+          close_issue
+
+          note = issue.notes.last
+          expect(note.note).to include "closed"
+        end
+      end
 
-        note = issue.notes.last
-        expect(note.note).to include "closed"
+      context 'when resource state events are enabled' do
+        it 'creates resource state event about the issue being closed' do
+          close_issue
+
+          event = issue.resource_state_events.last
+          expect(event.state).to eq('closed')
+        end
       end
 
       it 'marks todos as done' do
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 7a251e03e51..bb02941576a 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -458,7 +458,7 @@ describe Issues::CreateService do
         context 'when SpamVerdictService requires reCAPTCHA' do
           before do
             expect_next_instance_of(Spam::SpamVerdictService) do |verdict_service|
-              expect(verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+              expect(verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
             end
           end
 
diff --git a/spec/services/issues/import_csv_service_spec.rb b/spec/services/issues/import_csv_service_spec.rb
index aa43892a36d..92b88489af9 100644
--- a/spec/services/issues/import_csv_service_spec.rb
+++ b/spec/services/issues/import_csv_service_spec.rb
@@ -18,9 +18,7 @@ describe Issues::ImportCsvService do
       let(:file) { fixture_file_upload('spec/fixtures/banana_sample.gif') }
 
       it 'returns invalid file error' do
-        expect_next_instance_of(Notify) do |instance|
-          expect(instance).to receive(:import_issues_csv_email)
-        end
+        expect(Notify).to receive_message_chain(:import_issues_csv_email, :deliver_later)
 
         expect(subject[:success]).to eq(0)
         expect(subject[:parse_error]).to eq(true)
@@ -31,9 +29,7 @@ describe Issues::ImportCsvService do
       let(:file) { fixture_file_upload('spec/fixtures/csv_gitlab_export.csv') }
 
       it 'imports the CSV without errors' do
-        expect_next_instance_of(Notify) do |instance|
-          expect(instance).to receive(:import_issues_csv_email)
-        end
+        expect(Notify).to receive_message_chain(:import_issues_csv_email, :deliver_later)
 
         expect(subject[:success]).to eq(4)
         expect(subject[:error_lines]).to eq([])
@@ -54,9 +50,7 @@ describe Issues::ImportCsvService do
       let(:file) { fixture_file_upload('spec/fixtures/csv_comma.csv') }
 
       it 'imports CSV without errors' do
-        expect_next_instance_of(Notify) do |instance|
-          expect(instance).to receive(:import_issues_csv_email)
-        end
+        expect(Notify).to receive_message_chain(:import_issues_csv_email, :deliver_later)
 
         expect(subject[:success]).to eq(3)
         expect(subject[:error_lines]).to eq([])
@@ -77,9 +71,7 @@ describe Issues::ImportCsvService do
       let(:file) { fixture_file_upload('spec/fixtures/csv_tab.csv') }
 
       it 'imports CSV with some error rows' do
-        expect_next_instance_of(Notify) do |instance|
-          expect(instance).to receive(:import_issues_csv_email)
-        end
+        expect(Notify).to receive_message_chain(:import_issues_csv_email, :deliver_later)
 
         expect(subject[:success]).to eq(2)
         expect(subject[:error_lines]).to eq([3])
@@ -100,9 +92,7 @@ describe Issues::ImportCsvService do
       let(:file) { fixture_file_upload('spec/fixtures/csv_semicolon.csv') }
 
       it 'imports CSV with a blank row' do
-        expect_next_instance_of(Notify) do |instance|
-          expect(instance).to receive(:import_issues_csv_email)
-        end
+        expect(Notify).to receive_message_chain(:import_issues_csv_email, :deliver_later)
 
         expect(subject[:success]).to eq(3)
         expect(subject[:error_lines]).to eq([4])
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 80039049bc3..33ae2682d01 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -3,13 +3,13 @@
 require 'spec_helper'
 
 describe Issues::UpdateService, :mailer do
-  let(:user) { create(:user) }
-  let(:user2) { create(:user) }
-  let(:user3) { create(:user) }
-  let(:group) { create(:group, :public) }
-  let(:project) { create(:project, :repository, group: group) }
-  let(:label) { create(:label, project: project) }
-  let(:label2) { create(:label) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:user2) { create(:user) }
+  let_it_be(:user3) { create(:user) }
+  let_it_be(:group) { create(:group, :public) }
+  let_it_be(:project, reload: true) { create(:project, :repository, group: group) }
+  let_it_be(:label) { create(:label, project: project) }
+  let_it_be(:label2) { create(:label, project: project) }
 
   let(:issue) do
     create(:issue, title: 'Old title',
@@ -19,7 +19,7 @@ describe Issues::UpdateService, :mailer do
                    author: create(:user))
   end
 
-  before do
+  before_all do
     project.add_maintainer(user)
     project.add_developer(user2)
     project.add_developer(user3)
@@ -669,28 +669,24 @@ describe Issues::UpdateService, :mailer do
       context 'when add_label_ids and label_ids are passed' do
         let(:params) { { label_ids: [label.id], add_label_ids: [label3.id] } }
 
-        it 'ignores the label_ids parameter' do
-          expect(result.label_ids).not_to include(label.id)
+        before do
+          issue.update(labels: [label2])
         end
 
-        it 'adds the passed labels' do
-          expect(result.label_ids).to include(label3.id)
+        it 'replaces the labels with the ones in label_ids and adds those in add_label_ids' do
+          expect(result.label_ids).to contain_exactly(label.id, label3.id)
         end
       end
 
       context 'when remove_label_ids and label_ids are passed' do
-        let(:params) { { label_ids: [], remove_label_ids: [label.id] } }
+        let(:params) { { label_ids: [label.id, label2.id, label3.id], remove_label_ids: [label.id] } }
 
         before do
           issue.update(labels: [label, label3])
         end
 
-        it 'ignores the label_ids parameter' do
-          expect(result.label_ids).not_to be_empty
-        end
-
-        it 'removes the passed labels' do
-          expect(result.label_ids).not_to include(label.id)
+        it 'replaces the labels with the ones in label_ids and removes those in remove_label_ids' do
+          expect(result.label_ids).to contain_exactly(label2.id, label3.id)
         end
       end
 
diff --git a/spec/services/jira/requests/projects_spec.rb b/spec/services/jira/requests/projects_spec.rb
new file mode 100644
index 00000000000..f7b9aa7c00c
--- /dev/null
+++ b/spec/services/jira/requests/projects_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Jira::Requests::Projects do
+  let(:jira_service) { create(:jira_service) }
+  let(:params) { {} }
+
+  describe '#execute' do
+    let(:service) { described_class.new(jira_service, params) }
+
+    subject { service.execute }
+
+    context 'without jira_service' do
+      before do
+        jira_service.update!(active: false)
+      end
+
+      it 'returns an error response' do
+        expect(subject.error?).to be_truthy
+        expect(subject.message).to eq('Jira service not configured.')
+      end
+    end
+
+    context 'when jira_service is nil' do
+      let(:jira_service) { nil }
+
+      it 'returns an error response' do
+        expect(subject.error?).to be_truthy
+        expect(subject.message).to eq('Jira service not configured.')
+      end
+    end
+
+    context 'with jira_service' do
+      context 'when limit is invalid' do
+        let(:params) { { limit: 0 } }
+
+        it 'returns a paylod with no projects returned' do
+          expect(subject.payload[:projects]).to be_empty
+        end
+      end
+
+      context 'when validations and params are ok' do
+        let(:client) { double(options: { site: 'https://jira.example.com' }) }
+
+        before do
+          expect(service).to receive(:client).at_least(:once).and_return(client)
+        end
+
+        context 'when the request to Jira returns an error' do
+          before do
+            expect(client).to receive(:get).and_raise(Timeout::Error)
+          end
+
+          it 'returns an error response' do
+            expect(subject.error?).to be_truthy
+            expect(subject.message).to eq('Jira request error: Timeout::Error')
+          end
+        end
+
+        context 'when the request does not return any values' do
+          before do
+            expect(client).to receive(:get).and_return({ 'someKey' => 'value' })
+          end
+
+          it 'returns a paylod with no projects returned' do
+            payload = subject.payload
+
+            expect(subject.success?).to be_truthy
+            expect(payload[:projects]).to be_empty
+            expect(payload[:is_last]).to be_truthy
+          end
+        end
+
+        context 'when the request returns values' do
+          before do
+            expect(client).to receive(:get).and_return(
+              { 'values' => %w(project1 project2), 'isLast' => false }
+            )
+            expect(JIRA::Resource::Project).to receive(:build).with(client, 'project1').and_return('jira_project1')
+            expect(JIRA::Resource::Project).to receive(:build).with(client, 'project2').and_return('jira_project2')
+          end
+
+          it 'returns a paylod with jira projets' do
+            payload = subject.payload
+
+            expect(subject.success?).to be_truthy
+            expect(payload[:projects]).to eq(%w(jira_project1 jira_project2))
+            expect(payload[:is_last]).to be_falsey
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/jira_import/start_import_service_spec.rb b/spec/services/jira_import/start_import_service_spec.rb
index 759e4f3363f..9dc8cdb1475 100644
--- a/spec/services/jira_import/start_import_service_spec.rb
+++ b/spec/services/jira_import/start_import_service_spec.rb
@@ -13,7 +13,7 @@ describe JiraImport::StartImportService do
 
   context 'when an error is returned from the project validation' do
     before do
-      allow(project).to receive(:validate_jira_import_settings!)
+      allow(Gitlab::JiraImport).to receive(:validate_project_settings!)
         .and_raise(Projects::ImportService::Error, 'Jira import feature is disabled.')
     end
 
@@ -25,7 +25,7 @@ describe JiraImport::StartImportService do
 
     before do
       stub_jira_service_test
-      allow(project).to receive(:validate_jira_import_settings!)
+      allow(Gitlab::JiraImport).to receive(:validate_project_settings!)
     end
 
     context 'when Jira project key is not provided' do
@@ -45,6 +45,22 @@ describe JiraImport::StartImportService do
         it_behaves_like 'responds with error', 'Jira import is already running.'
       end
 
+      context 'when an error is raised while scheduling import' do
+        before do
+          expect_next_instance_of(JiraImportState) do |jira_impport|
+            expect(jira_impport).to receive(:schedule!).and_raise(Projects::ImportService::Error, 'Unexpected failure.')
+          end
+        end
+
+        it_behaves_like 'responds with error', 'Unexpected failure.'
+
+        it 'saves the error message' do
+          subject
+
+          expect(JiraImportState.last.error_message).to eq('Unexpected failure.')
+        end
+      end
+
       context 'when everything is ok' do
         it 'returns success response' do
           expect(subject).to be_a(ServiceResponse)
@@ -57,7 +73,7 @@ describe JiraImport::StartImportService do
           expect(project.latest_jira_import).to be_scheduled
         end
 
-        it 'creates Jira import data' do
+        it 'creates Jira import data', :aggregate_failures do
           jira_import = subject.payload[:import_data]
 
           expect(jira_import.jira_project_xid).to eq(0)
@@ -72,8 +88,8 @@ describe JiraImport::StartImportService do
 
         it 'creates Jira label title with correct number' do
           jira_import = subject.payload[:import_data]
-
           label_title = "jira-import::#{jira_import.jira_project_key}-1"
+
           expect(jira_import.label.title).to eq(label_title)
         end
       end
@@ -83,8 +99,8 @@ describe JiraImport::StartImportService do
 
         it 'creates Jira label title with correct number' do
           jira_import = subject.payload[:import_data]
-
           label_title = "jira-import::#{jira_import.jira_project_key}-4"
+
           expect(jira_import.label.title).to eq(label_title)
         end
       end
diff --git a/spec/services/jira_import/users_importer_spec.rb b/spec/services/jira_import/users_importer_spec.rb
new file mode 100644
index 00000000000..28ce5f1b44b
--- /dev/null
+++ b/spec/services/jira_import/users_importer_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe JiraImport::UsersImporter do
+  include JiraServiceHelper
+
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project, reload: true) { create(:project) }
+  let_it_be(:start_at) { 7 }
+
+  let(:importer) { described_class.new(user, project, start_at) }
+
+  subject { importer.execute }
+
+  describe '#execute' do
+    before do
+      stub_jira_service_test
+      project.add_maintainer(user)
+    end
+
+    context 'when Jira import is not configured properly' do
+      it 'returns an error' do
+        expect(subject.errors).to eq(['Jira integration not configured.'])
+      end
+    end
+
+    context 'when Jira import is configured correctly' do
+      let_it_be(:jira_service) { create(:jira_service, project: project, active: true) }
+      let(:client) { double }
+
+      before do
+        expect(importer).to receive(:client).and_return(client)
+      end
+
+      context 'when jira client raises an error' do
+        it 'returns an error response' do
+          expect(client).to receive(:get).and_raise(Timeout::Error)
+
+          expect(subject.error?).to be_truthy
+          expect(subject.message).to include('There was an error when communicating to Jira')
+        end
+      end
+
+      context 'when jira client returns result' do
+        before do
+          allow(client).to receive(:get).with('/rest/api/2/users?maxResults=50&startAt=7')
+            .and_return(jira_users)
+        end
+
+        context 'when jira client returns an empty array' do
+          let(:jira_users) { [] }
+
+          it 'retturns nil payload' do
+            expect(subject.success?).to be_truthy
+            expect(subject.payload).to be_nil
+          end
+        end
+
+        context 'when jira client returns an results' do
+          let(:jira_users)   { [{ 'name' => 'user1' }, { 'name' => 'user2' }] }
+          let(:mapped_users) { [{ jira_display_name: 'user1', gitlab_id: 5 }] }
+
+          before do
+            expect(JiraImport::UsersMapper).to receive(:new).with(project, jira_users)
+            .and_return(double(execute: mapped_users))
+          end
+
+          it 'returns the mapped users' do
+            expect(subject.success?).to be_truthy
+            expect(subject.payload).to eq(mapped_users)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/jira_import/users_mapper_spec.rb b/spec/services/jira_import/users_mapper_spec.rb
new file mode 100644
index 00000000000..75dbc41aa2e
--- /dev/null
+++ b/spec/services/jira_import/users_mapper_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe JiraImport::UsersMapper do
+  let_it_be(:project) { create(:project) }
+
+  subject { described_class.new(project, jira_users).execute }
+
+  describe '#execute' do
+    context 'jira_users is nil' do
+      let(:jira_users) { nil }
+
+      it 'returns an empty array' do
+        expect(subject).to be_empty
+      end
+    end
+
+    context 'when jira_users is present' do
+      let(:jira_users) do
+        [
+          { 'accountId' => 'abcd', 'displayName' => 'user1' },
+          { 'accountId' => 'efg' },
+          { 'accountId' => 'hij', 'displayName' => 'user3', 'emailAddress' => 'user3@example.com' }
+        ]
+      end
+
+      # TODO: now we only create an array in a proper format
+      # mapping is tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/219023
+      let(:mapped_users) do
+        [
+          { jira_account_id: 'abcd', jira_display_name: 'user1', jira_email: nil, gitlab_id: nil },
+          { jira_account_id: 'efg', jira_display_name: nil, jira_email: nil, gitlab_id: nil },
+          { jira_account_id: 'hij', jira_display_name: 'user3', jira_email: 'user3@example.com', gitlab_id: nil }
+        ]
+      end
+
+      it 'returns users mapped to Gitlab' do
+        expect(subject).to eq(mapped_users)
+      end
+    end
+  end
+end
diff --git a/spec/services/labels/available_labels_service_spec.rb b/spec/services/labels/available_labels_service_spec.rb
index 3ba1add121d..56826257d6f 100644
--- a/spec/services/labels/available_labels_service_spec.rb
+++ b/spec/services/labels/available_labels_service_spec.rb
@@ -73,6 +73,12 @@ describe Labels::AvailableLabelsService do
 
         expect(result).to match_array([project_label.id, group_label.id])
       end
+
+      it 'returns labels in preserved order' do
+        result = described_class.new(user, project, ids: label_ids.reverse).filter_labels_ids_in_param(:ids)
+
+        expect(result).to eq([group_label.id, project_label.id])
+      end
     end
 
     context 'when parent is a group' do
diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb
index b037b73752e..0e51de48fb1 100644
--- a/spec/services/merge_requests/close_service_spec.rb
+++ b/spec/services/merge_requests/close_service_spec.rb
@@ -19,45 +19,54 @@ describe MergeRequests::CloseService do
   describe '#execute' do
     it_behaves_like 'cache counters invalidator'
 
-    context 'valid params' do
-      let(:service) { described_class.new(project, user, {}) }
+    [true, false].each do |state_tracking_enabled|
+      context "valid params with state_tracking #{state_tracking_enabled ? 'enabled' : 'disabled'}" do
+        let(:service) { described_class.new(project, user, {}) }
 
-      before do
-        allow(service).to receive(:execute_hooks)
+        before do
+          stub_feature_flags(track_resource_state_change_events: state_tracking_enabled)
 
-        perform_enqueued_jobs do
-          @merge_request = service.execute(merge_request)
+          allow(service).to receive(:execute_hooks)
+
+          perform_enqueued_jobs do
+            @merge_request = service.execute(merge_request)
+          end
         end
-      end
 
-      it { expect(@merge_request).to be_valid }
-      it { expect(@merge_request).to be_closed }
+        it { expect(@merge_request).to be_valid }
+        it { expect(@merge_request).to be_closed }
 
-      it 'executes hooks with close action' do
-        expect(service).to have_received(:execute_hooks)
+        it 'executes hooks with close action' do
+          expect(service).to have_received(:execute_hooks)
                                .with(@merge_request, 'close')
-      end
+        end
 
-      it 'sends email to user2 about assign of new merge_request', :sidekiq_might_not_need_inline do
-        email = ActionMailer::Base.deliveries.last
-        expect(email.to.first).to eq(user2.email)
-        expect(email.subject).to include(merge_request.title)
-      end
+        it 'sends email to user2 about assign of new merge_request', :sidekiq_might_not_need_inline do
+          email = ActionMailer::Base.deliveries.last
+          expect(email.to.first).to eq(user2.email)
+          expect(email.subject).to include(merge_request.title)
+        end
 
-      it 'creates system note about merge_request reassign' do
-        note = @merge_request.notes.last
-        expect(note.note).to include 'closed'
-      end
+        it 'creates system note about merge_request reassign' do
+          if state_tracking_enabled
+            event = @merge_request.resource_state_events.last
+            expect(event.state).to eq('closed')
+          else
+            note = @merge_request.notes.last
+            expect(note.note).to include 'closed'
+          end
+        end
 
-      it 'marks todos as done' do
-        expect(todo.reload).to be_done
-      end
+        it 'marks todos as done' do
+          expect(todo.reload).to be_done
+        end
 
-      context 'when auto merge is enabled' do
-        let(:merge_request) { create(:merge_request, :merge_when_pipeline_succeeds) }
+        context 'when auto merge is enabled' do
+          let(:merge_request) { create(:merge_request, :merge_when_pipeline_succeeds) }
 
-        it 'cancels the auto merge' do
-          expect(@merge_request).not_to be_auto_merge_enabled
+          it 'cancels the auto merge' do
+            expect(@merge_request).not_to be_auto_merge_enabled
+          end
         end
       end
     end
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index 9155db16d17..bb40c399b6e 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -59,7 +59,7 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do
 
       it 'creates exactly 1 create MR event', :sidekiq_might_not_need_inline do
         attributes = {
-          action: Event::CREATED,
+          action: :created,
           target_id: merge_request.id,
           target_type: merge_request.class.name
         }
@@ -136,11 +136,11 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do
         let!(:pipeline_3) { create(:ci_pipeline, project: project, ref: "other_branch", project_id: project.id) }
 
         before do
-          # rubocop: disable DestroyAll
+          # rubocop: disable Cop/DestroyAll
           project.merge_requests
             .where(source_branch: opts[:source_branch], target_branch: opts[:target_branch])
             .destroy_all
-          # rubocop: enable DestroyAll
+          # rubocop: enable Cop/DestroyAll
         end
 
         it 'sets head pipeline' do
diff --git a/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb b/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb
index a1c86467f34..2adf808619d 100644
--- a/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb
+++ b/spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb
@@ -48,12 +48,12 @@ describe MergeRequests::DeleteNonLatestDiffsService, :clean_gitlab_redis_shared_
     end
 
     it 'schedules no removal if there is no non-latest diffs' do
-      # rubocop: disable DestroyAll
+      # rubocop: disable Cop/DestroyAll
       merge_request
         .merge_request_diffs
         .where.not(id: merge_request.latest_merge_request_diff_id)
         .destroy_all
-      # rubocop: enable DestroyAll
+      # rubocop: enable Cop/DestroyAll
 
       expect(DeleteDiffFilesWorker).not_to receive(:bulk_perform_in)
 
diff --git a/spec/services/merge_requests/ff_merge_service_spec.rb b/spec/services/merge_requests/ff_merge_service_spec.rb
index 87fcd70a298..415b351e13a 100644
--- a/spec/services/merge_requests/ff_merge_service_spec.rb
+++ b/spec/services/merge_requests/ff_merge_service_spec.rb
@@ -21,65 +21,74 @@ describe MergeRequests::FfMergeService do
   end
 
   describe '#execute' do
-    context 'valid params' do
-      let(:service) { described_class.new(project, user, valid_merge_params) }
-
-      def execute_ff_merge
-        perform_enqueued_jobs do
-          service.execute(merge_request)
+    [true, false].each do |state_tracking_enabled|
+      context "valid params with state_tracking #{state_tracking_enabled ? 'enabled' : 'disabled'}" do
+        let(:service) { described_class.new(project, user, valid_merge_params) }
+
+        def execute_ff_merge
+          perform_enqueued_jobs do
+            service.execute(merge_request)
+          end
         end
-      end
 
-      before do
-        allow(service).to receive(:execute_hooks)
-      end
+        before do
+          stub_feature_flags(track_resource_state_change_events: state_tracking_enabled)
 
-      it "does not create merge commit" do
-        execute_ff_merge
+          allow(service).to receive(:execute_hooks)
+        end
 
-        source_branch_sha = merge_request.source_project.repository.commit(merge_request.source_branch).sha
-        target_branch_sha = merge_request.target_project.repository.commit(merge_request.target_branch).sha
+        it "does not create merge commit" do
+          execute_ff_merge
 
-        expect(source_branch_sha).to eq(target_branch_sha)
-      end
+          source_branch_sha = merge_request.source_project.repository.commit(merge_request.source_branch).sha
+          target_branch_sha = merge_request.target_project.repository.commit(merge_request.target_branch).sha
 
-      it 'keeps the merge request valid' do
-        expect { execute_ff_merge }
-          .not_to change { merge_request.valid? }
-      end
+          expect(source_branch_sha).to eq(target_branch_sha)
+        end
 
-      it 'updates the merge request to merged' do
-        expect { execute_ff_merge }
-          .to change { merge_request.merged? }
-          .from(false)
-          .to(true)
-      end
+        it 'keeps the merge request valid' do
+          expect { execute_ff_merge }
+            .not_to change { merge_request.valid? }
+        end
 
-      it 'sends email to user2 about merge of new merge_request' do
-        execute_ff_merge
+        it 'updates the merge request to merged' do
+          expect { execute_ff_merge }
+            .to change { merge_request.merged? }
+            .from(false)
+            .to(true)
+        end
 
-        email = ActionMailer::Base.deliveries.last
-        expect(email.to.first).to eq(user2.email)
-        expect(email.subject).to include(merge_request.title)
-      end
+        it 'sends email to user2 about merge of new merge_request' do
+          execute_ff_merge
 
-      it 'creates system note about merge_request merge' do
-        execute_ff_merge
+          email = ActionMailer::Base.deliveries.last
+          expect(email.to.first).to eq(user2.email)
+          expect(email.subject).to include(merge_request.title)
+        end
 
-        note = merge_request.notes.last
-        expect(note.note).to include 'merged'
-      end
+        it 'creates system note about merge_request merge' do
+          execute_ff_merge
 
-      it 'does not update squash_commit_sha if it is not a squash' do
-        expect { execute_ff_merge }.not_to change { merge_request.squash_commit_sha }
-      end
+          if state_tracking_enabled
+            event = merge_request.resource_state_events.last
+            expect(event.state).to eq('merged')
+          else
+            note = merge_request.notes.last
+            expect(note.note).to include 'merged'
+          end
+        end
 
-      it 'updates squash_commit_sha if it is a squash' do
-        merge_request.update!(squash: true)
+        it 'does not update squash_commit_sha if it is not a squash' do
+          expect { execute_ff_merge }.not_to change { merge_request.squash_commit_sha }
+        end
 
-        expect { execute_ff_merge }
-          .to change { merge_request.squash_commit_sha }
-          .from(nil)
+        it 'updates squash_commit_sha if it is a squash' do
+          merge_request.update!(squash: true)
+
+          expect { execute_ff_merge }
+            .to change { merge_request.squash_commit_sha }
+            .from(nil)
+        end
       end
     end
 
@@ -87,7 +96,7 @@ describe MergeRequests::FfMergeService do
       let(:service) { described_class.new(project, user, valid_merge_params.merge(commit_message: 'Awesome message')) }
 
       before do
-        allow(Rails.logger).to receive(:error)
+        allow(Gitlab::AppLogger).to receive(:error)
       end
 
       it 'logs and saves error if there is an exception' do
@@ -99,7 +108,7 @@ describe MergeRequests::FfMergeService do
         service.execute(merge_request)
 
         expect(merge_request.merge_error).to include(error_message)
-        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+        expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
       end
 
       it 'logs and saves error if there is an PreReceiveError exception' do
@@ -111,7 +120,7 @@ describe MergeRequests::FfMergeService do
         service.execute(merge_request)
 
         expect(merge_request.merge_error).to include(error_message)
-        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+        expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
       end
 
       it 'does not update squash_commit_sha if squash merge is not successful' do
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index bcad822b1dc..2274d917527 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -20,7 +20,11 @@ describe MergeRequests::MergeService do
     end
 
     context 'valid params' do
+      let(:state_tracking) { true }
+
       before do
+        stub_feature_flags(track_resource_state_change_events: state_tracking)
+
         allow(service).to receive(:execute_hooks)
 
         perform_enqueued_jobs do
@@ -42,9 +46,22 @@ describe MergeRequests::MergeService do
         expect(email.subject).to include(merge_request.title)
       end
 
-      it 'creates system note about merge_request merge' do
-        note = merge_request.notes.last
-        expect(note.note).to include 'merged'
+      context 'note creation' do
+        context 'when resource state event tracking is disabled' do
+          let(:state_tracking) { false }
+
+          it 'creates system note about merge_request merge' do
+            note = merge_request.notes.last
+            expect(note.note).to include 'merged'
+          end
+        end
+
+        context 'when resource state event tracking is enabled' do
+          it 'creates resource state event about merge_request merge' do
+            event = merge_request.resource_state_events.last
+            expect(event.state).to eq('merged')
+          end
+        end
       end
 
       context 'when squashing' do
@@ -55,7 +72,7 @@ describe MergeRequests::MergeService do
         end
 
         let(:merge_request) do
-          # A merge reqeust with 5 commits
+          # A merge request with 5 commits
           create(:merge_request, :simple,
                  author: user2,
                  assignees: [user2],
@@ -277,7 +294,7 @@ describe MergeRequests::MergeService do
 
     context 'error handling' do
       before do
-        allow(Rails.logger).to receive(:error)
+        allow(Gitlab::AppLogger).to receive(:error)
       end
 
       context 'when source is missing' do
@@ -289,7 +306,7 @@ describe MergeRequests::MergeService do
           service.execute(merge_request)
 
           expect(merge_request.merge_error).to eq(error_message)
-          expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+          expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
         end
       end
 
@@ -302,7 +319,7 @@ describe MergeRequests::MergeService do
         service.execute(merge_request)
 
         expect(merge_request.merge_error).to include('Something went wrong during merge')
-        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+        expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
       end
 
       it 'logs and saves error if user is not authorized' do
@@ -326,7 +343,7 @@ describe MergeRequests::MergeService do
         service.execute(merge_request)
 
         expect(merge_request.merge_error).to include('Something went wrong during merge pre-receive hook')
-        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+        expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
       end
 
       it 'logs and saves error if there is a merge conflict' do
@@ -340,7 +357,7 @@ describe MergeRequests::MergeService do
         expect(merge_request).to be_open
         expect(merge_request.merge_commit_sha).to be_nil
         expect(merge_request.merge_error).to include(error_message)
-        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+        expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
       end
 
       context 'when squashing' do
@@ -359,7 +376,7 @@ describe MergeRequests::MergeService do
           expect(merge_request).to be_open
           expect(merge_request.merge_commit_sha).to be_nil
           expect(merge_request.merge_error).to include(error_message)
-          expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+          expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
         end
 
         it 'logs and saves error if there is a squash in progress' do
@@ -373,7 +390,7 @@ describe MergeRequests::MergeService do
           expect(merge_request).to be_open
           expect(merge_request.merge_commit_sha).to be_nil
           expect(merge_request.merge_error).to include(error_message)
-          expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+          expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
         end
 
         context 'when fast-forward merge is not allowed' do
@@ -393,7 +410,7 @@ describe MergeRequests::MergeService do
               expect(merge_request).to be_open
               expect(merge_request.merge_commit_sha).to be_nil
               expect(merge_request.merge_error).to include(error_message)
-              expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
+              expect(Gitlab::AppLogger).to have_received(:error).with(a_string_matching(error_message))
             end
           end
         end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 94e65d895ac..e60ff6eb98a 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -362,76 +362,101 @@ describe MergeRequests::RefreshService do
       end
     end
 
-    context 'push to origin repo target branch', :sidekiq_might_not_need_inline do
-      context 'when all MRs to the target branch had diffs' do
+    [true, false].each do |state_tracking_enabled|
+      context "push to origin repo target branch with state tracking #{state_tracking_enabled ? 'enabled' : 'disabled'}", :sidekiq_might_not_need_inline do
         before do
-          service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature')
-          reload_mrs
+          stub_feature_flags(track_resource_state_change_events: state_tracking_enabled)
         end
 
-        it 'updates the merge state' do
-          expect(@merge_request.notes.last.note).to include('merged')
-          expect(@merge_request).to be_merged
-          expect(@fork_merge_request).to be_merged
-          expect(@fork_merge_request.notes.last.note).to include('merged')
-          expect(@build_failed_todo).to be_done
-          expect(@fork_build_failed_todo).to be_done
+        context 'when all MRs to the target branch had diffs' do
+          before do
+            service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature')
+            reload_mrs
+          end
+
+          it 'updates the merge state' do
+            expect(@merge_request).to be_merged
+            expect(@fork_merge_request).to be_merged
+            expect(@build_failed_todo).to be_done
+            expect(@fork_build_failed_todo).to be_done
+
+            if state_tracking_enabled
+              expect(@merge_request.resource_state_events.last.state).to eq('merged')
+              expect(@fork_merge_request.resource_state_events.last.state).to eq('merged')
+            else
+              expect(@merge_request.notes.last.note).to include('merged')
+              expect(@fork_merge_request.notes.last.note).to include('merged')
+            end
+          end
         end
-      end
 
-      context 'when an MR to be closed was empty already' do
-        let!(:empty_fork_merge_request) do
-          create(:merge_request,
-                 source_project: @fork_project,
-                 source_branch: 'master',
-                 target_branch: 'master',
-                 target_project: @project)
+        context 'when an MR to be closed was empty already' do
+          let!(:empty_fork_merge_request) do
+            create(:merge_request,
+                   source_project: @fork_project,
+                   source_branch: 'master',
+                   target_branch: 'master',
+                   target_project: @project)
+          end
+
+          before do
+            # This spec already has a fake push, so pretend that we were targeting
+            # feature all along.
+            empty_fork_merge_request.update_columns(target_branch: 'feature')
+
+            service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature')
+            reload_mrs
+            empty_fork_merge_request.reload
+          end
+
+          it 'only updates the non-empty MRs' do
+            expect(@merge_request).to be_merged
+            expect(@fork_merge_request).to be_merged
+
+            expect(empty_fork_merge_request).to be_open
+            expect(empty_fork_merge_request.merge_request_diff.state).to eq('empty')
+            expect(empty_fork_merge_request.notes).to be_empty
+
+            if state_tracking_enabled
+              expect(@merge_request.resource_state_events.last.state).to eq('merged')
+              expect(@fork_merge_request.resource_state_events.last.state).to eq('merged')
+            else
+              expect(@merge_request.notes.last.note).to include('merged')
+              expect(@fork_merge_request.notes.last.note).to include('merged')
+            end
+          end
         end
+      end
 
+      context "manual merge of source branch #{state_tracking_enabled ? 'enabled' : 'disabled'}", :sidekiq_might_not_need_inline do
         before do
-          # This spec already has a fake push, so pretend that we were targeting
-          # feature all along.
-          empty_fork_merge_request.update_columns(target_branch: 'feature')
+          stub_feature_flags(track_resource_state_change_events: state_tracking_enabled)
 
-          service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature')
+          # Merge master -> feature branch
+          @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, 'Test message')
+          commit = @project.repository.commit('feature')
+          service.new(@project, @user).execute(@oldrev, commit.id, 'refs/heads/feature')
           reload_mrs
-          empty_fork_merge_request.reload
         end
 
-        it 'only updates the non-empty MRs' do
-          expect(@merge_request).to be_merged
-          expect(@merge_request.notes.last.note).to include('merged')
+        it 'updates the merge state' do
+          if state_tracking_enabled
+            expect(@merge_request.resource_state_events.last.state).to eq('merged')
+            expect(@fork_merge_request.resource_state_events.last.state).to eq('merged')
+          else
+            expect(@merge_request.notes.last.note).to include('merged')
+            expect(@fork_merge_request.notes.last.note).to include('merged')
+          end
 
+          expect(@merge_request).to be_merged
+          expect(@merge_request.diffs.size).to be > 0
           expect(@fork_merge_request).to be_merged
-          expect(@fork_merge_request.notes.last.note).to include('merged')
-
-          expect(empty_fork_merge_request).to be_open
-          expect(empty_fork_merge_request.merge_request_diff.state).to eq('empty')
-          expect(empty_fork_merge_request.notes).to be_empty
+          expect(@build_failed_todo).to be_done
+          expect(@fork_build_failed_todo).to be_done
         end
       end
     end
 
-    context 'manual merge of source branch', :sidekiq_might_not_need_inline do
-      before do
-        # Merge master -> feature branch
-        @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, 'Test message')
-        commit = @project.repository.commit('feature')
-        service.new(@project, @user).execute(@oldrev, commit.id, 'refs/heads/feature')
-        reload_mrs
-      end
-
-      it 'updates the merge state' do
-        expect(@merge_request.notes.last.note).to include('merged')
-        expect(@merge_request).to be_merged
-        expect(@merge_request.diffs.size).to be > 0
-        expect(@fork_merge_request).to be_merged
-        expect(@fork_merge_request.notes.last.note).to include('merged')
-        expect(@build_failed_todo).to be_done
-        expect(@fork_build_failed_todo).to be_done
-      end
-    end
-
     context 'push to fork repo source branch', :sidekiq_might_not_need_inline do
       let(:refresh_service) { service.new(@fork_project, @user) }
 
@@ -583,20 +608,29 @@ describe MergeRequests::RefreshService do
       end
     end
 
-    context 'push to origin repo target branch after fork project was removed' do
-      before do
-        @fork_project.destroy
-        service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature')
-        reload_mrs
-      end
+    [true, false].each do |state_tracking_enabled|
+      context "push to origin repo target branch after fork project was removed #{state_tracking_enabled ? 'enabled' : 'disabled'}" do
+        before do
+          stub_feature_flags(track_resource_state_change_events: state_tracking_enabled)
 
-      it 'updates the merge request state' do
-        expect(@merge_request.notes.last.note).to include('merged')
-        expect(@merge_request).to be_merged
-        expect(@fork_merge_request).to be_open
-        expect(@fork_merge_request.notes).to be_empty
-        expect(@build_failed_todo).to be_done
-        expect(@fork_build_failed_todo).to be_done
+          @fork_project.destroy
+          service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature')
+          reload_mrs
+        end
+
+        it 'updates the merge request state' do
+          if state_tracking_enabled
+            expect(@merge_request.resource_state_events.last.state).to eq('merged')
+          else
+            expect(@merge_request.notes.last.note).to include('merged')
+          end
+
+          expect(@merge_request).to be_merged
+          expect(@fork_merge_request).to be_open
+          expect(@fork_merge_request.notes).to be_empty
+          expect(@build_failed_todo).to be_done
+          expect(@fork_build_failed_todo).to be_done
+        end
       end
     end
 
diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb
index 25ab79d70c3..3807c44b01f 100644
--- a/spec/services/merge_requests/reopen_service_spec.rb
+++ b/spec/services/merge_requests/reopen_service_spec.rb
@@ -20,8 +20,11 @@ describe MergeRequests::ReopenService do
 
     context 'valid params' do
       let(:service) { described_class.new(project, user, {}) }
+      let(:state_tracking) { true }
 
       before do
+        stub_feature_flags(track_resource_state_change_events: state_tracking)
+
         allow(service).to receive(:execute_hooks)
 
         perform_enqueued_jobs do
@@ -43,9 +46,22 @@ describe MergeRequests::ReopenService do
         expect(email.subject).to include(merge_request.title)
       end
 
-      it 'creates system note about merge_request reopen' do
-        note = merge_request.notes.last
-        expect(note.note).to include 'reopened'
+      context 'note creation' do
+        context 'when state event tracking is disabled' do
+          let(:state_tracking) { false }
+
+          it 'creates system note about merge_request reopen' do
+            note = merge_request.notes.last
+            expect(note.note).to include 'reopened'
+          end
+        end
+
+        context 'when state event tracking is enabled' do
+          it 'creates resource state event about merge_request reopen' do
+            event = merge_request.resource_state_events.last
+            expect(event.state).to eq('reopened')
+          end
+        end
       end
     end
 
diff --git a/spec/services/namespaces/check_storage_size_service_spec.rb b/spec/services/namespaces/check_storage_size_service_spec.rb
index 50359ef90ab..e192f897cf9 100644
--- a/spec/services/namespaces/check_storage_size_service_spec.rb
+++ b/spec/services/namespaces/check_storage_size_service_spec.rb
@@ -44,7 +44,7 @@ describe Namespaces::CheckStorageSizeService, '#execute' do
     end
 
     it 'errors when feature flag is activated for the current namespace' do
-      stub_feature_flags(namespace_storage_limit: namespace )
+      stub_feature_flags(namespace_storage_limit: namespace)
 
       expect(response).to be_error
       expect(response.message).to be_present
@@ -156,4 +156,10 @@ describe Namespaces::CheckStorageSizeService, '#execute' do
       expect(response).to include("60%")
     end
   end
+
+  describe 'payload root_namespace' do
+    subject(:response) { service.execute.payload[:root_namespace] }
+
+    it { is_expected.to eq(namespace) }
+  end
 end
diff --git a/spec/services/notification_recipients/build_service_spec.rb b/spec/services/notification_recipients/build_service_spec.rb
index 2e848c2f04d..e203093623d 100644
--- a/spec/services/notification_recipients/build_service_spec.rb
+++ b/spec/services/notification_recipients/build_service_spec.rb
@@ -58,4 +58,56 @@ describe NotificationRecipients::BuildService do
       end
     end
   end
+
+  describe '#build_new_review_recipients' do
+    let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
+    let(:review) { create(:review, merge_request: merge_request, project: project, author: merge_request.author) }
+    let(:notes) { create_list(:note_on_merge_request, 3, review: review, noteable: review.merge_request, project: review.project) }
+
+    shared_examples 'no N+1 queries' do
+      it 'avoids N+1 queries', :request_store do
+        create_user
+
+        service.build_new_review_recipients(review)
+
+        control_count = ActiveRecord::QueryRecorder.new do
+          service.build_new_review_recipients(review)
+        end
+
+        create_user
+
+        expect { service.build_new_review_recipients(review) }.not_to exceed_query_limit(control_count)
+      end
+    end
+
+    context 'when there are multiple watchers' do
+      def create_user
+        watcher = create(:user)
+        create(:notification_setting, source: project, user: watcher, level: :watch)
+
+        other_projects.each do |other_project|
+          create(:notification_setting, source: other_project, user: watcher, level: :watch)
+        end
+      end
+
+      include_examples 'no N+1 queries'
+    end
+
+    context 'when there are multiple subscribers' do
+      def create_user
+        subscriber = create(:user)
+        merge_request.subscriptions.create(user: subscriber, project: project, subscribed: true)
+      end
+
+      include_examples 'no N+1 queries'
+
+      context 'when the project is private' do
+        before do
+          project.update!(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
+        end
+
+        include_examples 'no N+1 queries'
+      end
+    end
+  end
 end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 46c80a86639..3c1c3e2dfc3 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -243,11 +243,12 @@ describe NotificationService, :mailer do
   describe '#unknown_sign_in' do
     let_it_be(:user) { create(:user) }
     let_it_be(:ip) { '127.0.0.1' }
+    let_it_be(:time) { Time.current }
 
-    subject { notification.unknown_sign_in(user, ip) }
+    subject { notification.unknown_sign_in(user, ip, time) }
 
     it 'sends email to the user' do
-      expect { subject }.to have_enqueued_email(user, ip, mail: 'unknown_sign_in_email')
+      expect { subject }.to have_enqueued_email(user, ip, time, mail: 'unknown_sign_in_email')
     end
   end
 
@@ -2867,6 +2868,57 @@ describe NotificationService, :mailer do
     end
   end
 
+  describe '#new_review' do
+    let(:project) { create(:project, :repository) }
+    let(:user) { create(:user) }
+    let(:user2) { create(:user) }
+    let(:reviewer) { create(:user) }
+    let(:merge_request) { create(:merge_request, source_project: project, assignees: [user, user2], author: create(:user)) }
+    let(:review) { create(:review, merge_request: merge_request, project: project, author: reviewer) }
+    let(:note) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, author: reviewer, review: review) }
+
+    before do
+      build_team(review.project)
+      add_users(review.project)
+      add_user_subscriptions(merge_request)
+      project.add_maintainer(merge_request.author)
+      project.add_maintainer(reviewer)
+      merge_request.assignees.each { |assignee| project.add_maintainer(assignee) }
+
+      create(:diff_note_on_merge_request,
+             project: project,
+             noteable: merge_request,
+             author: reviewer,
+             review: review,
+             note: "cc @mention")
+    end
+
+    it 'sends emails' do
+      expect(Notify).not_to receive(:new_review_email).with(review.author.id, review.id)
+      expect(Notify).not_to receive(:new_review_email).with(@unsubscriber.id, review.id)
+      merge_request.assignee_ids.each do |assignee_id|
+        expect(Notify).to receive(:new_review_email).with(assignee_id, review.id).and_call_original
+      end
+      expect(Notify).to receive(:new_review_email).with(merge_request.author.id, review.id).and_call_original
+      expect(Notify).to receive(:new_review_email).with(@u_watcher.id, review.id).and_call_original
+      expect(Notify).to receive(:new_review_email).with(@u_mentioned.id, review.id).and_call_original
+      expect(Notify).to receive(:new_review_email).with(@subscriber.id, review.id).and_call_original
+      expect(Notify).to receive(:new_review_email).with(@watcher_and_subscriber.id, review.id).and_call_original
+      expect(Notify).to receive(:new_review_email).with(@subscribed_participant.id, review.id).and_call_original
+
+      subject.new_review(review)
+    end
+
+    it_behaves_like 'project emails are disabled' do
+      let(:notification_target)  { review }
+      let(:notification_trigger) { subject.new_review(review) }
+
+      around do |example|
+        perform_enqueued_jobs { example.run }
+      end
+    end
+  end
+
   def build_team(project)
     @u_watcher               = create_global_setting_for(create(:user), :watch)
     @u_participating         = create_global_setting_for(create(:user), :participating)
diff --git a/spec/services/projects/alerting/notify_service_spec.rb b/spec/services/projects/alerting/notify_service_spec.rb
index b88f0ef5149..2f8c2049f85 100644
--- a/spec/services/projects/alerting/notify_service_spec.rb
+++ b/spec/services/projects/alerting/notify_service_spec.rb
@@ -8,21 +8,21 @@ describe Projects::Alerting::NotifyService do
   before do
     # We use `let_it_be(:project)` so we make sure to clear caches
     project.clear_memoization(:licensed_feature_available)
+    allow(ProjectServiceWorker).to receive(:perform_async)
   end
 
-  shared_examples 'processes incident issues' do |amount|
+  shared_examples 'processes incident issues' do
     let(:create_incident_service) { spy }
-    let(:new_alert) { instance_double(AlertManagement::Alert, id: 503, persisted?: true) }
 
-    it 'processes issues' do
-      expect(AlertManagement::Alert)
-        .to receive(:create)
-        .and_return(new_alert)
+    before do
+      allow_any_instance_of(AlertManagement::Alert).to receive(:execute_services)
+    end
 
+    it 'processes issues' do
       expect(IncidentManagement::ProcessAlertWorker)
         .to receive(:perform_async)
-        .with(project.id, kind_of(Hash), new_alert.id)
-        .exactly(amount).times
+        .with(project.id, kind_of(Hash), kind_of(Integer))
+        .once
 
       Sidekiq::Testing.inline! do
         expect(subject).to be_success
@@ -73,6 +73,7 @@ describe Projects::Alerting::NotifyService do
   describe '#execute' do
     let(:token) { 'invalid-token' }
     let(:starts_at) { Time.current.change(usec: 0) }
+    let(:fingerprint) { 'testing' }
     let(:service) { described_class.new(project, nil, payload) }
     let(:payload_raw) do
       {
@@ -82,7 +83,8 @@ describe Projects::Alerting::NotifyService do
         monitoring_tool: 'GitLab RSpec',
         service: 'GitLab Test Suite',
         description: 'Very detailed description',
-        hosts: ['1.1.1.1', '2.2.2.2']
+        hosts: ['1.1.1.1', '2.2.2.2'],
+        fingerprint: fingerprint
       }.with_indifferent_access
     end
     let(:payload) { ActionController::Parameters.new(payload_raw).permit! }
@@ -131,11 +133,37 @@ describe Projects::Alerting::NotifyService do
               description: payload_raw.fetch(:description),
               monitoring_tool: payload_raw.fetch(:monitoring_tool),
               service: payload_raw.fetch(:service),
-              fingerprint: nil,
+              fingerprint: Digest::SHA1.hexdigest(fingerprint),
               ended_at: nil
             )
           end
 
+          it 'executes the alert service hooks' do
+            slack_service = create(:service, type: 'SlackService', project: project, alert_events: true, active: true)
+            subject
+
+            expect(ProjectServiceWorker).to have_received(:perform_async).with(slack_service.id, an_instance_of(Hash))
+          end
+
+          context 'existing alert with same fingerprint' do
+            let(:fingerprint_sha) { Digest::SHA1.hexdigest(fingerprint) }
+            let!(:existing_alert) { create(:alert_management_alert, project: project, fingerprint: fingerprint_sha) }
+
+            it 'does not create AlertManagement::Alert' do
+              expect { subject }.not_to change(AlertManagement::Alert, :count)
+            end
+
+            it 'increments the existing alert count' do
+              expect { subject }.to change { existing_alert.reload.events }.from(1).to(2)
+            end
+
+            it 'does not executes the alert service hooks' do
+              subject
+
+              expect(ProjectServiceWorker).not_to have_received(:perform_async)
+            end
+          end
+
           context 'with a minimal payload' do
             let(:payload_raw) do
               {
@@ -176,7 +204,7 @@ describe Projects::Alerting::NotifyService do
         context 'issue enabled' do
           let(:issue_enabled) { true }
 
-          it_behaves_like 'processes incident issues', 1
+          it_behaves_like 'processes incident issues'
 
           context 'with an invalid payload' do
             before do
@@ -188,6 +216,21 @@ describe Projects::Alerting::NotifyService do
             it_behaves_like 'does not process incident issues due to error', http_status: :bad_request
             it_behaves_like 'NotifyService does not create alert'
           end
+
+          context 'when alert already exists' do
+            let(:fingerprint_sha) { Digest::SHA1.hexdigest(fingerprint) }
+            let!(:existing_alert) { create(:alert_management_alert, project: project, fingerprint: fingerprint_sha) }
+
+            context 'when existing alert does not have an associated issue' do
+              it_behaves_like 'processes incident issues'
+            end
+
+            context 'when existing alert has an associated issue' do
+              let!(:existing_alert) { create(:alert_management_alert, :with_issue, project: project, fingerprint: fingerprint_sha) }
+
+              it_behaves_like 'does not process incident issues'
+            end
+          end
         end
 
         context 'with emails turned on' do
diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
index 01f09f208fd..11ea7d51673 100644
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Projects::ContainerRepository::CleanupTagsService do
   let_it_be(:user) { create(:user) }
-  let_it_be(:project) { create(:project, :private) }
+  let_it_be(:project, reload: true) { create(:project, :private) }
   let_it_be(:repository) { create(:container_repository, :root, project: project) }
 
   let(:service) { described_class.new(project, user, params) }
@@ -72,6 +72,47 @@ describe Projects::ContainerRepository::CleanupTagsService do
       end
     end
 
+    context 'with invalid regular expressions' do
+      RSpec.shared_examples 'handling an invalid regex' do
+        it 'keeps all tags' do
+          expect(Projects::ContainerRepository::DeleteTagsService)
+            .not_to receive(:new)
+          subject
+        end
+
+        it 'returns an error' do
+          response = subject
+
+          expect(response[:status]).to eq(:error)
+          expect(response[:message]).to eq('invalid regex')
+        end
+
+        it 'calls error tracking service' do
+          expect(Gitlab::ErrorTracking).to receive(:log_exception).and_call_original
+
+          subject
+        end
+      end
+
+      context 'when name_regex_delete is invalid' do
+        let(:params) { { 'name_regex_delete' => '*test*' } }
+
+        it_behaves_like 'handling an invalid regex'
+      end
+
+      context 'when name_regex is invalid' do
+        let(:params) { { 'name_regex' => '*test*' } }
+
+        it_behaves_like 'handling an invalid regex'
+      end
+
+      context 'when name_regex_keep is invalid' do
+        let(:params) { { 'name_regex_keep' => '*test*' } }
+
+        it_behaves_like 'handling an invalid regex'
+      end
+    end
+
     context 'when delete regex matching specific tags is used' do
       let(:params) do
         { 'name_regex_delete' => 'C|D' }
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index e542f1e9108..e70ee05ed31 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -43,10 +43,10 @@ describe Projects::CreateService, '#execute' do
       create_project(user, opts)
     end
 
-    it 'creates associated project settings' do
+    it 'builds associated project settings' do
       project = create_project(user, opts)
 
-      expect(project.project_setting).to be_persisted
+      expect(project.project_setting).to be_new_record
     end
   end
 
@@ -88,6 +88,116 @@ describe Projects::CreateService, '#execute' do
     end
   end
 
+  context 'group sharing', :sidekiq_inline do
+    let_it_be(:group) { create(:group) }
+    let_it_be(:shared_group) { create(:group) }
+    let_it_be(:shared_group_user) { create(:user) }
+    let(:opts) do
+      {
+        name: 'GitLab',
+        namespace_id: shared_group.id
+      }
+    end
+
+    before do
+      create(:group_group_link, shared_group: shared_group, shared_with_group: group)
+
+      shared_group.add_maintainer(shared_group_user)
+      group.add_developer(user)
+    end
+
+    it 'updates authorization' do
+      shared_group_project = create_project(shared_group_user, opts)
+
+      expect(
+        Ability.allowed?(shared_group_user, :read_project, shared_group_project)
+      ).to be_truthy
+      expect(
+        Ability.allowed?(user, :read_project, shared_group_project)
+      ).to be_truthy
+    end
+  end
+
+  context 'membership overrides', :sidekiq_inline do
+    let_it_be(:group) { create(:group, :private) }
+    let_it_be(:subgroup_for_projects) { create(:group, :private, parent: group) }
+    let_it_be(:subgroup_for_access) { create(:group, :private, parent: group) }
+    let_it_be(:group_maintainer) { create(:user) }
+    let(:group_access_level) { Gitlab::Access::REPORTER }
+    let(:subgroup_access_level) { Gitlab::Access::DEVELOPER }
+    let(:share_max_access_level) { Gitlab::Access::MAINTAINER }
+    let(:opts) do
+      {
+        name: 'GitLab',
+        namespace_id: subgroup_for_projects.id
+      }
+    end
+
+    before do
+      group.add_maintainer(group_maintainer)
+
+      create(:group_group_link, shared_group: subgroup_for_projects,
+                                shared_with_group: subgroup_for_access,
+                                group_access: share_max_access_level)
+    end
+
+    context 'membership is higher from group hierarchy' do
+      let(:group_access_level) { Gitlab::Access::MAINTAINER }
+
+      it 'updates authorization' do
+        create(:group_member, access_level: subgroup_access_level, group: subgroup_for_access, user: user)
+        create(:group_member, access_level: group_access_level, group: group, user: user)
+
+        subgroup_project = create_project(group_maintainer, opts)
+
+        project_authorization = ProjectAuthorization.where(
+          project_id: subgroup_project.id,
+          user_id: user.id,
+          access_level: group_access_level)
+
+        expect(project_authorization).to exist
+      end
+    end
+
+    context 'membership is higher from group share' do
+      let(:subgroup_access_level) { Gitlab::Access::MAINTAINER }
+
+      context 'share max access level is not limiting' do
+        it 'updates authorization' do
+          create(:group_member, access_level: group_access_level, group: group, user: user)
+          create(:group_member, access_level: subgroup_access_level, group: subgroup_for_access, user: user)
+
+          subgroup_project = create_project(group_maintainer, opts)
+
+          project_authorization = ProjectAuthorization.where(
+            project_id: subgroup_project.id,
+            user_id: user.id,
+            access_level: subgroup_access_level)
+
+          expect(project_authorization).to exist
+        end
+      end
+
+      context 'share max access level is limiting' do
+        let(:share_max_access_level) { Gitlab::Access::DEVELOPER }
+
+        it 'updates authorization' do
+          create(:group_member, access_level: group_access_level, group: group, user: user)
+          create(:group_member, access_level: subgroup_access_level, group: subgroup_for_access, user: user)
+
+          subgroup_project = create_project(group_maintainer, opts)
+
+          project_authorization = ProjectAuthorization.where(
+            project_id: subgroup_project.id,
+            user_id: user.id,
+            access_level: share_max_access_level)
+
+          expect(project_authorization).to exist
+        end
+      end
+    end
+  end
+
   context 'error handling' do
     it 'handles invalid options' do
       opts[:default_branch] = 'master'
@@ -339,29 +449,39 @@ describe Projects::CreateService, '#execute' do
     end
   end
 
-  context 'when there is an active service template' do
-    before do
-      create(:prometheus_service, project: nil, template: true, active: true)
-    end
+  describe 'create service for the project' do
+    subject(:project) { create_project(user, opts) }
 
-    it 'creates a service from this template' do
-      project = create_project(user, opts)
+    context 'when there is an active instance-level and an active template integration' do
+      let!(:template_integration) { create(:prometheus_service, :template, api_url: 'https://prometheus.template.com/') }
+      let!(:instance_integration) { create(:prometheus_service, :instance, api_url: 'https://prometheus.instance.com/') }
 
-      expect(project.services.count).to eq 1
-      expect(project.errors).to be_empty
+      it 'creates a service from the instance-level integration' do
+        expect(project.services.count).to eq(1)
+        expect(project.services.first.api_url).to eq(instance_integration.api_url)
+        expect(project.services.first.inherit_from_id).to eq(instance_integration.id)
+      end
     end
-  end
 
-  context 'when a bad service template is created' do
-    it 'sets service to be inactive' do
-      opts[:import_url] = 'http://www.gitlab.com/gitlab-org/gitlab-foss'
-      create(:service, type: 'DroneCiService', project: nil, template: true, active: true)
+    context 'when there is an active service template' do
+      let!(:template_integration) { create(:prometheus_service, :template, api_url: 'https://prometheus.template.com/') }
 
-      project = create_project(user, opts)
-      service = project.services.first
+      it 'creates a service from the template' do
+        expect(project.services.count).to eq(1)
+        expect(project.services.first.api_url).to eq(template_integration.api_url)
+        expect(project.services.first.inherit_from_id).to be_nil
+      end
+    end
 
-      expect(project).to be_persisted
-      expect(service.active).to be false
+    context 'when there is an invalid integration' do
+      before do
+        create(:service, :template, type: 'DroneCiService', active: true)
+      end
+
+      it 'creates an inactive service' do
+        expect(project).to be_persisted
+        expect(project.services.first.active).to be false
+      end
     end
   end
 
@@ -547,7 +667,9 @@ describe Projects::CreateService, '#execute' do
       )
       expect(AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker).to(
         receive(:bulk_perform_in)
-          .with(1.hour, array_including([user.id], [other_user.id]))
+          .with(1.hour,
+                array_including([user.id], [other_user.id]),
+                batch_delay: 30.seconds, batch_size: 100)
           .and_call_original
       )
 
diff --git a/spec/services/projects/group_links/create_service_spec.rb b/spec/services/projects/group_links/create_service_spec.rb
index 92667184be8..22f7c8bdcb4 100644
--- a/spec/services/projects/group_links/create_service_spec.rb
+++ b/spec/services/projects/group_links/create_service_spec.rb
@@ -3,16 +3,17 @@
 require 'spec_helper'
 
 describe Projects::GroupLinks::CreateService, '#execute' do
-  let(:user) { create :user }
-  let(:group) { create :group }
-  let(:project) { create :project }
+  let_it_be(:user) { create :user }
+  let_it_be(:group) { create :group }
+  let_it_be(:project) { create :project }
   let(:opts) do
     {
       link_group_access: '30',
       expires_at: nil
     }
   end
-  let(:subject) { described_class.new(project, user, opts) }
+
+  subject { described_class.new(project, user, opts) }
 
   before do
     group.add_developer(user)
@@ -22,6 +23,12 @@ describe Projects::GroupLinks::CreateService, '#execute' do
     expect { subject.execute(group) }.to change { project.project_group_links.count }.from(0).to(1)
   end
 
+  it 'updates authorization' do
+    expect { subject.execute(group) }.to(
+      change { Ability.allowed?(user, :read_project, project) }
+        .from(false).to(true))
+  end
+
   it 'returns false if group is blank' do
     expect { subject.execute(nil) }.not_to change { project.project_group_links.count }
   end
diff --git a/spec/services/projects/group_links/destroy_service_spec.rb b/spec/services/projects/group_links/destroy_service_spec.rb
index 0fd1fcfe1a5..0a8c9580e70 100644
--- a/spec/services/projects/group_links/destroy_service_spec.rb
+++ b/spec/services/projects/group_links/destroy_service_spec.rb
@@ -3,15 +3,25 @@
 require 'spec_helper'
 
 describe Projects::GroupLinks::DestroyService, '#execute' do
-  let(:project) { create(:project, :private) }
-  let!(:group_link) { create(:project_group_link, project: project) }
-  let(:user) { create :user }
-  let(:subject) { described_class.new(project, user) }
+  let_it_be(:user) { create :user }
+  let_it_be(:project) { create(:project, :private) }
+  let_it_be(:group) { create(:group) }
+  let!(:group_link) { create(:project_group_link, project: project, group: group) }
+
+  subject { described_class.new(project, user) }
 
   it 'removes group from project' do
     expect { subject.execute(group_link) }.to change { project.project_group_links.count }.from(1).to(0)
   end
 
+  it 'updates authorization' do
+    group.add_maintainer(user)
+
+    expect { subject.execute(group_link) }.to(
+      change { Ability.allowed?(user, :read_project, project) }
+        .from(true).to(false))
+  end
+
   it 'returns false if group_link is blank' do
     expect { subject.execute(nil) }.not_to change { project.project_group_links.count }
   end
diff --git a/spec/services/projects/group_links/update_service_spec.rb b/spec/services/projects/group_links/update_service_spec.rb
new file mode 100644
index 00000000000..5be2ae1e0f7
--- /dev/null
+++ b/spec/services/projects/group_links/update_service_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Projects::GroupLinks::UpdateService, '#execute' do
+  let_it_be(:user) { create :user }
+  let_it_be(:group) { create :group }
+  let_it_be(:project) { create :project }
+  let!(:link) { create(:project_group_link, project: project, group: group) }
+
+  let(:expiry_date) { 1.month.from_now.to_date }
+  let(:group_link_params) do
+    { group_access: Gitlab::Access::GUEST,
+      expires_at: expiry_date }
+  end
+
+  subject { described_class.new(link).execute(group_link_params) }
+
+  before do
+    group.add_developer(user)
+  end
+
+  it 'updates existing link' do
+    expect(link.group_access).to eq(Gitlab::Access::DEVELOPER)
+    expect(link.expires_at).to be_nil
+
+    subject
+
+    link.reload
+
+    expect(link.group_access).to eq(Gitlab::Access::GUEST)
+    expect(link.expires_at).to eq(expiry_date)
+  end
+
+  it 'updates project permissions' do
+    expect { subject }.to change { user.can?(:create_release, project) }.from(true).to(false)
+  end
+
+  it 'executes UserProjectAccessChangedService' do
+    expect_next_instance_of(UserProjectAccessChangedService) do |service|
+      expect(service).to receive(:execute)
+    end
+
+    subject
+  end
+
+  context 'with only param not requiring authorization refresh' do
+    let(:group_link_params) { { expires_at: Date.tomorrow } }
+
+    it 'does not execute UserProjectAccessChangedService' do
+      expect(UserProjectAccessChangedService).not_to receive(:new)
+
+      subject
+    end
+  end
+end
diff --git a/spec/services/projects/import_export/export_service_spec.rb b/spec/services/projects/import_export/export_service_spec.rb
index 5f496cb1e56..19891341311 100644
--- a/spec/services/projects/import_export/export_service_spec.rb
+++ b/spec/services/projects/import_export/export_service_spec.rb
@@ -119,9 +119,7 @@ describe Projects::ImportExport::ExportService do
         end
 
         it 'notifies logger' do
-          allow(Rails.logger).to receive(:error)
-
-          expect(Rails.logger).to receive(:error)
+          expect(service.instance_variable_get(:@logger)).to receive(:error)
         end
       end
     end
@@ -149,7 +147,7 @@ describe Projects::ImportExport::ExportService do
       end
 
       it 'notifies logger' do
-        expect(Rails.logger).to receive(:error)
+        expect(service.instance_variable_get(:@logger)).to receive(:error)
       end
 
       it 'does not call the export strategy' do
diff --git a/spec/services/projects/lsif_data_service_spec.rb b/spec/services/projects/lsif_data_service_spec.rb
deleted file mode 100644
index 4866f848121..00000000000
--- a/spec/services/projects/lsif_data_service_spec.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Projects::LsifDataService do
-  let(:artifact) { create(:ci_job_artifact, :lsif) }
-  let(:project) { build_stubbed(:project) }
-  let(:path) { 'main.go' }
-  let(:commit_id) { Digest::SHA1.hexdigest(SecureRandom.hex) }
-
-  let(:service) { described_class.new(artifact.file, project, commit_id) }
-
-  describe '#execute' do
-    def highlighted_value(value)
-      [{ language: 'go', value: Gitlab::Highlight.highlight(nil, value, language: 'go') }]
-    end
-
-    context 'fetched lsif file', :use_clean_rails_memory_store_caching do
-      it 'is cached' do
-        service.execute(path)
-
-        cached_data = Rails.cache.fetch("project:#{project.id}:lsif:#{commit_id}")
-
-        expect(cached_data.keys).to eq(%w[def_refs doc_ranges docs hover_refs ranges])
-      end
-    end
-
-    context 'for main.go' do
-      let(:path_prefix) { "/#{project.full_path}/-/blob/#{commit_id}" }
-
-      it 'returns lsif ranges for the file' do
-        expect(service.execute(path)).to eq([
-          {
-            end_char: 9,
-            end_line: 6,
-            start_char: 5,
-            start_line: 6,
-            definition_url: "#{path_prefix}/main.go#L7",
-            hover: highlighted_value('func main()')
-          },
-          {
-            end_char: 36,
-            end_line: 3,
-            start_char: 1,
-            start_line: 3,
-            definition_url: "#{path_prefix}/main.go#L4",
-            hover: highlighted_value('package "github.com/user/hello/morestrings" ("github.com/user/hello/morestrings")')
-          },
-          {
-            end_char: 12,
-            end_line: 7,
-            start_char: 1,
-            start_line: 7,
-            definition_url: "#{path_prefix}/main.go#L4",
-            hover: highlighted_value('package "github.com/user/hello/morestrings" ("github.com/user/hello/morestrings")')
-          },
-          {
-            end_char: 20,
-            end_line: 7,
-            start_char: 13,
-            start_line: 7,
-            definition_url: "#{path_prefix}/morestrings/reverse.go#L11",
-            hover: highlighted_value('func Reverse(s string) string') + [{ value: "This method reverses a string \n\n" }]
-          },
-          {
-            end_char: 12,
-            end_line: 8,
-            start_char: 1,
-            start_line: 8,
-            definition_url: "#{path_prefix}/main.go#L4",
-            hover: highlighted_value('package "github.com/user/hello/morestrings" ("github.com/user/hello/morestrings")')
-          },
-          {
-            end_char: 18,
-            end_line: 8,
-            start_char: 13,
-            start_line: 8,
-            definition_url: "#{path_prefix}/morestrings/reverse.go#L5",
-            hover: highlighted_value('func Func2(i int) string')
-          }
-        ])
-      end
-    end
-
-    context 'for morestring/reverse.go' do
-      let(:path) { 'morestrings/reverse.go' }
-
-      it 'returns lsif ranges for the file' do
-        expect(service.execute(path).first).to eq({
-          end_char: 2,
-          end_line: 11,
-          start_char: 1,
-          start_line: 11,
-          definition_url: "/#{project.full_path}/-/blob/#{commit_id}/morestrings/reverse.go#L12",
-          hover: highlighted_value('var a string')
-        })
-      end
-    end
-
-    context 'for an unknown file' do
-      let(:path) { 'unknown.go' }
-
-      it 'returns nil' do
-        expect(service.execute(path)).to eq(nil)
-      end
-    end
-  end
-
-  describe '#doc_id' do
-    context 'when the passed path matches multiple files' do
-      let(:path) { 'check/main.go' }
-      let(:docs) do
-        {
-          1 => 'cmd/check/main.go',
-          2 => 'cmd/command.go',
-          3 => 'check/main.go',
-          4 => 'cmd/nested/check/main.go'
-        }
-      end
-
-      it 'fetches the document with the shortest absolute path' do
-        expect(service.__send__(:find_doc_id, docs, path)).to eq(3)
-      end
-    end
-  end
-end
diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb
index 99a9fdd4184..f4d62b48fe5 100644
--- a/spec/services/projects/operations/update_service_spec.rb
+++ b/spec/services/projects/operations/update_service_spec.rb
@@ -96,7 +96,8 @@ describe Projects::Operations::UpdateService do
       let(:params) do
         {
           metrics_setting_attributes: {
-            external_dashboard_url: 'http://gitlab.com'
+            external_dashboard_url: 'http://gitlab.com',
+            dashboard_timezone: 'utc'
           }
         }
       end
@@ -108,6 +109,7 @@ describe Projects::Operations::UpdateService do
           expect(project.reload.metrics_setting.external_dashboard_url).to eq(
             'http://gitlab.com'
           )
+          expect(project.metrics_setting.dashboard_timezone).to eq('utc')
         end
       end
 
@@ -122,22 +124,25 @@ describe Projects::Operations::UpdateService do
           expect(project.reload.metrics_setting.external_dashboard_url).to eq(
             'http://gitlab.com'
           )
+          expect(project.metrics_setting.dashboard_timezone).to eq('utc')
         end
+      end
 
-        context 'with blank external_dashboard_url in params' do
-          let(:params) do
-            {
-              metrics_setting_attributes: {
-                external_dashboard_url: ''
-              }
+      context 'with blank external_dashboard_url' do
+        let(:params) do
+          {
+            metrics_setting_attributes: {
+              external_dashboard_url: '',
+              dashboard_timezone: 'utc'
             }
-          end
+          }
+        end
 
-          it 'destroys the metrics_setting entry in DB' do
-            expect(result[:status]).to eq(:success)
+        it 'updates dashboard_timezone' do
+          expect(result[:status]).to eq(:success)
 
-            expect(project.reload.metrics_setting).to be_nil
-          end
+          expect(project.reload.metrics_setting.external_dashboard_url).to be(nil)
+          expect(project.metrics_setting.dashboard_timezone).to eq('utc')
         end
       end
     end
diff --git a/spec/services/projects/prometheus/alerts/create_events_service_spec.rb b/spec/services/projects/prometheus/alerts/create_events_service_spec.rb
index 35f23afd7a2..61236b5bbdb 100644
--- a/spec/services/projects/prometheus/alerts/create_events_service_spec.rb
+++ b/spec/services/projects/prometheus/alerts/create_events_service_spec.rb
@@ -89,9 +89,9 @@ describe Projects::Prometheus::Alerts::CreateEventsService do
     context 'with a resolved payload' do
       let(:started_at) { truncate_to_second(Time.current) }
       let(:ended_at) { started_at + 1 }
-      let(:payload_key) { PrometheusAlertEvent.payload_key_for(alert.prometheus_metric_id, utc_rfc3339(started_at)) }
       let(:resolved_event) { alert_payload(status: 'resolved', started_at: started_at, ended_at: ended_at) }
       let(:alerts_payload) { { 'alerts' => [resolved_event] } }
+      let(:payload_key) { Gitlab::Alerting::Alert.new(project: project, payload: resolved_event).gitlab_fingerprint }
 
       context 'with a matching firing event' do
         before do
diff --git a/spec/services/projects/prometheus/alerts/notify_service_spec.rb b/spec/services/projects/prometheus/alerts/notify_service_spec.rb
index 009543f9016..95acedb1e76 100644
--- a/spec/services/projects/prometheus/alerts/notify_service_spec.rb
+++ b/spec/services/projects/prometheus/alerts/notify_service_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe Projects::Prometheus::Alerts::NotifyService do
+  include PrometheusHelpers
+
   let_it_be(:project, reload: true) { create(:project) }
 
   let(:service) { described_class.new(project, nil, payload) }
@@ -92,9 +94,10 @@ describe Projects::Prometheus::Alerts::NotifyService do
   end
 
   context 'with valid payload' do
-    let(:alert_firing) { create(:prometheus_alert, project: project) }
-    let(:alert_resolved) { create(:prometheus_alert, project: project) }
-    let(:payload_raw) { payload_for(firing: [alert_firing], resolved: [alert_resolved]) }
+    let_it_be(:alert_firing) { create(:prometheus_alert, project: project) }
+    let_it_be(:alert_resolved) { create(:prometheus_alert, project: project) }
+    let_it_be(:cluster) { create(:cluster, :provided_by_user, projects: [project]) }
+    let(:payload_raw) { prometheus_alert_payload(firing: [alert_firing], resolved: [alert_resolved]) }
     let(:payload) { ActionController::Parameters.new(payload_raw).permit! }
     let(:payload_alert_firing) { payload_raw['alerts'].first }
     let(:token) { 'token' }
@@ -116,9 +119,7 @@ describe Projects::Prometheus::Alerts::NotifyService do
 
       with_them do
         before do
-          cluster = create(:cluster, :provided_by_user,
-                           projects: [project],
-                           enabled: cluster_enabled)
+          cluster.update!(enabled: cluster_enabled)
 
           if status
             create(:clusters_applications_prometheus, status,
@@ -179,6 +180,39 @@ describe Projects::Prometheus::Alerts::NotifyService do
       end
     end
 
+    context 'with generic alerts integration' do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:alerts_service, :token, :result) do
+        :active   | :valid    | :success
+        :active   | :invalid  | :failure
+        :active   | nil       | :failure
+        :inactive | :valid    | :failure
+        nil       | nil       | :failure
+      end
+
+      with_them do
+        let(:valid) { project.alerts_service.token }
+        let(:invalid) { 'invalid token' }
+        let(:token_input) { public_send(token) if token }
+
+        before do
+          if alerts_service
+            create(:alerts_service, alerts_service, project: project)
+          end
+        end
+
+        case result = params[:result]
+        when :success
+          it_behaves_like 'notifies alerts'
+        when :failure
+          it_behaves_like 'no notifications', http_status: :unauthorized
+        else
+          raise "invalid result: #{result.inspect}"
+        end
+      end
+    end
+
     context 'alert emails' do
       before do
         create(:prometheus_service, project: project)
@@ -227,7 +261,7 @@ describe Projects::Prometheus::Alerts::NotifyService do
 
       context 'with multiple firing alerts and resolving alerts' do
         let(:payload_raw) do
-          payload_for(firing: [alert_firing, alert_firing], resolved: [alert_resolved])
+          prometheus_alert_payload(firing: [alert_firing, alert_firing], resolved: [alert_resolved])
         end
 
         it 'processes Prometheus alerts' do
@@ -258,7 +292,7 @@ describe Projects::Prometheus::Alerts::NotifyService do
 
         context 'multiple firing alerts' do
           let(:payload_raw) do
-            payload_for(firing: [alert_firing, alert_firing], resolved: [])
+            prometheus_alert_payload(firing: [alert_firing, alert_firing], resolved: [])
           end
 
           it_behaves_like 'processes incident issues', 2
@@ -266,7 +300,7 @@ describe Projects::Prometheus::Alerts::NotifyService do
 
         context 'without firing alerts' do
           let(:payload_raw) do
-            payload_for(firing: [], resolved: [alert_resolved])
+            prometheus_alert_payload(firing: [], resolved: [alert_resolved])
           end
 
           it_behaves_like 'processes incident issues', 1
@@ -284,24 +318,17 @@ describe Projects::Prometheus::Alerts::NotifyService do
   end
 
   context 'with invalid payload' do
-    context 'without version' do
+    context 'when payload is not processable' do
       let(:payload) { {} }
 
-      it_behaves_like 'no notifications', http_status: :unprocessable_entity
-    end
-
-    context 'when version is not "4"' do
-      let(:payload) { { 'version' => '5' } }
+      before do
+        allow(described_class).to receive(:processable?).with(payload)
+          .and_return(false)
+      end
 
       it_behaves_like 'no notifications', http_status: :unprocessable_entity
     end
 
-    context 'with missing alerts' do
-      let(:payload) { { 'version' => '4' } }
-
-      it_behaves_like 'no notifications', http_status: :unauthorized
-    end
-
     context 'when the payload is too big' do
       let(:payload) { { 'the-payload-is-too-big' => true } }
       let(:deep_size_object) { instance_double(Gitlab::Utils::DeepSize, valid?: false) }
@@ -328,50 +355,39 @@ describe Projects::Prometheus::Alerts::NotifyService do
     end
   end
 
-  private
-
-  def payload_for(firing: [], resolved: [])
-    status = firing.any? ? 'firing' : 'resolved'
-    alerts = firing + resolved
-    alert_name = alerts.first.title
-    prometheus_metric_id = alerts.first.prometheus_metric_id.to_s
-
-    alerts_map = \
-      firing.map { |alert| map_alert_payload('firing', alert) } +
-      resolved.map { |alert| map_alert_payload('resolved', alert) }
-
-    # See https://prometheus.io/docs/alerting/configuration/#%3Cwebhook_config%3E
-    {
-      'version' => '4',
-      'receiver' => 'gitlab',
-      'status' => status,
-      'alerts' => alerts_map,
-      'groupLabels' => {
-        'alertname' => alert_name
-      },
-      'commonLabels' => {
-        'alertname' => alert_name,
-        'gitlab' => 'hook',
-        'gitlab_alert_id' => prometheus_metric_id
-      },
-      'commonAnnotations' => {},
-      'externalURL' => '',
-      'groupKey' => "{}:{alertname=\'#{alert_name}\'}"
-    }
-  end
+  describe '.processable?' do
+    let(:valid_payload) { prometheus_alert_payload }
+
+    subject { described_class.processable?(payload) }
+
+    context 'with valid payload' do
+      let(:payload) { valid_payload }
+
+      it { is_expected.to eq(true) }
+
+      context 'containing unrelated keys' do
+        let(:payload) { valid_payload.merge('unrelated' => 'key') }
 
-  def map_alert_payload(status, alert)
-    {
-      'status' => status,
-      'labels' => {
-        'alertname' => alert.title,
-        'gitlab' => 'hook',
-        'gitlab_alert_id' => alert.prometheus_metric_id.to_s
-      },
-      'annotations' => {},
-      'startsAt' => '2018-09-24T08:57:31.095725221Z',
-      'endsAt' => '0001-01-01T00:00:00Z',
-      'generatorURL' => 'http://prometheus-prometheus-server-URL'
-    }
+        it { is_expected.to eq(true) }
+      end
+    end
+
+    context 'with invalid payload' do
+      where(:missing_key) do
+        described_class::REQUIRED_PAYLOAD_KEYS.to_a
+      end
+
+      with_them do
+        let(:payload) { valid_payload.except(missing_key) }
+
+        it { is_expected.to eq(false) }
+      end
+    end
+
+    context 'with unsupported version' do
+      let(:payload) { valid_payload.merge('version' => '5') }
+
+      it { is_expected.to eq(false) }
+    end
   end
 end
diff --git a/spec/services/projects/propagate_service_template_spec.rb b/spec/services/projects/propagate_service_template_spec.rb
index 7188ac5f733..ddc27c037f8 100644
--- a/spec/services/projects/propagate_service_template_spec.rb
+++ b/spec/services/projects/propagate_service_template_spec.rb
@@ -62,8 +62,8 @@ describe Projects::PropagateServiceTemplate do
         }
       )
 
-      Service.build_from_template(project.id, service_template).save!
-      Service.build_from_template(project.id, other_service).save!
+      Service.build_from_integration(project.id, service_template).save!
+      Service.build_from_integration(project.id, other_service).save!
 
       expect { described_class.propagate(service_template) }
         .not_to change { Service.count }
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index f561a303be4..29c3c300d1b 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -158,6 +158,23 @@ describe Projects::UpdatePagesService do
           expect(project.pages_metadatum).not_to be_deployed
         end
       end
+
+      context 'with background jobs running', :sidekiq_inline do
+        where(:ci_atomic_processing) do
+          [true, false]
+        end
+
+        with_them do
+          before do
+            stub_feature_flags(ci_atomic_processing: ci_atomic_processing)
+          end
+
+          it 'succeeds' do
+            expect(project.pages_deployed?).to be_falsey
+            expect(execute).to eq(:success)
+          end
+        end
+      end
     end
   end
 
diff --git a/spec/services/projects/update_remote_mirror_service_spec.rb b/spec/services/projects/update_remote_mirror_service_spec.rb
index 38c2dc0780e..418973fb0a6 100644
--- a/spec/services/projects/update_remote_mirror_service_spec.rb
+++ b/spec/services/projects/update_remote_mirror_service_spec.rb
@@ -10,6 +10,10 @@ describe Projects::UpdateRemoteMirrorService do
 
   subject(:service) { described_class.new(project, project.creator) }
 
+  before do
+    stub_feature_flags(gitaly_ruby_remote_branches_ls_remote: false)
+  end
+
   describe '#execute' do
     subject(:execute!) { service.execute(remote_mirror, 0) }
 
@@ -102,6 +106,19 @@ describe Projects::UpdateRemoteMirrorService do
         expect(remote_mirror.last_error).to include("refs/heads/develop")
       end
     end
+
+    # https://gitlab.com/gitlab-org/gitaly/-/issues/2670
+    context 'when `gitaly_ruby_remote_branches_ls_remote` is enabled' do
+      before do
+        stub_feature_flags(gitaly_ruby_remote_branches_ls_remote: true)
+      end
+
+      it 'does not perform a fetch' do
+        expect(project.repository).not_to receive(:fetch_remote)
+
+        execute!
+      end
+    end
   end
 
   def stub_fetch_remote(project, remote_name:, ssh_auth:)
diff --git a/spec/services/projects/update_repository_storage_service_spec.rb b/spec/services/projects/update_repository_storage_service_spec.rb
index 28b79bc61d9..e37580e7367 100644
--- a/spec/services/projects/update_repository_storage_service_spec.rb
+++ b/spec/services/projects/update_repository_storage_service_spec.rb
@@ -16,7 +16,7 @@ describe Projects::UpdateRepositoryStorageService do
     end
 
     context 'without wiki and design repository' do
-      let(:project) { create(:project, :repository, repository_read_only: true, wiki_enabled: false) }
+      let(:project) { create(:project, :repository, wiki_enabled: false) }
       let(:destination) { 'test_second_storage' }
       let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, project: project, destination_storage_name: destination) }
       let!(:checksum) { project.repository.checksum }
@@ -131,7 +131,7 @@ describe Projects::UpdateRepositoryStorageService do
 
     context 'with wiki repository' do
       include_examples 'moves repository to another storage', 'wiki' do
-        let(:project) { create(:project, :repository, repository_read_only: true, wiki_enabled: true) }
+        let(:project) { create(:project, :repository, wiki_enabled: true) }
         let(:repository) { project.wiki.repository }
         let(:destination) { 'test_second_storage' }
         let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, project: project, destination_storage_name: destination) }
@@ -144,7 +144,7 @@ describe Projects::UpdateRepositoryStorageService do
 
     context 'with design repository' do
       include_examples 'moves repository to another storage', 'design' do
-        let(:project) { create(:project, :repository, repository_read_only: true) }
+        let(:project) { create(:project, :repository) }
         let(:repository) { project.design_repository }
         let(:destination) { 'test_second_storage' }
         let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, project: project, destination_storage_name: destination) }
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb
index ce9765a36ba..8a17884f641 100644
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
@@ -254,7 +254,7 @@ describe Projects::UpdateService do
       it 'logs an error and creates a metric when wiki can not be created' do
         project.project_feature.update(wiki_access_level: ProjectFeature::DISABLED)
 
-        expect_any_instance_of(ProjectWiki).to receive(:wiki).and_raise(ProjectWiki::CouldNotCreateWikiError)
+        expect_any_instance_of(ProjectWiki).to receive(:wiki).and_raise(Wiki::CouldNotCreateWikiError)
         expect_any_instance_of(described_class).to receive(:log_error).with("Could not create wiki for #{project.full_name}")
 
         counter = double(:counter)
@@ -552,6 +552,63 @@ describe Projects::UpdateService do
         end
       end
     end
+
+    describe 'when changing repository_storage' do
+      let(:repository_read_only) { false }
+      let(:project) { create(:project, :repository, repository_read_only: repository_read_only) }
+      let(:opts) { { repository_storage: 'test_second_storage' } }
+
+      before do
+        stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
+      end
+
+      shared_examples 'the transfer was not scheduled' do
+        it 'does not schedule the transfer' do
+          expect do
+            update_project(project, user, opts)
+          end.not_to change(project.repository_storage_moves, :count)
+        end
+      end
+
+      context 'authenticated as admin' do
+        let(:user) { create(:admin) }
+
+        it 'schedules the transfer of the repository to the new storage and locks the project' do
+          update_project(project, admin, opts)
+
+          expect(project).to be_repository_read_only
+          expect(project.repository_storage_moves.last).to have_attributes(
+            state: ::ProjectRepositoryStorageMove.state_machines[:state].states[:scheduled].value,
+            source_storage_name: 'default',
+            destination_storage_name: 'test_second_storage'
+          )
+        end
+
+        context 'the repository is read-only' do
+          let(:repository_read_only) { true }
+
+          it_behaves_like 'the transfer was not scheduled'
+        end
+
+        context 'the storage has not changed' do
+          let(:opts) { { repository_storage: 'default' } }
+
+          it_behaves_like 'the transfer was not scheduled'
+        end
+
+        context 'the storage does not exist' do
+          let(:opts) { { repository_storage: 'nonexistent' } }
+
+          it_behaves_like 'the transfer was not scheduled'
+        end
+      end
+
+      context 'authenticated as user' do
+        let(:user) { create(:user) }
+
+        it_behaves_like 'the transfer was not scheduled'
+      end
+    end
   end
 
   describe '#run_auto_devops_pipeline?' do
@@ -611,25 +668,6 @@ describe Projects::UpdateService do
     end
   end
 
-  describe 'repository_storage' do
-    let(:admin) { create(:admin) }
-    let(:user) { create(:user) }
-    let(:project) { create(:project, :repository) }
-    let(:opts) { { repository_storage: 'test_second_storage' } }
-
-    it 'calls the change repository storage method if the storage changed' do
-      expect(project).to receive(:change_repository_storage).with('test_second_storage')
-
-      update_project(project, admin, opts).inspect
-    end
-
-    it "doesn't call the change repository storage for non-admin users" do
-      expect(project).not_to receive(:change_repository_storage)
-
-      update_project(project, user, opts).inspect
-    end
-  end
-
   def update_project(project, user, opts)
     described_class.new(project, user, opts).execute
   end
diff --git a/spec/services/prometheus/create_default_alerts_service_spec.rb b/spec/services/prometheus/create_default_alerts_service_spec.rb
index 3382844c99a..a28c38491de 100644
--- a/spec/services/prometheus/create_default_alerts_service_spec.rb
+++ b/spec/services/prometheus/create_default_alerts_service_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Prometheus::CreateDefaultAlertsService do
-  let_it_be(:project) { create(:project) }
+  let_it_be(:project) { create(:project, :repository) }
   let(:instance) { described_class.new(project: project) }
   let(:expected_alerts) { described_class::DEFAULT_ALERTS }
 
@@ -45,6 +45,23 @@ describe Prometheus::CreateDefaultAlertsService do
            .by(expected_alerts.size)
         end
 
+        it 'does not schedule an update to prometheus' do
+          expect(::Clusters::Applications::ScheduleUpdateService).not_to receive(:new)
+          execute
+        end
+
+        context 'cluster with prometheus exists' do
+          let!(:cluster) { create(:cluster, :with_installed_prometheus, :provided_by_user, projects: [project]) }
+
+          it 'schedules an update to prometheus' do
+            expect_next_instance_of(::Clusters::Applications::ScheduleUpdateService) do |instance|
+              expect(instance).to receive(:execute)
+            end
+
+            execute
+          end
+        end
+
         context 'multiple environments' do
           let!(:production) { create(:environment, project: project, name: 'production') }
 
diff --git a/spec/services/prometheus/proxy_service_spec.rb b/spec/services/prometheus/proxy_service_spec.rb
index 656ccea10de..bd451ff00a1 100644
--- a/spec/services/prometheus/proxy_service_spec.rb
+++ b/spec/services/prometheus/proxy_service_spec.rb
@@ -41,6 +41,27 @@ describe Prometheus::ProxyService do
         expect(result.params).to eq('query' => '1')
       end
     end
+
+    context 'with series method' do
+      let(:params) do
+        ActionController::Parameters.new(
+          match: ['1'],
+          start: "2020-06-11T10:15:51Z",
+          end: "2020-06-11T11:16:06Z",
+          unknown_param: 'val'
+        ).permit!
+      end
+
+      it 'allows match, start and end parameters' do
+        result = described_class.new(environment, 'GET', 'series', params)
+
+        expect(result.params).to eq(
+          'match' => ['1'],
+          'start' => "2020-06-11T10:15:51Z",
+          'end' => "2020-06-11T11:16:06Z"
+        )
+      end
+    end
   end
 
   describe '#execute' do
@@ -182,6 +203,24 @@ describe Prometheus::ProxyService do
           end
         end
       end
+
+      context 'with series API' do
+        let(:rest_client_response) { instance_double(RestClient::Response, code: 200, body: '') }
+
+        let(:params) do
+          ActionController::Parameters.new(match: ['1'], start: 1.hour.ago.rfc3339, end: Time.current.rfc3339).permit!
+        end
+
+        subject { described_class.new(environment, 'GET', 'series', params) }
+
+        it 'calls PrometheusClient with given parameters' do
+          expect(prometheus_client).to receive(:proxy)
+            .with('series', params.to_h)
+            .and_return(rest_client_response)
+
+          subject.execute
+        end
+      end
     end
   end
 
diff --git a/spec/services/prometheus/proxy_variable_substitution_service_spec.rb b/spec/services/prometheus/proxy_variable_substitution_service_spec.rb
index 5982dcbc404..2435dda07b4 100644
--- a/spec/services/prometheus/proxy_variable_substitution_service_spec.rb
+++ b/spec/services/prometheus/proxy_variable_substitution_service_spec.rb
@@ -186,5 +186,19 @@ describe Prometheus::ProxyVariableSubstitutionService do
         end
       end
     end
+
+    context '__range' do
+      let(:params_keys) do
+        {
+          query: 'topk(5, sum by (method) (rate(rest_client_requests_total[{{__range}}])))',
+          start_time: '2020-05-29T08:19:07.142Z',
+          end_time: '2020-05-29T16:19:07.142Z'
+        }
+      end
+
+      it_behaves_like 'success' do
+        let(:expected_query) { "topk(5, sum by (method) (rate(rest_client_requests_total[#{8.hours.to_i}s])))" }
+      end
+    end
   end
 end
diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb
index a9de0a747f6..1bd402e38be 100644
--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
@@ -1621,6 +1621,29 @@ describe QuickActions::InterpretService do
         expect(message).to eq("Created branch '#{branch_name}' and a merge request to resolve this issue.")
       end
     end
+
+    context 'submit_review command' do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:note) do
+        [
+          'I like it',
+          '/submit_review'
+        ]
+      end
+
+      with_them do
+        let(:content) { '/submit_review' }
+        let!(:draft_note) { create(:draft_note, note: note, merge_request: merge_request, author: developer) }
+
+        it 'submits the users current review' do
+          _, _, message = service.execute(content, merge_request)
+
+          expect { draft_note.reload }.to raise_error(ActiveRecord::RecordNotFound)
+          expect(message).to eq('Submitted the current review.')
+        end
+      end
+    end
   end
 
   describe '#explain' do
diff --git a/spec/services/releases/create_evidence_service_spec.rb b/spec/services/releases/create_evidence_service_spec.rb
new file mode 100644
index 00000000000..caa36a6b21d
--- /dev/null
+++ b/spec/services/releases/create_evidence_service_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Releases::CreateEvidenceService do
+  let_it_be(:project) { create(:project) }
+  let(:release) { create(:release, project: project) }
+  let(:service) { described_class.new(release) }
+
+  it 'creates evidence' do
+    expect { service.execute }.to change { release.reload.evidences.count }.by(1)
+  end
+
+  it 'saves evidence summary' do
+    service.execute
+    evidence = Releases::Evidence.last
+
+    expect(release.tag).not_to be_nil
+    expect(evidence.summary["release"]["tag_name"]).to eq(release.tag)
+  end
+
+  it 'saves sha' do
+    service.execute
+    evidence = Releases::Evidence.last
+
+    expect(evidence.summary_sha).not_to be_nil
+  end
+end
diff --git a/spec/services/releases/create_service_spec.rb b/spec/services/releases/create_service_spec.rb
index d0859500440..4e3d9d5f108 100644
--- a/spec/services/releases/create_service_spec.rb
+++ b/spec/services/releases/create_service_spec.rb
@@ -186,4 +186,181 @@ describe Releases::CreateService do
       end
     end
   end
+
+  context 'Evidence collection' do
+    let(:sha) { project.repository.commit('master').sha }
+    let(:params) do
+      {
+        name: 'New release',
+        ref: 'master',
+        tag: 'v0.1',
+        description: 'Super nice release',
+        released_at: released_at
+      }.compact
+    end
+    let(:last_release) { project.releases.last }
+
+    around do |example|
+      Timecop.freeze { example.run }
+    end
+
+    subject { service.execute }
+
+    context 'historical release' do
+      let(:released_at) { 3.weeks.ago }
+
+      it 'does not execute CreateEvidenceWorker' do
+        expect { subject }.not_to change(CreateEvidenceWorker.jobs, :size)
+      end
+
+      it 'does not create an Evidence object', :sidekiq_inline do
+        expect { subject }.not_to change(Releases::Evidence, :count)
+      end
+
+      it 'is a historical release' do
+        subject
+
+        expect(last_release.historical_release?).to be_truthy
+      end
+
+      it 'is not an upcoming release' do
+        subject
+
+        expect(last_release.upcoming_release?).to be_falsy
+      end
+    end
+
+    shared_examples 'uses the right pipeline for evidence' do
+      it 'creates evidence without pipeline if it does not exist', :sidekiq_inline do
+        expect_next_instance_of(Releases::CreateEvidenceService, anything, pipeline: nil) do |service|
+          expect(service).to receive(:execute).and_call_original
+        end
+
+        expect { subject }.to change(Releases::Evidence, :count).by(1)
+      end
+
+      it 'uses the last pipeline for evidence', :sidekiq_inline do
+        create(:ci_empty_pipeline, sha: sha, project: project) # old pipeline
+        pipeline = create(:ci_empty_pipeline, sha: sha, project: project)
+
+        expect_next_instance_of(Releases::CreateEvidenceService, anything, pipeline: pipeline) do |service|
+          expect(service).to receive(:execute).and_call_original
+        end
+
+        expect { subject }.to change(Releases::Evidence, :count).by(1)
+      end
+
+      context 'when old evidence_pipeline is passed to service' do
+        let!(:old_pipeline) { create(:ci_empty_pipeline, sha: sha, project: project) }
+        let!(:new_pipeline) { create(:ci_empty_pipeline, sha: sha, project: project) }
+        let(:params) do
+          super().merge(
+            evidence_pipeline: old_pipeline
+          )
+        end
+
+        it 'uses the old pipeline for evidence', :sidekiq_inline do
+          expect_next_instance_of(Releases::CreateEvidenceService, anything, pipeline: old_pipeline) do |service|
+            expect(service).to receive(:execute).and_call_original
+          end
+
+          expect { subject }.to change(Releases::Evidence, :count).by(1)
+        end
+      end
+
+      it 'pipeline is still being used for evidence if new pipeline is being created for tag', :sidekiq_inline do
+        pipeline = create(:ci_empty_pipeline, sha: sha, project: project)
+
+        expect(project.repository).to receive(:add_tag).and_wrap_original do |m, *args|
+          create(:ci_empty_pipeline, sha: sha, project: project)
+          m.call(*args)
+        end
+
+        expect_next_instance_of(Releases::CreateEvidenceService, anything, pipeline: pipeline) do |service|
+          expect(service).to receive(:execute).and_call_original
+        end
+
+        expect { subject }.to change(Releases::Evidence, :count).by(1)
+      end
+
+      it 'uses the last pipeline for evidence when tag is already created', :sidekiq_inline do
+        Tags::CreateService.new(project, user).execute('v0.1', 'master', nil)
+
+        expect(project.repository.find_tag('v0.1')).to be_present
+
+        create(:ci_empty_pipeline, sha: sha, project: project) # old pipeline
+        pipeline = create(:ci_empty_pipeline, sha: sha, project: project)
+
+        expect_next_instance_of(Releases::CreateEvidenceService, anything, pipeline: pipeline) do |service|
+          expect(service).to receive(:execute).and_call_original
+        end
+
+        expect { subject }.to change(Releases::Evidence, :count).by(1)
+      end
+    end
+
+    context 'immediate release' do
+      let(:released_at) { nil }
+
+      it 'sets `released_at` to the current dttm' do
+        subject
+
+        expect(last_release.updated_at).to be_like_time(Time.current)
+      end
+
+      it 'queues CreateEvidenceWorker' do
+        expect { subject }.to change(CreateEvidenceWorker.jobs, :size).by(1)
+      end
+
+      it 'creates Evidence', :sidekiq_inline do
+        expect { subject }.to change(Releases::Evidence, :count).by(1)
+      end
+
+      it 'is not a historical release' do
+        subject
+
+        expect(last_release.historical_release?).to be_falsy
+      end
+
+      it 'is not an upcoming release' do
+        subject
+
+        expect(last_release.upcoming_release?).to be_falsy
+      end
+
+      include_examples 'uses the right pipeline for evidence'
+    end
+
+    context 'upcoming release' do
+      let(:released_at) { 1.day.from_now }
+
+      it 'queues CreateEvidenceWorker' do
+        expect { subject }.to change(CreateEvidenceWorker.jobs, :size).by(1)
+      end
+
+      it 'queues CreateEvidenceWorker at the released_at timestamp' do
+        subject
+
+        expect(CreateEvidenceWorker.jobs.last['at'].to_i).to eq(released_at.to_i)
+      end
+
+      it 'creates Evidence', :sidekiq_inline do
+        expect { subject }.to change(Releases::Evidence, :count).by(1)
+      end
+
+      it 'is not a historical release' do
+        subject
+
+        expect(last_release.historical_release?).to be_falsy
+      end
+
+      it 'is an upcoming release' do
+        subject
+
+        expect(last_release.upcoming_release?).to be_truthy
+      end
+
+      include_examples 'uses the right pipeline for evidence'
+    end
+  end
 end
diff --git a/spec/services/resource_events/change_state_service_spec.rb b/spec/services/resource_events/change_state_service_spec.rb
new file mode 100644
index 00000000000..e5d2a4ab11e
--- /dev/null
+++ b/spec/services/resource_events/change_state_service_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ResourceEvents::ChangeStateService do
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+
+  let(:issue) { create(:issue, project: project) }
+  let(:merge_request) { create(:merge_request, source_project: project) }
+
+  describe '#execute' do
+    context 'when resource is an issue' do
+      %w[opened reopened closed locked].each do |state|
+        it "creates the expected event if issue has #{state} state" do
+          described_class.new(user: user, resource: issue).execute(state)
+
+          event = issue.resource_state_events.last
+          expect(event.issue).to eq(issue)
+          expect(event.merge_request).to be_nil
+          expect(event.state).to eq(state)
+        end
+      end
+    end
+
+    context 'when resource is a merge request' do
+      %w[opened reopened closed locked merged].each do |state|
+        it "creates the expected event if merge request has #{state} state" do
+          described_class.new(user: user, resource: merge_request).execute(state)
+
+          event = merge_request.resource_state_events.last
+          expect(event.issue).to be_nil
+          expect(event.merge_request).to eq(merge_request)
+          expect(event.state).to eq(state)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/service_response_spec.rb b/spec/services/service_response_spec.rb
index a6567f52c6f..2c944a63ebb 100644
--- a/spec/services/service_response_spec.rb
+++ b/spec/services/service_response_spec.rb
@@ -84,4 +84,14 @@ describe ServiceResponse do
       expect(described_class.error(message: 'Bad apple').error?).to eq(true)
     end
   end
+
+  describe '#errors' do
+    it 'returns an empty array for a successful response' do
+      expect(described_class.success.errors).to be_empty
+    end
+
+    it 'returns an array with a correct message for an error response' do
+      expect(described_class.error(message: 'error message').errors).to eq(['error message'])
+    end
+  end
 end
diff --git a/spec/services/snippets/bulk_destroy_service_spec.rb b/spec/services/snippets/bulk_destroy_service_spec.rb
index f03d7496f94..6e5623e575f 100644
--- a/spec/services/snippets/bulk_destroy_service_spec.rb
+++ b/spec/services/snippets/bulk_destroy_service_spec.rb
@@ -69,6 +69,18 @@ describe Snippets::BulkDestroyService do
       it_behaves_like 'error is raised' do
         let(:error_message) { "You don't have access to delete these snippets." }
       end
+
+      context 'when hard_delete option is passed' do
+        subject { described_class.new(service_user, snippets).execute(hard_delete: true) }
+
+        it 'returns a ServiceResponse success response' do
+          expect(subject).to be_success
+        end
+
+        it 'deletes all the snippets that belong to the user' do
+          expect { subject }.to change(Snippet, :count).by(-2)
+        end
+      end
     end
 
     context 'when an error is raised deleting the repository' do
diff --git a/spec/services/snippets/create_service_spec.rb b/spec/services/snippets/create_service_spec.rb
index 786fc3ec8dd..fa8cbc87563 100644
--- a/spec/services/snippets/create_service_spec.rb
+++ b/spec/services/snippets/create_service_spec.rb
@@ -109,7 +109,7 @@ describe Snippets::CreateService do
         expect(snippet.repository.exists?).to be_truthy
       end
 
-      it 'commit the files to the repository' do
+      it 'commits the files to the repository' do
         subject
 
         blob = snippet.repository.blob_at('master', base_opts[:file_name])
@@ -230,6 +230,61 @@ describe Snippets::CreateService do
       end
     end
 
+    shared_examples 'when snippet_files param is present' do
+      let(:file_path) { 'snippet_file_path.rb' }
+      let(:content) { 'snippet_content' }
+      let(:snippet_files) { [{ action: 'create', file_path: file_path, content: content }] }
+      let(:base_opts) do
+        {
+          title: 'Test snippet',
+          visibility_level: Gitlab::VisibilityLevel::PRIVATE,
+          snippet_files: snippet_files
+        }
+      end
+
+      it 'creates a snippet with the provided attributes' do
+        expect(snippet.title).to eq(opts[:title])
+        expect(snippet.visibility_level).to eq(opts[:visibility_level])
+        expect(snippet.file_name).to eq(file_path)
+        expect(snippet.content).to eq(content)
+      end
+
+      it 'commit the files to the repository' do
+        subject
+
+        blob = snippet.repository.blob_at('master', file_path)
+
+        expect(blob.data).to eq content
+      end
+
+      context 'when content or file_name params are present' do
+        let(:extra_opts) { { content: 'foo', file_name: 'path' } }
+
+        it 'a validation error is raised' do
+          response = subject
+          snippet = response.payload[:snippet]
+
+          expect(response).to be_error
+          expect(snippet.errors.full_messages_for(:content)).to eq ['Content and snippet files cannot be used together']
+          expect(snippet.errors.full_messages_for(:file_name)).to eq ['File name and snippet files cannot be used together']
+          expect(snippet.repository.exists?).to be_falsey
+        end
+      end
+
+      context 'when snippet_files param is invalid' do
+        let(:snippet_files) { [{ action: 'invalid_action', file_path: 'snippet_file_path.rb', content: 'snippet_content' }] }
+
+        it 'a validation error is raised' do
+          response = subject
+          snippet = response.payload[:snippet]
+
+          expect(response).to be_error
+          expect(snippet.errors.full_messages_for(:snippet_files)).to eq ['Snippet files have invalid data']
+          expect(snippet.repository.exists?).to be_falsey
+        end
+      end
+    end
+
     context 'when ProjectSnippet' do
       let_it_be(:project) { create(:project) }
 
@@ -244,6 +299,7 @@ describe Snippets::CreateService do
       it_behaves_like 'an error service response when save fails'
       it_behaves_like 'creates repository and files'
       it_behaves_like 'after_save callback to store_mentions', ProjectSnippet
+      it_behaves_like 'when snippet_files param is present'
 
       context 'when uploaded files are passed to the service' do
         let(:extra_opts) { { files: ['foo'] } }
@@ -270,6 +326,7 @@ describe Snippets::CreateService do
       it_behaves_like 'an error service response when save fails'
       it_behaves_like 'creates repository and files'
       it_behaves_like 'after_save callback to store_mentions', PersonalSnippet
+      it_behaves_like 'when snippet_files param is present'
 
       context 'when the snippet description contains files' do
         include FileMoverHelpers
diff --git a/spec/services/snippets/update_service_spec.rb b/spec/services/snippets/update_service_spec.rb
index 6c3ae52befc..7e6441ad2f9 100644
--- a/spec/services/snippets/update_service_spec.rb
+++ b/spec/services/snippets/update_service_spec.rb
@@ -302,6 +302,82 @@ describe Snippets::UpdateService do
       end
     end
 
+    shared_examples 'when snippet_files param is present' do
+      let(:file_path) { 'CHANGELOG' }
+      let(:content) { 'snippet_content' }
+      let(:new_title) { 'New title' }
+      let(:snippet_files) { [{ action: 'update', previous_path: file_path, file_path: file_path, content: content }] }
+      let(:base_opts) do
+        {
+          title: new_title,
+          snippet_files: snippet_files
+        }
+      end
+
+      it 'updates a snippet with the provided attributes' do
+        file_path = 'foo'
+        snippet_files[0][:action] = 'move'
+        snippet_files[0][:file_path] = file_path
+
+        response = subject
+        snippet = response.payload[:snippet]
+
+        expect(response).to be_success
+        expect(snippet.title).to eq(new_title)
+        expect(snippet.file_name).to eq(file_path)
+        expect(snippet.content).to eq(content)
+      end
+
+      it 'commit the files to the repository' do
+        subject
+
+        blob = snippet.repository.blob_at('master', file_path)
+
+        expect(blob.data).to eq content
+      end
+
+      context 'when content or file_name params are present' do
+        let(:extra_opts) { { content: 'foo', file_name: 'path' } }
+
+        it 'raises a validation error' do
+          response = subject
+          snippet = response.payload[:snippet]
+
+          expect(response).to be_error
+          expect(snippet.errors.full_messages_for(:content)).to eq ['Content and snippet files cannot be used together']
+          expect(snippet.errors.full_messages_for(:file_name)).to eq ['File name and snippet files cannot be used together']
+        end
+      end
+
+      context 'when snippet_files param is invalid' do
+        let(:snippet_files) { [{ action: 'invalid_action' }] }
+
+        it 'raises a validation error' do
+          response = subject
+          snippet = response.payload[:snippet]
+
+          expect(response).to be_error
+          expect(snippet.errors.full_messages_for(:snippet_files)).to eq ['Snippet files have invalid data']
+        end
+      end
+
+      context 'when an error is raised committing the file' do
+        it 'keeps any snippet modifications' do
+          expect_next_instance_of(described_class) do |instance|
+            expect(instance).to receive(:create_repository_for).and_raise(StandardError)
+          end
+
+          response = subject
+          snippet = response.payload[:snippet]
+
+          expect(response).to be_error
+          expect(snippet.title).to eq(new_title)
+          expect(snippet.file_name).to eq(file_path)
+          expect(snippet.content).to eq(content)
+        end
+      end
+    end
+
     shared_examples 'only file_name is present' do
       let(:base_opts) do
         {
@@ -370,6 +446,7 @@ describe Snippets::UpdateService do
       it_behaves_like 'updates repository content'
       it_behaves_like 'commit operation fails'
       it_behaves_like 'committable attributes'
+      it_behaves_like 'when snippet_files param is present'
       it_behaves_like 'only file_name is present'
       it_behaves_like 'only content is present'
       it_behaves_like 'snippets spam check is performed' do
@@ -396,6 +473,7 @@ describe Snippets::UpdateService do
       it_behaves_like 'updates repository content'
       it_behaves_like 'commit operation fails'
       it_behaves_like 'committable attributes'
+      it_behaves_like 'when snippet_files param is present'
       it_behaves_like 'only file_name is present'
       it_behaves_like 'only content is present'
       it_behaves_like 'snippets spam check is performed' do
diff --git a/spec/services/spam/akismet_service_spec.rb b/spec/services/spam/akismet_service_spec.rb
index a496cd1890e..413b43d0156 100644
--- a/spec/services/spam/akismet_service_spec.rb
+++ b/spec/services/spam/akismet_service_spec.rb
@@ -45,9 +45,7 @@ describe Spam::AkismetService do
       end
 
       it 'logs an error' do
-        logger_spy = double(:logger)
-        expect(Rails).to receive(:logger).and_return(logger_spy)
-        expect(logger_spy).to receive(:error).with(/skipping/)
+        expect(Gitlab::AppLogger).to receive(:error).with(/skipping/)
 
         subject.send(method_call)
       end
@@ -98,9 +96,7 @@ describe Spam::AkismetService do
         end
 
         it 'logs an error' do
-          logger_spy = double(:logger)
-          expect(Rails).to receive(:logger).and_return(logger_spy)
-          expect(logger_spy).to receive(:error).with(/skipping check/)
+          expect(Gitlab::AppLogger).to receive(:error).with(/skipping check/)
 
           subject.spam?
         end
diff --git a/spec/services/spam/spam_action_service_spec.rb b/spec/services/spam/spam_action_service_spec.rb
index 560833aba97..7b6b65c82b1 100644
--- a/spec/services/spam/spam_action_service_spec.rb
+++ b/spec/services/spam/spam_action_service_spec.rb
@@ -24,7 +24,7 @@ describe Spam::SpamActionService do
   end
 
   describe '#initialize' do
-    subject { described_class.new(spammable: issue, request: request) }
+    subject { described_class.new(spammable: issue, request: request, user: user) }
 
     context 'when the request is nil' do
       let(:request) { nil }
@@ -53,7 +53,7 @@ describe Spam::SpamActionService do
 
   shared_examples 'only checks for spam if a request is provided' do
     context 'when request is missing' do
-      subject { described_class.new(spammable: issue, request: nil) }
+      subject { described_class.new(spammable: issue, request: nil, user: user) }
 
       it "doesn't check as spam" do
         subject
@@ -78,9 +78,9 @@ describe Spam::SpamActionService do
     let_it_be(:existing_spam_log) { create(:spam_log, user: user, recaptcha_verified: false) }
 
     subject do
-      described_service = described_class.new(spammable: issue, request: request)
+      described_service = described_class.new(spammable: issue, request: request, user: user)
       allow(described_service).to receive(:allowlisted?).and_return(allowlisted)
-      described_service.execute(user: user, api: nil, recaptcha_verified: recaptcha_verified, spam_log_id: existing_spam_log.id)
+      described_service.execute(api: nil, recaptcha_verified: recaptcha_verified, spam_log_id: existing_spam_log.id)
     end
 
     before do
@@ -163,9 +163,9 @@ describe Spam::SpamActionService do
           end
         end
 
-        context 'when spam verdict service requires reCAPTCHA' do
+        context 'when spam verdict service conditionally allows' do
           before do
-            allow(fake_verdict_service).to receive(:execute).and_return(REQUIRE_RECAPTCHA)
+            allow(fake_verdict_service).to receive(:execute).and_return(CONDITIONAL_ALLOW)
           end
 
           context 'when allow_possible_spam feature flag is false' do
diff --git a/spec/services/spam/spam_verdict_service_spec.rb b/spec/services/spam/spam_verdict_service_spec.rb
index 93460a5e7d7..f6d9cd96da5 100644
--- a/spec/services/spam/spam_verdict_service_spec.rb
+++ b/spec/services/spam/spam_verdict_service_spec.rb
@@ -16,50 +16,266 @@ describe Spam::SpamVerdictService do
   let(:request) { double(:request, env: env) }
 
   let(:check_for_spam) { true }
-  let(:issue) { build(:issue) }
+  let_it_be(:user) { create(:user) }
+  let(:issue) { build(:issue, author: user) }
   let(:service) do
-    described_class.new(target: issue, request: request, options: {})
+    described_class.new(user: user, target: issue, request: request, options: {})
   end
 
   describe '#execute' do
     subject { service.execute }
 
     before do
-      allow_next_instance_of(Spam::AkismetService) do |service|
-        allow(service).to receive(:spam?).and_return(spam_verdict)
+      allow(service).to receive(:akismet_verdict).and_return(nil)
+      allow(service).to receive(:spam_verdict_verdict).and_return(nil)
+    end
+
+    context 'if all services return nil' do
+      it 'renders ALLOW verdict' do
+        expect(subject).to eq ALLOW
       end
     end
 
-    context 'if Akismet considers it spam' do
-      let(:spam_verdict) { true }
+    context 'if only one service returns a verdict' do
+      context 'and it is supported' do
+        before do
+          allow(service).to receive(:akismet_verdict).and_return(DISALLOW)
+        end
 
-      context 'if reCAPTCHA is enabled' do
+        it 'renders that verdict' do
+          expect(subject).to eq DISALLOW
+        end
+      end
+
+      context 'and it is unexpected' do
         before do
-          stub_application_setting(recaptcha_enabled: true)
+          allow(service).to receive(:akismet_verdict).and_return("unexpected")
         end
 
-        it 'requires reCAPTCHA' do
-          expect(subject).to eq REQUIRE_RECAPTCHA
+        it 'allows' do
+          expect(subject).to eq ALLOW
         end
       end
+    end
 
-      context 'if reCAPTCHA is not enabled' do
+    context 'if more than one service returns a verdict' do
+      context 'and they are supported' do
         before do
-          stub_application_setting(recaptcha_enabled: false)
+          allow(service).to receive(:akismet_verdict).and_return(DISALLOW)
+          allow(service).to receive(:spam_verdict).and_return(BLOCK_USER)
         end
 
-        it 'disallows the change' do
-          expect(subject).to eq DISALLOW
+        it 'renders the more restrictive verdict' do
+          expect(subject).to eq BLOCK_USER
+        end
+      end
+
+      context 'and one is supported' do
+        before do
+          allow(service).to receive(:akismet_verdict).and_return('nonsense')
+          allow(service).to receive(:spam_verdict).and_return(BLOCK_USER)
+        end
+
+        it 'renders the more restrictive verdict' do
+          expect(subject).to eq BLOCK_USER
+        end
+      end
+
+      context 'and one is supported' do
+        before do
+          allow(service).to receive(:akismet_verdict).and_return('nonsense')
+          allow(service).to receive(:spam_verdict).and_return(BLOCK_USER)
+        end
+
+        it 'renders the more restrictive verdict' do
+          expect(subject).to eq BLOCK_USER
+        end
+      end
+
+      context 'and none are supported' do
+        before do
+          allow(service).to receive(:akismet_verdict).and_return('nonsense')
+          allow(service).to receive(:spam_verdict).and_return('rubbish')
+        end
+
+        it 'renders the more restrictive verdict' do
+          expect(subject).to eq ALLOW
+        end
+      end
+    end
+  end
+
+  describe '#akismet_verdict' do
+    subject { service.send(:akismet_verdict) }
+
+    context 'if Akismet is enabled' do
+      before do
+        stub_application_setting(akismet_enabled: true)
+        allow_next_instance_of(Spam::AkismetService) do |service|
+          allow(service).to receive(:spam?).and_return(akismet_result)
+        end
+      end
+
+      context 'if Akismet considers it spam' do
+        let(:akismet_result) { true }
+
+        context 'if reCAPTCHA is enabled' do
+          before do
+            stub_application_setting(recaptcha_enabled: true)
+          end
+
+          it 'returns conditionally allow verdict' do
+            expect(subject).to eq CONDITIONAL_ALLOW
+          end
+        end
+
+        context 'if reCAPTCHA is not enabled' do
+          before do
+            stub_application_setting(recaptcha_enabled: false)
+          end
+
+          it 'renders disallow verdict' do
+            expect(subject).to eq DISALLOW
+          end
+        end
+      end
+
+      context 'if Akismet does not consider it spam' do
+        let(:akismet_result) { false }
+
+        it 'renders allow verdict' do
+          expect(subject).to eq ALLOW
         end
       end
     end
 
-    context 'if Akismet does not consider it spam' do
-      let(:spam_verdict) { false }
+    context 'if Akismet is not enabled' do
+      before do
+        stub_application_setting(akismet_enabled: false)
+      end
 
-      it 'allows the change' do
+      it 'renders allow verdict' do
         expect(subject).to eq ALLOW
       end
     end
   end
+
+  describe '#spam_verdict' do
+    subject { service.send(:spam_verdict) }
+
+    context 'if a Spam Check endpoint enabled and set to a URL' do
+      let(:spam_check_body) { {} }
+      let(:spam_check_http_status) { nil }
+
+      before do
+        stub_application_setting(spam_check_endpoint_enabled: true)
+        stub_application_setting(spam_check_endpoint_url: "http://www.spamcheckurl.com/spam_check")
+        stub_request(:post, /.*spamcheckurl.com.*/).to_return( body: spam_check_body.to_json, status: spam_check_http_status )
+      end
+
+      context 'if the endpoint is accessible' do
+        let(:spam_check_http_status) { 200 }
+        let(:error) { nil }
+        let(:verdict) { nil }
+        let(:spam_check_body) do
+          { verdict: verdict, error: error }
+        end
+
+        context 'the result is a valid verdict' do
+          let(:verdict) { 'allow' }
+
+          it 'returns the verdict' do
+            expect(subject).to eq ALLOW
+          end
+        end
+
+        context 'the verdict is an unexpected string' do
+          let(:verdict) { 'this is fine' }
+
+          it 'returns nil' do
+            expect(subject).to be_nil
+          end
+        end
+
+        context 'the JSON is malformed' do
+          let(:spam_check_body) { 'this is fine' }
+
+          it 'returns allow' do
+            expect(subject).to eq ALLOW
+          end
+        end
+
+        context 'the verdict is an empty string' do
+          let(:verdict) { '' }
+
+          it 'returns nil' do
+            expect(subject).to be_nil
+          end
+        end
+
+        context 'the verdict is nil' do
+          let(:verdict) { nil }
+
+          it 'returns nil' do
+            expect(subject).to be_nil
+          end
+        end
+
+        context 'there is an error' do
+          let(:error) { "Sorry Dave, I can't do that" }
+
+          it 'returns nil' do
+            expect(subject).to be_nil
+          end
+        end
+
+        context 'the HTTP status is not 200' do
+          let(:spam_check_http_status) { 500 }
+
+          it 'returns nil' do
+            expect(subject).to be_nil
+          end
+        end
+
+        context 'the confused API endpoint returns both an error and a verdict' do
+          let(:verdict) { 'disallow' }
+          let(:error) { 'oh noes!' }
+
+          it 'renders the verdict' do
+            expect(subject).to eq DISALLOW
+          end
+        end
+      end
+
+      context 'if the endpoint times out' do
+        before do
+          stub_request(:post, /.*spamcheckurl.com.*/).to_timeout
+        end
+
+        it 'returns nil' do
+          expect(subject).to be_nil
+        end
+      end
+    end
+
+    context 'if a Spam Check endpoint is not set' do
+      before do
+        stub_application_setting(spam_check_endpoint_url: nil)
+      end
+
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+
+    context 'if Spam Check endpoint is not enabled' do
+      before do
+        stub_application_setting(spam_check_endpoint_enabled: false)
+      end
+
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/services/submit_usage_ping_service_spec.rb b/spec/services/submit_usage_ping_service_spec.rb
index 26ce5968ad6..981ea0dbec1 100644
--- a/spec/services/submit_usage_ping_service_spec.rb
+++ b/spec/services/submit_usage_ping_service_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 describe SubmitUsagePingService do
   include StubRequests
+  include UsageDataHelpers
 
   let(:score_params) do
     {
@@ -76,7 +77,7 @@ describe SubmitUsagePingService do
 
   context 'when usage ping is enabled' do
     before do
-      allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
+      stub_usage_data_connections
       stub_application_setting(usage_ping_enabled: true)
     end
 
diff --git a/spec/services/suggestions/apply_service_spec.rb b/spec/services/suggestions/apply_service_spec.rb
index b04c3278eaa..678e2129181 100644
--- a/spec/services/suggestions/apply_service_spec.rb
+++ b/spec/services/suggestions/apply_service_spec.rb
@@ -5,41 +5,66 @@ require 'spec_helper'
 describe Suggestions::ApplyService do
   include ProjectForksHelper
 
-  def build_position(args = {})
-    default_args = { old_path: "files/ruby/popen.rb",
-                     new_path: "files/ruby/popen.rb",
-                     old_line: nil,
-                     new_line: 9,
-                     diff_refs: merge_request.diff_refs }
-
-    Gitlab::Diff::Position.new(default_args.merge(args))
+  def build_position(**optional_args)
+    args = { old_path: "files/ruby/popen.rb",
+             new_path: "files/ruby/popen.rb",
+             old_line: nil,
+             new_line: 9,
+             diff_refs: merge_request.diff_refs,
+             **optional_args }
+
+    Gitlab::Diff::Position.new(args)
   end
 
-  shared_examples 'successfully creates commit and updates suggestion' do
-    def apply(suggestion)
-      result = subject.execute(suggestion)
-      expect(result[:status]).to eq(:success)
-    end
+  def create_suggestion(args)
+    position_args = args.slice(:old_path, :new_path, :old_line, :new_line)
+    content_args = args.slice(:from_content, :to_content)
+
+    position = build_position(position_args)
+
+    diff_note = create(:diff_note_on_merge_request,
+                       noteable: merge_request,
+                       position: position,
+                       project: project)
+
+    suggestion_args = { note: diff_note }.merge(content_args)
+
+    create(:suggestion, :content_from_repo, suggestion_args)
+  end
+
+  def apply(suggestions)
+    result = apply_service.new(user, *suggestions).execute
 
-    it 'updates the file with the new contents' do
-      apply(suggestion)
+    suggestions.map { |suggestion| suggestion.reload }
 
-      blob = project.repository.blob_at_branch(merge_request.source_branch,
-                                               position.new_path)
+    expect(result[:status]).to eq(:success)
+  end
+
+  shared_examples 'successfully creates commit and updates suggestions' do
+    it 'updates the files with the new content' do
+      apply(suggestions)
 
-      expect(blob.data).to eq(expected_content)
+      suggestions.each do |suggestion|
+        path = suggestion.diff_file.file_path
+        blob = project.repository.blob_at_branch(merge_request.source_branch,
+                                                 path)
+
+        expect(blob.data).to eq(expected_content_by_path[path.to_sym])
+      end
     end
 
     it 'updates suggestion applied and commit_id columns' do
-      expect { apply(suggestion) }
-        .to change(suggestion, :applied)
-        .from(false).to(true)
-        .and change(suggestion, :commit_id)
-        .from(nil)
+      expect(suggestions.map(&:applied)).to all(be false)
+      expect(suggestions.map(&:commit_id)).to all(be nil)
+
+      apply(suggestions)
+
+      expect(suggestions.map(&:applied)).to all(be true)
+      expect(suggestions.map(&:commit_id)).to all(be_present)
     end
 
     it 'created commit has users email and name' do
-      apply(suggestion)
+      apply(suggestions)
 
       commit = project.repository.commit
 
@@ -53,125 +78,214 @@ describe Suggestions::ApplyService do
       before do
         project.update!(suggestion_commit_message: message)
 
-        apply(suggestion)
+        apply(suggestions)
       end
 
       context 'is not specified' do
-        let(:expected_value) { "Apply suggestion to files/ruby/popen.rb" }
-
-        context 'is nil' do
-          let(:message) { nil }
+        let(:message) { '' }
 
-          it 'sets default commit message' do
-            expect(project.repository.commit.message).to eq(expected_value)
-          end
-        end
-
-        context 'is an empty string' do
-          let(:message) { '' }
-
-          it 'sets default commit message' do
-            expect(project.repository.commit.message).to eq(expected_value)
-          end
+        it 'uses the default commit message' do
+          expect(project.repository.commit.message).to(
+            match(/\AApply #{suggestions.size} suggestion\(s\) to \d+ file\(s\)\z/)
+          )
         end
       end
 
       context 'is specified' do
-        let(:message) { 'refactor: %{project_path} %{project_name} %{file_path} %{branch_name} %{username} %{user_full_name}' }
+        let(:message) do
+          'refactor: %{project_name} %{branch_name} %{username}'
+        end
 
-        it 'sets custom commit message' do
-          expect(project.repository.commit.message).to eq("refactor: project-1 Project_1 files/ruby/popen.rb master test.user Test User")
+        it 'generates a custom commit message' do
+          expect(project.repository.commit.message).to(
+            eq("refactor: Project_1 master test.user")
+          )
         end
       end
     end
   end
 
-  let(:project) { create(:project, :repository, path: 'project-1', name: 'Project_1') }
-  let(:user) { create(:user, :commit_email, name: 'Test User', username: 'test.user') }
+  subject(:apply_service) { described_class }
+
+  let_it_be(:user) do
+    create(:user, :commit_email, name: 'Test User', username: 'test.user')
+  end
+
+  let(:project) do
+    create(:project, :repository, path: 'project-1', name: 'Project_1')
+  end
+
+  let(:merge_request) do
+    create(:merge_request, source_project: project,
+           target_project: project,
+           source_branch: 'master')
+  end
 
   let(:position) { build_position }
 
   let(:diff_note) do
-    create(:diff_note_on_merge_request, noteable: merge_request, position: position, project: project)
+    create(:diff_note_on_merge_request, noteable: merge_request,
+           position: position, project: project)
   end
 
   let(:suggestion) do
     create(:suggestion, :content_from_repo, note: diff_note,
-                                            to_content: "      raise RuntimeError, 'Explosion'\n      # explosion?\n")
+           to_content: "      raise RuntimeError, 'Explosion'\n      # explosion?\n")
   end
 
-  subject { described_class.new(user) }
+  let(:suggestion2) do
+    create_suggestion(
+      to_content: "      *** SUGGESTION CHANGE ***\n",
+      new_line: 15)
+  end
+
+  let(:suggestion3) do
+    create_suggestion(
+      to_content: "      *** ANOTHER SUGGESTION CHANGE ***\n",
+      old_path: "files/ruby/regex.rb",
+      new_path: "files/ruby/regex.rb",
+      new_line: 22)
+  end
+
+  let(:suggestions) { [suggestion, suggestion2, suggestion3] }
 
   context 'patch is appliable' do
-    let(:expected_content) do
+    let(:popen_content) do
       <<-CONTENT.strip_heredoc
-          require 'fileutils'
-          require 'open3'
+        require 'fileutils'
+        require 'open3'
+
+        module Popen
+          extend self
+
+          def popen(cmd, path=nil)
+            unless cmd.is_a?(Array)
+              raise RuntimeError, 'Explosion'
+              # explosion?
+            end
+
+            path ||= Dir.pwd
+
+            vars = {
+              *** SUGGESTION CHANGE ***
+            }
+
+            options = {
+              chdir: path
+            }
+
+            unless File.directory?(path)
+              FileUtils.mkdir_p(path)
+            end
+
+            @cmd_output = ""
+            @cmd_status = 0
+
+            Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
+              @cmd_output << stdout.read
+              @cmd_output << stderr.read
+              @cmd_status = wait_thr.value.exitstatus
+            end
 
-          module Popen
+            return @cmd_output, @cmd_status
+          end
+        end
+      CONTENT
+    end
+
+    let(:regex_content) do
+      <<-CONTENT.strip_heredoc
+        module Gitlab
+          module Regex
             extend self
 
-            def popen(cmd, path=nil)
-              unless cmd.is_a?(Array)
-                raise RuntimeError, 'Explosion'
-                # explosion?
-              end
+            def username_regex
+              default_regex
+            end
 
-              path ||= Dir.pwd
+            def project_name_regex
+              /\\A[a-zA-Z0-9][a-zA-Z0-9_\\-\\. ]*\\z/
+            end
 
-              vars = {
-                "PWD" => path
-              }
+            def name_regex
+              /\\A[a-zA-Z0-9_\\-\\. ]*\\z/
+            end
 
-              options = {
-                chdir: path
-              }
+            def path_regex
+              default_regex
+            end
 
-              unless File.directory?(path)
-                FileUtils.mkdir_p(path)
-              end
+            def archive_formats_regex
+              *** ANOTHER SUGGESTION CHANGE ***
+            end
 
-              @cmd_output = ""
-              @cmd_status = 0
+            def git_reference_regex
+              # Valid git ref regex, see:
+              # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
+              %r{
+                (?!
+                   (?# doesn't begins with)
+                   \\/|                    (?# rule #6)
+                   (?# doesn't contain)
+                   .*(?:
+                      [\\\/.]\\\.|            (?# rule #1,3)
+                      \\/\\/|               (?# rule #6)
+                      @\\{|                (?# rule #8)
+                      \\\\                  (?# rule #9)
+                   )
+                )
+                [^\\000-\\040\\177~^:?*\\[]+  (?# rule #4-5)
+                (?# doesn't end with)
+                (?<!\\.lock)               (?# rule #1)
+                (?<![\\/.])                (?# rule #6-7)
+              }x
+            end
 
-              Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
-                @cmd_output << stdout.read
-                @cmd_output << stderr.read
-                @cmd_status = wait_thr.value.exitstatus
-              end
+            protected
 
-              return @cmd_output, @cmd_status
+            def default_regex
+              /\\A[.?]?[a-zA-Z0-9][a-zA-Z0-9_\\-\\.]*(?<!\\.git)\\z/
             end
           end
+        end
       CONTENT
     end
 
-    context 'non-fork project' do
-      let(:merge_request) do
-        create(:merge_request, source_project: project,
-                               target_project: project,
-                               source_branch: 'master')
-      end
+    let(:expected_content_by_path) do
+      {
+        "files/ruby/popen.rb": popen_content,
+        "files/ruby/regex.rb": regex_content
+      }
+    end
 
+    context 'non-fork project' do
       before do
         project.add_maintainer(user)
       end
 
-      it_behaves_like 'successfully creates commit and updates suggestion'
+      it_behaves_like 'successfully creates commit and updates suggestions'
 
-      context 'when it fails to apply because the file was changed' do
-        it 'returns error message' do
-          service = instance_double(Files::UpdateService)
+      context 'when it fails to apply because a file was changed' do
+        before do
+          params = {
+            file_path: suggestion3.diff_file.file_path,
+            start_branch: suggestion3.branch,
+            branch_name: suggestion3.branch,
+            commit_message: 'Update file',
+            file_content: 'New content'
+          }
 
-          expect(Files::UpdateService).to receive(:new)
-            .and_return(service)
+          # Reload the suggestion so it's memoized values get reset after the
+          # file was changed.
+          suggestion3.reload
 
-          allow(service).to receive(:execute)
-            .and_raise(Files::UpdateService::FileChangedError)
+          Files::UpdateService.new(project, user, params).execute
+        end
 
-          result = subject.execute(suggestion)
+        it 'returns error message' do
+          result = apply_service.new(user, suggestion, suggestion3, suggestion2).execute
 
-          expect(result).to eq(message: 'The file has been changed', status: :error)
+          expect(result).to eq(message: 'A file has been changed.', status: :error)
         end
       end
 
@@ -181,78 +295,20 @@ describe Suggestions::ApplyService do
           allow(suggestion.position).to receive(:head_sha) { 'old-sha' }
           allow(suggestion.noteable).to receive(:source_branch_sha) { 'new-sha' }
 
-          result = subject.execute(suggestion)
+          result = apply_service.new(user, suggestion).execute
 
-          expect(result).to eq(message: 'The file has been changed', status: :error)
+          expect(result).to eq(message: 'A file has been changed.', status: :error)
         end
       end
 
-      context 'multiple suggestions applied' do
-        let(:expected_content) do
-          <<-CONTENT.strip_heredoc
-              require 'fileutils'
-              require 'open3'
-
-              module Popen
-                extend self
-
-
-                def popen(cmd, path=nil)
-                  unless cmd.is_a?(Array)
-                    # v1 change
-                  end
-
-                  path ||= Dir.pwd
-                  # v1 change
-                  vars = {
-                    "PWD" => path
-                  }
-
-                  options = {
-                    chdir: path
-                  }
-                  # v2 change
-                  unless File.directory?(path)
-                    FileUtils.mkdir_p(path)
-                  end
-
-                  @cmd_output = ""
-                  # v2 change
-
-                  Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
-                    @cmd_output << stdout.read
-                    @cmd_output << stderr.read
-                    @cmd_status = wait_thr.value.exitstatus
-                  end
-
-                  return @cmd_output, @cmd_status
-                end
-              end
-          CONTENT
-        end
-
-        def create_suggestion(diff, old_line: nil, new_line: nil, from_content:, to_content:, path:)
-          position = Gitlab::Diff::Position.new(old_path: path,
-                                                new_path: path,
-                                                old_line: old_line,
-                                                new_line: new_line,
-                                                diff_refs: diff.diff_refs)
-
-          suggestion_note = create(:diff_note_on_merge_request, noteable: merge_request,
-                                                                original_position: position,
-                                                                position: position,
-                                                                project: project)
-          create(:suggestion, note: suggestion_note,
-                              from_content: from_content,
-                              to_content: to_content)
-        end
-
+      context 'multiple suggestions applied sequentially' do
         def apply_suggestion(suggestion)
           suggestion.reload
           merge_request.reload
           merge_request.clear_memoized_shas
 
-          result = subject.execute(suggestion)
+          result = apply_service.new(user, suggestion).execute
+          suggestion.reload
           expect(result[:status]).to eq(:success)
 
           refresh = MergeRequests::RefreshService.new(project, user)
@@ -264,34 +320,31 @@ describe Suggestions::ApplyService do
         end
 
         def fetch_raw_diff(suggestion)
-          project.reload.commit(suggestion.commit_id).diffs.diff_files.first.diff.diff
+          project.reload.commit(suggestion.commit_id)
+            .diffs.diff_files.first.diff.diff
         end
 
         it 'applies multiple suggestions in subsequent versions correctly' do
-          diff = merge_request.merge_request_diff
-          path = 'files/ruby/popen.rb'
+          suggestion1 = create_suggestion(
+            from_content: "\n",
+            to_content: "# v1 change\n",
+            old_line: nil,
+            new_line: 13)
 
-          suggestion_1_changes = { old_line: nil,
-                                   new_line: 13,
-                                   from_content: "\n",
-                                   to_content: "# v1 change\n",
-                                   path: path }
+          suggestion2 = create_suggestion(
+            from_content: "      @cmd_output << stderr.read\n",
+            to_content: "# v2 change\n",
+            old_line: 24,
+            new_line: 31)
 
-          suggestion_2_changes = { old_line: 24,
-                                   new_line: 31,
-                                   from_content: "      @cmd_output << stderr.read\n",
-                                   to_content: "# v2 change\n",
-                                   path: path }
+          apply_suggestion(suggestion1)
+          apply_suggestion(suggestion2)
 
-          suggestion_1 = create_suggestion(diff, suggestion_1_changes)
-          suggestion_2 = create_suggestion(diff, suggestion_2_changes)
-
-          apply_suggestion(suggestion_1)
-
-          suggestion_1_diff = fetch_raw_diff(suggestion_1)
+          suggestion1_diff = fetch_raw_diff(suggestion1)
+          suggestion2_diff = fetch_raw_diff(suggestion2)
 
           # rubocop: disable Layout/TrailingWhitespace
-          expected_suggestion_1_diff = <<-CONTENT.strip_heredoc
+          expected_suggestion1_diff = <<-CONTENT.strip_heredoc
             @@ -10,7 +10,7 @@ module Popen
                  end
              
@@ -304,12 +357,8 @@ describe Suggestions::ApplyService do
           CONTENT
           # rubocop: enable Layout/TrailingWhitespace
 
-          apply_suggestion(suggestion_2)
-
-          suggestion_2_diff = fetch_raw_diff(suggestion_2)
-
           # rubocop: disable Layout/TrailingWhitespace
-          expected_suggestion_2_diff = <<-CONTENT.strip_heredoc
+          expected_suggestion2_diff = <<-CONTENT.strip_heredoc
             @@ -28,7 +28,7 @@ module Popen
              
                  Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
@@ -321,14 +370,14 @@ describe Suggestions::ApplyService do
           CONTENT
           # rubocop: enable Layout/TrailingWhitespace
 
-          expect(suggestion_1_diff.strip).to eq(expected_suggestion_1_diff.strip)
-          expect(suggestion_2_diff.strip).to eq(expected_suggestion_2_diff.strip)
+          expect(suggestion1_diff.strip).to eq(expected_suggestion1_diff.strip)
+          expect(suggestion2_diff.strip).to eq(expected_suggestion2_diff.strip)
         end
       end
 
       context 'multi-line suggestion' do
-        let(:expected_content) do
-          <<~CONTENT
+        let(:popen_content) do
+          <<~CONTENT.strip_heredoc
             require 'fileutils'
             require 'open3'
 
@@ -365,19 +414,27 @@ describe Suggestions::ApplyService do
           CONTENT
         end
 
+        let(:expected_content_by_path) do
+          {
+            "files/ruby/popen.rb": popen_content
+          }
+        end
+
         let(:suggestion) do
           create(:suggestion, :content_from_repo, note: diff_note,
-                                                  lines_above: 2,
-                                                  lines_below: 3,
-                                                  to_content: "# multi\n# line\n")
+                 lines_above: 2,
+                 lines_below: 3,
+                 to_content: "# multi\n# line\n")
         end
 
-        it_behaves_like 'successfully creates commit and updates suggestion'
+        let(:suggestions) { [suggestion] }
+
+        it_behaves_like 'successfully creates commit and updates suggestions'
       end
 
       context 'remove an empty line suggestion' do
-        let(:expected_content) do
-          <<~CONTENT
+        let(:popen_content) do
+          <<~CONTENT.strip_heredoc
             require 'fileutils'
             require 'open3'
 
@@ -417,12 +474,19 @@ describe Suggestions::ApplyService do
           CONTENT
         end
 
-        let(:position) { build_position(new_line: 13) }
+        let(:expected_content_by_path) do
+          {
+            "files/ruby/popen.rb": popen_content
+          }
+        end
+
         let(:suggestion) do
-          create(:suggestion, :content_from_repo, note: diff_note, to_content: "")
+          create_suggestion( to_content: "", new_line: 13)
         end
 
-        it_behaves_like 'successfully creates commit and updates suggestion'
+        let(:suggestions) { [suggestion] }
+
+        it_behaves_like 'successfully creates commit and updates suggestions'
       end
     end
 
@@ -430,17 +494,23 @@ describe Suggestions::ApplyService do
       let(:project) { create(:project, :public, :repository) }
 
       let(:forked_project) do
-        fork_project_with_submodules(project, user, repository: project.repository)
+        fork_project_with_submodules(project,
+                                     user, repository: project.repository)
       end
 
       let(:merge_request) do
         create(:merge_request,
-               source_branch: 'conflict-resolvable-fork', source_project: forked_project,
-               target_branch: 'conflict-start', target_project: project)
+               source_branch: 'conflict-resolvable-fork',
+               source_project: forked_project,
+               target_branch: 'conflict-start',
+               target_project: project)
       end
 
       let!(:diff_note) do
-        create(:diff_note_on_merge_request, noteable: merge_request, position: position, project: project)
+        create(:diff_note_on_merge_request,
+               noteable: merge_request,
+               position: position,
+               project: project)
       end
 
       before do
@@ -448,11 +518,12 @@ describe Suggestions::ApplyService do
       end
 
       it 'updates file in the source project' do
-        expect(Files::UpdateService).to receive(:new)
-          .with(merge_request.source_project, user, anything)
-          .and_call_original
+        expect(Files::MultiService).to receive(:new)
+                                         .with(merge_request.source_project,
+                                               user,
+                                               anything).and_call_original
 
-        subject.execute(suggestion)
+        apply_service.new(user, suggestion).execute
       end
     end
   end
@@ -460,13 +531,13 @@ describe Suggestions::ApplyService do
   context 'no permission' do
     let(:merge_request) do
       create(:merge_request, source_project: project,
-                             target_project: project)
+             target_project: project)
     end
 
     let(:diff_note) do
       create(:diff_note_on_merge_request, noteable: merge_request,
-                                          position: position,
-                                          project: project)
+             position: position,
+             project: project)
     end
 
     context 'user cannot write in project repo' do
@@ -475,7 +546,7 @@ describe Suggestions::ApplyService do
       end
 
       it 'returns error' do
-        result = subject.execute(suggestion)
+        result = apply_service.new(user, suggestion).execute
 
         expect(result).to eq(message: "You are not allowed to push into this branch",
                              status: :error)
@@ -486,13 +557,13 @@ describe Suggestions::ApplyService do
   context 'patch is not appliable' do
     let(:merge_request) do
       create(:merge_request, source_project: project,
-                             target_project: project)
+             target_project: project)
     end
 
     let(:diff_note) do
       create(:diff_note_on_merge_request, noteable: merge_request,
-                                          position: position,
-                                          project: project)
+             position: position,
+             project: project)
     end
 
     before do
@@ -503,29 +574,49 @@ describe Suggestions::ApplyService do
       it 'returns error message' do
         expect(suggestion.note).to receive(:latest_diff_file) { nil }
 
-        result = subject.execute(suggestion)
+        result = apply_service.new(user, suggestion).execute
 
-        expect(result).to eq(message: 'Suggestion is not appliable',
+        expect(result).to eq(message: 'A file was not found.',
                              status: :error)
       end
     end
 
-    context 'suggestion is eligible to be outdated' do
-      it 'returns error message' do
-        expect(suggestion).to receive(:outdated?) { true }
+    context 'when not all suggestions belong to the same branch' do
+      it 'renders error message' do
+        merge_request2 = create(:merge_request,
+                                :conflict,
+                                source_project: project,
+                                target_project: project)
 
-        result = subject.execute(suggestion)
+        position2 = Gitlab::Diff::Position.new(old_path: "files/ruby/popen.rb",
+                                               new_path: "files/ruby/popen.rb",
+                                               old_line: nil,
+                                               new_line: 15,
+                                               diff_refs: merge_request2
+                                                            .diff_refs)
 
-        expect(result).to eq(message: 'Suggestion is not appliable',
+        diff_note2 = create(:diff_note_on_merge_request,
+                            noteable: merge_request2,
+                            position: position2,
+                            project: project)
+
+        other_branch_suggestion = create(:suggestion, note: diff_note2)
+
+        result = apply_service.new(user, suggestion, other_branch_suggestion).execute
+
+        expect(result).to eq(message: 'Suggestions must all be on the same branch.',
                              status: :error)
       end
     end
 
-    context 'suggestion was already applied' do
-      it 'returns success status' do
-        result = subject.execute(suggestion)
+    context 'suggestion is eligible to be outdated' do
+      it 'returns error message' do
+        expect(suggestion).to receive(:outdated?) { true }
+
+        result = apply_service.new(user, suggestion).execute
 
-        expect(result[:status]).to eq(:success)
+        expect(result).to eq(message: 'A suggestion is not applicable.',
+                             status: :error)
       end
     end
 
@@ -535,9 +626,9 @@ describe Suggestions::ApplyService do
       end
 
       it 'returns error message' do
-        result = subject.execute(suggestion)
+        result = apply_service.new(user, suggestion).execute
 
-        expect(result).to eq(message: 'Suggestion is not appliable',
+        expect(result).to eq(message: 'A suggestion is not applicable.',
                              status: :error)
       end
     end
@@ -548,9 +639,27 @@ describe Suggestions::ApplyService do
       end
 
       it 'returns error message' do
-        result = subject.execute(suggestion)
+        result = apply_service.new(user, suggestion).execute
+
+        expect(result).to eq(message: 'A suggestion is not applicable.',
+                             status: :error)
+      end
+    end
+
+    context 'lines of suggestions overlap' do
+      let(:suggestion) do
+        create_suggestion(
+          to_content: "      raise RuntimeError, 'Explosion'\n      # explosion?\n")
+      end
+
+      let(:overlapping_suggestion) do
+        create_suggestion(to_content: "I Overlap!")
+      end
+
+      it 'returns error message' do
+        result = apply_service.new(user, suggestion, overlapping_suggestion).execute
 
-        expect(result).to eq(message: 'Suggestion is not appliable',
+        expect(result).to eq(message: 'Suggestions are not applicable as their lines cannot overlap.',
                              status: :error)
       end
     end
diff --git a/spec/services/system_notes/issuables_service_spec.rb b/spec/services/system_notes/issuables_service_spec.rb
index 477f9eae39e..c3b3c877583 100644
--- a/spec/services/system_notes/issuables_service_spec.rb
+++ b/spec/services/system_notes/issuables_service_spec.rb
@@ -157,7 +157,18 @@ describe ::SystemNotes::IssuablesService do
   describe '#change_status' do
     subject { service.change_status(status, source) }
 
+    context 'when resource state event tracking is enabled' do
+      let(:status) { 'reopened' }
+      let(:source) { nil }
+
+      it { is_expected.to be_nil }
+    end
+
     context 'with status reopened' do
+      before do
+        stub_feature_flags(track_resource_state_change_events: false)
+      end
+
       let(:status) { 'reopened' }
       let(:source) { nil }
 
@@ -169,6 +180,10 @@ describe ::SystemNotes::IssuablesService do
     end
 
     context 'with a source' do
+      before do
+        stub_feature_flags(track_resource_state_change_events: false)
+      end
+
       let(:status) { 'opened' }
       let(:source) { double('commit', gfm_reference: 'commit 123456') }
 
diff --git a/spec/services/test_hooks/project_service_spec.rb b/spec/services/test_hooks/project_service_spec.rb
index 8d30f5018dd..3c5bc0d85f2 100644
--- a/spec/services/test_hooks/project_service_spec.rb
+++ b/spec/services/test_hooks/project_service_spec.rb
@@ -31,15 +31,7 @@ describe TestHooks::ProjectService do
       let(:trigger) { 'push_events' }
       let(:trigger_key) { :push_hooks }
 
-      it 'returns error message if not enough data' do
-        allow(project).to receive(:empty_repo?).and_return(true)
-
-        expect(hook).not_to receive(:execute)
-        expect(service.execute).to include({ status: :error, message: 'Ensure the project has at least one commit.' })
-      end
-
       it 'executes hook' do
-        allow(project).to receive(:empty_repo?).and_return(false)
         allow(Gitlab::DataBuilder::Push).to receive(:build_sample).and_return(sample_data)
 
         expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
@@ -51,15 +43,7 @@ describe TestHooks::ProjectService do
       let(:trigger) { 'tag_push_events' }
       let(:trigger_key) { :tag_push_hooks }
 
-      it 'returns error message if not enough data' do
-        allow(project).to receive(:empty_repo?).and_return(true)
-
-        expect(hook).not_to receive(:execute)
-        expect(service.execute).to include({ status: :error, message: 'Ensure the project has at least one commit.' })
-      end
-
       it 'executes hook' do
-        allow(project).to receive(:empty_repo?).and_return(false)
         allow(Gitlab::DataBuilder::Push).to receive(:build_sample).and_return(sample_data)
 
         expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
diff --git a/spec/services/test_hooks/system_service_spec.rb b/spec/services/test_hooks/system_service_spec.rb
index 799b57eb04e..8a86b14a2a1 100644
--- a/spec/services/test_hooks/system_service_spec.rb
+++ b/spec/services/test_hooks/system_service_spec.rb
@@ -29,7 +29,6 @@ describe TestHooks::SystemService do
       let(:trigger_key) { :push_hooks }
 
       it 'executes hook' do
-        allow(project).to receive(:empty_repo?).and_return(false)
         expect(Gitlab::DataBuilder::Push).to receive(:sample_data).and_call_original
 
         expect(hook).to receive(:execute).with(Gitlab::DataBuilder::Push::SAMPLE_DATA, trigger_key).and_return(success_result)
@@ -55,7 +54,6 @@ describe TestHooks::SystemService do
       let(:trigger_key) { :repository_update_hooks }
 
       it 'executes hook' do
-        allow(project).to receive(:empty_repo?).and_return(false)
         expect(Gitlab::DataBuilder::Repository).to receive(:sample_data).and_call_original
 
         expect(hook).to receive(:execute).with(Gitlab::DataBuilder::Repository::SAMPLE_DATA, trigger_key).and_return(success_result)
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index 4894cf12372..f6e1608acbe 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -27,6 +27,39 @@ describe TodoService do
     project.add_developer(skipped)
   end
 
+  shared_examples 'reassigned target' do
+    it 'creates a pending todo for new assignee' do
+      target_unassigned.assignees = [john_doe]
+      service.send(described_method, target_unassigned, author)
+
+      should_create_todo(user: john_doe, target: target_unassigned, action: Todo::ASSIGNED)
+    end
+
+    it 'does not create a todo if unassigned' do
+      target_assigned.assignees = []
+
+      should_not_create_any_todo { service.send(described_method, target_assigned, author) }
+    end
+
+    it 'creates a todo if new assignee is the current user' do
+      target_assigned.assignees = [john_doe]
+      service.send(described_method, target_assigned, john_doe)
+
+      should_create_todo(user: john_doe, target: target_assigned, author: john_doe, action: Todo::ASSIGNED)
+    end
+
+    it 'does not create a todo for guests' do
+      service.send(described_method, target_assigned, author)
+      should_not_create_todo(user: guest, target: target_assigned, action: Todo::MENTIONED)
+    end
+
+    it 'does not create a directly addressed todo for guests' do
+      service.send(described_method, addressed_target_assigned, author)
+
+      should_not_create_todo(user: guest, target: addressed_target_assigned, action: Todo::DIRECTLY_ADDRESSED)
+    end
+  end
+
   describe 'Issues' do
     let(:issue) { create(:issue, project: project, assignees: [john_doe], author: author, description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
     let(:addressed_issue) { create(:issue, project: project, assignees: [john_doe], author: author, description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
@@ -274,12 +307,12 @@ describe TodoService do
       end
     end
 
-    describe '#mark_pending_todos_as_done' do
+    describe '#resolve_todos_for_target' do
       it 'marks related pending todos to the target for the user as done' do
         first_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
         second_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
 
-        service.mark_pending_todos_as_done(issue, john_doe)
+        service.resolve_todos_for_target(issue, john_doe)
 
         expect(first_todo.reload).to be_done
         expect(second_todo.reload).to be_done
@@ -293,7 +326,7 @@ describe TodoService do
           expect(john_doe.todos_pending_count).to eq(1)
           expect(john_doe).to receive(:update_todos_count_cache).and_call_original
 
-          service.mark_pending_todos_as_done(issue, john_doe)
+          service.resolve_todos_for_target(issue, john_doe)
 
           expect(john_doe.todos_done_count).to eq(1)
           expect(john_doe.todos_pending_count).to eq(0)
@@ -301,59 +334,6 @@ describe TodoService do
       end
     end
 
-    shared_examples 'updating todos state' do |meth, state, new_state|
-      let!(:first_todo) { create(:todo, state, user: john_doe, project: project, target: issue, author: author) }
-      let!(:second_todo) { create(:todo, state, user: john_doe, project: project, target: issue, author: author) }
-
-      it 'updates related todos for the user with the new_state' do
-        service.send(meth, collection, john_doe)
-
-        expect(first_todo.reload.state?(new_state)).to be true
-        expect(second_todo.reload.state?(new_state)).to be true
-      end
-
-      it 'returns the updated ids' do
-        expect(service.send(meth, collection, john_doe)).to match_array([first_todo.id, second_todo.id])
-      end
-
-      describe 'cached counts' do
-        it 'updates when todos change' do
-          expect(john_doe.todos.where(state: new_state).count).to eq(0)
-          expect(john_doe.todos.where(state: state).count).to eq(2)
-          expect(john_doe).to receive(:update_todos_count_cache).and_call_original
-
-          service.send(meth, collection, john_doe)
-
-          expect(john_doe.todos.where(state: new_state).count).to eq(2)
-          expect(john_doe.todos.where(state: state).count).to eq(0)
-        end
-      end
-    end
-
-    describe '#mark_todos_as_done' do
-      it_behaves_like 'updating todos state', :mark_todos_as_done, :pending, :done do
-        let(:collection) { Todo.all }
-      end
-    end
-
-    describe '#mark_todos_as_done_by_ids' do
-      it_behaves_like 'updating todos state', :mark_todos_as_done_by_ids, :pending, :done do
-        let(:collection) { [first_todo, second_todo].map(&:id) }
-      end
-    end
-
-    describe '#mark_todos_as_pending' do
-      it_behaves_like 'updating todos state', :mark_todos_as_pending, :done, :pending do
-        let(:collection) { Todo.all }
-      end
-    end
-
-    describe '#mark_todos_as_pending_by_ids' do
-      it_behaves_like 'updating todos state', :mark_todos_as_pending_by_ids, :done, :pending do
-        let(:collection) { [first_todo, second_todo].map(&:id) }
-      end
-    end
-
     describe '#new_note' do
       let!(:first_todo) { create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author) }
       let!(:second_todo) { create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author) }
@@ -575,51 +555,21 @@ describe TodoService do
   end
 
   describe '#reassigned_issuable' do
-    shared_examples 'reassigned issuable' do
-      it 'creates a pending todo for new assignee' do
-        issuable_unassigned.assignees = [john_doe]
-        service.reassigned_issuable(issuable_unassigned, author)
-
-        should_create_todo(user: john_doe, target: issuable_unassigned, action: Todo::ASSIGNED)
-      end
-
-      it 'does not create a todo if unassigned' do
-        issuable_assigned.assignees = []
-
-        should_not_create_any_todo { service.reassigned_issuable(issuable_assigned, author) }
-      end
-
-      it 'creates a todo if new assignee is the current user' do
-        issuable_assigned.assignees = [john_doe]
-        service.reassigned_issuable(issuable_assigned, john_doe)
-
-        should_create_todo(user: john_doe, target: issuable_assigned, author: john_doe, action: Todo::ASSIGNED)
-      end
-
-      it 'does not create a todo for guests' do
-        service.reassigned_issuable(issuable_assigned, author)
-        should_not_create_todo(user: guest, target: issuable_assigned, action: Todo::MENTIONED)
-      end
-
-      it 'does not create a directly addressed todo for guests' do
-        service.reassigned_issuable(addressed_issuable_assigned, author)
-        should_not_create_todo(user: guest, target: addressed_issuable_assigned, action: Todo::DIRECTLY_ADDRESSED)
-      end
-    end
+    let(:described_method) { :reassigned_issuable }
 
     context 'issuable is a merge request' do
-      it_behaves_like 'reassigned issuable' do
-        let(:issuable_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
-        let(:addressed_issuable_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
-        let(:issuable_unassigned) { create(:merge_request, source_project: project, author: author, assignees: []) }
+      it_behaves_like 'reassigned target' do
+        let(:target_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
+        let(:addressed_target_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
+        let(:target_unassigned) { create(:merge_request, source_project: project, author: author, assignees: []) }
       end
     end
 
     context 'issuable is an issue' do
-      it_behaves_like 'reassigned issuable' do
-        let(:issuable_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
-        let(:addressed_issuable_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
-        let(:issuable_unassigned) { create(:issue, project: project, author: author, assignees: []) }
+      it_behaves_like 'reassigned target' do
+        let(:target_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
+        let(:addressed_target_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
+        let(:target_unassigned) { create(:issue, project: project, author: author, assignees: []) }
       end
     end
   end
@@ -809,6 +759,16 @@ describe TodoService do
       end
     end
 
+    describe '#assign_alert' do
+      let(:described_method) { :assign_alert }
+
+      it_behaves_like 'reassigned target' do
+        let(:target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) }
+        let(:addressed_target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) }
+        let(:target_unassigned) { create(:alert_management_alert, project: project, assignees: []) }
+      end
+    end
+
     describe '#merge_request_build_failed' do
       let(:merge_participants) { [mr_unassigned.author, admin] }
 
@@ -1000,121 +960,111 @@ describe TodoService do
     expect(john_doe.todos_pending_count).to eq(1)
   end
 
-  describe '#mark_todos_as_done' do
-    let(:issue) { create(:issue, project: project, author: author, assignees: [john_doe]) }
-    let(:another_issue) { create(:issue, project: project, author: author, assignees: [john_doe]) }
+  shared_examples 'updating todos state' do |state, new_state, new_resolved_by = nil|
+    let!(:first_todo) { create(:todo, state, user: john_doe) }
+    let!(:second_todo) { create(:todo, state, user: john_doe) }
+    let(:collection) { Todo.all }
 
-    it 'marks a relation of todos as done' do
-      create(:todo, :mentioned, user: john_doe, target: issue, project: project)
+    it 'updates related todos for the user with the new_state' do
+      method_call
 
-      todos = TodosFinder.new(john_doe, {}).execute
-      expect { described_class.new.mark_todos_as_done(todos, john_doe) }
-       .to change { john_doe.todos.done.count }.from(0).to(1)
+      expect(collection.all? { |todo| todo.reload.state?(new_state)}).to be_truthy
     end
 
-    it 'marks an array of todos as done' do
-      todo = create(:todo, :mentioned, user: john_doe, target: issue, project: project)
+    if new_resolved_by
+      it 'updates resolution mechanism' do
+        method_call
 
-      todos = TodosFinder.new(john_doe, {}).execute
-      expect { described_class.new.mark_todos_as_done(todos, john_doe) }
-        .to change { todo.reload.state }.from('pending').to('done')
+        expect(collection.all? { |todo| todo.reload.resolved_by_action == new_resolved_by }).to be_truthy
+      end
     end
 
-    it 'returns the ids of updated todos' do # Needed on API
-      todo = create(:todo, :mentioned, user: john_doe, target: issue, project: project)
-
-      todos = TodosFinder.new(john_doe, {}).execute
-      expect(described_class.new.mark_todos_as_done(todos, john_doe)).to eq([todo.id])
+    it 'returns the updated ids' do
+      expect(method_call).to match_array([first_todo.id, second_todo.id])
     end
 
-    context 'when some of the todos are done already' do
-      let!(:first_todo) { create(:todo, :mentioned, user: john_doe, target: issue, project: project) }
-      let!(:second_todo) { create(:todo, :mentioned, user: john_doe, target: another_issue, project: project) }
-
-      it 'returns the ids of those still pending' do
-        described_class.new.mark_pending_todos_as_done(issue, john_doe)
-
-        expect(described_class.new.mark_todos_as_done(Todo.all, john_doe)).to eq([second_todo.id])
-      end
+    describe 'cached counts' do
+      it 'updates when todos change' do
+        expect(john_doe.todos.where(state: new_state).count).to eq(0)
+        expect(john_doe.todos.where(state: state).count).to eq(2)
+        expect(john_doe).to receive(:update_todos_count_cache).and_call_original
 
-      it 'returns an empty array if all are done' do
-        described_class.new.mark_pending_todos_as_done(issue, john_doe)
-        described_class.new.mark_pending_todos_as_done(another_issue, john_doe)
+        method_call
 
-        expect(described_class.new.mark_todos_as_done(Todo.all, john_doe)).to eq([])
+        expect(john_doe.todos.where(state: new_state).count).to eq(2)
+        expect(john_doe.todos.where(state: state).count).to eq(0)
       end
     end
   end
 
-  describe '#mark_todo_as_done' do
-    it 'marks a todo done' do
-      todo1 = create(:todo, :pending, user: john_doe)
-
-      described_class.new.mark_todo_as_done(todo1, john_doe)
-
-      expect(todo1.reload.state).to eq('done')
-    end
-
-    context 'when todo is already in state done' do
-      let(:todo1) { create(:todo, :done, user: john_doe) }
-
-      it 'does not update the todo' do
-        expect { described_class.new.mark_todo_as_done(todo1, john_doe) }.not_to change(todo1.reload, :state)
+  describe '#resolve_todos' do
+    it_behaves_like 'updating todos state', :pending, :done, 'mark_done' do
+      subject(:method_call) do
+        service.resolve_todos(collection, john_doe, resolution: :done, resolved_by_action: :mark_done)
       end
+    end
+  end
 
-      it 'does not update cache count' do
-        expect(john_doe).not_to receive(:update_todos_count_cache)
-
-        described_class.new.mark_todo_as_done(todo1, john_doe)
+  describe '#restore_todos' do
+    it_behaves_like 'updating todos state', :done, :pending do
+      subject(:method_call) do
+        service.restore_todos(collection, john_doe)
       end
     end
   end
 
-  describe '#mark_all_todos_as_done_by_user' do
-    it 'marks all todos done' do
-      todo1 = create(:todo, user: john_doe, state: :pending)
-      todo2 = create(:todo, user: john_doe, state: :done)
-      todo3 = create(:todo, user: john_doe, state: :pending)
+  describe '#resolve_todo' do
+    let!(:todo) { create(:todo, :assigned, user: john_doe) }
 
-      ids = described_class.new.mark_all_todos_as_done_by_user(john_doe)
+    it 'marks pending todo as done' do
+      expect do
+        service.resolve_todo(todo, john_doe)
+        todo.reload
+      end.to change { todo.done? }.to(true)
+    end
 
-      expect(ids).to contain_exactly(todo1.id, todo3.id)
-      expect(todo1.reload.state).to eq('done')
-      expect(todo2.reload.state).to eq('done')
-      expect(todo3.reload.state).to eq('done')
+    it 'saves resolution mechanism' do
+      expect do
+        service.resolve_todo(todo, john_doe, resolved_by_action: :mark_done)
+        todo.reload
+      end.to change { todo.resolved_by_mark_done? }.to(true)
     end
-  end
 
-  describe '#mark_todos_as_done_by_ids' do
-    let(:issue) { create(:issue, project: project, author: author, assignees: [john_doe]) }
-    let(:another_issue) { create(:issue, project: project, author: author, assignees: [john_doe]) }
+    context 'cached counts' do
+      it 'updates when todos change' do
+        expect(john_doe.todos_done_count).to eq(0)
+        expect(john_doe.todos_pending_count).to eq(1)
+        expect(john_doe).to receive(:update_todos_count_cache).and_call_original
 
-    it 'marks an array of todo ids as done' do
-      todo = create(:todo, :mentioned, user: john_doe, target: issue, project: project)
-      another_todo = create(:todo, :mentioned, user: john_doe, target: another_issue, project: project)
+        service.resolve_todo(todo, john_doe)
 
-      expect { described_class.new.mark_todos_as_done_by_ids([todo.id, another_todo.id], john_doe) }
-        .to change { john_doe.todos.done.count }.from(0).to(2)
+        expect(john_doe.todos_done_count).to eq(1)
+        expect(john_doe.todos_pending_count).to eq(0)
+      end
     end
+  end
 
-    it 'marks a single todo id as done' do
-      todo = create(:todo, :mentioned, user: john_doe, target: issue, project: project)
+  describe '#restore_todo' do
+    let!(:todo) { create(:todo, :done, user: john_doe) }
 
-      expect { described_class.new.mark_todos_as_done_by_ids(todo.id, john_doe) }
-        .to change { todo.reload.state }.from('pending').to('done')
+    it 'marks resolved todo as pending' do
+      expect do
+        service.restore_todo(todo, john_doe)
+        todo.reload
+      end.to change { todo.pending? }.to(true)
     end
 
-    it 'caches the number of todos of a user', :use_clean_rails_memory_store_caching do
-      create(:todo, :mentioned, user: john_doe, target: issue, project: project)
-      todo = create(:todo, :mentioned, user: john_doe, target: issue, project: project)
+    context 'cached counts' do
+      it 'updates when todos change' do
+        expect(john_doe.todos_done_count).to eq(1)
+        expect(john_doe.todos_pending_count).to eq(0)
+        expect(john_doe).to receive(:update_todos_count_cache).and_call_original
 
-      described_class.new.mark_todos_as_done_by_ids(todo, john_doe)
+        service.restore_todo(todo, john_doe)
 
-      # Make sure no TodosFinder is inialized to perform counting
-      expect(TodosFinder).not_to receive(:new)
-
-      expect(john_doe.todos_done_count).to eq(1)
-      expect(john_doe.todos_pending_count).to eq(1)
+        expect(john_doe.todos_done_count).to eq(0)
+        expect(john_doe.todos_pending_count).to eq(1)
+      end
     end
   end
 
diff --git a/spec/services/user_project_access_changed_service_spec.rb b/spec/services/user_project_access_changed_service_spec.rb
index f27eeb74265..e5ecdd123f7 100644
--- a/spec/services/user_project_access_changed_service_spec.rb
+++ b/spec/services/user_project_access_changed_service_spec.rb
@@ -20,7 +20,11 @@ describe UserProjectAccessChangedService do
 
     it 'permits low-priority operation' do
       expect(AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker).to(
-        receive(:bulk_perform_in).with(described_class::DELAY, [[1], [2]])
+        receive(:bulk_perform_in).with(
+          described_class::DELAY,
+          [[1], [2]],
+          { batch_delay: 30.seconds, batch_size: 100 }
+        )
       )
 
       described_class.new([1, 2]).execute(blocking: false,
diff --git a/spec/services/users/destroy_service_spec.rb b/spec/services/users/destroy_service_spec.rb
index 6e4b293286b..3db5e66fe05 100644
--- a/spec/services/users/destroy_service_spec.rb
+++ b/spec/services/users/destroy_service_spec.rb
@@ -67,6 +67,18 @@ describe Users::DestroyService do
         end
       end
 
+      it 'calls the bulk snippet destroy service with hard delete option if it is present' do
+        # this avoids getting into Projects::DestroyService as it would
+        # call Snippets::BulkDestroyService first!
+        allow(user).to receive(:personal_projects).and_return([])
+
+        expect_next_instance_of(Snippets::BulkDestroyService) do |bulk_destroy_service|
+          expect(bulk_destroy_service).to receive(:execute).with(hard_delete: true).and_call_original
+        end
+
+        service.execute(user, hard_delete: true)
+      end
+
       it 'does not delete project snippets that the user is the author of' do
         repo = create(:project_snippet, :repository, author: user).snippet_repository
         service.execute(user)
diff --git a/spec/services/users/migrate_to_ghost_user_service_spec.rb b/spec/services/users/migrate_to_ghost_user_service_spec.rb
index a7d7c16a66f..c2a793b2368 100644
--- a/spec/services/users/migrate_to_ghost_user_service_spec.rb
+++ b/spec/services/users/migrate_to_ghost_user_service_spec.rb
@@ -84,6 +84,15 @@ describe Users::MigrateToGhostUserService do
       end
     end
 
+    context 'reviews' do
+      let!(:user)   { create(:user) }
+      let(:service) { described_class.new(user) }
+
+      include_examples "migrating a deleted user's associated records to the ghost user", Review, [:author] do
+        let(:created_record) { create(:review, author: user) }
+      end
+    end
+
     context "when record migration fails with a rollback exception" do
       before do
         expect_any_instance_of(ActiveRecord::Associations::CollectionProxy)
diff --git a/spec/services/wiki_pages/event_create_service_spec.rb b/spec/services/wiki_pages/event_create_service_spec.rb
index cf971b0a02c..c725c67d7a7 100644
--- a/spec/services/wiki_pages/event_create_service_spec.rb
+++ b/spec/services/wiki_pages/event_create_service_spec.rb
@@ -11,7 +11,7 @@ describe WikiPages::EventCreateService do
   describe '#execute' do
     let_it_be(:page) { create(:wiki_page, project: project) }
     let(:slug) { generate(:sluggified_title) }
-    let(:action) { Event::CREATED }
+    let(:action) { :created }
     let(:response) { subject.execute(slug, page, action) }
 
     context 'feature flag is not enabled' do
@@ -38,7 +38,7 @@ describe WikiPages::EventCreateService do
     end
 
     context 'the action is illegal' do
-      let(:action) { Event::WIKI_ACTIONS.max + 1 }
+      let(:action) { :illegal_action }
 
       it 'returns an error' do
         expect(response).to be_error
@@ -58,7 +58,7 @@ describe WikiPages::EventCreateService do
     end
 
     context 'the action is a deletion' do
-      let(:action) { Event::DESTROYED }
+      let(:action) { :destroyed }
 
       it 'does not synchronize the wiki metadata timestamps with the git commit' do
         expect_next_instance_of(WikiPage::Meta) do |instance|
@@ -74,7 +74,7 @@ describe WikiPages::EventCreateService do
     end
 
     it 'returns an event in the payload' do
-      expect(response.payload).to include(event: have_attributes(author: user, wiki_page?: true, action: action))
+      expect(response.payload).to include(event: have_attributes(author: user, wiki_page?: true, action: 'created'))
     end
 
     it 'records the slug for the page' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 80dfa20a2f1..84de5119505 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -139,6 +139,7 @@ RSpec.configure do |config|
   config.include IdempotentWorkerHelper, type: :worker
   config.include RailsHelpers
   config.include SidekiqMiddleware
+  config.include StubActionCableConnection, type: :channel
 
   if ENV['CI'] || ENV['RETRIES']
     # This includes the first try, i.e. tests will be run 4 times before failing.
@@ -172,37 +173,39 @@ RSpec.configure do |config|
   end
 
   config.before do |example|
-    # Enable all features by default for testing
-    allow(Feature).to receive(:enabled?) { true }
+    if example.metadata.fetch(:stub_feature_flags, true)
+      # Enable all features by default for testing
+      stub_all_feature_flags
+
+      # The following can be removed when we remove the staged rollout strategy
+      # and we can just enable it using instance wide settings
+      # (ie. ApplicationSetting#auto_devops_enabled)
+      stub_feature_flags(force_autodevops_on_by_default: false)
+
+      # The following can be removed once Vue Issuable Sidebar
+      # is feature-complete and can be made default in place
+      # of older sidebar.
+      # See https://gitlab.com/groups/gitlab-org/-/epics/1863
+      stub_feature_flags(vue_issuable_sidebar: false)
+      stub_feature_flags(vue_issuable_epic_sidebar: false)
+
+      enable_rugged = example.metadata[:enable_rugged].present?
+
+      # Disable Rugged features by default
+      Gitlab::Git::RuggedImpl::Repository::FEATURE_FLAGS.each do |flag|
+        stub_feature_flags(flag => enable_rugged)
+      end
 
-    enable_rugged = example.metadata[:enable_rugged].present?
+      # Disable the usage of file_identifier_hash by default until it is ready
+      # See https://gitlab.com/gitlab-org/gitlab/-/issues/33867
+      stub_feature_flags(file_identifier_hash: false)
 
-    # Disable Rugged features by default
-    Gitlab::Git::RuggedImpl::Repository::FEATURE_FLAGS.each do |flag|
-      stub_feature_flags(flag => enable_rugged)
+      allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged)
     end
 
-    allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged)
-
-    # The following can be removed when we remove the staged rollout strategy
-    # and we can just enable it using instance wide settings
-    # (ie. ApplicationSetting#auto_devops_enabled)
-    stub_feature_flags(force_autodevops_on_by_default: false)
-
     # Enable Marginalia feature for all specs in the test suite.
     allow(Gitlab::Marginalia).to receive(:cached_feature_enabled?).and_return(true)
 
-    # The following can be removed once Vue Issuable Sidebar
-    # is feature-complete and can be made default in place
-    # of older sidebar.
-    # See https://gitlab.com/groups/gitlab-org/-/epics/1863
-    stub_feature_flags(vue_issuable_sidebar: false)
-    stub_feature_flags(vue_issuable_epic_sidebar: false)
-
-    allow(Feature).to receive(:enabled?)
-      .with(/\Apromo_\w+\z/, default_enabled: false)
-      .and_return(false)
-
     # Stub these calls due to being expensive operations
     # It can be reenabled for specific tests via:
     #
diff --git a/spec/support/action_cable.rb b/spec/support/action_cable.rb
new file mode 100644
index 00000000000..64cfc435875
--- /dev/null
+++ b/spec/support/action_cable.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.before(:each, type: :channel) do
+    stub_action_cable_connection
+  end
+end
diff --git a/spec/support/helpers/api_helpers.rb b/spec/support/helpers/api_helpers.rb
index eb9594a4fb6..b1e6078c4f2 100644
--- a/spec/support/helpers/api_helpers.rb
+++ b/spec/support/helpers/api_helpers.rb
@@ -40,17 +40,6 @@ module ApiHelpers
     end
   end
 
-  def basic_auth_header(user = nil)
-    return { 'HTTP_AUTHORIZATION' => user } unless user.respond_to?(:username)
-
-    {
-      'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(
-        user.username,
-        create(:personal_access_token, user: user).token
-      )
-    }
-  end
-
   def expect_empty_array_response
     expect_successful_response_with_paginated_array
     expect(json_response.length).to eq(0)
diff --git a/spec/support/helpers/design_management_test_helpers.rb b/spec/support/helpers/design_management_test_helpers.rb
index bf41e2f5079..1daa92e8ad4 100644
--- a/spec/support/helpers/design_management_test_helpers.rb
+++ b/spec/support/helpers/design_management_test_helpers.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module DesignManagementTestHelpers
-  def enable_design_management(enabled = true, ref_filter = true)
+  def enable_design_management(enabled = true)
     stub_lfs_setting(enabled: enabled)
-    stub_feature_flags(design_management_reference_filter_gfm_pipeline: ref_filter)
   end
 
   def delete_designs(*designs)
diff --git a/spec/support/helpers/filter_spec_helper.rb b/spec/support/helpers/filter_spec_helper.rb
index c165128040f..ca844b33ba8 100644
--- a/spec/support/helpers/filter_spec_helper.rb
+++ b/spec/support/helpers/filter_spec_helper.rb
@@ -56,14 +56,11 @@ module FilterSpecHelper
     pipeline.call(body)
   end
 
-  def reference_pipeline(context = {})
+  def reference_pipeline(filter: described_class, **context)
     context.reverse_merge!(project: project) if defined?(project)
     context.reverse_merge!(current_user: current_user) if defined?(current_user)
 
-    filters = [
-      Banzai::Filter::AutolinkFilter,
-      described_class
-    ]
+    filters = [Banzai::Filter::AutolinkFilter, filter].compact
 
     redact = context.delete(:redact)
     filters.push(Banzai::Filter::ReferenceRedactorFilter) if redact
@@ -75,8 +72,13 @@ module FilterSpecHelper
     reference_pipeline(context).call(body)
   end
 
-  def reference_filter(html, context = {})
-    reference_pipeline(context).to_document(html)
+  def reference_filter(text, context = {})
+    reference_pipeline(**context).to_document(text)
+  end
+
+  # Use to test no-ops
+  def null_filter(text, context = {})
+    reference_pipeline(filter: nil, **context).to_document(text)
   end
 
   # Modify a String reference to make it invalid
diff --git a/spec/support/helpers/graphql_helpers.rb b/spec/support/helpers/graphql_helpers.rb
index b3d7f7bcece..87525734490 100644
--- a/spec/support/helpers/graphql_helpers.rb
+++ b/spec/support/helpers/graphql_helpers.rb
@@ -11,9 +11,19 @@ module GraphqlHelpers
     underscored_field_name.to_s.camelize(:lower)
   end
 
-  # Run a loader's named resolver
+  # Run a loader's named resolver in a way that closely mimics the framework.
+  #
+  # First the `ready?` method is called. If it turns out that the resolver is not
+  # ready, then the early return is returned instead.
+  #
+  # Then the resolve method is called.
   def resolve(resolver_class, obj: nil, args: {}, ctx: {}, field: nil)
-    resolver_class.new(object: obj, context: ctx, field: field).resolve(args)
+    resolver = resolver_class.new(object: obj, context: ctx, field: field)
+    ready, early_return = sync_all { resolver.ready?(**args) }
+
+    return early_return unless ready
+
+    resolver.resolve(args)
   end
 
   # Eagerly run a loader's named resolver
@@ -51,12 +61,12 @@ module GraphqlHelpers
   # BatchLoader::GraphQL returns a wrapper, so we need to :sync in order
   # to get the actual values
   def batch_sync(max_queries: nil, &blk)
-    wrapper = proc do
-      lazy_vals = yield
-      lazy_vals.is_a?(Array) ? lazy_vals.map { |val| sync(val) } : sync(lazy_vals)
-    end
+    batch(max_queries: max_queries) { sync_all(&blk) }
+  end
 
-    batch(max_queries: max_queries, &wrapper)
+  def sync_all(&blk)
+    lazy_vals = yield
+    lazy_vals.is_a?(Array) ? lazy_vals.map { |val| sync(val) } : sync(lazy_vals)
   end
 
   def graphql_query_for(name, attributes = {}, fields = nil)
@@ -67,10 +77,14 @@ module GraphqlHelpers
     QUERY
   end
 
-  def graphql_mutation(name, input, fields = nil)
+  def graphql_mutation(name, input, fields = nil, &block)
+    raise ArgumentError, 'Please pass either `fields` parameter or a block to `#graphql_mutation`, but not both.' if fields.present? && block_given?
+
     mutation_name = GraphqlHelpers.fieldnamerize(name)
     input_variable_name = "$#{input_variable_name_for_mutation(name)}"
     mutation_field = GitlabSchema.mutation.fields[mutation_name]
+
+    fields = yield if block_given?
     fields ||= all_graphql_fields_for(mutation_field.type.to_graphql)
 
     query = <<~MUTATION
@@ -139,7 +153,15 @@ module GraphqlHelpers
   end
 
   def wrap_fields(fields)
-    fields = Array.wrap(fields).join("\n")
+    fields = Array.wrap(fields).map do |field|
+      case field
+      when Symbol
+        GraphqlHelpers.fieldnamerize(field)
+      else
+        field
+      end
+    end.join("\n")
+
     return unless fields.present?
 
     <<~FIELDS
@@ -257,8 +279,13 @@ module GraphqlHelpers
   end
 
   def graphql_dig_at(data, *path)
-    keys = path.map { |segment| GraphqlHelpers.fieldnamerize(segment) }
-    data.dig(*keys)
+    keys = path.map { |segment| segment.is_a?(Integer) ? segment : GraphqlHelpers.fieldnamerize(segment) }
+
+    # Allows for array indexing, like this
+    # ['project', 'boards', 'edges', 0, 'node', 'lists']
+    keys.reduce(data) do |memo, key|
+      memo.is_a?(Array) ? memo[key] : memo&.dig(key)
+    end
   end
 
   def graphql_errors
@@ -294,6 +321,22 @@ module GraphqlHelpers
     graphql_data.fetch(GraphqlHelpers.fieldnamerize(mutation_name))
   end
 
+  def scalar_fields_of(type_name)
+    GitlabSchema.types[type_name].fields.map do |name, field|
+      next if nested_fields?(field) || required_arguments?(field)
+
+      name
+    end.compact
+  end
+
+  def nested_fields_of(type_name)
+    GitlabSchema.types[type_name].fields.map do |name, field|
+      next if !nested_fields?(field) || required_arguments?(field)
+
+      [name, field]
+    end.compact
+  end
+
   def nested_fields?(field)
     !scalar?(field) && !enum?(field)
   end
diff --git a/spec/support/helpers/http_basic_auth_helpers.rb b/spec/support/helpers/http_basic_auth_helpers.rb
new file mode 100644
index 00000000000..c0b24b3dfa4
--- /dev/null
+++ b/spec/support/helpers/http_basic_auth_helpers.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module HttpBasicAuthHelpers
+  def user_basic_auth_header(user)
+    access_token = create(:personal_access_token, user: user)
+
+    basic_auth_header(user.username, access_token.token)
+  end
+
+  def job_basic_auth_header(job)
+    basic_auth_header(Ci::Build::CI_REGISTRY_USER, job.token)
+  end
+
+  def client_basic_auth_header(client)
+    basic_auth_header(client.uid, client.secret)
+  end
+
+  def basic_auth_header(username, password)
+    {
+      'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(
+        username,
+        password
+      )
+    }
+  end
+end
diff --git a/spec/support/helpers/login_helpers.rb b/spec/support/helpers/login_helpers.rb
index cb880939b1c..92f6d673255 100644
--- a/spec/support/helpers/login_helpers.rb
+++ b/spec/support/helpers/login_helpers.rb
@@ -57,13 +57,13 @@ module LoginHelpers
   def gitlab_sign_in_via(provider, user, uid, saml_response = nil)
     mock_auth_hash_with_saml_xml(provider, uid, user.email, saml_response)
     visit new_user_session_path
-    click_link provider
+    click_button provider
   end
 
   def gitlab_enable_admin_mode_sign_in_via(provider, user, uid, saml_response = nil)
     mock_auth_hash_with_saml_xml(provider, uid, user.email, saml_response)
     visit new_admin_session_path
-    click_link provider
+    click_button provider
   end
 
   # Requires Javascript driver.
@@ -103,7 +103,7 @@ module LoginHelpers
 
     check 'remember_me' if remember_me
 
-    click_link "oauth-login-#{provider}"
+    click_button "oauth-login-#{provider}"
   end
 
   def fake_successful_u2f_authentication
diff --git a/spec/support/helpers/markdown_feature.rb b/spec/support/helpers/markdown_feature.rb
index eea03fb9325..40e0d4413e2 100644
--- a/spec/support/helpers/markdown_feature.rb
+++ b/spec/support/helpers/markdown_feature.rb
@@ -36,12 +36,12 @@ class MarkdownFeature
     end
   end
 
-  def project_wiki
-    @project_wiki ||= ProjectWiki.new(project, user)
+  def wiki
+    @wiki ||= ProjectWiki.new(project, user)
   end
 
-  def project_wiki_page
-    @project_wiki_page ||= build(:wiki_page, wiki: project_wiki)
+  def wiki_page
+    @wiki_page ||= build(:wiki_page, wiki: wiki)
   end
 
   def issue
diff --git a/spec/support/helpers/partitioning_helpers.rb b/spec/support/helpers/partitioning_helpers.rb
new file mode 100644
index 00000000000..98a13915d76
--- /dev/null
+++ b/spec/support/helpers/partitioning_helpers.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module PartitioningHelpers
+  def expect_table_partitioned_by(table, columns, part_type: :range)
+    columns_with_part_type = columns.map { |c| [part_type.to_s, c] }
+    actual_columns = find_partitioned_columns(table)
+
+    expect(columns_with_part_type).to match_array(actual_columns)
+  end
+
+  def expect_range_partition_of(partition_name, table_name, min_value, max_value)
+    definition = find_partition_definition(partition_name)
+
+    expect(definition).not_to be_nil
+    expect(definition['base_table']).to eq(table_name.to_s)
+    expect(definition['condition']).to eq("FOR VALUES FROM (#{min_value}) TO (#{max_value})")
+  end
+
+  private
+
+  def find_partitioned_columns(table)
+    connection.select_rows(<<~SQL)
+      select
+        case partstrat
+        when 'l' then 'list'
+        when 'r' then 'range'
+        when 'h' then 'hash'
+        end as partstrat,
+        cols.column_name
+      from (
+        select partrelid, partstrat, unnest(partattrs) as col_pos
+        from pg_partitioned_table
+      ) pg_part
+      inner join pg_class
+      on pg_part.partrelid = pg_class.oid
+      inner join information_schema.columns cols
+      on cols.table_name = pg_class.relname
+      and cols.ordinal_position = pg_part.col_pos
+      where pg_class.relname = '#{table}';
+    SQL
+  end
+
+  def find_partition_definition(partition)
+    connection.select_one(<<~SQL)
+      select
+        parent_class.relname as base_table,
+        pg_get_expr(pg_class.relpartbound, inhrelid) as condition
+      from pg_class
+      inner join pg_inherits i on pg_class.oid = inhrelid
+      inner join pg_class parent_class on parent_class.oid = inhparent
+      where pg_class.relname = '#{partition}' and pg_class.relispartition;
+    SQL
+  end
+end
diff --git a/spec/support/helpers/prometheus_helpers.rb b/spec/support/helpers/prometheus_helpers.rb
index fdce00e7dec..d49abbf3f19 100644
--- a/spec/support/helpers/prometheus_helpers.rb
+++ b/spec/support/helpers/prometheus_helpers.rb
@@ -236,4 +236,51 @@ module PrometheusHelpers
       ]
     }
   end
+
+  def prometheus_alert_payload(firing: [], resolved: [])
+    status = firing.any? ? 'firing' : 'resolved'
+    alerts = firing + resolved
+    alert_name = alerts.first&.title || ''
+    prometheus_metric_id = alerts.first&.prometheus_metric_id&.to_s
+
+    alerts_map = \
+      firing.map { |alert| prometheus_map_alert_payload('firing', alert) } +
+      resolved.map { |alert| prometheus_map_alert_payload('resolved', alert) }
+
+    # See https://prometheus.io/docs/alerting/configuration/#%3Cwebhook_config%3E
+    {
+      'version' => '4',
+      'receiver' => 'gitlab',
+      'status' => status,
+      'alerts' => alerts_map,
+      'groupLabels' => {
+        'alertname' => alert_name
+      },
+      'commonLabels' => {
+        'alertname' => alert_name,
+        'gitlab' => 'hook',
+        'gitlab_alert_id' => prometheus_metric_id
+      },
+      'commonAnnotations' => {},
+      'externalURL' => '',
+      'groupKey' => "{}:{alertname=\'#{alert_name}\'}"
+    }
+  end
+
+  private
+
+  def prometheus_map_alert_payload(status, alert)
+    {
+      'status' => status,
+      'labels' => {
+        'alertname' => alert.title,
+        'gitlab' => 'hook',
+        'gitlab_alert_id' => alert.prometheus_metric_id.to_s
+      },
+      'annotations' => {},
+      'startsAt' => '2018-09-24T08:57:31.095725221Z',
+      'endsAt' => '0001-01-01T00:00:00Z',
+      'generatorURL' => 'http://prometheus-prometheus-server-URL'
+    }
+  end
 end
diff --git a/spec/support/helpers/stub_action_cable_connection.rb b/spec/support/helpers/stub_action_cable_connection.rb
new file mode 100644
index 00000000000..b4e9c2ae48c
--- /dev/null
+++ b/spec/support/helpers/stub_action_cable_connection.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module StubActionCableConnection
+  def stub_action_cable_connection(current_user: nil, request: ActionDispatch::TestRequest.create)
+    stub_connection(current_user: current_user, request: request)
+  end
+end
diff --git a/spec/support/helpers/stub_feature_flags.rb b/spec/support/helpers/stub_feature_flags.rb
index 5b8a85b206f..696148cacaf 100644
--- a/spec/support/helpers/stub_feature_flags.rb
+++ b/spec/support/helpers/stub_feature_flags.rb
@@ -1,6 +1,38 @@
 # frozen_string_literal: true
 
 module StubFeatureFlags
+  class StubFeatureGate
+    attr_reader :flipper_id
+
+    def initialize(flipper_id)
+      @flipper_id = flipper_id
+    end
+  end
+
+  def stub_all_feature_flags
+    adapter = Flipper::Adapters::Memory.new
+    flipper = Flipper.new(adapter)
+
+    allow(Feature).to receive(:flipper).and_return(flipper)
+
+    # All new requested flags are enabled by default
+    allow(Feature).to receive(:enabled?).and_wrap_original do |m, *args|
+      feature_flag = m.call(*args)
+
+      # If feature flag is not persisted we mark the feature flag as enabled
+      # We do `m.call` as we want to validate the execution of method arguments
+      # and a feature flag state if it is not persisted
+      unless Feature.persisted_name?(args.first)
+        # TODO: this is hack to support `promo_feature_available?`
+        # We enable all feature flags by default unless they are `promo_`
+        # Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/218667
+        feature_flag = true unless args.first.to_s.start_with?('promo_')
+      end
+
+      feature_flag
+    end
+  end
+
   # Stub Feature flags with `flag_name: true/false`
   #
   # @param [Hash] features where key is feature name and value is boolean whether enabled or not.
@@ -14,23 +46,29 @@ module StubFeatureFlags
   #   Enable `ci_live_trace` feature flag only on the specified projects.
   def stub_feature_flags(features)
     features.each do |feature_name, actors|
-      allow(Feature).to receive(:enabled?).with(feature_name, any_args).and_return(false)
-      allow(Feature).to receive(:enabled?).with(feature_name.to_s, any_args).and_return(false)
+      # Remove feature flag overwrite
+      feature = Feature.get(feature_name) # rubocop:disable Gitlab/AvoidFeatureGet
+      feature.remove
 
       Array(actors).each do |actor|
         raise ArgumentError, "actor cannot be Hash" if actor.is_a?(Hash)
 
-        case actor
-        when false, true
-          allow(Feature).to receive(:enabled?).with(feature_name, any_args).and_return(actor)
-          allow(Feature).to receive(:enabled?).with(feature_name.to_s, any_args).and_return(actor)
-        when nil, ActiveRecord::Base, Symbol, RSpec::Mocks::Double
-          allow(Feature).to receive(:enabled?).with(feature_name, actor, any_args).and_return(true)
-          allow(Feature).to receive(:enabled?).with(feature_name.to_s, actor, any_args).and_return(true)
+        # Control a state of feature flag
+        if actor == true || actor.nil? || actor.respond_to?(:flipper_id)
+          feature.enable(actor)
+        elsif actor == false
+          feature.disable
         else
-          raise ArgumentError, "#stub_feature_flags accepts only `nil`, `true`, `false`, `ActiveRecord::Base` or `Symbol` as actors"
+          raise ArgumentError, "#stub_feature_flags accepts only `nil`, `bool`, an object responding to `#flipper_id` or including `FeatureGate`."
         end
       end
     end
   end
+
+  def stub_feature_flag_gate(object)
+    return if object.nil?
+    return object if object.is_a?(FeatureGate)
+
+    StubFeatureGate.new(object)
+  end
 end
diff --git a/spec/support/helpers/stub_gitlab_calls.rb b/spec/support/helpers/stub_gitlab_calls.rb
index 120d432655b..4da8f760056 100644
--- a/spec/support/helpers/stub_gitlab_calls.rb
+++ b/spec/support/helpers/stub_gitlab_calls.rb
@@ -141,6 +141,12 @@ module StubGitlabCalls
       .to_return(status: 200, body: "", headers: {})
   end
 
+  def stub_webide_config_file(content, sha: anything)
+    allow_any_instance_of(Repository)
+      .to receive(:blob_data_at).with(sha, '.gitlab/.gitlab-webide.yml')
+      .and_return(content)
+  end
+
   def project_hash_array
     f = File.read(Rails.root.join('spec/support/gitlab_stubs/projects.json'))
     Gitlab::Json.parse(f)
diff --git a/spec/support/helpers/trigger_helpers.rb b/spec/support/helpers/trigger_helpers.rb
new file mode 100644
index 00000000000..fa4f499b900
--- /dev/null
+++ b/spec/support/helpers/trigger_helpers.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module TriggerHelpers
+  def expect_function_to_exist(name)
+    expect(find_function_def(name)).not_to be_nil
+  end
+
+  def expect_function_not_to_exist(name)
+    expect(find_function_def(name)).to be_nil
+  end
+
+  def expect_function_to_contain(name, *statements)
+    return_stmt, *body_stmts = parsed_function_statements(name).reverse
+
+    expect(return_stmt).to eq('return old')
+    expect(body_stmts).to contain_exactly(*statements)
+  end
+
+  def expect_trigger_not_to_exist(table_name, name)
+    expect(find_trigger_def(table_name, name)).to be_nil
+  end
+
+  def expect_valid_function_trigger(table_name, name, fn_name, fires_on)
+    events, timing, definition = cleaned_trigger_def(table_name, name)
+
+    events = events&.split(',')
+    expected_timing, expected_events = fires_on.first
+    expect(timing).to eq(expected_timing.to_s)
+    expect(events).to match_array(Array.wrap(expected_events))
+    expect(definition).to eq("execute procedure #{fn_name}()")
+  end
+
+  private
+
+  def parsed_function_statements(name)
+    cleaned_definition = find_function_def(name)['body'].downcase.gsub(/\s+/, ' ')
+    statements = cleaned_definition.sub(/\A\s*begin\s*(.*)\s*end\s*\Z/, "\\1")
+    statements.split(';').map! { |stmt| stmt.strip.presence }.compact!
+  end
+
+  def find_function_def(name)
+    connection.select_one(<<~SQL)
+      SELECT prosrc AS body
+      FROM pg_proc
+      WHERE proname = '#{name}'
+    SQL
+  end
+
+  def cleaned_trigger_def(table_name, name)
+    find_trigger_def(table_name, name).values_at('event', 'action_timing', 'action_statement').map!(&:downcase)
+  end
+
+  def find_trigger_def(table_name, name)
+    connection.select_one(<<~SQL)
+      SELECT
+        string_agg(event_manipulation, ',') AS event,
+        action_timing,
+        action_statement
+      FROM information_schema.triggers
+      WHERE event_object_table = '#{table_name}'
+      AND trigger_name = '#{name}'
+      GROUP BY 2, 3
+    SQL
+  end
+end
diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb
index 382e4f6a1a4..f6c415a75bc 100644
--- a/spec/support/helpers/usage_data_helpers.rb
+++ b/spec/support/helpers/usage_data_helpers.rb
@@ -78,6 +78,7 @@ module UsageDataHelpers
       labels
       lfs_objects
       merge_requests
+      merge_requests_users
       milestone_lists
       milestones
       notes
@@ -117,12 +118,18 @@ module UsageDataHelpers
       projects_with_expiration_policy_enabled_with_cadence_set_to_14d
       projects_with_expiration_policy_enabled_with_cadence_set_to_1month
       projects_with_expiration_policy_enabled_with_cadence_set_to_3month
+      projects_with_terraform_reports
+      projects_with_terraform_states
       pages_domains
       protected_branches
       releases
       remote_mirrors
       snippets
+      personal_snippets
+      project_snippets
       suggestions
+      terraform_reports
+      terraform_states
       todos
       uploads
       web_hooks
@@ -157,6 +164,11 @@ module UsageDataHelpers
       object_store
     ).freeze
 
+  def stub_usage_data_connections
+    allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
+    allow(Gitlab::Prometheus::Internal).to receive(:prometheus_enabled?).and_return(false)
+  end
+
   def stub_object_store_settings
     allow(Settings).to receive(:[]).with('artifacts')
       .and_return(
@@ -209,4 +221,16 @@ module UsageDataHelpers
            'proxy_download' => false } }
       )
   end
+
+  def expect_prometheus_api_to(*receive_matchers)
+    expect_next_instance_of(Gitlab::PrometheusClient) do |client|
+      receive_matchers.each { |m| expect(client).to m }
+    end
+  end
+
+  def allow_prometheus_queries
+    allow_next_instance_of(Gitlab::PrometheusClient) do |client|
+      allow(client).to receive(:aggregate).and_return({})
+    end
+  end
 end
diff --git a/spec/support/helpers/wiki_helpers.rb b/spec/support/helpers/wiki_helpers.rb
index e6818ff8f0c..ae0d53d1297 100644
--- a/spec/support/helpers/wiki_helpers.rb
+++ b/spec/support/helpers/wiki_helpers.rb
@@ -8,14 +8,14 @@ module WikiHelpers
     find('.svg-content .js-lazy-loaded') if example.nil? || example.metadata.key?(:js)
   end
 
-  def upload_file_to_wiki(project, user, file_name)
+  def upload_file_to_wiki(container, user, file_name)
     opts = {
       file_name: file_name,
       file_content: File.read(expand_fixture_path(file_name))
      }
 
     ::Wikis::CreateAttachmentService.new(
-      container: project,
+      container: container,
       current_user: user,
       params: opts
     ).execute[:result][:file_path]
diff --git a/spec/support/import_export/common_util.rb b/spec/support/import_export/common_util.rb
index 0069ae81b76..c0c3559cca0 100644
--- a/spec/support/import_export/common_util.rb
+++ b/spec/support/import_export/common_util.rb
@@ -19,7 +19,7 @@ module ImportExport
     end
 
     def setup_reader(reader)
-      if reader == :ndjson_reader && Feature.enabled?(:project_import_ndjson)
+      if reader == :ndjson_reader && Feature.enabled?(:project_import_ndjson, default_enabled: true)
         allow_any_instance_of(Gitlab::ImportExport::JSON::LegacyReader::File).to receive(:exist?).and_return(false)
         allow_any_instance_of(Gitlab::ImportExport::JSON::NdjsonReader).to receive(:exist?).and_return(true)
       else
diff --git a/spec/support/let_it_be.rb b/spec/support/let_it_be.rb
new file mode 100644
index 00000000000..ade585faaec
--- /dev/null
+++ b/spec/support/let_it_be.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+TestProf::LetItBe.configure do |config|
+  config.alias_to :let_it_be_with_refind, refind: true
+end
+
+TestProf::LetItBe.configure do |config|
+  config.alias_to :let_it_be_with_reload, reload: true
+end
diff --git a/spec/support/matchers/exceed_query_limit.rb b/spec/support/matchers/exceed_query_limit.rb
index b9630b00038..cc0abfa0dd6 100644
--- a/spec/support/matchers/exceed_query_limit.rb
+++ b/spec/support/matchers/exceed_query_limit.rb
@@ -59,11 +59,15 @@ module ExceedQueryLimitHelpers
 
   def verify_count(&block)
     @subject_block = block
-    actual_count > expected_count + threshold
+    actual_count > maximum
+  end
+
+  def maximum
+    expected_count + threshold
   end
 
   def failure_message
-    threshold_message = threshold > 0 ? " (+#{@threshold})" : ''
+    threshold_message = threshold > 0 ? " (+#{threshold})" : ''
     counts = "#{expected_count}#{threshold_message}"
     "Expected a maximum of #{counts} queries, got #{actual_count}:\n\n#{log_message}"
   end
@@ -73,6 +77,55 @@ module ExceedQueryLimitHelpers
   end
 end
 
+RSpec::Matchers.define :issue_fewer_queries_than do
+  supports_block_expectations
+
+  include ExceedQueryLimitHelpers
+
+  def control
+    block_arg
+  end
+
+  def control_recorder
+    @control_recorder ||= ActiveRecord::QueryRecorder.new(&control)
+  end
+
+  def expected_count
+    control_recorder.count
+  end
+
+  def verify_count(&block)
+    @subject_block = block
+
+    # These blocks need to be evaluated in an expected order, in case
+    # the events in expected affect the counts in actual
+    expected_count
+    actual_count
+
+    actual_count < expected_count
+  end
+
+  match do |block|
+    verify_count(&block)
+  end
+
+  def failure_message
+    <<~MSG
+    Expected to issue fewer than #{expected_count} queries, but got #{actual_count}
+
+    #{log_message}
+    MSG
+  end
+
+  failure_message_when_negated do |actual|
+    <<~MSG
+    Expected query count of #{actual_count} to be less than #{expected_count}
+
+    #{log_message}
+    MSG
+  end
+end
+
 RSpec::Matchers.define :issue_same_number_of_queries_as do
   supports_block_expectations
 
@@ -82,30 +135,66 @@ RSpec::Matchers.define :issue_same_number_of_queries_as do
     block_arg
   end
 
+  chain :or_fewer do
+    @or_fewer = true
+  end
+
+  chain :ignoring_cached_queries do
+    @skip_cached = true
+  end
+
   def control_recorder
     @control_recorder ||= ActiveRecord::QueryRecorder.new(&control)
   end
 
   def expected_count
-    @expected_count ||= control_recorder.count
+    control_recorder.count
   end
 
   def verify_count(&block)
     @subject_block = block
 
-    (expected_count - actual_count).abs <= threshold
+    # These blocks need to be evaluated in an expected order, in case
+    # the events in expected affect the counts in actual
+    expected_count
+    actual_count
+
+    if @or_fewer
+      actual_count <= expected_count
+    else
+      (expected_count - actual_count).abs <= threshold
+    end
   end
 
   match do |block|
     verify_count(&block)
   end
 
+  def failure_message
+    <<~MSG
+    Expected #{expected_count_message} queries, but got #{actual_count}
+
+    #{log_message}
+    MSG
+  end
+
   failure_message_when_negated do |actual|
-    failure_message
+    <<~MSG
+    Expected #{actual_count} not to equal #{expected_count_message}
+
+    #{log_message}
+    MSG
+  end
+
+  def expected_count_message
+    or_fewer_msg = "or fewer" if @or_fewer
+    threshold_msg = "(+/- #{threshold})" unless threshold.zero?
+
+    ["#{expected_count}", or_fewer_msg, threshold_msg].compact.join(' ')
   end
 
   def skip_cached
-    false
+    @skip_cached || false
   end
 end
 
diff --git a/spec/support/matchers/graphql_matchers.rb b/spec/support/matchers/graphql_matchers.rb
index 3e2193a9069..7fa06e25405 100644
--- a/spec/support/matchers/graphql_matchers.rb
+++ b/spec/support/matchers/graphql_matchers.rb
@@ -82,12 +82,30 @@ RSpec::Matchers.define :have_graphql_mutation do |mutation_class|
   end
 end
 
+# note: connection arguments do not have to be named, they will be inferred.
 RSpec::Matchers.define :have_graphql_arguments do |*expected|
   include GraphqlHelpers
 
+  def expected_names(field)
+    @names ||= Array.wrap(expected).map { |name| GraphqlHelpers.fieldnamerize(name) }
+
+    if field.type.try(:ancestors)&.include?(GraphQL::Types::Relay::BaseConnection)
+      @names | %w(after before first last)
+    else
+      @names
+    end
+  end
+
   match do |field|
-    argument_names = expected.map { |name| GraphqlHelpers.fieldnamerize(name) }
-    expect(field.arguments.keys).to contain_exactly(*argument_names)
+    names = expected_names(field)
+
+    expect(field.arguments.keys).to contain_exactly(*names)
+  end
+
+  failure_message do |field|
+    names = expected_names(field)
+
+    "expected that #{field.name} would have the following fields: #{names.inspect}, but it has #{field.arguments.keys.inspect}."
   end
 end
 
diff --git a/spec/support/rspec.rb b/spec/support/rspec.rb
index 1c9f9e5161e..7d011c5eb95 100644
--- a/spec/support/rspec.rb
+++ b/spec/support/rspec.rb
@@ -4,6 +4,7 @@ require_relative "helpers/stub_configuration"
 require_relative "helpers/stub_metrics"
 require_relative "helpers/stub_object_storage"
 require_relative "helpers/stub_env"
+require_relative "helpers/expect_offense"
 
 RSpec.configure do |config|
   config.mock_with :rspec
@@ -13,4 +14,6 @@ RSpec.configure do |config|
   config.include StubMetrics
   config.include StubObjectStorage
   config.include StubENV
+
+  config.include ExpectOffense, type: :rubocop
 end
diff --git a/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb b/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb
index 617701abf27..2b8daa80ab4 100644
--- a/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb
+++ b/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb
@@ -45,11 +45,32 @@ RSpec.shared_context 'MergeRequestsFinder multiple projects with merge requests
     allow_gitaly_n_plus_1 { create(:project, group: subgroup) }
   end
 
-  let!(:merge_request1) { create(:merge_request, assignees: [user], author: user, source_project: project2, target_project: project1, target_branch: 'merged-target') }
-  let!(:merge_request2) { create(:merge_request, :conflict, assignees: [user], author: user, source_project: project2, target_project: project1, state: 'closed') }
-  let!(:merge_request3) { create(:merge_request, :simple, author: user, assignees: [user2], source_project: project2, target_project: project2, state: 'locked', title: 'thing WIP thing') }
-  let!(:merge_request4) { create(:merge_request, :simple, author: user, source_project: project3, target_project: project3, title: 'WIP thing') }
-  let!(:merge_request5) { create(:merge_request, :simple, author: user, source_project: project4, target_project: project4, title: '[WIP]') }
+  let!(:merge_request1) do
+    create(:merge_request, assignees: [user], author: user,
+           source_project: project2, target_project: project1,
+           target_branch: 'merged-target')
+  end
+  let!(:merge_request2) do
+    create(:merge_request, :conflict, assignees: [user], author: user,
+           source_project: project2, target_project: project1,
+           state: 'closed')
+  end
+  let!(:merge_request3) do
+    create(:merge_request, :simple, author: user, assignees: [user2],
+           source_project: project2, target_project: project2,
+           state: 'locked',
+           title: 'thing WIP thing')
+  end
+  let!(:merge_request4) do
+    create(:merge_request, :simple, author: user,
+           source_project: project3, target_project: project3,
+           title: 'WIP thing')
+  end
+  let_it_be(:merge_request5) do
+    create(:merge_request, :simple, author: user,
+           source_project: project4, target_project: project4,
+           title: '[WIP]')
+  end
 
   before do
     project1.add_maintainer(user)
diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index fe3c32ec0c5..79b5ff44d4f 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -80,10 +80,13 @@ RSpec.shared_context 'project navbar structure' do
         nav_sub_items: []
       },
       {
+        nav_item: _('Members'),
+        nav_sub_items: []
+      },
+      {
         nav_item: _('Settings'),
         nav_sub_items: [
           _('General'),
-          _('Members'),
           _('Integrations'),
           _('Webhooks'),
           _('Access Tokens'),
diff --git a/spec/support/shared_contexts/project_service_shared_context.rb b/spec/support/shared_contexts/project_service_shared_context.rb
index 21d67ea71a8..5b0dd26bd7b 100644
--- a/spec/support/shared_contexts/project_service_shared_context.rb
+++ b/spec/support/shared_contexts/project_service_shared_context.rb
@@ -5,7 +5,6 @@ shared_context 'project service activation' do
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(integration_form_refactor: false)
     project.add_maintainer(user)
     sign_in(user)
   end
diff --git a/spec/support/shared_contexts/requests/api/graphql/jira_import/jira_projects_context.rb b/spec/support/shared_contexts/requests/api/graphql/jira_import/jira_projects_context.rb
new file mode 100644
index 00000000000..f0722beb3ed
--- /dev/null
+++ b/spec/support/shared_contexts/requests/api/graphql/jira_import/jira_projects_context.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+shared_context 'jira projects request context' do
+  let(:url) { 'https://jira.example.com' }
+  let(:username) { 'jira-username' }
+  let(:password) { 'jira-password' }
+  let!(:jira_service) do
+    create(:jira_service,
+      project: project,
+      url: url,
+      username: username,
+      password: password
+    )
+  end
+
+  let_it_be(:jira_projects_json) do
+    '{
+          "self": "https://your-domain.atlassian.net/rest/api/2/project/search?startAt=0&maxResults=2",
+          "nextPage": "https://your-domain.atlassian.net/rest/api/2/project/search?startAt=2&maxResults=2",
+          "maxResults": 2,
+          "startAt": 0,
+          "total": 7,
+          "isLast": false,
+          "values": [
+            {
+              "self": "https://your-domain.atlassian.net/rest/api/2/project/EX",
+              "id": "10000",
+              "key": "EX",
+              "name": "Example",
+              "avatarUrls": {
+                "48x48": "https://your-domain.atlassian.net/secure/projectavatar?size=large&pid=10000",
+                "24x24": "https://your-domain.atlassian.net/secure/projectavatar?size=small&pid=10000",
+                "16x16": "https://your-domain.atlassian.net/secure/projectavatar?size=xsmall&pid=10000",
+                "32x32": "https://your-domain.atlassian.net/secure/projectavatar?size=medium&pid=10000"
+              },
+              "projectCategory": {
+                "self": "https://your-domain.atlassian.net/rest/api/2/projectCategory/10000",
+                "id": "10000",
+                "name": "FIRST",
+                "description": "First Project Category"
+              },
+              "simplified": false,
+              "style": "classic",
+              "insight": {
+                "totalIssueCount": 100,
+                "lastIssueUpdateTime": "2020-03-31T05:45:24.792+0000"
+              }
+            },
+            {
+              "self": "https://your-domain.atlassian.net/rest/api/2/project/ABC",
+              "id": "10001",
+              "key": "ABC",
+              "name": "Alphabetical",
+              "avatarUrls": {
+                "48x48": "https://your-domain.atlassian.net/secure/projectavatar?size=large&pid=10001",
+                "24x24": "https://your-domain.atlassian.net/secure/projectavatar?size=small&pid=10001",
+                "16x16": "https://your-domain.atlassian.net/secure/projectavatar?size=xsmall&pid=10001",
+                "32x32": "https://your-domain.atlassian.net/secure/projectavatar?size=medium&pid=10001"
+              },
+              "projectCategory": {
+                "self": "https://your-domain.atlassian.net/rest/api/2/projectCategory/10000",
+                "id": "10000",
+                "name": "FIRST",
+                "description": "First Project Category"
+              },
+              "simplified": false,
+              "style": "classic",
+              "insight": {
+                "totalIssueCount": 100,
+                "lastIssueUpdateTime": "2020-03-31T05:45:24.792+0000"
+              }
+            }
+          ]
+        }'
+  end
+
+  let_it_be(:empty_jira_projects_json) do
+    '{
+          "self": "https://your-domain.atlassian.net/rest/api/2/project/search?startAt=0&maxResults=2",
+          "nextPage": "https://your-domain.atlassian.net/rest/api/2/project/search?startAt=2&maxResults=2",
+          "maxResults": 2,
+          "startAt": 0,
+          "total": 7,
+          "isLast": false,
+          "values": []
+    }'
+  end
+
+  let(:test_url) { "#{url}/rest/api/2/project/search?maxResults=50&query=&startAt=0" }
+  let(:start_at_20_url) { "#{url}/rest/api/2/project/search?maxResults=50&query=&startAt=20" }
+  let(:start_at_1_url) { "#{url}/rest/api/2/project/search?maxResults=50&query=&startAt=1" }
+  let(:max_results_1_url) { "#{url}/rest/api/2/project/search?maxResults=1&query=&startAt=0" }
+
+  before do
+    WebMock.stub_request(:get, test_url).with(basic_auth: [username, password])
+      .to_return(body: jira_projects_json, headers: { "Content-Type": "application/json" })
+    WebMock.stub_request(:get, start_at_20_url).with(basic_auth: [username, password])
+      .to_return(body: empty_jira_projects_json, headers: { "Content-Type": "application/json" })
+    WebMock.stub_request(:get, start_at_1_url).with(basic_auth: [username, password])
+      .to_return(body: jira_projects_json, headers: { "Content-Type": "application/json" })
+    WebMock.stub_request(:get, max_results_1_url).with(basic_auth: [username, password])
+      .to_return(body: jira_projects_json, headers: { "Content-Type": "application/json" })
+  end
+end
diff --git a/spec/support/shared_contexts/spam_constants.rb b/spec/support/shared_contexts/spam_constants.rb
index b6e92ea3050..32371f4b92f 100644
--- a/spec/support/shared_contexts/spam_constants.rb
+++ b/spec/support/shared_contexts/spam_constants.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 shared_context 'includes Spam constants' do
-  REQUIRE_RECAPTCHA = Spam::SpamConstants::REQUIRE_RECAPTCHA
-  DISALLOW = Spam::SpamConstants::DISALLOW
-  ALLOW = Spam::SpamConstants::ALLOW
+  before do
+    stub_const('CONDITIONAL_ALLOW', Spam::SpamConstants::CONDITIONAL_ALLOW)
+    stub_const('DISALLOW', Spam::SpamConstants::DISALLOW)
+    stub_const('ALLOW', Spam::SpamConstants::ALLOW)
+    stub_const('BLOCK_USER', Spam::SpamConstants::BLOCK_USER)
+  end
 end
diff --git a/spec/support/shared_examples/controllers/import_controller_new_import_ui_shared_examples.rb b/spec/support/shared_examples/controllers/import_controller_new_import_ui_shared_examples.rb
new file mode 100644
index 00000000000..88ad1f6cde2
--- /dev/null
+++ b/spec/support/shared_examples/controllers/import_controller_new_import_ui_shared_examples.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'import controller with new_import_ui feature flag' do
+  include ImportSpecHelper
+
+  context 'with new_import_ui feature flag enabled' do
+    let(:group) { create(:group) }
+
+    before do
+      stub_feature_flags(new_import_ui: true)
+      group.add_owner(user)
+    end
+
+    it "returns variables for json request" do
+      project = create(:project, import_type: provider_name, creator_id: user.id)
+      stub_client(client_repos_field => [repo])
+
+      get :status, format: :json
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response.dig("imported_projects", 0, "id")).to eq(project.id)
+      expect(json_response.dig("provider_repos", 0, "id")).to eq(repo_id)
+      expect(json_response.dig("namespaces", 0, "id")).to eq(group.id)
+    end
+
+    it "does not show already added project" do
+      project = create(:project, import_type: provider_name, namespace: user.namespace, import_status: :finished, import_source: import_source)
+      stub_client(client_repos_field => [repo])
+
+      get :status, format: :json
+
+      expect(json_response.dig("imported_projects", 0, "id")).to eq(project.id)
+      expect(json_response.dig("provider_repos")).to eq([])
+    end
+  end
+end
diff --git a/spec/support/shared_examples/controllers/issuables_list_metadata_shared_examples.rb b/spec/support/shared_examples/controllers/issuables_list_metadata_shared_examples.rb
index 2dbaea57c44..62a1a07b6c1 100644
--- a/spec/support/shared_examples/controllers/issuables_list_metadata_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/issuables_list_metadata_shared_examples.rb
@@ -34,7 +34,7 @@ RSpec.shared_examples 'issuables list meta-data' do |issuable_type, action = nil
 
     aggregate_failures do
       expect(meta_data.keys).to match_array(issuables.map(&:id))
-      expect(meta_data.values).to all(be_kind_of(Issuable::IssuableMeta))
+      expect(meta_data.values).to all(be_kind_of(Gitlab::IssuableMetadata::IssuableMeta))
     end
   end
 
diff --git a/spec/support/shared_examples/controllers/milestone_tabs_shared_examples.rb b/spec/support/shared_examples/controllers/milestone_tabs_shared_examples.rb
index d9656824452..925c45005f0 100644
--- a/spec/support/shared_examples/controllers/milestone_tabs_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/milestone_tabs_shared_examples.rb
@@ -2,15 +2,7 @@
 
 RSpec.shared_examples 'milestone tabs' do
   def go(path, extra_params = {})
-    params =
-      case milestone
-      when DashboardMilestone
-        { id: milestone.safe_title, title: milestone.title }
-      when GroupMilestone
-        { group_id: group.to_param, id: milestone.safe_title, title: milestone.title }
-      else
-        { namespace_id: project.namespace.to_param, project_id: project, id: milestone.iid }
-      end
+    params = { namespace_id: project.namespace.to_param, project_id: project, id: milestone.iid }
 
     get path, params: params.merge(extra_params)
   end
diff --git a/spec/support/shared_examples/controllers/namespace_storage_limit_alert_shared_examples.rb b/spec/support/shared_examples/controllers/namespace_storage_limit_alert_shared_examples.rb
new file mode 100644
index 00000000000..7885eb6c1f8
--- /dev/null
+++ b/spec/support/shared_examples/controllers/namespace_storage_limit_alert_shared_examples.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'namespace storage limit alert' do
+  let(:alert_level) { :info }
+
+  before do
+    allow_next_instance_of(Namespaces::CheckStorageSizeService, namespace, user) do |check_storage_size_service|
+      expect(check_storage_size_service).to receive(:execute).and_return(
+        ServiceResponse.success(
+          payload: {
+            alert_level: alert_level,
+            usage_message: "Usage",
+            explanation_message: "Explanation",
+            root_namespace: namespace
+          }
+        )
+      )
+    end
+
+    allow(controller).to receive(:current_user).and_return(user)
+  end
+
+  render_views
+
+  it 'does render' do
+    subject
+
+    expect(response.body).to match(/Explanation/)
+    expect(response.body).to have_css('.js-namespace-storage-alert-dismiss')
+  end
+
+  context 'when alert_level is error' do
+    let(:alert_level) { :error }
+
+    it 'does not render a dismiss button' do
+      subject
+
+      expect(response.body).not_to have_css('.js-namespace-storage-alert-dismiss')
+    end
+  end
+
+  context 'when cookie is set' do
+    before do
+      cookies["hide_storage_limit_alert_#{namespace.id}_info"] = 'true'
+    end
+
+    it 'does not render alert' do
+      subject
+
+      expect(response.body).not_to match(/Explanation/)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/controllers/wiki_actions_shared_examples.rb b/spec/support/shared_examples/controllers/wiki_actions_shared_examples.rb
new file mode 100644
index 00000000000..c128bbe5e02
--- /dev/null
+++ b/spec/support/shared_examples/controllers/wiki_actions_shared_examples.rb
@@ -0,0 +1,302 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'wiki controller actions' do
+  let(:container) { raise NotImplementedError }
+  let(:routing_params) { raise NotImplementedError }
+
+  let_it_be(:user) { create(:user) }
+  let(:wiki) { Wiki.for_container(container, user) }
+  let(:wiki_title) { 'page title test' }
+
+  before do
+    create(:wiki_page, wiki: wiki, title: wiki_title, content: 'hello world')
+
+    sign_in(user)
+  end
+
+  describe 'GET #new' do
+    subject { get :new, params: routing_params }
+
+    it 'redirects to #show and appends a `random_title` param' do
+      subject
+
+      expect(response).to be_redirect
+      expect(response.redirect_url).to match(%r{
+        #{Regexp.quote(wiki.wiki_base_path)} # wiki base path
+        /[-\h]{36}                           # page slug
+        \?random_title=true\Z                # random_title param
+      }x)
+    end
+
+    context 'when the wiki repository cannot be created' do
+      before do
+        expect(Wiki).to receive(:for_container).and_return(wiki)
+        expect(wiki).to receive(:wiki) { raise Wiki::CouldNotCreateWikiError }
+      end
+
+      it 'redirects to the wiki container and displays an error message' do
+        subject
+
+        expect(response).to redirect_to(container)
+        expect(flash[:notice]).to eq('Could not create Wiki Repository at this time. Please try again later.')
+      end
+    end
+  end
+
+  describe 'GET #pages' do
+    before do
+      get :pages, params: routing_params.merge(id: wiki_title)
+    end
+
+    it 'assigns the page collections' do
+      expect(assigns(:wiki_pages)).to contain_exactly(an_instance_of(WikiPage))
+      expect(assigns(:wiki_entries)).to contain_exactly(an_instance_of(WikiPage))
+    end
+
+    it 'does not load the page content' do
+      expect(assigns(:page)).to be_nil
+    end
+
+    it 'does not load the sidebar' do
+      expect(assigns(:sidebar_wiki_entries)).to be_nil
+      expect(assigns(:sidebar_limited)).to be_nil
+    end
+  end
+
+  describe 'GET #history' do
+    before do
+      allow(controller)
+        .to receive(:can?)
+        .with(any_args)
+        .and_call_original
+
+      # The :create_wiki permission is irrelevant to reading history.
+      expect(controller)
+        .not_to receive(:can?)
+        .with(anything, :create_wiki, any_args)
+
+      allow(controller)
+        .to receive(:can?)
+        .with(anything, :read_wiki, any_args)
+        .and_return(allow_read_wiki)
+    end
+
+    shared_examples 'fetching history' do |expected_status|
+      before do
+        get :history, params: routing_params.merge(id: wiki_title)
+      end
+
+      it "returns status #{expected_status}" do
+        expect(response).to have_gitlab_http_status(expected_status)
+      end
+    end
+
+    it_behaves_like 'fetching history', :ok do
+      let(:allow_read_wiki)   { true }
+
+      it 'assigns @page_versions' do
+        expect(assigns(:page_versions)).to be_present
+      end
+    end
+
+    it_behaves_like 'fetching history', :not_found do
+      let(:allow_read_wiki)   { false }
+    end
+  end
+
+  describe 'GET #show' do
+    render_views
+
+    let(:random_title) { nil }
+
+    subject { get :show, params: routing_params.merge(id: id, random_title: random_title) }
+
+    context 'when page exists' do
+      let(:id) { wiki_title }
+
+      it 'renders the page' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(assigns(:page).title).to eq(wiki_title)
+        expect(assigns(:sidebar_wiki_entries)).to contain_exactly(an_instance_of(WikiPage))
+        expect(assigns(:sidebar_limited)).to be(false)
+      end
+
+      context 'when page content encoding is invalid' do
+        it 'sets flash error' do
+          allow(controller).to receive(:valid_encoding?).and_return(false)
+
+          subject
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(flash[:notice]).to eq(_('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.'))
+        end
+      end
+    end
+
+    context 'when the page does not exist' do
+      let(:id) { 'does not exist' }
+
+      before do
+        subject
+      end
+
+      it 'builds a new wiki page with the id as the title' do
+        expect(assigns(:page).title).to eq(id)
+      end
+
+      context 'when a random_title param is present' do
+        let(:random_title) { true }
+
+        it 'builds a new wiki page with no title' do
+          expect(assigns(:page).title).to be_empty
+        end
+      end
+    end
+
+    context 'when page is a file' do
+      include WikiHelpers
+
+      let(:id) { upload_file_to_wiki(container, user, file_name) }
+
+      context 'when file is an image' do
+        let(:file_name) { 'dk.png' }
+
+        it 'delivers the image' do
+          subject
+
+          expect(response.headers['Content-Disposition']).to match(/^inline/)
+          expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
+        end
+
+        context 'when file is a svg' do
+          let(:file_name) { 'unsanitized.svg' }
+
+          it 'delivers the image' do
+            subject
+
+            expect(response.headers['Content-Disposition']).to match(/^inline/)
+            expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
+          end
+        end
+
+        it_behaves_like 'project cache control headers' do
+          let(:project) { container }
+        end
+      end
+
+      context 'when file is a pdf' do
+        let(:file_name) { 'git-cheat-sheet.pdf' }
+
+        it 'sets the content type to sets the content response headers' do
+          subject
+
+          expect(response.headers['Content-Disposition']).to match(/^inline/)
+          expect(response.headers[Gitlab::Workhorse::DETECT_HEADER]).to eq "true"
+        end
+
+        it_behaves_like 'project cache control headers' do
+          let(:project) { container }
+        end
+      end
+    end
+  end
+
+  describe 'POST #preview_markdown' do
+    it 'renders json in a correct format' do
+      post :preview_markdown, params: routing_params.merge(id: 'page/path', text: '*Markdown* text')
+
+      expect(json_response.keys).to match_array(%w(body references))
+    end
+  end
+
+  describe 'GET #edit' do
+    subject { get(:edit, params: routing_params.merge(id: wiki_title)) }
+
+    context 'when page content encoding is invalid' do
+      it 'redirects to show' do
+        allow(controller).to receive(:valid_encoding?).and_return(false)
+
+        subject
+
+        expect(response).to redirect_to_wiki(wiki, wiki.list_pages.first)
+      end
+    end
+
+    context 'when the page has nil content' do
+      let(:page) { create(:wiki_page) }
+
+      it 'redirects to show' do
+        allow(page).to receive(:content).and_return(nil)
+        allow(controller).to receive(:page).and_return(page)
+
+        subject
+
+        expect(response).to redirect_to_wiki(wiki, page)
+      end
+    end
+
+    context 'when page content encoding is valid' do
+      render_views
+
+      it 'shows the edit page' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response.body).to include(s_('Wiki|Edit Page'))
+      end
+    end
+  end
+
+  describe 'PATCH #update' do
+    let(:new_title) { 'New title' }
+    let(:new_content) { 'New content' }
+
+    subject do
+      patch(:update,
+            params: routing_params.merge(
+              id: wiki_title,
+              wiki: { title: new_title, content: new_content }
+            ))
+    end
+
+    context 'when page content encoding is invalid' do
+      it 'redirects to show' do
+        allow(controller).to receive(:valid_encoding?).and_return(false)
+
+        subject
+        expect(response).to redirect_to_wiki(wiki, wiki.list_pages.first)
+      end
+    end
+
+    context 'when page content encoding is valid' do
+      render_views
+
+      it 'updates the page' do
+        subject
+
+        wiki_page = wiki.list_pages(load_content: true).first
+
+        expect(wiki_page.title).to eq new_title
+        expect(wiki_page.content).to eq new_content
+      end
+    end
+
+    context 'when user does not have edit permissions' do
+      before do
+        sign_out(:user)
+      end
+
+      it 'renders the empty state' do
+        subject
+
+        expect(response).to render_template('shared/wikis/empty')
+      end
+    end
+  end
+
+  def redirect_to_wiki(wiki, page)
+    redirect_to(controller.wiki_page_path(wiki, page))
+  end
+end
diff --git a/spec/support/shared_examples/features/comments_on_merge_request_files_shared_examples.rb b/spec/support/shared_examples/features/comments_on_merge_request_files_shared_examples.rb
index fb3b17d05ee..e0a032b1a43 100644
--- a/spec/support/shared_examples/features/comments_on_merge_request_files_shared_examples.rb
+++ b/spec/support/shared_examples/features/comments_on_merge_request_files_shared_examples.rb
@@ -6,13 +6,14 @@ RSpec.shared_examples 'comment on merge request file' do
 
     page.within('.js-discussion-note-form') do
       fill_in(:note_note, with: 'Line is wrong')
-      click_button('Comment')
+      find('.js-comment-button').click
     end
 
     wait_for_requests
 
     page.within('.notes_holder') do
       expect(page).to have_content('Line is wrong')
+      expect(page).not_to have_content('Comment on lines')
     end
 
     visit(merge_request_path(merge_request))
diff --git a/spec/support/shared_examples/features/discussion_comments_shared_example.rb b/spec/support/shared_examples/features/discussion_comments_shared_example.rb
index 81433d124c9..6007798c290 100644
--- a/spec/support/shared_examples/features/discussion_comments_shared_example.rb
+++ b/spec/support/shared_examples/features/discussion_comments_shared_example.rb
@@ -15,7 +15,7 @@ RSpec.shared_examples 'thread comments' do |resource_name|
 
     find("#{form_selector} .note-textarea").send_keys(comment)
 
-    click_button 'Comment'
+    find('.js-comment-button').click
 
     expect(page).to have_content(comment)
 
@@ -30,6 +30,8 @@ RSpec.shared_examples 'thread comments' do |resource_name|
 
       click_button 'Comment & close issue'
 
+      wait_for_all_requests
+
       expect(page).to have_content(comment)
       expect(page).to have_content "@#{user.username} closed"
 
@@ -144,7 +146,7 @@ RSpec.shared_examples 'thread comments' do |resource_name|
           find("#{comments_selector} .js-vue-discussion-reply").click
           find("#{comments_selector} .note-textarea").send_keys(text)
 
-          click_button "Comment"
+          find("#{comments_selector} .js-comment-button").click
           wait_for_requests
         end
 
diff --git a/spec/support/shared_examples/graphql/container_expiration_policy_shared_examples.rb b/spec/support/shared_examples/graphql/container_expiration_policy_shared_examples.rb
new file mode 100644
index 00000000000..9914de7c847
--- /dev/null
+++ b/spec/support/shared_examples/graphql/container_expiration_policy_shared_examples.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'exposing container expiration policy option' do |model_option|
+  it 'exposes all options' do
+    expect(described_class.values.keys).to contain_exactly(*expected_values)
+  end
+
+  it 'uses all possible options from model' do
+    all_options = ContainerExpirationPolicy.public_send("#{model_option}_options").keys
+    expect(described_class::OPTIONS_MAPPING.keys).to contain_exactly(*all_options)
+  end
+end
diff --git a/spec/support/shared_examples/graphql/label_fields.rb b/spec/support/shared_examples/graphql/label_fields.rb
new file mode 100644
index 00000000000..b1bfb395bc6
--- /dev/null
+++ b/spec/support/shared_examples/graphql/label_fields.rb
@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'a GraphQL type with labels' do
+  it 'has label fields' do
+    expected_fields = %w[label labels]
+
+    expect(described_class).to include_graphql_fields(*expected_fields)
+  end
+
+  describe 'label field' do
+    subject { described_class.fields['label'] }
+
+    it { is_expected.to have_graphql_type(Types::LabelType) }
+    it { is_expected.to have_graphql_arguments(:title) }
+  end
+
+  describe 'labels field' do
+    subject { described_class.fields['labels'] }
+
+    it { is_expected.to have_graphql_type(Types::LabelType.connection_type) }
+    it { is_expected.to have_graphql_arguments(:search_term) }
+  end
+end
+
+RSpec.shared_examples 'querying a GraphQL type with labels' do
+  let_it_be(:current_user) { create(:user) }
+
+  let_it_be(:label_a) { create(label_factory, :described, **label_attrs) }
+  let_it_be(:label_b) { create(label_factory, :described, **label_attrs) }
+  let_it_be(:label_c) { create(label_factory, :described, :scoped, prefix: 'matching', **label_attrs) }
+  let_it_be(:label_d) { create(label_factory, :described, :scoped, prefix: 'matching', **label_attrs) }
+
+  let(:label_title) { label_b.title }
+
+  let(:label_params) { { title: label_title } }
+  let(:labels_params) { nil }
+
+  let(:label_response) { graphql_data.dig(*path_prefix, 'label') }
+  let(:labels_response) { graphql_data.dig(*path_prefix, 'labels', 'nodes') }
+
+  let(:query) do
+    make_query(
+      [
+        query_graphql_field(:label, label_params, all_graphql_fields_for(Label)),
+        query_graphql_field(:labels, labels_params, [
+          query_graphql_field(:nodes, nil, all_graphql_fields_for(Label))
+        ])
+      ]
+    )
+  end
+
+  context 'running a query' do
+    before do
+      run_query(query)
+    end
+
+    context 'minimum required arguments' do
+      it 'returns the label information' do
+        expect(label_response).to include(
+          'title' => label_title,
+          'description' => label_b.description
+        )
+      end
+
+      it 'returns the labels information' do
+        expect(labels_response.pluck('title')).to contain_exactly(
+          label_a.title,
+          label_b.title,
+          label_c.title,
+          label_d.title
+        )
+      end
+    end
+
+    context 'with a search param' do
+      let(:labels_params) { { search_term: 'matching' } }
+
+      it 'finds the matching labels' do
+        expect(labels_response.pluck('title')).to contain_exactly(
+          label_c.title,
+          label_d.title
+        )
+      end
+    end
+
+    context 'the label does not exist' do
+      let(:label_title) { 'not-a-label' }
+
+      it 'returns nil' do
+        expect(label_response).to be_nil
+      end
+    end
+  end
+
+  describe 'performance' do
+    def query_for(*labels)
+      selections = labels.map do |label|
+        %Q[#{label.title.gsub(/:+/, '_')}: label(title: "#{label.title}") { description }]
+      end
+
+      make_query(selections)
+    end
+
+    before do
+      run_query(query_for(label_a))
+    end
+
+    it 'batches queries for labels by title' do
+      pending('See: https://gitlab.com/gitlab-org/gitlab/-/issues/217767')
+
+      multi_selection = query_for(label_b, label_c)
+      single_selection = query_for(label_d)
+
+      expect { run_query(multi_selection) }
+        .to issue_same_number_of_queries_as { run_query(single_selection) }
+    end
+  end
+
+  # Run a known good query with the current user
+  def run_query(query)
+    post_graphql(query, current_user: current_user)
+    expect(graphql_errors).not_to be_present
+  end
+end
diff --git a/spec/support/shared_examples/graphql/members_shared_examples.rb b/spec/support/shared_examples/graphql/members_shared_examples.rb
new file mode 100644
index 00000000000..a58e716efd2
--- /dev/null
+++ b/spec/support/shared_examples/graphql/members_shared_examples.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'a working membership object query' do |model_option|
+  let_it_be(:member_source) { member.source }
+  let_it_be(:member_source_type) { member_source.class.to_s.downcase }
+
+  it 'contains edge to expected project' do
+    expect(
+      graphql_data.dig('user', "#{member_source_type}Memberships", 'nodes', 0, member_source_type, 'id')
+    ).to eq(member.send(member_source_type).to_global_id.to_s)
+  end
+
+  it 'contains correct access level' do
+    expect(
+      graphql_data.dig('user', "#{member_source_type}Memberships", 'nodes', 0, 'accessLevel', 'integerValue')
+    ).to eq(30)
+
+    expect(
+      graphql_data.dig('user', "#{member_source_type}Memberships", 'nodes', 0, 'accessLevel', 'stringValue')
+    ).to eq('DEVELOPER')
+  end
+end
diff --git a/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb b/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb
index b56181371c3..58cd3d21f66 100644
--- a/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb
+++ b/spec/support/shared_examples/graphql/resolves_issuable_shared_examples.rb
@@ -22,26 +22,16 @@ RSpec.shared_examples 'resolving an issuable in GraphQL' do |type|
         .with(full_path: parent.full_path)
         .and_return(resolved_parent)
 
-      expect(resolver_class).to receive(:new)
+      expect(resolver_class.single).to receive(:new)
         .with(object: resolved_parent, context: context, field: nil)
         .and_call_original
 
       subject
     end
 
-    it 'uses correct Resolver to resolve issuable parent' do
-      resolver_class = type == :epic ? 'Resolvers::GroupResolver' : 'Resolvers::ProjectResolver'
-
-      expect(resolver_class.constantize).to receive(:new)
-        .with(object: nil, context: context, field: nil)
-        .and_call_original
-
-      subject
-    end
-
     it 'returns nil if issuable is not found' do
       result = mutation.resolve_issuable(type: type, parent_path: parent.full_path, iid: "100")
-      result = type == :merge_request ? result.sync : result
+      result = result.respond_to?(:sync) ? result.sync : result
 
       expect(result).to be_nil
     end
diff --git a/spec/support/shared_examples/graphql/sorted_paginated_query_shared_examples.rb b/spec/support/shared_examples/graphql/sorted_paginated_query_shared_examples.rb
index fb7e24eecf2..2ef71d275a2 100644
--- a/spec/support/shared_examples/graphql/sorted_paginated_query_shared_examples.rb
+++ b/spec/support/shared_examples/graphql/sorted_paginated_query_shared_examples.rb
@@ -23,7 +23,7 @@
 #       graphql_query_for(
 #         'project',
 #         { 'fullPath' => sort_project.full_path },
-#         "issues(#{params}) { #{page_info} edges { node { iid weight } } }"
+#         query_graphql_field('issues', params, "#{page_info} edges { node { id } }")
 #       )
 #     end
 #
@@ -47,11 +47,13 @@ RSpec.shared_examples 'sorted paginated query' do
   end
 
   describe do
-    let(:params)       { "sort: #{sort_param}" }
-    let(:start_cursor) { graphql_data_at(*data_path, :pageInfo, :startCursor) }
-    let(:end_cursor)   { graphql_data_at(*data_path, :pageInfo, :endCursor) }
-    let(:sorted_edges) { graphql_data_at(*data_path, :edges) }
-    let(:page_info)    { "pageInfo { startCursor endCursor }" }
+    let(:sort_argument)  { "sort: #{sort_param}" if sort_param.present? }
+    let(:first_argument) { "first: #{first_param}" if first_param.present? }
+    let(:params)         { sort_argument }
+    let(:start_cursor)   { graphql_data_at(*data_path, :pageInfo, :startCursor) }
+    let(:end_cursor)     { graphql_data_at(*data_path, :pageInfo, :endCursor) }
+    let(:sorted_edges)   { graphql_data_at(*data_path, :edges) }
+    let(:page_info)      { "pageInfo { startCursor endCursor }" }
 
     def pagination_query(params, page_info)
       raise('pagination_query(params, page_info) must be defined in the test, see example in comment') unless defined?(super)
@@ -75,12 +77,12 @@ RSpec.shared_examples 'sorted paginated query' do
       end
 
       context 'when paginating' do
-        let(:params) { "sort: #{sort_param}, first: #{first_param}" }
+        let(:params) { [sort_argument, first_argument].compact.join(',') }
 
         it 'paginates correctly' do
           expect(pagination_results_data(sorted_edges)).to eq expected_results.first(first_param)
 
-          cursored_query = pagination_query("sort: #{sort_param}, after: \"#{end_cursor}\"", page_info)
+          cursored_query = pagination_query([sort_argument, "after: \"#{end_cursor}\""].compact.join(','), page_info)
           post_graphql(cursored_query, current_user: current_user)
           response_data = graphql_dig_at(Gitlab::Json.parse(response.body), :data, *data_path, :edges)
 
diff --git a/spec/support/shared_examples/integrations/test_examples.rb b/spec/support/shared_examples/integrations/test_examples.rb
new file mode 100644
index 00000000000..eb2e83ce5d1
--- /dev/null
+++ b/spec/support/shared_examples/integrations/test_examples.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'tests for integration with pipeline data' do
+  it 'tests the integration with pipeline data' do
+    create(:ci_empty_pipeline, project: project)
+    allow(Gitlab::DataBuilder::Pipeline).to receive(:build).and_return(sample_data)
+
+    expect(integration).to receive(:test).with(sample_data).and_return(success_result)
+    expect(subject).to eq(success_result)
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/gl_repository_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/gl_repository_shared_examples.rb
new file mode 100644
index 00000000000..97f4341340d
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/gl_repository_shared_examples.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'parsing gl_repository identifier' do
+  subject { described_class.new(identifier) }
+
+  it 'returns correct information' do
+    aggregate_failures do
+      expect(subject.repo_type).to eq(expected_type)
+      expect(subject.fetch_container!).to eq(expected_container)
+    end
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb
new file mode 100644
index 00000000000..06ea540706a
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/import/stuck_import_job_workers_shared_examples.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+shared_examples 'stuck import job detection' do
+  context 'when the job has completed' do
+    context 'when the import status was already updated' do
+      before do
+        allow(Gitlab::SidekiqStatus).to receive(:completed_jids) do
+          import_state.start
+          import_state.finish
+
+          [import_state.jid]
+        end
+      end
+
+      it 'does not mark the import as failed' do
+        worker.perform
+
+        expect(import_state.reload.status).to eq('finished')
+      end
+    end
+
+    context 'when the import status was not updated' do
+      before do
+        allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return([import_state.jid])
+      end
+
+      it 'marks the import as failed' do
+        worker.perform
+
+        expect(import_state.reload.status).to eq('failed')
+      end
+    end
+  end
+
+  context 'when the job is still in Sidekiq' do
+    before do
+      allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return([])
+    end
+
+    it 'does not mark the import as failed' do
+      expect { worker.perform }.not_to change { import_state.reload.status }
+    end
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb
index c9300aff3e6..326800e6dc2 100644
--- a/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/position_formatters_shared_examples.rb
@@ -32,7 +32,21 @@ RSpec.shared_examples "position formatter" do
 
     subject { formatter.to_h }
 
-    it { is_expected.to eq(formatter_hash) }
+    context 'when file_identifier_hash is disabled' do
+      before do
+        stub_feature_flags(file_identifier_hash: false)
+      end
+
+      it { is_expected.to eq(formatter_hash.except(:file_identifier_hash)) }
+    end
+
+    context 'when file_identifier_hash is enabled' do
+      before do
+        stub_feature_flags(file_identifier_hash: true)
+      end
+
+      it { is_expected.to eq(formatter_hash) }
+    end
   end
 
   describe '#==' do
diff --git a/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb
index 69ae9339f10..4aeae788114 100644
--- a/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/repo_type_shared_examples.rb
@@ -7,26 +7,6 @@ RSpec.shared_examples 'a repo type' do
     it { is_expected.to eq(expected_identifier) }
   end
 
-  describe '#fetch_id' do
-    it 'finds an id match in the identifier' do
-      expect(described_class.fetch_id(expected_identifier)).to eq(expected_id)
-    end
-
-    it 'does not break on other identifiers' do
-      expect(described_class.fetch_id('wiki-noid')).to eq(nil)
-    end
-  end
-
-  describe '#fetch_container!' do
-    it 'returns the container' do
-      expect(described_class.fetch_container!(expected_identifier)).to eq expected_container
-    end
-
-    it 'raises an exception if the identifier is invalid' do
-      expect { described_class.fetch_container!('project-noid') }.to raise_error ArgumentError
-    end
-  end
-
   describe '#path_suffix' do
     subject { described_class.path_suffix }
 
diff --git a/spec/support/shared_examples/models/application_setting_shared_examples.rb b/spec/support/shared_examples/models/application_setting_shared_examples.rb
index aed85a6630a..01513161d24 100644
--- a/spec/support/shared_examples/models/application_setting_shared_examples.rb
+++ b/spec/support/shared_examples/models/application_setting_shared_examples.rb
@@ -288,11 +288,37 @@ RSpec.shared_examples 'application settings examples' do
   end
 
   describe '#pick_repository_storage' do
-    it 'uses Array#sample to pick a random storage' do
-      array = double('array', sample: 'random')
-      expect(setting).to receive(:repository_storages).and_return(array)
+    before do
+      allow(setting).to receive(:repository_storages_weighted).and_return({ 'default' => 20, 'backup' => 80 })
+    end
+
+    it 'chooses repository based on weight' do
+      picked_storages = { 'default' => 0.0, 'backup' => 0.0 }
+      10_000.times { picked_storages[setting.pick_repository_storage] += 1 }
+
+      expect(((picked_storages['default'] / 10_000) * 100).round.to_i).to be_between(19, 21)
+      expect(((picked_storages['backup'] / 10_000) * 100).round.to_i).to be_between(79, 81)
+    end
+  end
+
+  describe '#normalized_repository_storage_weights' do
+    using RSpec::Parameterized::TableSyntax
 
-      expect(setting.pick_repository_storage).to eq('random')
+    where(:storages, :normalized) do
+      { 'default' => 0, 'backup' => 100 }   | { 'default' => 0.0, 'backup' => 1.0 }
+      { 'default' => 100, 'backup' => 100 } | { 'default' => 0.5, 'backup' => 0.5 }
+      { 'default' => 20, 'backup' => 80 }   | { 'default' => 0.2, 'backup' => 0.8 }
+      { 'default' => 0, 'backup' => 0 }     | { 'default' => 0.0, 'backup' => 0.0 }
+    end
+
+    with_them do
+      before do
+        allow(setting).to receive(:repository_storages_weighted).and_return(storages)
+      end
+
+      it 'normalizes storage weights' do
+        expect(setting.normalized_repository_storage_weights).to eq(normalized)
+      end
     end
   end
 
diff --git a/spec/support/shared_examples/models/cluster_application_helm_cert_shared_examples.rb b/spec/support/shared_examples/models/cluster_application_helm_cert_shared_examples.rb
index fa6b0c3afdd..239588d3b2f 100644
--- a/spec/support/shared_examples/models/cluster_application_helm_cert_shared_examples.rb
+++ b/spec/support/shared_examples/models/cluster_application_helm_cert_shared_examples.rb
@@ -54,7 +54,7 @@ RSpec.shared_examples 'cluster application helm specs' do |application_name|
 
     context 'managed_apps_local_tiller feature flag is enabled' do
       before do
-        stub_feature_flags(managed_apps_local_tiller: true)
+        stub_feature_flags(managed_apps_local_tiller: application.cluster.clusterable)
       end
 
       it 'does not include cert files' do
diff --git a/spec/support/shared_examples/models/cluster_application_initial_status_shared_examples.rb b/spec/support/shared_examples/models/cluster_application_initial_status_shared_examples.rb
index 0b21e9a3aa7..7f0c60d4204 100644
--- a/spec/support/shared_examples/models/cluster_application_initial_status_shared_examples.rb
+++ b/spec/support/shared_examples/models/cluster_application_initial_status_shared_examples.rb
@@ -18,7 +18,7 @@ RSpec.shared_examples 'cluster application initial status specs' do
 
     context 'local tiller feature flag is enabled' do
       before do
-        stub_feature_flags(managed_apps_local_tiller: true)
+        stub_feature_flags(managed_apps_local_tiller: cluster.clusterable)
       end
 
       it 'sets a default status' do
diff --git a/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb b/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb
index c2fd04d648b..0efa5e56199 100644
--- a/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb
+++ b/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb
@@ -66,7 +66,7 @@ RSpec.shared_examples 'cluster application status specs' do |application_name|
 
       context 'managed_apps_local_tiller feature flag enabled' do
         before do
-          stub_feature_flags(managed_apps_local_tiller: true)
+          stub_feature_flags(managed_apps_local_tiller: subject.cluster.clusterable)
         end
 
         it 'does not update the helm version' do
@@ -197,12 +197,73 @@ RSpec.shared_examples 'cluster application status specs' do |application_name|
     describe '#make_externally_installed' do
       subject { create(application_name, :installing) }
 
+      let(:old_helm) { create(:clusters_applications_helm, version: '1.2.3') }
+
       it 'is installed' do
         subject.make_externally_installed
 
         expect(subject).to be_installed
       end
 
+      context 'local tiller flag enabled' do
+        before do
+          stub_feature_flags(managed_apps_local_tiller: true)
+        end
+
+        context 'helm record does not exist' do
+          subject { build(application_name, :installing, :no_helm_installed) }
+
+          it 'does not create a helm record' do
+            subject.make_externally_installed!
+
+            subject.cluster.reload
+            expect(subject.cluster.application_helm).to be_nil
+          end
+        end
+
+        context 'helm record exists' do
+          subject { build(application_name, :installing, cluster: old_helm.cluster) }
+
+          it 'does not update helm version' do
+            subject.make_externally_installed!
+
+            subject.cluster.application_helm.reload
+
+            expect(subject.cluster.application_helm.version).to eq('1.2.3')
+          end
+        end
+      end
+
+      context 'local tiller flag disabled' do
+        before do
+          stub_feature_flags(managed_apps_local_tiller: false)
+        end
+
+        context 'helm record does not exist' do
+          subject { build(application_name, :installing, :no_helm_installed) }
+
+          it 'creates a helm record' do
+            subject.make_externally_installed!
+
+            subject.cluster.reload
+            expect(subject.cluster.application_helm).to be_present
+            expect(subject.cluster.application_helm).to be_persisted
+          end
+        end
+
+        context 'helm record exists' do
+          subject { build(application_name, :installing, cluster: old_helm.cluster) }
+
+          it 'does not update helm version' do
+            subject.make_externally_installed!
+
+            subject.cluster.application_helm.reload
+
+            expect(subject.cluster.application_helm.version).to eq('1.2.3')
+          end
+        end
+      end
+
       context 'application is updated' do
         subject { create(application_name, :updated) }
 
diff --git a/spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb b/spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb
deleted file mode 100644
index 76339837351..00000000000
--- a/spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-# Include these shared examples in specs of Replicators that include
-# BlobReplicatorStrategy.
-#
-# A let variable called model_record should be defined in the spec. It should be
-# a valid, unpersisted instance of the model class.
-#
-RSpec.shared_examples 'a blob replicator' do
-  include EE::GeoHelpers
-
-  let_it_be(:primary) { create(:geo_node, :primary) }
-  let_it_be(:secondary) { create(:geo_node) }
-
-  subject(:replicator) { model_record.replicator }
-
-  before do
-    stub_current_geo_node(primary)
-  end
-
-  describe '#handle_after_create_commit' do
-    it 'creates a Geo::Event' do
-      expect do
-        replicator.handle_after_create_commit
-      end.to change { ::Geo::Event.count }.by(1)
-
-      expect(::Geo::Event.last.attributes).to include(
-        "replicable_name" => replicator.replicable_name, "event_name" => "created", "payload" => { "model_record_id" => replicator.model_record.id })
-    end
-
-    it 'schedules the checksum calculation if needed' do
-      expect(Geo::BlobVerificationPrimaryWorker).to receive(:perform_async)
-      expect(replicator).to receive(:needs_checksum?).and_return(true)
-
-      replicator.handle_after_create_commit
-    end
-
-    it 'does not schedule the checksum calculation if feature flag is disabled' do
-      stub_feature_flags(geo_self_service_framework: false)
-
-      expect(Geo::BlobVerificationPrimaryWorker).not_to receive(:perform_async)
-      allow(replicator).to receive(:needs_checksum?).and_return(true)
-
-      replicator.handle_after_create_commit
-    end
-  end
-
-  describe '#calculate_checksum!' do
-    it 'calculates the checksum' do
-      model_record.save!
-
-      replicator.calculate_checksum!
-
-      expect(model_record.reload.verification_checksum).not_to be_nil
-      expect(model_record.reload.verified_at).not_to be_nil
-    end
-
-    it 'saves the error message and increments retry counter' do
-      model_record.save!
-
-      allow(model_record).to receive(:calculate_checksum!) do
-        raise StandardError.new('Failure to calculate checksum')
-      end
-
-      replicator.calculate_checksum!
-
-      expect(model_record.reload.verification_failure).to eq 'Failure to calculate checksum'
-      expect(model_record.verification_retry_count).to be 1
-    end
-  end
-
-  describe '#consume_created_event' do
-    it 'invokes Geo::BlobDownloadService' do
-      service = double(:service)
-
-      expect(service).to receive(:execute)
-      expect(::Geo::BlobDownloadService).to receive(:new).with(replicator: replicator).and_return(service)
-
-      replicator.consume_event_created
-    end
-  end
-
-  describe '#carrierwave_uploader' do
-    it 'is implemented' do
-      expect do
-        replicator.carrierwave_uploader
-      end.not_to raise_error
-    end
-  end
-
-  describe '#model' do
-    let(:invoke_model) { replicator.class.model }
-
-    it 'is implemented' do
-      expect do
-        invoke_model
-      end.not_to raise_error
-    end
-
-    it 'is a Class' do
-      expect(invoke_model).to be_a(Class)
-    end
-
-    # For convenience (and reliability), instead of asking developers to include shared examples on each model spec as well
-    context 'replicable model' do
-      it 'defines #replicator' do
-        expect(model_record).to respond_to(:replicator)
-      end
-
-      it 'invokes replicator.handle_after_create_commit on create' do
-        expect(replicator).to receive(:handle_after_create_commit)
-
-        model_record.save!
-      end
-    end
-  end
-end
diff --git a/spec/support/shared_examples/models/concerns/has_repository_shared_examples.rb b/spec/support/shared_examples/models/concerns/has_repository_shared_examples.rb
index 30c8c7d0fe5..f37ef3533c3 100644
--- a/spec/support/shared_examples/models/concerns/has_repository_shared_examples.rb
+++ b/spec/support/shared_examples/models/concerns/has_repository_shared_examples.rb
@@ -148,18 +148,18 @@ RSpec.shared_examples 'model with repository' do
       expect(subject).to eq('picked')
     end
 
-    it 'picks from the latest available storage', :request_store do
+    it 'picks from the available storages based on weight', :request_store do
       stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
       Gitlab::CurrentSettings.expire_current_application_settings
       Gitlab::CurrentSettings.current_application_settings
 
       settings = ApplicationSetting.last
-      settings.repository_storages = %w(picked)
+      settings.repository_storages_weighted = { 'picked' => 100, 'default' => 0 }
       settings.save!
 
-      expect(Gitlab::CurrentSettings.repository_storages).to eq(%w(default))
+      expect(Gitlab::CurrentSettings.repository_storages_weighted).to eq({ 'default' => 100 })
       expect(subject).to eq('picked')
-      expect(Gitlab::CurrentSettings.repository_storages).to eq(%w(picked))
+      expect(Gitlab::CurrentSettings.repository_storages_weighted).to eq({ 'default' => 0, 'picked' => 100 })
     end
   end
 end
diff --git a/spec/support/shared_examples/models/concerns/limitable_shared_examples.rb b/spec/support/shared_examples/models/concerns/limitable_shared_examples.rb
index 4bcea36fd42..d21823661f8 100644
--- a/spec/support/shared_examples/models/concerns/limitable_shared_examples.rb
+++ b/spec/support/shared_examples/models/concerns/limitable_shared_examples.rb
@@ -26,7 +26,7 @@ RSpec.shared_examples 'includes Limitable concern' do
           subject.dup.save
         end
 
-        it 'cannot create new models exceding the plan limits' do
+        it 'cannot create new models exceeding the plan limits' do
           expect { subject.save }.not_to change { described_class.count }
           expect(subject.errors[:base]).to contain_exactly("Maximum number of #{subject.class.limit_name.humanize(capitalize: false)} (1) exceeded")
         end
diff --git a/spec/support/shared_examples/models/wiki_shared_examples.rb b/spec/support/shared_examples/models/wiki_shared_examples.rb
index 84569e95e11..a881d5f036c 100644
--- a/spec/support/shared_examples/models/wiki_shared_examples.rb
+++ b/spec/support/shared_examples/models/wiki_shared_examples.rb
@@ -32,6 +32,13 @@ RSpec.shared_examples 'wiki model' do
     it 'returns the wiki base path' do
       expect(subject.wiki_base_path).to eq("#{wiki_container.web_url(only_path: true)}/-/wikis")
     end
+
+    it 'includes the relative URL root' do
+      allow(Rails.application.routes).to receive(:default_url_options).and_return(script_name: '/root')
+
+      expect(subject.wiki_base_path).to start_with('/root/')
+      expect(subject.wiki_base_path).not_to start_with('/root/root')
+    end
   end
 
   describe '#wiki' do
diff --git a/spec/support/shared_examples/path_extraction_shared_examples.rb b/spec/support/shared_examples/path_extraction_shared_examples.rb
new file mode 100644
index 00000000000..19c6f2404e5
--- /dev/null
+++ b/spec/support/shared_examples/path_extraction_shared_examples.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'assigns ref vars' do
+  it 'assigns the repository var' do
+    assign_ref_vars
+
+    expect(@repo).to eq container.repository
+  end
+
+  context 'ref contains %20' do
+    let(:ref) { 'foo%20bar' }
+
+    it 'is not converted to a space in @id' do
+      container.repository.add_branch(owner, 'foo%20bar', 'master')
+
+      assign_ref_vars
+
+      expect(@id).to start_with('foo%20bar/')
+    end
+  end
+
+  context 'ref contains trailing space' do
+    let(:ref) { 'master ' }
+
+    it 'strips surrounding space' do
+      assign_ref_vars
+
+      expect(@ref).to eq('master')
+    end
+  end
+
+  context 'ref contains leading space' do
+    let(:ref) { ' master ' }
+
+    it 'strips surrounding space' do
+      assign_ref_vars
+
+      expect(@ref).to eq('master')
+    end
+  end
+
+  context 'path contains space' do
+    let(:params) { { path: 'with space', ref: '38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e' } }
+
+    it 'is not converted to %20 in @path' do
+      assign_ref_vars
+
+      expect(@path).to eq(params[:path])
+    end
+  end
+
+  context 'subclass overrides get_id' do
+    it 'uses ref returned by get_id' do
+      allow_next_instance_of(self.class) do |instance|
+        allow(instance).to receive(:get_id) { '38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e' }
+      end
+
+      assign_ref_vars
+
+      expect(@id).to eq(get_id)
+    end
+  end
+end
+
+RSpec.shared_examples 'extracts refs' do
+  describe '#extract_ref' do
+    it 'returns an empty pair when no repository_container is set' do
+      allow_any_instance_of(described_class).to receive(:repository_container).and_return(nil)
+      expect(extract_ref('master/CHANGELOG')).to eq(['', ''])
+    end
+
+    context 'without a path' do
+      it 'extracts a valid branch' do
+        expect(extract_ref('master')).to eq(['master', ''])
+      end
+
+      it 'extracts a valid tag' do
+        expect(extract_ref('v2.0.0')).to eq(['v2.0.0', ''])
+      end
+
+      it 'extracts a valid commit ref without a path' do
+        expect(extract_ref('f4b14494ef6abf3d144c28e4af0c20143383e062')).to eq(
+          ['f4b14494ef6abf3d144c28e4af0c20143383e062', '']
+        )
+      end
+
+      it 'falls back to a primitive split for an invalid ref' do
+        expect(extract_ref('stable')).to eq(['stable', ''])
+      end
+
+      it 'extracts the longest matching ref' do
+        expect(extract_ref('release/app/v1.0.0/README.md')).to eq(
+          ['release/app/v1.0.0', 'README.md'])
+      end
+    end
+
+    context 'with a path' do
+      it 'extracts a valid branch' do
+        expect(extract_ref('foo/bar/baz/CHANGELOG')).to eq(
+          ['foo/bar/baz', 'CHANGELOG'])
+      end
+
+      it 'extracts a valid tag' do
+        expect(extract_ref('v2.0.0/CHANGELOG')).to eq(['v2.0.0', 'CHANGELOG'])
+      end
+
+      it 'extracts a valid commit SHA' do
+        expect(extract_ref('f4b14494ef6abf3d144c28e4af0c20143383e062/CHANGELOG')).to eq(
+          %w(f4b14494ef6abf3d144c28e4af0c20143383e062 CHANGELOG)
+        )
+      end
+
+      it 'falls back to a primitive split for an invalid ref' do
+        expect(extract_ref('stable/CHANGELOG')).to eq(%w(stable CHANGELOG))
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/quick_actions/issuable/time_tracking_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/issuable/time_tracking_quick_action_shared_examples.rb
index 37a504cd56a..37ee2548dfe 100644
--- a/spec/support/shared_examples/quick_actions/issuable/time_tracking_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/issuable/time_tracking_quick_action_shared_examples.rb
@@ -86,7 +86,7 @@ RSpec.shared_examples 'issuable time tracker' do |issuable_type|
     page.within '.time-tracking-component-wrap' do
       find('.help-button').click
 
-      expect(find_link('Learn more')[:href]).to have_content('/help/workflow/time_tracking.md')
+      expect(find_link('Learn more')[:href]).to have_content('/help/user/project/time_tracking.md')
     end
   end
 end
diff --git a/spec/support/shared_examples/requests/api/container_repositories_shared_examples.rb b/spec/support/shared_examples/requests/api/container_repositories_shared_examples.rb
index 0f277c11913..3e058838773 100644
--- a/spec/support/shared_examples/requests/api/container_repositories_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/container_repositories_shared_examples.rb
@@ -54,6 +54,29 @@ RSpec.shared_examples 'returns repositories for allowed users' do |user_type, sc
         expect(response).to match_response_schema('registry/repositories')
       end
     end
+
+    context 'with tags_count param' do
+      let(:url) { "/#{scope}s/#{object.id}/registry/repositories?tags_count=true" }
+
+      before do
+        stub_container_registry_tags(repository: root_repository.path, tags: %w(rootA latest), with_manifest: true)
+        stub_container_registry_tags(repository: test_repository.path, tags: %w(rootA latest), with_manifest: true)
+      end
+
+      it 'returns a list of repositories and their tags_count' do
+        subject
+
+        expect(response.body).to include('tags_count')
+        expect(json_response[0]['tags_count']).to eq(2)
+      end
+
+      it 'returns a matching schema' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to match_response_schema('registry/repositories')
+      end
+    end
   end
 end
 
diff --git a/spec/support/shared_examples/requests/api/diff_discussions_shared_examples.rb b/spec/support/shared_examples/requests/api/diff_discussions_shared_examples.rb
index 3d25b9076ad..518c5b8dc28 100644
--- a/spec/support/shared_examples/requests/api/diff_discussions_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/diff_discussions_shared_examples.rb
@@ -30,7 +30,9 @@ RSpec.shared_examples 'diff discussions API' do |parent_type, noteable_type, id_
     it "creates a new diff note" do
       line_range = {
         "start_line_code" => Gitlab::Git.diff_line_code(diff_note.position.file_path, 1, 1),
-        "end_line_code" => Gitlab::Git.diff_line_code(diff_note.position.file_path, 2, 2)
+        "end_line_code" => Gitlab::Git.diff_line_code(diff_note.position.file_path, 2, 2),
+        "start_line_type" => diff_note.position.type,
+        "end_line_type" => diff_note.position.type
       }
 
       position = diff_note.position.to_h.merge({ line_range: line_range })
diff --git a/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb b/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb
index feb3ba46353..f26af6cb766 100644
--- a/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb
@@ -45,44 +45,37 @@ RSpec.shared_examples 'group and project boards query' do
     end
 
     describe 'sorting and pagination' do
+      let(:data_path) { [board_parent_type, :boards] }
+
+      def pagination_query(params, page_info)
+        graphql_query_for(
+          board_parent_type,
+          { 'fullPath' => board_parent.full_path },
+          query_graphql_field('boards', params, "#{page_info} edges { node { id } }")
+        )
+      end
+
+      def pagination_results_data(data)
+        data.map { |board| board.dig('node', 'id') }
+      end
+
       context 'when using default sorting' do
         let!(:board_B) { create(:board, resource_parent: board_parent, name: 'B') }
         let!(:board_C) { create(:board, resource_parent: board_parent, name: 'C') }
         let!(:board_a) { create(:board, resource_parent: board_parent, name: 'a') }
         let!(:board_A) { create(:board, resource_parent: board_parent, name: 'A') }
-
-        before do
-          post_graphql(query, current_user: current_user)
-        end
-
-        it_behaves_like 'a working graphql query'
+        let(:boards)   { [board_a, board_A, board_B, board_C] }
 
         context 'when ascending' do
-          let(:boards) { [board_a, board_A, board_B, board_C] }
-          let(:expected_boards) do
-            if board_parent.multiple_issue_boards_available?
-              boards
-            else
-              [boards.first]
-            end
-          end
-
-          it 'sorts boards' do
-            expect(grab_names).to eq expected_boards.map(&:name)
-          end
-
-          context 'when paginating' do
-            let(:params) { 'first: 2' }
-
-            it 'sorts boards' do
-              expect(grab_names).to eq expected_boards.first(2).map(&:name)
-
-              cursored_query = query("after: \"#{end_cursor}\"")
-              post_graphql(cursored_query, current_user: current_user)
-
-              response_data = Gitlab::Json.parse(response.body)['data'][board_parent_type]['boards']['edges']
-
-              expect(grab_names(response_data)).to eq expected_boards.drop(2).first(2).map(&:name)
+          it_behaves_like 'sorted paginated query' do
+            let(:sort_param)       { }
+            let(:first_param)      { 2 }
+            let(:expected_results) do
+              if board_parent.multiple_issue_boards_available?
+                boards.map { |board| board.to_global_id.to_s }
+              else
+                [boards.first.to_global_id.to_s]
+              end
             end
           end
         end
diff --git a/spec/support/shared_examples/requests/api/issuable_update_shared_examples.rb b/spec/support/shared_examples/requests/api/issuable_update_shared_examples.rb
new file mode 100644
index 00000000000..ded381fd402
--- /dev/null
+++ b/spec/support/shared_examples/requests/api/issuable_update_shared_examples.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'issuable update endpoint' do
+  let(:area) { entity.class.name.underscore.pluralize }
+
+  describe 'PUT /projects/:id/issues/:issue_id' do
+    let(:url) { "/projects/#{project.id}/#{area}/#{entity.iid}" }
+
+    it 'clears labels when labels param is nil' do
+      put api(url, user), params: { labels: 'label1' }
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['labels']).to contain_exactly('label1')
+
+      put api(url, user), params: { labels: nil }
+
+      expect(response).to have_gitlab_http_status(:ok)
+      json_response = Gitlab::Json.parse(response.body)
+      expect(json_response['labels']).to be_empty
+    end
+
+    it 'updates the issuable with labels param as array' do
+      stub_const("Gitlab::QueryLimiting::Transaction::THRESHOLD", 110)
+
+      params = { labels: ['label1', 'label2', 'foo, bar', '&,?'] }
+
+      put api(url, user), params: params
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['labels']).to include 'label1'
+      expect(json_response['labels']).to include 'label2'
+      expect(json_response['labels']).to include 'foo'
+      expect(json_response['labels']).to include 'bar'
+      expect(json_response['labels']).to include '&'
+      expect(json_response['labels']).to include '?'
+    end
+  end
+end
diff --git a/spec/support/shared_examples/requests/api/resource_label_events_api_shared_examples.rb b/spec/support/shared_examples/requests/api/resource_label_events_api_shared_examples.rb
index f49f944f38d..675b6c5cef6 100644
--- a/spec/support/shared_examples/requests/api/resource_label_events_api_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/resource_label_events_api_shared_examples.rb
@@ -93,6 +93,20 @@ RSpec.shared_examples 'resource_label_events API' do |parent_type, eventable_typ
     end
   end
 
+  describe 'pagination' do
+    let!(:event1) { create_event(label) }
+    let!(:event2) { create_event(label) }
+
+    # https://gitlab.com/gitlab-org/gitlab/-/issues/220192
+    it "returns the second page" do
+      get api("/#{parent_type}/#{parent.id}/#{eventable_type}/#{eventable[id_name]}/resource_label_events?page=2&per_page=1", user)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response.count).to eq(1)
+      expect(json_response.first['id']).to eq(event2.id)
+    end
+  end
+
   def create_event(label)
     create(:resource_label_event, eventable.class.name.underscore => eventable, label: label)
   end
diff --git a/spec/support/shared_examples/requests/api/resource_milestone_events_api_shared_examples.rb b/spec/support/shared_examples/requests/api/resource_milestone_events_api_shared_examples.rb
new file mode 100644
index 00000000000..bca51dab353
--- /dev/null
+++ b/spec/support/shared_examples/requests/api/resource_milestone_events_api_shared_examples.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'resource_milestone_events API' do |parent_type, eventable_type, id_name|
+  describe "GET /#{parent_type}/:id/#{eventable_type}/:noteable_id/resource_milestone_events" do
+    let!(:event) { create_event(milestone) }
+
+    it "returns an array of resource milestone events" do
+      url = "/#{parent_type}/#{parent.id}/#{eventable_type}/#{eventable[id_name]}/resource_milestone_events"
+      get api(url, user)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to include_pagination_headers
+      expect(json_response).to be_an Array
+      expect(json_response.first['id']).to eq(event.id)
+      expect(json_response.first['milestone']['id']).to eq(event.milestone.id)
+      expect(json_response.first['action']).to eq(event.action)
+    end
+
+    it "returns a 404 error when eventable id not found" do
+      get api("/#{parent_type}/#{parent.id}/#{eventable_type}/#{non_existing_record_id}/resource_milestone_events", user)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+
+    it "returns 404 when not authorized" do
+      parent.update!(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
+      private_user = create(:user)
+
+      get api("/#{parent_type}/#{parent.id}/#{eventable_type}/#{eventable[id_name]}/resource_milestone_events", private_user)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+  end
+
+  describe "GET /#{parent_type}/:id/#{eventable_type}/:noteable_id/resource_milestone_events/:event_id" do
+    let!(:event) { create_event(milestone) }
+
+    it "returns a resource milestone event by id" do
+      get api("/#{parent_type}/#{parent.id}/#{eventable_type}/#{eventable[id_name]}/resource_milestone_events/#{event.id}", user)
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response['id']).to eq(event.id)
+      expect(json_response['milestone']['id']).to eq(event.milestone.id)
+      expect(json_response['action']).to eq(event.action)
+    end
+
+    it "returns 404 when not authorized" do
+      parent.update!(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
+      private_user = create(:user)
+
+      get api("/#{parent_type}/#{parent.id}/#{eventable_type}/#{eventable[id_name]}/resource_milestone_events/#{event.id}", private_user)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+
+    it "returns a 404 error if resource milestone event not found" do
+      get api("/#{parent_type}/#{parent.id}/#{eventable_type}/#{eventable[id_name]}/resource_milestone_events/#{non_existing_record_id}", user)
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+  end
+
+  def create_event(milestone, action: :add)
+    create(:resource_milestone_event, eventable.class.name.underscore => eventable, milestone: milestone, action: action)
+  end
+end
diff --git a/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb b/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb
index db5c4b45b70..1ef08de31a9 100644
--- a/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb
+++ b/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb
@@ -8,7 +8,7 @@ RSpec.shared_examples 'diff file base entity' do
                                :file_hash, :file_path, :old_path, :new_path,
                                :viewer, :diff_refs, :stored_externally,
                                :external_storage, :renamed_file, :deleted_file,
-                               :a_mode, :b_mode, :new_file)
+                               :a_mode, :b_mode, :new_file, :file_identifier_hash)
   end
 
   # Converted diff files from GitHub import does not contain blob file
diff --git a/spec/support/shared_examples/serializers/import/import_entity_shared_examples.rb b/spec/support/shared_examples/serializers/import/import_entity_shared_examples.rb
new file mode 100644
index 00000000000..6422c4beb1d
--- /dev/null
+++ b/spec/support/shared_examples/serializers/import/import_entity_shared_examples.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'exposes required fields for import entity' do
+  describe 'exposes required fields' do
+    it 'correctly exposes id' do
+      expect(subject[:id]).to eql(expected_values[:id])
+    end
+
+    it 'correctly exposes full name' do
+      expect(subject[:full_name]).to eql(expected_values[:full_name])
+    end
+
+    it 'correctly exposes sanitized name' do
+      expect(subject[:sanitized_name]).to eql(expected_values[:sanitized_name])
+    end
+
+    it 'correctly exposes provider link' do
+      expect(subject[:provider_link]).to eql(expected_values[:provider_link])
+    end
+  end
+end
diff --git a/spec/support/shared_examples/services/container_expiration_policy_shared_examples.rb b/spec/support/shared_examples/services/container_expiration_policy_shared_examples.rb
new file mode 100644
index 00000000000..28bf46a57d5
--- /dev/null
+++ b/spec/support/shared_examples/services/container_expiration_policy_shared_examples.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'updating the container expiration policy attributes' do |mode:, from: {}, to:|
+  if mode == :create
+    it 'creates a new container expiration policy' do
+      expect { subject }
+        .to change { project.reload.container_expiration_policy.present? }.from(false).to(true)
+        .and change { ContainerExpirationPolicy.count }.by(1)
+    end
+  else
+    it_behaves_like 'not creating the container expiration policy'
+  end
+
+  it 'updates the container expiration policy' do
+    if from.empty?
+      subject
+
+      expect(container_expiration_policy.reload.cadence).to eq(to[:cadence])
+      expect(container_expiration_policy.keep_n).to eq(to[:keep_n])
+      expect(container_expiration_policy.older_than).to eq(to[:older_than])
+    else
+      expect { subject }
+        .to change { container_expiration_policy.reload.cadence }.from(from[:cadence]).to(to[:cadence])
+        .and change { container_expiration_policy.reload.keep_n }.from(from[:keep_n]).to(to[:keep_n])
+        .and change { container_expiration_policy.reload.older_than }.from(from[:older_than]).to(to[:older_than])
+    end
+  end
+end
+
+RSpec.shared_examples 'not creating the container expiration policy' do
+  it "doesn't create the container expiration policy" do
+    expect { subject }.not_to change { ContainerExpirationPolicy.count }
+  end
+end
+
+RSpec.shared_examples 'creating the container expiration policy' do
+  it_behaves_like 'updating the container expiration policy attributes', mode: :create, to: { cadence: '3month', keep_n: 100, older_than: '14d' }
+
+  it_behaves_like 'returning a success'
+end
diff --git a/spec/support/shared_examples/services/wiki_pages/create_service_shared_examples.rb b/spec/support/shared_examples/services/wiki_pages/create_service_shared_examples.rb
index 71bdd46572f..efcb83a34af 100644
--- a/spec/support/shared_examples/services/wiki_pages/create_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/wiki_pages/create_service_shared_examples.rb
@@ -45,7 +45,7 @@ RSpec.shared_examples 'WikiPages::CreateService#execute' do |container_type|
       expect { service.execute }.to change { Event.count }.by 1
 
       expect(Event.recent.first).to have_attributes(
-        action: Event::CREATED,
+        action: 'created',
         target: have_attributes(canonical_slug: page_title)
       )
     end
diff --git a/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb b/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb
index 62541eb3da9..1231c012c31 100644
--- a/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb
@@ -27,7 +27,7 @@ RSpec.shared_examples 'WikiPages::DestroyService#execute' do |container_type|
     expect { service.execute(page) }.to change { Event.count }.by 1
 
     expect(Event.recent.first).to have_attributes(
-      action: Event::DESTROYED,
+      action: 'destroyed',
       target: have_attributes(canonical_slug: page.slug)
     )
   end
diff --git a/spec/support/shared_examples/services/wiki_pages/update_service_shared_examples.rb b/spec/support/shared_examples/services/wiki_pages/update_service_shared_examples.rb
index 0dfc99d043b..77354fec069 100644
--- a/spec/support/shared_examples/services/wiki_pages/update_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/wiki_pages/update_service_shared_examples.rb
@@ -48,7 +48,7 @@ RSpec.shared_examples 'WikiPages::UpdateService#execute' do |container_type|
       expect { service.execute(page) }.to change { Event.count }.by 1
 
       expect(Event.recent.first).to have_attributes(
-        action: Event::UPDATED,
+        action: 'updated',
         wiki_page: page,
         target_title: page.title
       )
diff --git a/spec/support/shared_examples/uncached_response_shared_examples.rb b/spec/support/shared_examples/uncached_response_shared_examples.rb
new file mode 100644
index 00000000000..3997017ff35
--- /dev/null
+++ b/spec/support/shared_examples/uncached_response_shared_examples.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+#
+# Pairs with lib/gitlab/no_cache_headers.rb
+#
+
+RSpec.shared_examples 'uncached response' do
+  it 'defines an uncached header response' do
+    expect(response.headers["Cache-Control"]).to include("no-store", "no-cache")
+    expect(response.headers["Pragma"]).to eq("no-cache")
+    expect(response.headers["Expires"]).to eq("Fri, 01 Jan 1990 00:00:00 GMT")
+  end
+end
diff --git a/spec/support_specs/helpers/graphql_helpers_spec.rb b/spec/support_specs/helpers/graphql_helpers_spec.rb
new file mode 100644
index 00000000000..bfc71f519cf
--- /dev/null
+++ b/spec/support_specs/helpers/graphql_helpers_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GraphqlHelpers do
+  include GraphqlHelpers
+
+  describe '.graphql_mutation' do
+    shared_examples 'correct mutation definition' do
+      it 'returns correct mutation definition' do
+        query = <<~MUTATION
+          mutation($updateAlertStatusInput: UpdateAlertStatusInput!) {
+            updateAlertStatus(input: $updateAlertStatusInput) {
+              clientMutationId
+            }
+          }
+        MUTATION
+        variables = %q({"updateAlertStatusInput":{"projectPath":"test/project"}})
+
+        is_expected.to eq(GraphqlHelpers::MutationDefinition.new(query, variables))
+      end
+    end
+
+    context 'when fields argument is passed' do
+      subject do
+        graphql_mutation(:update_alert_status, { project_path: 'test/project' }, 'clientMutationId')
+      end
+
+      it_behaves_like 'correct mutation definition'
+    end
+
+    context 'when block is passed' do
+      subject do
+        graphql_mutation(:update_alert_status, { project_path: 'test/project' }) do
+          'clientMutationId'
+        end
+      end
+
+      it_behaves_like 'correct mutation definition'
+    end
+
+    context 'when both fields and a block are passed' do
+      subject do
+        graphql_mutation(:mutation_name, { variable_name: 'variable/value' }, 'fieldName') do
+          'fieldName'
+        end
+      end
+
+      it 'raises an ArgumentError' do
+        expect { subject }.to raise_error(
+          ArgumentError,
+          'Please pass either `fields` parameter or a block to `#graphql_mutation`, but not both.'
+        )
+      end
+    end
+  end
+end
diff --git a/spec/support_specs/helpers/stub_feature_flags_spec.rb b/spec/support_specs/helpers/stub_feature_flags_spec.rb
index b6e230075f2..e90a7f68a90 100644
--- a/spec/support_specs/helpers/stub_feature_flags_spec.rb
+++ b/spec/support_specs/helpers/stub_feature_flags_spec.rb
@@ -3,16 +3,7 @@
 require 'spec_helper'
 
 describe StubFeatureFlags do
-  before do
-    # reset stub introduced by `stub_feature_flags`
-    allow(Feature).to receive(:enabled?).and_call_original
-  end
-
-  context 'if not stubbed' do
-    it 'features are disabled by default' do
-      expect(Feature.enabled?(:test_feature)).to eq(false)
-    end
-  end
+  let(:feature_name) { :test_feature }
 
   describe '#stub_feature_flags' do
     using RSpec::Parameterized::TableSyntax
@@ -30,7 +21,7 @@ describe StubFeatureFlags do
 
       with_them do
         before do
-          stub_feature_flags(feature_name => feature_actors)
+          stub_feature_flags(feature_name => actor(feature_actors))
         end
 
         it { expect(Feature.enabled?(feature_name)).to eq(expected_result) }
@@ -62,15 +53,15 @@ describe StubFeatureFlags do
 
       with_them do
         before do
-          stub_feature_flags(feature_name => feature_actors)
+          stub_feature_flags(feature_name => actor(feature_actors))
         end
 
-        it { expect(Feature.enabled?(feature_name, tested_actor)).to eq(expected_result) }
-        it { expect(Feature.disabled?(feature_name, tested_actor)).not_to eq(expected_result) }
+        it { expect(Feature.enabled?(feature_name, actor(tested_actor))).to eq(expected_result) }
+        it { expect(Feature.disabled?(feature_name, actor(tested_actor))).not_to eq(expected_result) }
 
         context 'default_enabled does not impact feature state' do
-          it { expect(Feature.enabled?(feature_name, tested_actor, default_enabled: true)).to eq(expected_result) }
-          it { expect(Feature.disabled?(feature_name, tested_actor, default_enabled: true)).not_to eq(expected_result) }
+          it { expect(Feature.enabled?(feature_name, actor(tested_actor), default_enabled: true)).to eq(expected_result) }
+          it { expect(Feature.disabled?(feature_name, actor(tested_actor), default_enabled: true)).not_to eq(expected_result) }
         end
       end
     end
@@ -82,7 +73,7 @@ describe StubFeatureFlags do
         end
 
         with_them do
-          subject { stub_feature_flags(feature_name => feature_actors) }
+          subject { stub_feature_flags(feature_name => actor(feature_actors)) }
 
           it { expect { subject }.to raise_error(ArgumentError, /accepts only/) }
         end
@@ -90,11 +81,11 @@ describe StubFeatureFlags do
 
       context 'does not raise error' do
         where(:feature_actors) do
-          [true, false, nil, :symbol, double, User.new]
+          [true, false, nil, stub_feature_flag_gate(100), User.new]
         end
 
         with_them do
-          subject { stub_feature_flags(feature_name => feature_actors) }
+          subject { stub_feature_flags(feature_name => actor(feature_actors)) }
 
           it { expect { subject }.not_to raise_error }
         end
@@ -103,28 +94,39 @@ describe StubFeatureFlags do
 
     it 'subsquent run changes state' do
       # enable FF only on A
-      stub_feature_flags(test_feature: %i[A])
-      expect(Feature.enabled?(:test_feature)).to eq(false)
-      expect(Feature.enabled?(:test_feature, :A)).to eq(true)
-      expect(Feature.enabled?(:test_feature, :B)).to eq(false)
+      stub_feature_flags({ feature_name => actor(%i[A]) })
+      expect(Feature.enabled?(feature_name)).to eq(false)
+      expect(Feature.enabled?(feature_name, actor(:A))).to eq(true)
+      expect(Feature.enabled?(feature_name, actor(:B))).to eq(false)
 
       # enable FF only on B
-      stub_feature_flags(test_feature: %i[B])
-      expect(Feature.enabled?(:test_feature)).to eq(false)
-      expect(Feature.enabled?(:test_feature, :A)).to eq(false)
-      expect(Feature.enabled?(:test_feature, :B)).to eq(true)
+      stub_feature_flags({ feature_name => actor(%i[B]) })
+      expect(Feature.enabled?(feature_name)).to eq(false)
+      expect(Feature.enabled?(feature_name, actor(:A))).to eq(false)
+      expect(Feature.enabled?(feature_name, actor(:B))).to eq(true)
 
       # enable FF on all
-      stub_feature_flags(test_feature: true)
-      expect(Feature.enabled?(:test_feature)).to eq(true)
-      expect(Feature.enabled?(:test_feature, :A)).to eq(true)
-      expect(Feature.enabled?(:test_feature, :B)).to eq(true)
+      stub_feature_flags({ feature_name => true })
+      expect(Feature.enabled?(feature_name)).to eq(true)
+      expect(Feature.enabled?(feature_name, actor(:A))).to eq(true)
+      expect(Feature.enabled?(feature_name, actor(:B))).to eq(true)
 
       # disable FF on all
-      stub_feature_flags(test_feature: false)
-      expect(Feature.enabled?(:test_feature)).to eq(false)
-      expect(Feature.enabled?(:test_feature, :A)).to eq(false)
-      expect(Feature.enabled?(:test_feature, :B)).to eq(false)
+      stub_feature_flags({ feature_name => false })
+      expect(Feature.enabled?(feature_name)).to eq(false)
+      expect(Feature.enabled?(feature_name, actor(:A))).to eq(false)
+      expect(Feature.enabled?(feature_name, actor(:B))).to eq(false)
+    end
+  end
+
+  def actor(actor)
+    case actor
+    when Array
+      actor.map(&method(:actor))
+    when Symbol # convert to flipper compatible object
+      stub_feature_flag_gate(actor)
+    else
+      actor
     end
   end
 end
diff --git a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
index 3b15d804d7c..4a711b43d9a 100644
--- a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
+++ b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
@@ -3,16 +3,21 @@
 require 'spec_helper'
 
 describe ExceedQueryLimitHelpers do
-  class TestQueries < ActiveRecord::Base
-    self.table_name = 'schema_migrations'
-  end
+  before do
+    stub_const('TestQueries', Class.new(ActiveRecord::Base))
+    stub_const('TestMatcher', Class.new)
+
+    TestQueries.class_eval do
+      self.table_name = 'schema_migrations'
+    end
 
-  class TestMatcher
-    include ExceedQueryLimitHelpers
+    TestMatcher.class_eval do
+      include ExceedQueryLimitHelpers
 
-    def expected
-      ActiveRecord::QueryRecorder.new do
-        2.times { TestQueries.count }
+      def expected
+        ActiveRecord::QueryRecorder.new do
+          2.times { TestQueries.count }
+        end
       end
     end
   end
diff --git a/spec/tasks/gitlab/container_registry_rake_spec.rb b/spec/tasks/gitlab/container_registry_rake_spec.rb
new file mode 100644
index 00000000000..181d5c8b7c8
--- /dev/null
+++ b/spec/tasks/gitlab/container_registry_rake_spec.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'rake_helper'
+
+describe 'gitlab:container_registry namespace rake tasks' do
+  let_it_be(:application_settings) { Gitlab::CurrentSettings }
+  let_it_be(:api_url) { 'http://registry.gitlab' }
+
+  before :all do
+    Rake.application.rake_require 'tasks/gitlab/container_registry'
+  end
+
+  describe 'configure' do
+    before do
+      stub_access_token
+      stub_container_registry_config(enabled: true, api_url: api_url)
+    end
+
+    subject { run_rake_task('gitlab:container_registry:configure') }
+
+    shared_examples 'invalid config' do
+      it 'does not update the application settings' do
+        expect(application_settings).not_to receive(:update!)
+
+        subject
+      end
+
+      it 'does not raise an error' do
+        expect { subject }.not_to raise_error
+      end
+
+      it 'prints a warning message' do
+        expect { subject }.to output(/Registry is not enabled or registry api url is not present./).to_stdout
+      end
+    end
+
+    context 'when container registry is disabled' do
+      before do
+        stub_container_registry_config(enabled: false)
+      end
+
+      it_behaves_like 'invalid config'
+    end
+
+    context 'when container registry api_url is blank' do
+      before do
+        stub_container_registry_config(api_url: '')
+      end
+
+      it_behaves_like 'invalid config'
+    end
+
+    context 'when creating a registry client instance' do
+      let(:token) { 'foo' }
+      let(:client) { ContainerRegistry::Client.new(api_url, token: token) }
+
+      before do
+        stub_registry_info({})
+      end
+
+      it 'uses a token with no access permissions' do
+        expect(Auth::ContainerRegistryAuthenticationService)
+          .to receive(:access_token).with([], []).and_return(token)
+        expect(ContainerRegistry::Client)
+          .to receive(:new).with(api_url, token: token).and_return(client)
+
+        run_rake_task('gitlab:container_registry:configure')
+      end
+    end
+
+    context 'when unabled to detect the container registry type' do
+      it 'fails and raises an error message' do
+        stub_registry_info({})
+
+        run_rake_task('gitlab:container_registry:configure')
+
+        application_settings.reload
+        expect(application_settings.container_registry_vendor).to be_blank
+        expect(application_settings.container_registry_version).to be_blank
+        expect(application_settings.container_registry_features).to eq([])
+      end
+    end
+
+    context 'when able to detect the container registry type' do
+      context 'when using the GitLab container registry' do
+        it 'updates application settings accordingly' do
+          stub_registry_info(vendor: 'gitlab', version: '2.9.1-gitlab', features: %w[a,b,c])
+
+          run_rake_task('gitlab:container_registry:configure')
+
+          application_settings.reload
+          expect(application_settings.container_registry_vendor).to eq('gitlab')
+          expect(application_settings.container_registry_version).to eq('2.9.1-gitlab')
+          expect(application_settings.container_registry_features).to eq(%w[a,b,c])
+        end
+      end
+
+      context 'when using a third-party container registry' do
+        it 'updates application settings accordingly' do
+          stub_registry_info(vendor: 'other', version: nil, features: nil)
+
+          run_rake_task('gitlab:container_registry:configure')
+
+          application_settings.reload
+          expect(application_settings.container_registry_vendor).to eq('other')
+          expect(application_settings.container_registry_version).to be_blank
+          expect(application_settings.container_registry_features).to eq([])
+        end
+      end
+    end
+  end
+
+  def stub_access_token
+    allow(Auth::ContainerRegistryAuthenticationService)
+      .to receive(:access_token).with([], []).and_return('foo')
+  end
+
+  def stub_registry_info(output)
+    allow_next_instance_of(ContainerRegistry::Client) do |client|
+      allow(client).to receive(:registry_info).and_return(output)
+    end
+  end
+end
diff --git a/spec/tasks/gitlab/db_rake_spec.rb b/spec/tasks/gitlab/db_rake_spec.rb
index 1d2341bb46f..c3da5af5439 100644
--- a/spec/tasks/gitlab/db_rake_spec.rb
+++ b/spec/tasks/gitlab/db_rake_spec.rb
@@ -115,19 +115,52 @@ describe 'gitlab:db namespace rake task' do
     end
 
     it 'can be executed multiple times within another rake task' do
-      Rake::Task.define_task(test_task_name => :environment) do
+      expect_multiple_executions_of_task(test_task_name, clean_rake_task) do
         expect_next_instance_of(Gitlab::Database::SchemaCleaner) do |cleaner|
           expect(cleaner).to receive(:clean).with(output)
         end
-        Rake::Task[clean_rake_task].invoke
+      end
+    end
+  end
 
-        expect_next_instance_of(Gitlab::Database::SchemaCleaner) do |cleaner|
-          expect(cleaner).to receive(:clean).with(output)
+  describe 'load_custom_structure' do
+    let_it_be(:db_config) { Rails.application.config_for(:database) }
+    let_it_be(:custom_load_task) { 'gitlab:db:load_custom_structure' }
+    let_it_be(:custom_filepath) { Pathname.new('db/directory') }
+
+    it 'uses the psql command to load the custom structure file' do
+      expect(Gitlab::Database::CustomStructure).to receive(:custom_dump_filepath).and_return(custom_filepath)
+
+      expect(Kernel).to receive(:system)
+        .with('psql', any_args, custom_filepath.to_path, db_config['database']).and_return(true)
+
+      run_rake_task(custom_load_task)
+    end
+
+    it 'raises an error when the call to the psql command fails' do
+      expect(Gitlab::Database::CustomStructure).to receive(:custom_dump_filepath).and_return(custom_filepath)
+
+      expect(Kernel).to receive(:system)
+        .with('psql', any_args, custom_filepath.to_path, db_config['database']).and_return(nil)
+
+      expect { run_rake_task(custom_load_task) }.to raise_error(/failed to execute:\s*psql/)
+    end
+  end
+
+  describe 'dump_custom_structure' do
+    let_it_be(:test_task_name) { 'gitlab:db:_test_multiple_task_executions' }
+    let_it_be(:custom_dump_task) { 'gitlab:db:dump_custom_structure' }
+
+    after do
+      Rake::Task[test_task_name].clear if Rake::Task.task_defined?(test_task_name)
+    end
+
+    it 'can be executed multiple times within another rake task' do
+      expect_multiple_executions_of_task(test_task_name, custom_dump_task) do
+        expect_next_instance_of(Gitlab::Database::CustomStructure) do |custom_structure|
+          expect(custom_structure).to receive(:dump)
         end
-        Rake::Task[clean_rake_task].invoke
       end
-
-      run_rake_task(test_task_name)
     end
   end
 
@@ -135,4 +168,16 @@ describe 'gitlab:db namespace rake task' do
     Rake::Task[task_name].reenable
     Rake.application.invoke_task task_name
   end
+
+  def expect_multiple_executions_of_task(test_task_name, task_to_invoke, count: 2)
+    Rake::Task.define_task(test_task_name => :environment) do
+      count.times do
+        yield
+
+        Rake::Task[task_to_invoke].invoke
+      end
+    end
+
+    run_rake_task(test_task_name)
+  end
 end
diff --git a/spec/tooling/lib/tooling/test_file_finder_spec.rb b/spec/tooling/lib/tooling/test_file_finder_spec.rb
new file mode 100644
index 00000000000..9c33f20877b
--- /dev/null
+++ b/spec/tooling/lib/tooling/test_file_finder_spec.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require_relative '../../../../tooling/lib/tooling/test_file_finder'
+
+RSpec.describe Tooling::TestFileFinder do
+  subject { Tooling::TestFileFinder.new(file) }
+
+  describe '#test_files' do
+    context 'when given non .rb files' do
+      let(:file) { 'app/assets/images/emoji.png' }
+
+      it 'does not return a test file' do
+        expect(subject.test_files).to be_empty
+      end
+    end
+
+    context 'when given file in app/' do
+      let(:file) { 'app/finders/admin/projects_finder.rb' }
+
+      it 'returns the matching app spec file' do
+        expect(subject.test_files).to contain_exactly('spec/finders/admin/projects_finder_spec.rb')
+      end
+    end
+
+    context 'when given file in lib/' do
+      let(:file) { 'lib/banzai/color_parser.rb' }
+
+      it 'returns the matching app spec file' do
+        expect(subject.test_files).to contain_exactly('spec/lib/banzai/color_parser_spec.rb')
+      end
+    end
+
+    context 'when given a file in tooling/' do
+      let(:file) { 'tooling/lib/tooling/test_file_finder.rb' }
+
+      it 'returns the matching tooling test' do
+        expect(subject.test_files).to contain_exactly('spec/tooling/lib/tooling/test_file_finder_spec.rb')
+      end
+    end
+
+    context 'when given a test file' do
+      let(:file) { 'spec/lib/banzai/color_parser_spec.rb' }
+
+      it 'returns the matching test file itself' do
+        expect(subject.test_files).to contain_exactly('spec/lib/banzai/color_parser_spec.rb')
+      end
+    end
+
+    context 'when given an app file in ee/' do
+      let(:file) { 'ee/app/models/analytics/cycle_analytics/group_level.rb' }
+
+      it 'returns the matching ee/ test file' do
+        expect(subject.test_files).to contain_exactly('ee/spec/models/analytics/cycle_analytics/group_level_spec.rb')
+      end
+    end
+
+    context 'when given an ee extension module file' do
+      let(:file) { 'ee/app/models/ee/user.rb' }
+
+      it 'returns the matching ee/ class test file, ee extension module test file and the foss class test file' do
+        test_files = ['ee/spec/models/user_spec.rb', 'ee/spec/models/ee/user_spec.rb', 'spec/app/models/user_spec.rb']
+        expect(subject.test_files).to contain_exactly(*test_files)
+      end
+    end
+
+    context 'when given a lib file in ee/' do
+      let(:file) { 'ee/lib/flipper_session.rb' }
+
+      it 'returns the matching ee/ lib test file' do
+        expect(subject.test_files).to contain_exactly('ee/spec/lib/flipper_session_spec.rb')
+      end
+    end
+
+    context 'when given a test file in ee/' do
+      let(:file) { 'ee/spec/models/container_registry/event_spec.rb' }
+
+      it 'returns the test file itself' do
+        expect(subject.test_files).to contain_exactly('ee/spec/models/container_registry/event_spec.rb')
+      end
+    end
+
+    context 'when given a module test file in ee/' do
+      let(:file) { 'ee/spec/models/ee/appearance_spec.rb' }
+
+      it 'returns the matching module test file itself and the corresponding spec model test file' do
+        test_files = ['ee/spec/models/ee/appearance_spec.rb', 'spec/models/appearance_spec.rb']
+        expect(subject.test_files).to contain_exactly(*test_files)
+      end
+    end
+
+    context 'with foss_test_only: true' do
+      subject { Tooling::TestFileFinder.new(file, foss_test_only: true) }
+
+      context 'when given a module file in ee/' do
+        let(:file) { 'ee/app/models/ee/user.rb' }
+
+        it 'returns only the corresponding spec model test file in foss' do
+          expect(subject.test_files).to contain_exactly('spec/app/models/user_spec.rb')
+        end
+      end
+
+      context 'when given an app file in ee/' do
+        let(:file) { 'ee/app/models/approval.rb' }
+
+        it 'returns no test file in foss' do
+          expect(subject.test_files).to be_empty
+        end
+      end
+    end
+  end
+end
diff --git a/spec/uploaders/uploader_helper_spec.rb b/spec/uploaders/uploader_helper_spec.rb
index 753f32a9570..7bc6caf8224 100644
--- a/spec/uploaders/uploader_helper_spec.rb
+++ b/spec/uploaders/uploader_helper_spec.rb
@@ -14,7 +14,7 @@ describe UploaderHelper do
   end
 
   describe '#extension_match?' do
-    it 'returns false if file does not exists' do
+    it 'returns false if file does not exist' do
       expect(uploader.file).to be_nil
       expect(uploader.send(:extension_match?, 'jpg')).to eq false
     end
diff --git a/spec/validators/json_schema_validator_spec.rb b/spec/validators/json_schema_validator_spec.rb
new file mode 100644
index 00000000000..3e3a9c0e6a8
--- /dev/null
+++ b/spec/validators/json_schema_validator_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe JsonSchemaValidator do
+  describe '#validates_each' do
+    let(:build_report_result) { build(:ci_build_report_result, :with_junit_success) }
+
+    subject { validator.validate(build_report_result) }
+
+    context 'when filename is set' do
+      let(:validator) { described_class.new(attributes: [:data], filename: "build_report_result_data") }
+
+      context 'when data is valid' do
+        it 'returns no errors' do
+          subject
+
+          expect(build_report_result.errors).to be_empty
+        end
+      end
+
+      context 'when data is invalid' do
+        it 'returns json schema is invalid' do
+          build_report_result.data = { invalid: 'data' }
+
+          validator.validate(build_report_result)
+
+          expect(build_report_result.errors.size).to eq(1)
+          expect(build_report_result.errors.full_messages).to eq(["Data must be a valid json schema"])
+        end
+      end
+    end
+
+    context 'when filename is not set' do
+      let(:validator) { described_class.new(attributes: [:data]) }
+
+      it 'raises an ArgumentError' do
+        expect { subject }.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'when filename is invalid' do
+      let(:validator) { described_class.new(attributes: [:data], filename: "invalid$filename") }
+
+      it 'raises a FilenameError' do
+        expect { subject }.to raise_error(described_class::FilenameError)
+      end
+    end
+  end
+end
diff --git a/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb
index 3029bfb6df5..63236dbb0c4 100644
--- a/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb
+++ b/spec/views/admin/application_settings/_repository_storage.html.haml_spec.rb
@@ -3,26 +3,34 @@
 require 'spec_helper'
 
 describe 'admin/application_settings/_repository_storage.html.haml' do
-  let(:app_settings) { build(:application_setting) }
-  let(:storages) do
+  let(:app_settings) { create(:application_setting) }
+  let(:repository_storages_weighted_attributes) { [:repository_storages_weighted_default, :repository_storages_weighted_mepmep, :repository_storages_weighted_foobar]}
+  let(:repository_storages_weighted) do
     {
-      "mepmep" => { "path" => "/tmp" },
-      "foobar" => { "path" => "/tmp" }
+      "default" => 100,
+      "mepmep" => 50
     }
   end
 
   before do
+    allow(app_settings).to receive(:repository_storages_weighted).and_return(repository_storages_weighted)
+    allow(app_settings).to receive(:repository_storages_weighted_mepmep).and_return(100)
+    allow(app_settings).to receive(:repository_storages_weighted_foobar).and_return(50)
     assign(:application_setting, app_settings)
-    stub_storage_settings(storages)
+    allow(ApplicationSetting).to receive(:repository_storages_weighted_attributes).and_return(repository_storages_weighted_attributes)
   end
 
   context 'when multiple storages are available' do
     it 'lists them all' do
       render
 
-      storages.keys.each do |storage_name|
+      # lists storages that are saved with weights
+      repository_storages_weighted.each do |storage_name, storage_weight|
         expect(rendered).to have_content(storage_name)
       end
+
+      # lists storage not saved with weight
+      expect(rendered).to have_content('foobar')
     end
   end
 end
diff --git a/spec/views/layouts/_head.html.haml_spec.rb b/spec/views/layouts/_head.html.haml_spec.rb
index 8d7dcfc2416..7011fa23327 100644
--- a/spec/views/layouts/_head.html.haml_spec.rb
+++ b/spec/views/layouts/_head.html.haml_spec.rb
@@ -50,7 +50,7 @@ describe 'layouts/_head' do
     it 'adds a link preconnect tag' do
       render
 
-      expect(rendered).to match(%Q(<link crossorigin="" href="#{asset_host}" rel="preconnnect">))
+      expect(rendered).to match(%Q(<link crossorigin="" href="#{asset_host}" rel="preconnect">))
     end
   end
 
@@ -64,18 +64,25 @@ describe 'layouts/_head' do
 
   context 'when an asset_host is set and snowplow url is set' do
     let(:asset_host) { 'http://test.host' }
+    let(:snowplow_collector_hostname) { 'www.snow.plow' }
 
     before do
       allow(ActionController::Base).to receive(:asset_host).and_return(asset_host)
       allow(Gitlab::CurrentSettings).to receive(:snowplow_enabled?).and_return(true)
-      allow(Gitlab::CurrentSettings).to receive(:snowplow_collector_hostname).and_return('www.snow.plow')
+      allow(Gitlab::CurrentSettings).to receive(:snowplow_collector_hostname).and_return(snowplow_collector_hostname)
     end
 
     it 'adds a snowplow script tag with asset host' do
       render
       expect(rendered).to match('http://test.host/assets/snowplow/')
       expect(rendered).to match('window.snowplow')
-      expect(rendered).to match('www.snow.plow')
+      expect(rendered).to match(snowplow_collector_hostname)
+    end
+
+    it 'adds a link preconnect tag' do
+      render
+
+      expect(rendered).to match(%Q(<link crossorigin="" href="#{snowplow_collector_hostname}" rel="preconnect">))
     end
   end
 
diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index 3d5c34ae1e0..881ea818cb0 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -66,7 +66,7 @@ describe 'layouts/nav/sidebar/_project' do
       it 'shows the wiki tab with the wiki internal link' do
         render
 
-        expect(rendered).to have_link('Wiki', href: project_wiki_path(project, :home))
+        expect(rendered).to have_link('Wiki', href: wiki_path(project.wiki))
       end
     end
 
@@ -76,7 +76,7 @@ describe 'layouts/nav/sidebar/_project' do
       it 'does not show the wiki tab' do
         render
 
-        expect(rendered).not_to have_link('Wiki', href: project_wiki_path(project, :home))
+        expect(rendered).not_to have_link('Wiki', href: wiki_path(project.wiki))
       end
     end
   end
@@ -104,7 +104,7 @@ describe 'layouts/nav/sidebar/_project' do
       it 'does not show the external wiki tab' do
         render
 
-        expect(rendered).not_to have_link('External Wiki', href: project_wiki_path(project, :home))
+        expect(rendered).not_to have_link('External Wiki')
       end
     end
   end
diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb
index 16e4bd9c6d1..2e50e329cfd 100644
--- a/spec/views/profiles/preferences/show.html.haml_spec.rb
+++ b/spec/views/profiles/preferences/show.html.haml_spec.rb
@@ -32,8 +32,7 @@ describe 'profiles/preferences/show' do
     end
 
     before do
-      # Can't use stub_feature_flags because we use Feature.get to check if conditinally applied
-      Feature.get(:sourcegraph).enable sourcegraph_feature
+      stub_feature_flags(sourcegraph: sourcegraph_feature)
       stub_application_setting(sourcegraph_enabled: sourcegraph_enabled)
     end
 
diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb
index e95dec56a2d..0c0f74a41f0 100644
--- a/spec/views/projects/edit.html.haml_spec.rb
+++ b/spec/views/projects/edit.html.haml_spec.rb
@@ -32,26 +32,28 @@ describe 'projects/edit' do
     it 'displays all possible variables' do
       render
 
-      expect(rendered).to have_content('%{project_path}')
-      expect(rendered).to have_content('%{project_name}')
-      expect(rendered).to have_content('%{file_path}')
       expect(rendered).to have_content('%{branch_name}')
-      expect(rendered).to have_content('%{username}')
+      expect(rendered).to have_content('%{files_count}')
+      expect(rendered).to have_content('%{file_paths}')
+      expect(rendered).to have_content('%{project_name}')
+      expect(rendered).to have_content('%{project_path}')
       expect(rendered).to have_content('%{user_full_name}')
+      expect(rendered).to have_content('%{username}')
+      expect(rendered).to have_content('%{suggestions_count}')
     end
 
     it 'displays a placeholder if none is set' do
       render
 
-      expect(rendered).to have_field('project[suggestion_commit_message]', placeholder: 'Apply suggestion to %{file_path}')
+      expect(rendered).to have_field('project[suggestion_commit_message]', placeholder: "Apply %{suggestions_count} suggestion(s) to %{files_count} file(s)")
     end
 
     it 'displays the user entered value' do
-      project.update!(suggestion_commit_message: 'refactor: changed %{file_path}')
+      project.update!(suggestion_commit_message: 'refactor: changed %{file_paths}')
 
       render
 
-      expect(rendered).to have_field('project[suggestion_commit_message]', with: 'refactor: changed %{file_path}')
+      expect(rendered).to have_field('project[suggestion_commit_message]', with: 'refactor: changed %{file_paths}')
     end
   end
 
diff --git a/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb b/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb
new file mode 100644
index 00000000000..440edd376e0
--- /dev/null
+++ b/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'projects/issues/import_csv/_button' do
+  include Devise::Test::ControllerHelpers
+
+  context 'when the user does not have edit permissions' do
+    before do
+      render
+    end
+
+    it 'shows a dropdown button to import CSV' do
+      expect(rendered).to have_text('Import CSV')
+    end
+
+    it 'does not show a button to import from Jira' do
+      expect(rendered).not_to have_text('Import from Jira')
+    end
+  end
+
+  context 'when the user has edit permissions' do
+    let(:project) { create(:project) }
+    let(:current_user) { create(:user, maintainer_projects: [project]) }
+
+    before do
+      allow(view).to receive(:project_import_jira_path).and_return('import/jira')
+      allow(view).to receive(:current_user).and_return(current_user)
+
+      assign(:project, project)
+
+      render
+    end
+
+    it 'shows a dropdown button to import CSV' do
+      expect(rendered).to have_text('Import CSV')
+    end
+
+    it 'shows a button to import from Jira' do
+      expect(rendered).to have_text('Import from Jira')
+    end
+  end
+end
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb
index 665003d137a..e0acf5d1507 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -3,6 +3,10 @@
 require 'spec_helper'
 
 describe 'projects/merge_requests/show.html.haml' do
+  before do
+    allow(view).to receive(:experiment_enabled?).and_return(false)
+  end
+
   include_context 'merge request show action'
 
   describe 'merge request assignee sidebar' do
diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb
index a3faa92b50e..720e0aaf450 100644
--- a/spec/views/projects/services/_form.haml_spec.rb
+++ b/spec/views/projects/services/_form.haml_spec.rb
@@ -15,7 +15,8 @@ describe 'projects/services/_form' do
 
     allow(view).to receive_messages(current_user: user,
                                     can?: true,
-                                    current_application_settings: Gitlab::CurrentSettings.current_application_settings)
+                                    current_application_settings: Gitlab::CurrentSettings.current_application_settings,
+                                    request: double(referrer: '/services'))
   end
 
   context 'commit_events and merge_request_events' do
@@ -30,6 +31,7 @@ describe 'projects/services/_form' do
 
       expect(rendered).to have_content('Event will be triggered when a commit is created/updated')
       expect(rendered).to have_content('Event will be triggered when a merge request is created/updated/merged')
+      expect(rendered).to have_css("input[name='redirect_to'][value='/services']", count: 1, visible: false)
     end
   end
 end
diff --git a/spec/views/shared/milestones/_top.html.haml_spec.rb b/spec/views/shared/milestones/_top.html.haml_spec.rb
index 1e209ad6f3f..2d72e278706 100644
--- a/spec/views/shared/milestones/_top.html.haml_spec.rb
+++ b/spec/views/shared/milestones/_top.html.haml_spec.rb
@@ -12,22 +12,6 @@ describe 'shared/milestones/_top.html.haml' do
     allow(milestone).to receive(:milestone) { milestone }
   end
 
-  it 'renders a deprecation message for a legacy milestone' do
-    allow(milestone).to receive(:legacy_group_milestone?) { true }
-
-    render 'shared/milestones/top', milestone: milestone
-
-    expect(rendered).to have_css('.milestone-deprecation-message')
-  end
-
-  it 'renders a deprecation message for a dashboard milestone' do
-    allow(milestone).to receive(:dashboard_milestone?) { true }
-
-    render 'shared/milestones/top', milestone: milestone
-
-    expect(rendered).to have_css('.milestone-deprecation-message')
-  end
-
   it 'does not render a deprecation message for a non-legacy and non-dashboard milestone' do
     assign :group, group
 
diff --git a/spec/workers/build_finished_worker_spec.rb b/spec/workers/build_finished_worker_spec.rb
index 4adb795b1d6..849563d9608 100644
--- a/spec/workers/build_finished_worker_spec.rb
+++ b/spec/workers/build_finished_worker_spec.rb
@@ -3,7 +3,11 @@
 require 'spec_helper'
 
 describe BuildFinishedWorker do
+  subject { described_class.new.perform(build.id) }
+
   describe '#perform' do
+    let(:build) { create(:ci_build, :success, pipeline: create(:ci_pipeline)) }
+
     context 'when build exists' do
       let!(:build) { create(:ci_build) }
 
@@ -18,8 +22,10 @@ describe BuildFinishedWorker do
         expect(BuildHooksWorker).to receive(:perform_async)
         expect(ArchiveTraceWorker).to receive(:perform_async)
         expect(ExpirePipelineCacheWorker).to receive(:perform_async)
+        expect(ChatNotificationWorker).not_to receive(:perform_async)
+        expect(Ci::BuildReportResultWorker).not_to receive(:perform)
 
-        described_class.new.perform(build.id)
+        subject
       end
     end
 
@@ -30,23 +36,26 @@ describe BuildFinishedWorker do
       end
     end
 
-    it 'schedules a ChatNotification job for a chat build' do
-      build = create(:ci_build, :success, pipeline: create(:ci_pipeline, source: :chat))
+    context 'when build has a chat' do
+      let(:build) { create(:ci_build, :success, pipeline: create(:ci_pipeline, source: :chat)) }
 
-      expect(ChatNotificationWorker)
-        .to receive(:perform_async)
-        .with(build.id)
+      it 'schedules a ChatNotification job' do
+        expect(ChatNotificationWorker).to receive(:perform_async).with(build.id)
 
-      described_class.new.perform(build.id)
+        subject
+      end
     end
 
-    it 'does not schedule a ChatNotification job for a regular build' do
-      build = create(:ci_build, :success, pipeline: create(:ci_pipeline))
+    context 'when build has a test report' do
+      let(:build) { create(:ci_build, :test_reports) }
 
-      expect(ChatNotificationWorker)
-        .not_to receive(:perform_async)
+      it 'schedules a BuildReportResult job' do
+        expect_next_instance_of(Ci::BuildReportResultWorker) do |worker|
+          expect(worker).to receive(:perform).with(build.id)
+        end
 
-      described_class.new.perform(build.id)
+        subject
+      end
     end
   end
 end
diff --git a/spec/workers/ci/build_report_result_worker_spec.rb b/spec/workers/ci/build_report_result_worker_spec.rb
new file mode 100644
index 00000000000..290a98366b4
--- /dev/null
+++ b/spec/workers/ci/build_report_result_worker_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::BuildReportResultWorker do
+  subject { described_class.new.perform(build_id) }
+
+  context 'when build exists' do
+    let(:build) { create(:ci_build) }
+    let(:build_id) { build.id }
+
+    it 'calls build report result service' do
+      expect_next_instance_of(Ci::BuildReportResultService) do |build_report_result_service|
+        expect(build_report_result_service).to receive(:execute)
+      end
+
+      subject
+    end
+  end
+
+  context 'when build does not exist' do
+    let(:build_id) { -1 }
+
+    it 'does not call build report result service' do
+      expect(Ci::BuildReportResultService).not_to receive(:execute)
+
+      subject
+    end
+  end
+end
diff --git a/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb b/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb
new file mode 100644
index 00000000000..a09b9ec4165
--- /dev/null
+++ b/spec/workers/clusters/applications/check_prometheus_health_worker_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Clusters::Applications::CheckPrometheusHealthWorker, '#perform' do
+  subject { described_class.new.perform }
+
+  it 'triggers health service' do
+    cluster = create(:cluster)
+    allow(Gitlab::Monitor::DemoProjects).to receive(:primary_keys)
+    allow(Clusters::Cluster).to receive_message_chain(:with_application_prometheus, :with_project_alert_service_data).and_return([cluster])
+
+    service_instance = instance_double(Clusters::Applications::PrometheusHealthCheckService)
+    expect(Clusters::Applications::PrometheusHealthCheckService).to receive(:new).with(cluster).and_return(service_instance)
+    expect(service_instance).to receive(:execute)
+
+    subject
+  end
+end
diff --git a/spec/workers/concerns/application_worker_spec.rb b/spec/workers/concerns/application_worker_spec.rb
index ae311a54cd1..087a36d2bd0 100644
--- a/spec/workers/concerns/application_worker_spec.rb
+++ b/spec/workers/concerns/application_worker_spec.rb
@@ -118,5 +118,45 @@ describe ApplicationWorker do
           .to raise_error(ArgumentError)
       end
     end
+
+    context 'with batches' do
+      let(:batch_delay) { 1.minute }
+
+      it 'correctly schedules jobs' do
+        expect(Sidekiq::Client).to(
+          receive(:push_bulk).with(hash_including('args' => [['Foo', [1]], ['Foo', [2]]]))
+                             .ordered
+                             .and_call_original)
+        expect(Sidekiq::Client).to(
+          receive(:push_bulk).with(hash_including('args' => [['Foo', [3]], ['Foo', [4]]]))
+                             .ordered
+                             .and_call_original)
+        expect(Sidekiq::Client).to(
+          receive(:push_bulk).with(hash_including('args' => [['Foo', [5]]]))
+                             .ordered
+                             .and_call_original)
+
+        worker.bulk_perform_in(
+          1.minute,
+          [['Foo', [1]], ['Foo', [2]], ['Foo', [3]], ['Foo', [4]], ['Foo', [5]]],
+          batch_size: 2, batch_delay: batch_delay)
+
+        expect(worker.jobs.count).to eq 5
+        expect(worker.jobs[0]['at']).to eq(worker.jobs[1]['at'])
+        expect(worker.jobs[2]['at']).to eq(worker.jobs[3]['at'])
+        expect(worker.jobs[2]['at'] - worker.jobs[1]['at']).to eq(batch_delay)
+        expect(worker.jobs[4]['at'] - worker.jobs[3]['at']).to eq(batch_delay)
+      end
+
+      context 'when batch_size is invalid' do
+        it 'raises an ArgumentError exception' do
+          expect do
+            worker.bulk_perform_in(1.minute,
+                                   [['Foo']],
+                                   batch_size: -1, batch_delay: batch_delay)
+          end.to raise_error(ArgumentError)
+        end
+      end
+    end
   end
 end
diff --git a/spec/workers/concerns/project_import_options_spec.rb b/spec/workers/concerns/project_import_options_spec.rb
index 3ccfb21b653..c56dcc5ed82 100644
--- a/spec/workers/concerns/project_import_options_spec.rb
+++ b/spec/workers/concerns/project_import_options_spec.rb
@@ -17,7 +17,7 @@ describe ProjectImportOptions do
   end
 
   it 'sets default status expiration' do
-    expect(worker_class.sidekiq_options['status_expiration']).to eq(StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+    expect(worker_class.sidekiq_options['status_expiration']).to eq(Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION)
   end
 
   describe '.sidekiq_retries_exhausted' do
diff --git a/spec/workers/container_expiration_policy_worker_spec.rb b/spec/workers/container_expiration_policy_worker_spec.rb
index 48ab1614633..b15a28dcdca 100644
--- a/spec/workers/container_expiration_policy_worker_spec.rb
+++ b/spec/workers/container_expiration_policy_worker_spec.rb
@@ -53,5 +53,22 @@ describe ContainerExpirationPolicyWorker do
         subject
       end
     end
+
+    context 'an invalid policy' do
+      let_it_be(:container_expiration_policy) { create(:container_expiration_policy, :runnable) }
+      let_it_be(:user) {container_expiration_policy.project.owner }
+
+      before do
+        container_expiration_policy.update_column(:name_regex, '*production')
+      end
+
+      it 'runs the policy and tracks an error' do
+        expect(ContainerExpirationPolicyService)
+          .to receive(:new).with(container_expiration_policy.project, user).and_call_original
+        expect(Gitlab::ErrorTracking).to receive(:log_exception).with(instance_of(ContainerExpirationPolicyService::InvalidPolicyError), container_expiration_policy_id: container_expiration_policy.id)
+
+        expect { subject }.to change { container_expiration_policy.reload.enabled }.from(true).to(false)
+      end
+    end
   end
 end
diff --git a/spec/workers/create_evidence_worker_spec.rb b/spec/workers/create_evidence_worker_spec.rb
index 9b8314122cd..b8c622f7d1d 100644
--- a/spec/workers/create_evidence_worker_spec.rb
+++ b/spec/workers/create_evidence_worker_spec.rb
@@ -3,9 +3,24 @@
 require 'spec_helper'
 
 describe CreateEvidenceWorker do
-  let!(:release) { create(:release) }
+  let(:project) { create(:project, :repository) }
+  let(:release) { create(:release, project: project) }
+  let(:pipeline) { create(:ci_empty_pipeline, sha: release.sha, project: project) }
 
+  # support old scheduled workers without pipeline
   it 'creates a new Evidence record' do
+    expect_next_instance_of(::Releases::CreateEvidenceService, release, pipeline: nil) do |service|
+      expect(service).to receive(:execute).and_call_original
+    end
+
     expect { described_class.new.perform(release.id) }.to change(Releases::Evidence, :count).by(1)
   end
+
+  it 'creates a new Evidence record with pipeline' do
+    expect_next_instance_of(::Releases::CreateEvidenceService, release, pipeline: pipeline) do |service|
+      expect(service).to receive(:execute).and_call_original
+    end
+
+    expect { described_class.new.perform(release.id, pipeline.id) }.to change(Releases::Evidence, :count).by(1)
+  end
 end
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index d6e867ee407..195783c74df 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -40,6 +40,12 @@ describe 'Every Sidekiq worker' do
     end
   end
 
+  it 'has a value for loggable_arguments' do
+    workers_without_defaults.each do |worker|
+      expect(worker.klass.loggable_arguments).to be_an(Array)
+    end
+  end
+
   describe "feature category declarations" do
     let(:feature_categories) do
       YAML.load_file(Rails.root.join('config', 'feature_categories.yml')).map(&:to_sym).to_set
diff --git a/spec/workers/expire_job_cache_worker_spec.rb b/spec/workers/expire_job_cache_worker_spec.rb
index 804a50e89fe..062926cf7aa 100644
--- a/spec/workers/expire_job_cache_worker_spec.rb
+++ b/spec/workers/expire_job_cache_worker_spec.rb
@@ -13,7 +13,7 @@ describe ExpireJobCacheWorker do
 
       include_examples 'an idempotent worker' do
         it 'invalidates Etag caching for the job path' do
-          pipeline_path = "/#{project.full_path}/pipelines/#{pipeline.id}.json"
+          pipeline_path = "/#{project.full_path}/-/pipelines/#{pipeline.id}.json"
           job_path = "/#{project.full_path}/builds/#{job.id}.json"
 
           spy_store = Gitlab::EtagCaching::Store.new
diff --git a/spec/workers/gitlab/import/stuck_project_import_jobs_worker_spec.rb b/spec/workers/gitlab/import/stuck_project_import_jobs_worker_spec.rb
new file mode 100644
index 00000000000..5afc5717b82
--- /dev/null
+++ b/spec/workers/gitlab/import/stuck_project_import_jobs_worker_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Import::StuckProjectImportJobsWorker do
+  let(:worker) { described_class.new }
+
+  describe 'with scheduled import_status' do
+    it_behaves_like 'stuck import job detection' do
+      let(:import_state) { create(:project, :import_scheduled).import_state }
+
+      before do
+        import_state.update(jid: '123')
+      end
+    end
+  end
+
+  describe 'with started import_status' do
+    it_behaves_like 'stuck import job detection' do
+      let(:import_state) { create(:project, :import_started).import_state }
+
+      before do
+        import_state.update(jid: '123')
+      end
+    end
+  end
+end
diff --git a/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb
index 4cb6f5e28b8..084302be7d8 100644
--- a/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb
@@ -11,47 +11,33 @@ describe Gitlab::JiraImport::Stage::FinishImportWorker do
   end
 
   describe '#perform' do
-    context 'when feature flag enabled' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-      end
+    let_it_be(:jira_import, reload: true) { create(:jira_import_state, :scheduled, project: project) }
 
+    context 'when import did not start' do
       it_behaves_like 'cannot do Jira import'
     end
 
-    context 'when feature flag enabled' do
-      let_it_be(:jira_import, reload: true) { create(:jira_import_state, :scheduled, project: project) }
+    context 'when import started' do
+      let_it_be(:import_label) { create(:label, project: project, title: 'jira-import') }
+      let_it_be(:imported_issues) { create_list(:labeled_issue, 3, project: project, labels: [import_label]) }
 
       before do
-        stub_feature_flags(jira_issue_import: true)
-      end
+        expect(Gitlab::JiraImport).to receive(:get_import_label_id).and_return(import_label.id)
+        expect(Gitlab::JiraImport).to receive(:issue_failures).and_return(2)
 
-      context 'when import did not start' do
-        it_behaves_like 'cannot do Jira import'
+        jira_import.start!
+        worker.perform(project.id)
       end
 
-      context 'when import started' do
-        let_it_be(:import_label) { create(:label, project: project, title: 'jira-import') }
-        let_it_be(:imported_issues) { create_list(:labeled_issue, 3, project: project, labels: [import_label]) }
-
-        before do
-          expect(Gitlab::JiraImport).to receive(:get_import_label_id).and_return(import_label.id)
-          expect(Gitlab::JiraImport).to receive(:issue_failures).and_return(2)
-
-          jira_import.start!
-          worker.perform(project.id)
-        end
-
-        it 'changes import state to finished' do
-          expect(project.jira_import_status).to eq('finished')
-        end
+      it 'changes import state to finished' do
+        expect(project.jira_import_status).to eq('finished')
+      end
 
-        it 'saves imported issues counts' do
-          latest_jira_import = project.latest_jira_import
-          expect(latest_jira_import.total_issue_count).to eq(5)
-          expect(latest_jira_import.failed_to_import_count).to eq(2)
-          expect(latest_jira_import.imported_issues_count).to eq(3)
-        end
+      it 'saves imported issues counts' do
+        latest_jira_import = project.latest_jira_import
+        expect(latest_jira_import.total_issue_count).to eq(5)
+        expect(latest_jira_import.failed_to_import_count).to eq(2)
+        expect(latest_jira_import.imported_issues_count).to eq(3)
       end
     end
   end
diff --git a/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb
index e6d41ae8bb4..34981d974cd 100644
--- a/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb
@@ -10,34 +10,19 @@ describe Gitlab::JiraImport::Stage::ImportAttachmentsWorker do
   end
 
   describe '#perform' do
-    context 'when feature flag disabled' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-      end
+    let_it_be(:jira_import) { create(:jira_import_state, :scheduled, project: project) }
 
+    context 'when import did not start' do
       it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
-    context 'when feature flag enabled' do
-      let_it_be(:jira_import) { create(:jira_import_state, :scheduled, project: project) }
-
+    context 'when import started' do
       before do
-        stub_feature_flags(jira_issue_import: true)
+        jira_import.start!
       end
 
-      context 'when import did not start' do
-        it_behaves_like 'cannot do Jira import'
-        it_behaves_like 'does not advance to next stage'
-      end
-
-      context 'when import started' do
-        before do
-          jira_import.start!
-        end
-
-        it_behaves_like 'advance to next stage', :notes
-      end
+      it_behaves_like 'advance to next stage', :notes
     end
   end
 end
diff --git a/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb
index f2067522af4..40f6cf75412 100644
--- a/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb
@@ -13,65 +13,53 @@ describe Gitlab::JiraImport::Stage::ImportIssuesWorker do
   end
 
   describe '#perform' do
-    context 'when feature flag disabled' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-      end
+    let_it_be(:jira_import, reload: true) { create(:jira_import_state, :scheduled, project: project) }
+
+    before do
+      stub_jira_service_test
+    end
 
+    context 'when import did not start' do
       it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
-    context 'when feature flag enabled' do
-      let_it_be(:jira_import, reload: true) { create(:jira_import_state, :scheduled, project: project) }
+    context 'when import started', :clean_gitlab_redis_cache do
+      let_it_be(:jira_service) { create(:jira_service, project: project) }
 
       before do
-        stub_feature_flags(jira_issue_import: true)
-        stub_jira_service_test
+        jira_import.start!
+        allow_next_instance_of(Gitlab::JiraImport::IssuesImporter) do |instance|
+          allow(instance).to receive(:fetch_issues).and_return([])
+        end
       end
 
-      context 'when import did not start' do
-        it_behaves_like 'cannot do Jira import'
-        it_behaves_like 'does not advance to next stage'
+      context 'when start_at is nil' do
+        it_behaves_like 'advance to next stage', :attachments
       end
 
-      context 'when import started', :clean_gitlab_redis_cache do
-        let_it_be(:jira_service) { create(:jira_service, project: project) }
-
+      context 'when start_at is zero' do
         before do
-          jira_import.start!
-          allow_next_instance_of(Gitlab::JiraImport::IssuesImporter) do |instance|
-            allow(instance).to receive(:fetch_issues).and_return([])
-          end
-        end
-
-        context 'when start_at is nil' do
-          it_behaves_like 'advance to next stage', :attachments
+          allow(Gitlab::Cache::Import::Caching).to receive(:read).and_return(0)
         end
 
-        context 'when start_at is zero' do
-          before do
-            allow(Gitlab::Cache::Import::Caching).to receive(:read).and_return(0)
-          end
+        it_behaves_like 'advance to next stage', :issues
+      end
 
-          it_behaves_like 'advance to next stage', :issues
+      context 'when start_at is greater than zero' do
+        before do
+          allow(Gitlab::Cache::Import::Caching).to receive(:read).and_return(25)
         end
 
-        context 'when start_at is greater than zero' do
-          before do
-            allow(Gitlab::Cache::Import::Caching).to receive(:read).and_return(25)
-          end
+        it_behaves_like 'advance to next stage', :issues
+      end
 
-          it_behaves_like 'advance to next stage', :issues
+      context 'when start_at is below zero' do
+        before do
+          allow(Gitlab::Cache::Import::Caching).to receive(:read).and_return(-1)
         end
 
-        context 'when start_at is below zero' do
-          before do
-            allow(Gitlab::Cache::Import::Caching).to receive(:read).and_return(-1)
-          end
-
-          it_behaves_like 'advance to next stage', :attachments
-        end
+        it_behaves_like 'advance to next stage', :attachments
       end
     end
   end
diff --git a/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb
index 7f289de5422..1215b41bd9f 100644
--- a/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb
@@ -13,48 +13,33 @@ describe Gitlab::JiraImport::Stage::ImportLabelsWorker do
   end
 
   describe '#perform' do
-    context 'when feature flag disabled' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-      end
+    let_it_be(:jira_import, reload: true) { create(:jira_import_state, :scheduled, project: project) }
 
+    context 'when import did not start' do
       it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
-    context 'when feature flag enabled' do
-      let_it_be(:jira_import, reload: true) { create(:jira_import_state, :scheduled, project: project) }
+    context 'when import started' do
+      let!(:jira_service) { create(:jira_service, project: project) }
 
       before do
-        stub_feature_flags(jira_issue_import: true)
-      end
-
-      context 'when import did not start' do
-        it_behaves_like 'cannot do Jira import'
-        it_behaves_like 'does not advance to next stage'
-      end
+        stub_jira_service_test
 
-      context 'when import started' do
-        let!(:jira_service) { create(:jira_service, project: project) }
+        jira_import.start!
 
-        before do
-          stub_jira_service_test
+        WebMock.stub_request(:get, 'https://jira.example.com/rest/api/2/label?maxResults=500&startAt=0')
+          .to_return(body: {}.to_json )
+      end
 
-          jira_import.start!
+      it_behaves_like 'advance to next stage', :issues
 
-          WebMock.stub_request(:get, 'https://jira.example.com/rest/api/2/label?maxResults=500&startAt=0')
-            .to_return(body: {}.to_json )
+      it 'executes labels importer' do
+        expect_next_instance_of(Gitlab::JiraImport::LabelsImporter) do |instance|
+          expect(instance).to receive(:execute).and_return(Gitlab::JobWaiter.new)
         end
 
-        it_behaves_like 'advance to next stage', :issues
-
-        it 'executes labels importer' do
-          expect_next_instance_of(Gitlab::JiraImport::LabelsImporter) do |instance|
-            expect(instance).to receive(:execute).and_return(Gitlab::JobWaiter.new)
-          end
-
-          described_class.new.perform(project.id)
-        end
+        described_class.new.perform(project.id)
       end
     end
   end
diff --git a/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb
index f9bdbd669d8..a0a9ad6f695 100644
--- a/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb
@@ -10,34 +10,19 @@ describe Gitlab::JiraImport::Stage::ImportNotesWorker do
   end
 
   describe '#perform' do
-    context 'when feature flag disabled' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-      end
+    let_it_be(:jira_import) { create(:jira_import_state, :scheduled, project: project) }
 
+    context 'when import did not start' do
       it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
-    context 'when feature flag enabled' do
-      let_it_be(:jira_import) { create(:jira_import_state, :scheduled, project: project) }
-
+    context 'when import started' do
       before do
-        stub_feature_flags(jira_issue_import: true)
+        jira_import.start!
       end
 
-      context 'when import did not start' do
-        it_behaves_like 'cannot do Jira import'
-        it_behaves_like 'does not advance to next stage'
-      end
-
-      context 'when import started' do
-        before do
-          jira_import.start!
-        end
-
-        it_behaves_like 'advance to next stage', :finish
-      end
+      it_behaves_like 'advance to next stage', :finish
     end
   end
 end
diff --git a/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb
index 9cffe6e4ff7..a4fc761accf 100644
--- a/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb
@@ -12,80 +12,62 @@ describe Gitlab::JiraImport::Stage::StartImportWorker do
   end
 
   describe '#perform' do
-    context 'when feature flag not disabled' do
-      before do
-        stub_feature_flags(jira_issue_import: false)
-      end
+    let_it_be(:jira_import, reload: true) { create(:jira_import_state, project: project, jid: jid) }
 
-      it 'exits because import not allowed' do
+    context 'when import is not scheduled' do
+      it 'exits because import not started' do
         expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
 
         worker.perform(project.id)
       end
     end
 
-    context 'when feature flag enabled' do
-      let_it_be(:jira_import, reload: true) { create(:jira_import_state, project: project, jid: jid) }
-
+    context 'when import is scheduled' do
       before do
-        stub_feature_flags(jira_issue_import: true)
+        jira_import.schedule!
       end
 
-      context 'when import is not scheduled' do
-        it 'exits because import not started' do
-          expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
+      it 'advances to importing labels' do
+        expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).to receive(:perform_async)
 
-          worker.perform(project.id)
-        end
+        worker.perform(project.id)
       end
+    end
 
-      context 'when import is scheduled' do
-        before do
-          jira_import.schedule!
-        end
+    context 'when import is started' do
+      before do
+        jira_import.update!(status: :started)
+      end
 
+      context 'when this is the same worker that stated import' do
         it 'advances to importing labels' do
+          allow(worker).to receive(:jid).and_return(jid)
           expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).to receive(:perform_async)
 
           worker.perform(project.id)
         end
       end
 
-      context 'when import is started' do
-        before do
-          jira_import.update!(status: :started)
-        end
-
-        context 'when this is the same worker that stated import' do
-          it 'advances to importing labels' do
-            allow(worker).to receive(:jid).and_return(jid)
-            expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).to receive(:perform_async)
-
-            worker.perform(project.id)
-          end
-        end
-
-        context 'when this is a different worker that stated import' do
-          it 'advances to importing labels' do
-            allow(worker).to receive(:jid).and_return('87654321')
-            expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
+      context 'when this is a different worker that stated import' do
+        it 'advances to importing labels' do
+          allow(worker).to receive(:jid).and_return('87654321')
+          expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
 
-            worker.perform(project.id)
-          end
+          worker.perform(project.id)
         end
       end
+    end
 
-      context 'when import is finished' do
-        before do
-          jira_import.update!(status: :finished)
-        end
+    context 'when import is finished' do
+      before do
+        jira_import.update!(status: :finished)
+      end
 
-        it 'advances to importing labels' do
-          allow(worker).to receive(:jid).and_return(jid)
-          expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
+      it 'advances to importing labels' do
+        allow(worker).to receive(:jid).and_return(jid)
+        expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
 
-          worker.perform(project.id)
-        end
+        worker.perform(project.id)
       end
     end
   end
diff --git a/spec/workers/gitlab/jira_import/stuck_jira_import_jobs_worker_spec.rb b/spec/workers/gitlab/jira_import/stuck_jira_import_jobs_worker_spec.rb
new file mode 100644
index 00000000000..fae52cec2b4
--- /dev/null
+++ b/spec/workers/gitlab/jira_import/stuck_jira_import_jobs_worker_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ::Gitlab::JiraImport::StuckJiraImportJobsWorker do
+  let_it_be(:current_user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let(:worker) { described_class.new }
+
+  describe 'with scheduled Jira import' do
+    it_behaves_like 'stuck import job detection' do
+      let(:import_state) { create(:jira_import_state, :scheduled, project: project) }
+
+      before do
+        import_state.update(jid: '123')
+      end
+    end
+  end
+
+  describe 'with started jira import' do
+    it_behaves_like 'stuck import job detection' do
+      let(:import_state) { create(:jira_import_state, :started, project: project) }
+
+      before do
+        import_state.update(jid: '123')
+      end
+    end
+  end
+
+  describe 'with failed jira import' do
+    let(:import_state) { create(:jira_import_state, :failed, project: project) }
+
+    it 'detects no stuck jobs' do
+      expect(worker).to receive(:track_metrics).with(0, 0)
+
+      worker.perform
+    end
+  end
+end
diff --git a/spec/workers/group_import_worker_spec.rb b/spec/workers/group_import_worker_spec.rb
index bb7dc116a08..324a5fa6978 100644
--- a/spec/workers/group_import_worker_spec.rb
+++ b/spec/workers/group_import_worker_spec.rb
@@ -26,7 +26,7 @@ describe GroupImportWorker do
         subject.perform(user.id, group.id)
       end
 
-      context 'import state' do
+      context 'when the import state does not exist' do
         it 'creates group import' do
           expect(group.import_state).to be_nil
 
@@ -54,6 +54,17 @@ describe GroupImportWorker do
           subject.perform(user.id, group.id)
         end
       end
+
+      context 'when the import state already exists' do
+        it 'updates the existing state' do
+          existing_state = create(:group_import_state, group: group)
+
+          expect { subject.perform(user.id, group.id) }
+            .not_to change { GroupImportState.count }
+
+          expect(existing_state.reload).to be_finished
+        end
+      end
     end
 
     context 'when it fails' do
diff --git a/spec/workers/incident_management/process_alert_worker_spec.rb b/spec/workers/incident_management/process_alert_worker_spec.rb
index 2d17a59c76f..0470552d933 100644
--- a/spec/workers/incident_management/process_alert_worker_spec.rb
+++ b/spec/workers/incident_management/process_alert_worker_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 describe IncidentManagement::ProcessAlertWorker do
   let_it_be(:project) { create(:project) }
+  let_it_be(:settings) { create(:project_incident_management_setting, project: project, create_issue: true) }
 
   describe '#perform' do
     let(:alert_management_alert_id) { nil }
@@ -71,11 +72,7 @@ describe IncidentManagement::ProcessAlertWorker do
       end
 
       context 'when alert cannot be updated' do
-        before do
-          # invalidate alert
-          too_many_hosts = Array.new(AlertManagement::Alert::HOSTS_MAX_LENGTH + 1) { |_| 'host' }
-          alert.update_columns(hosts: too_many_hosts)
-        end
+        let(:alert) { create(:alert_management_alert, :with_validation_errors, project: project) }
 
         it 'updates AlertManagement::Alert#issue_id' do
           expect { subject }.not_to change { alert.reload.issue_id }
diff --git a/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb b/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb
index 5fbc39cad4e..c9ea96df5c2 100644
--- a/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb
+++ b/spec/workers/incident_management/process_prometheus_alert_worker_spec.rb
@@ -6,8 +6,9 @@ describe IncidentManagement::ProcessPrometheusAlertWorker do
   describe '#perform' do
     let_it_be(:project) { create(:project) }
     let_it_be(:prometheus_alert) { create(:prometheus_alert, project: project) }
-    let_it_be(:payload_key) { PrometheusAlertEvent.payload_key_for(prometheus_alert.prometheus_metric_id, prometheus_alert.created_at.rfc3339) }
+    let(:payload_key) { Gitlab::Alerting::Alert.new(project: project, payload: alert_params).gitlab_fingerprint }
     let!(:prometheus_alert_event) { create(:prometheus_alert_event, prometheus_alert: prometheus_alert, payload_key: payload_key) }
+    let!(:settings) { create(:project_incident_management_setting, project: project, create_issue: true) }
 
     let(:alert_params) do
       {
@@ -107,7 +108,6 @@ describe IncidentManagement::ProcessPrometheusAlertWorker do
       let(:starts_at) { Time.now.rfc3339 }
 
       let!(:prometheus_alert_event) do
-        payload_key = SelfManagedPrometheusAlertEvent.payload_key_for(starts_at, alert_name, 'vector(1)')
         create(:self_managed_prometheus_alert_event, project: project, payload_key: payload_key)
       end
 
diff --git a/spec/workers/irker_worker_spec.rb b/spec/workers/irker_worker_spec.rb
new file mode 100644
index 00000000000..6b58c04d909
--- /dev/null
+++ b/spec/workers/irker_worker_spec.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe IrkerWorker, '#perform' do
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:push_data) { HashWithIndifferentAccess.new(Gitlab::DataBuilder::Push.build_sample(project, user)) }
+  let_it_be(:channels) { ['irc://test.net/#test'] }
+
+  let_it_be(:server_settings) do
+    {
+      server_host: 'localhost',
+      server_port: 6659
+    }
+  end
+
+  let_it_be(:arguments) do
+    [
+      project.id,
+      channels,
+      false,
+      push_data,
+      server_settings
+    ]
+  end
+
+  let(:tcp_socket) { double('socket') }
+
+  subject(:worker) { described_class.new }
+
+  before do
+    allow(TCPSocket).to receive(:new).and_return(tcp_socket)
+    allow(tcp_socket).to receive(:puts).and_return(true)
+    allow(tcp_socket).to receive(:close).and_return(true)
+  end
+
+  context 'connection fails' do
+    before do
+      allow(TCPSocket).to receive(:new).and_raise(Errno::ECONNREFUSED.new('test'))
+    end
+
+    it { expect(subject.perform(*arguments)).to be_falsey }
+  end
+
+  context 'connection successful' do
+    it { expect(subject.perform(*arguments)).to be_truthy }
+
+    context 'new branch' do
+      it 'sends a correct message with branches url' do
+        branches_url = Gitlab::Routing.url_helpers
+          .project_branches_url(project)
+
+        push_data['before'] = '0000000000000000000000000000000000000000'
+
+        message = "has created a new branch master: #{branches_url}"
+
+        expect(tcp_socket).to receive(:puts).with(wrap_message(message))
+
+        subject.perform(*arguments)
+      end
+    end
+
+    context 'deleted branch' do
+      it 'sends a correct message' do
+        push_data['after'] = '0000000000000000000000000000000000000000'
+
+        message = "has deleted the branch master"
+
+        expect(tcp_socket).to receive(:puts).with(wrap_message(message))
+
+        subject.perform(*arguments)
+      end
+    end
+
+    context 'new commits to existing branch' do
+      it 'sends a correct message with a compare url' do
+        compare_url = Gitlab::Routing.url_helpers
+          .project_compare_url(project,
+                               from: Commit.truncate_sha(push_data[:before]),
+                               to: Commit.truncate_sha(push_data[:after]))
+
+        message = "pushed #{push_data['total_commits_count']} " \
+          "new commits to master: #{compare_url}"
+
+        expect(tcp_socket).to receive(:puts).with(wrap_message(message))
+
+        subject.perform(*arguments)
+      end
+    end
+  end
+
+  def wrap_message(text)
+    message = "[#{project.path}] #{push_data['user_name']} #{text}"
+    to_send = { to: channels, privmsg: message }
+
+    Gitlab::Json.dump(to_send)
+  end
+end
diff --git a/spec/workers/metrics/dashboard/prune_old_annotations_worker_spec.rb b/spec/workers/metrics/dashboard/prune_old_annotations_worker_spec.rb
new file mode 100644
index 00000000000..bab5a5d8740
--- /dev/null
+++ b/spec/workers/metrics/dashboard/prune_old_annotations_worker_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Metrics::Dashboard::PruneOldAnnotationsWorker do
+  let_it_be(:now) { DateTime.parse('2020-06-02T00:12:00Z') }
+  let_it_be(:two_weeks_old_annotation) { create(:metrics_dashboard_annotation, starting_at: now.advance(weeks: -2)) }
+  let_it_be(:one_day_old_annotation) { create(:metrics_dashboard_annotation, starting_at: now.advance(days: -1)) }
+  let_it_be(:month_old_annotation) { create(:metrics_dashboard_annotation, starting_at: now.advance(months: -1)) }
+
+  describe '#perform' do
+    it 'removes all annotations older than cut off', :aggregate_failures do
+      Timecop.freeze(now) do
+        described_class.new.perform
+
+        expect(Metrics::Dashboard::Annotation.all).to match_array([one_day_old_annotation, two_weeks_old_annotation])
+
+        # is idempotent in the scope of 24h
+        expect { described_class.new.perform }.not_to change { Metrics::Dashboard::Annotation.all.to_a }
+        Timecop.travel(24.hours.from_now) do
+          described_class.new.perform
+          expect(Metrics::Dashboard::Annotation.all).to match_array([one_day_old_annotation])
+        end
+      end
+    end
+
+    context 'batch to be deleted is bigger than upper limit' do
+      it 'schedules second job to clear remaining records' do
+        Timecop.freeze(now) do
+          create(:metrics_dashboard_annotation, starting_at: 1.month.ago)
+          stub_const("#{described_class}::DELETE_LIMIT", 1)
+
+          expect(described_class).to receive(:perform_async)
+
+          described_class.new.perform
+        end
+      end
+    end
+  end
+end
diff --git a/spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb b/spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb
new file mode 100644
index 00000000000..bfe6fe3a90e
--- /dev/null
+++ b/spec/workers/metrics/dashboard/schedule_annotations_prune_worker_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Metrics::Dashboard::ScheduleAnnotationsPruneWorker do
+  describe '#perform' do
+    it 'schedules annotations prune job with default cut off date' do
+      expect(Metrics::Dashboard::PruneOldAnnotationsWorker).to receive(:perform_async)
+
+      described_class.new.perform
+    end
+  end
+end
diff --git a/spec/workers/new_note_worker_spec.rb b/spec/workers/new_note_worker_spec.rb
index 387a0958d6b..57269355180 100644
--- a/spec/workers/new_note_worker_spec.rb
+++ b/spec/workers/new_note_worker_spec.rb
@@ -27,7 +27,7 @@ describe NewNoteWorker do
     let(:unexistent_note_id) { non_existing_record_id }
 
     it 'logs NewNoteWorker process skipping' do
-      expect(Rails.logger).to receive(:error)
+      expect(Gitlab::AppLogger).to receive(:error)
         .with("NewNoteWorker: couldn't find note with ID=#{unexistent_note_id}, skipping job")
 
       described_class.new.perform(unexistent_note_id)
@@ -49,4 +49,14 @@ describe NewNoteWorker do
       described_class.new.perform(unexistent_note_id)
     end
   end
+
+  context 'when note is with review' do
+    it 'does not create a new note notification' do
+      note = create(:note, :with_review)
+
+      expect_any_instance_of(NotificationService).not_to receive(:new_note)
+
+      subject.perform(note.id)
+    end
+  end
 end
diff --git a/spec/workers/personal_access_tokens/expiring_worker_spec.rb b/spec/workers/personal_access_tokens/expiring_worker_spec.rb
index fcc09e2705c..c8bdf02f4d3 100644
--- a/spec/workers/personal_access_tokens/expiring_worker_spec.rb
+++ b/spec/workers/personal_access_tokens/expiring_worker_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe PersonalAccessTokens::ExpiringWorker, type: :worker do
 
   describe '#perform' do
     context 'when a token needs to be notified' do
-      let!(:pat) { create(:personal_access_token, expires_at: 5.days.from_now) }
+      let_it_be(:pat) { create(:personal_access_token, expires_at: 5.days.from_now) }
 
       it 'uses notification service to send the email' do
         expect_next_instance_of(NotificationService) do |notification_service|
@@ -23,7 +23,7 @@ RSpec.describe PersonalAccessTokens::ExpiringWorker, type: :worker do
     end
 
     context 'when no tokens need to be notified' do
-      let!(:pat) { create(:personal_access_token, expires_at: 5.days.from_now, expire_notification_delivered: true) }
+      let_it_be(:pat) { create(:personal_access_token, expires_at: 5.days.from_now, expire_notification_delivered: true) }
 
       it "doesn't use notification service to send the email" do
         expect_next_instance_of(NotificationService) do |notification_service|
@@ -33,7 +33,23 @@ RSpec.describe PersonalAccessTokens::ExpiringWorker, type: :worker do
         worker.perform
       end
 
-      it "doesn't change the notificationd delivered of the token" do
+      it "doesn't change the notification delivered of the token" do
+        expect { worker.perform }.not_to change { pat.reload.expire_notification_delivered }
+      end
+    end
+
+    context 'when a token is an impersonation token' do
+      let_it_be(:pat) { create(:personal_access_token, :impersonation, expires_at: 5.days.from_now) }
+
+      it "doesn't use notification service to send the email" do
+        expect_next_instance_of(NotificationService) do |notification_service|
+          expect(notification_service).not_to receive(:access_token_about_to_expire).with(pat.user)
+        end
+
+        worker.perform
+      end
+
+      it "doesn't change the notification delivered of the token" do
         expect { worker.perform }.not_to change { pat.reload.expire_notification_delivered }
       end
     end
diff --git a/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb b/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb
index 7228de4f895..3fe8aa55142 100644
--- a/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb
+++ b/spec/workers/pipeline_update_ci_ref_status_worker_service_spec.rb
@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 
+# NOTE: This class is unused and to be removed in 13.1~
 describe PipelineUpdateCiRefStatusWorker do
   let(:worker) { described_class.new }
   let(:pipeline) { create(:ci_pipeline) }
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index aab7a36189a..18e06332eb3 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -355,7 +355,7 @@ describe PostReceive do
 
   context "webhook" do
     it "fetches the correct project" do
-      expect(Project).to receive(:find_by).with(id: project.id.to_s)
+      expect(Project).to receive(:find_by).with(id: project.id)
 
       perform
     end
diff --git a/spec/workers/propagate_integration_worker_spec.rb b/spec/workers/propagate_integration_worker_spec.rb
new file mode 100644
index 00000000000..e49869a38e9
--- /dev/null
+++ b/spec/workers/propagate_integration_worker_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe PropagateIntegrationWorker do
+  describe '#perform' do
+    let(:integration) do
+      PushoverService.create(
+        template: true,
+        active: true,
+        device: 'MyDevice',
+        sound: 'mic',
+        priority: 4,
+        user_key: 'asdf',
+        api_key: '123456789'
+      )
+    end
+
+    it 'calls the propagate service with the integration' do
+      expect(Admin::PropagateIntegrationService).to receive(:propagate)
+        .with(integration: integration, overwrite: true)
+
+      subject.perform(integration.id, true)
+    end
+  end
+end
diff --git a/spec/workers/remove_expired_group_links_worker_spec.rb b/spec/workers/remove_expired_group_links_worker_spec.rb
index 9557aa3086c..b637802cd78 100644
--- a/spec/workers/remove_expired_group_links_worker_spec.rb
+++ b/spec/workers/remove_expired_group_links_worker_spec.rb
@@ -23,30 +23,53 @@ describe RemoveExpiredGroupLinksWorker do
         subject.perform
         expect(non_expiring_project_group_link.reload).to be_present
       end
-    end
 
-    context 'GroupGroupLinks' do
-      let(:mock_destroy_service) { instance_double(Groups::GroupLinks::DestroyService) }
+      it 'removes project authorization' do
+        user = create(:user)
+
+        project = expired_project_group_link.project
+        group = expired_project_group_link.group
+
+        group.add_maintainer(user)
 
-      before do
-        allow(Groups::GroupLinks::DestroyService).to(
-          receive(:new).and_return(mock_destroy_service))
+        expect { subject.perform }.to(
+          change { user.can?(:read_project, project) }.from(true).to(false))
       end
+    end
 
+    context 'GroupGroupLinks' do
       context 'expired GroupGroupLink exists' do
-        before do
-          create(:group_group_link, expires_at: 1.hour.ago)
-        end
+        let!(:group_group_link) { create(:group_group_link, expires_at: 1.hour.ago) }
 
         it 'calls Groups::GroupLinks::DestroyService' do
+          mock_destroy_service = instance_double(Groups::GroupLinks::DestroyService)
+          allow(Groups::GroupLinks::DestroyService).to(
+            receive(:new).and_return(mock_destroy_service))
+
           expect(mock_destroy_service).to receive(:execute).once
 
           subject.perform
         end
+
+        it 'removes project authorization' do
+          shared_group = group_group_link.shared_group
+          shared_with_group = group_group_link.shared_with_group
+          project = create(:project, group: shared_group)
+
+          user = create(:user)
+          shared_with_group.add_maintainer(user)
+
+          expect { subject.perform }.to(
+            change { user.can?(:read_project, project) }.from(true).to(false))
+        end
       end
 
       context 'expired GroupGroupLink does not exist' do
         it 'does not call Groups::GroupLinks::DestroyService' do
+          mock_destroy_service = instance_double(Groups::GroupLinks::DestroyService)
+          allow(Groups::GroupLinks::DestroyService).to(
+            receive(:new).and_return(mock_destroy_service))
+
           expect(mock_destroy_service).not_to receive(:execute)
 
           subject.perform
diff --git a/spec/workers/repository_check/single_repository_worker_spec.rb b/spec/workers/repository_check/single_repository_worker_spec.rb
index 6870e15424f..43998f912ef 100644
--- a/spec/workers/repository_check/single_repository_worker_spec.rb
+++ b/spec/workers/repository_check/single_repository_worker_spec.rb
@@ -8,7 +8,7 @@ describe RepositoryCheck::SingleRepositoryWorker do
 
   it 'skips when the project has no push events' do
     project = create(:project, :repository, :wiki_disabled)
-    project.events.destroy_all # rubocop: disable DestroyAll
+    project.events.destroy_all # rubocop: disable Cop/DestroyAll
     break_project(project)
 
     expect(worker).not_to receive(:git_fsck)
@@ -86,7 +86,7 @@ describe RepositoryCheck::SingleRepositoryWorker do
   end
 
   def create_push_event(project)
-    project.events.create(action: Event::PUSHED, author_id: create(:user).id)
+    project.events.create(action: :pushed, author_id: create(:user).id)
   end
 
   def break_wiki(project)
diff --git a/spec/workers/stuck_import_jobs_worker_spec.rb b/spec/workers/stuck_import_jobs_worker_spec.rb
index dcb8e59ed28..f8d7f8747d5 100644
--- a/spec/workers/stuck_import_jobs_worker_spec.rb
+++ b/spec/workers/stuck_import_jobs_worker_spec.rb
@@ -5,51 +5,8 @@ require 'spec_helper'
 describe StuckImportJobsWorker do
   let(:worker) { described_class.new }
 
-  shared_examples 'project import job detection' do
-    context 'when the job has completed' do
-      context 'when the import status was already updated' do
-        before do
-          allow(Gitlab::SidekiqStatus).to receive(:completed_jids) do
-            import_state.start
-            import_state.finish
-
-            [import_state.jid]
-          end
-        end
-
-        it 'does not mark the project as failed' do
-          worker.perform
-
-          expect(import_state.reload.status).to eq('finished')
-        end
-      end
-
-      context 'when the import status was not updated' do
-        before do
-          allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return([import_state.jid])
-        end
-
-        it 'marks the project as failed' do
-          worker.perform
-
-          expect(import_state.reload.status).to eq('failed')
-        end
-      end
-    end
-
-    context 'when the job is still in Sidekiq' do
-      before do
-        allow(Gitlab::SidekiqStatus).to receive(:completed_jids).and_return([])
-      end
-
-      it 'does not mark the project as failed' do
-        expect { worker.perform }.not_to change { import_state.reload.status }
-      end
-    end
-  end
-
   describe 'with scheduled import_status' do
-    it_behaves_like 'project import job detection' do
+    it_behaves_like 'stuck import job detection' do
       let(:import_state) { create(:project, :import_scheduled).import_state }
 
       before do
@@ -59,7 +16,7 @@ describe StuckImportJobsWorker do
   end
 
   describe 'with started import_status' do
-    it_behaves_like 'project import job detection' do
+    it_behaves_like 'stuck import job detection' do
       let(:import_state) { create(:project, :import_started).import_state }
 
       before do