Add latest changes from gitlab-org/gitlab@master

11 files changed, 197 insertions, 237 deletions

diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb
index 8bf8ef56353..ec0399e0ee3 100644
--- a/spec/features/admin/admin_appearance_spec.rb
+++ b/spec/features/admin/admin_appearance_spec.rb
@@ -101,7 +101,7 @@ RSpec.describe 'Admin Appearance' do
 
   context 'Profile page with custom profile image guidelines' do
     before do
-      sign_in(create(:admin))
+      sign_in(admin)
       gitlab_enable_admin_mode_sign_in(admin)
       visit admin_application_settings_appearances_path
       fill_in 'appearance_profile_image_guidelines', with: 'Custom profile image guidelines, please :smile:!'
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index 1013937ebb9..2836ac2f801 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe 'Profile account page', :js do
     it 'deletes user', :js, :sidekiq_might_not_need_inline do
       click_button 'Delete account'
 
-      fill_in 'password', with: '12345678'
+      fill_in 'password', with: user.password
 
       page.within '.modal' do
         click_button 'Delete account'
diff --git a/spec/features/profiles/password_spec.rb b/spec/features/profiles/password_spec.rb
index 07dfbca8cbd..1d0db488751 100644
--- a/spec/features/profiles/password_spec.rb
+++ b/spec/features/profiles/password_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe 'Profile > Password' do
   end
 
   context 'Password authentication enabled' do
+    let(:new_password) { User.random_password }
     let(:user) { create(:user, password_automatically_set: true) }
 
     before do
@@ -23,7 +24,7 @@ RSpec.describe 'Profile > Password' do
     context 'User with password automatically set' do
       describe 'User puts different passwords in the field and in the confirmation' do
         it 'shows an error message' do
-          fill_passwords('mypassword', 'mypassword2')
+          fill_passwords(new_password, "#{new_password}2")
 
           page.within('.gl-alert-danger') do
             expect(page).to have_content("Password confirmation doesn't match Password")
@@ -31,7 +32,7 @@ RSpec.describe 'Profile > Password' do
         end
 
         it 'does not contain the current password field after an error' do
-          fill_passwords('mypassword', 'mypassword2')
+          fill_passwords(new_password, "#{new_password}2")
 
           expect(page).to have_no_field('user[current_password]')
         end
@@ -39,7 +40,7 @@ RSpec.describe 'Profile > Password' do
 
       describe 'User puts the same passwords in the field and in the confirmation' do
         it 'shows a success message' do
-          fill_passwords('mypassword', 'mypassword')
+          fill_passwords(new_password, new_password)
 
           page.within('[data-testid="alert-info"]') do
             expect(page).to have_content('Password was successfully updated. Please sign in again.')
@@ -79,7 +80,7 @@ RSpec.describe 'Profile > Password' do
   end
 
   context 'Change password' do
-    let(:new_password) { '22233344' }
+    let(:new_password) { User.random_password }
 
     before do
       sign_in(user)
@@ -156,6 +157,8 @@ RSpec.describe 'Profile > Password' do
   end
 
   context 'when password is expired' do
+    let(:new_password) { User.random_password }
+
     before do
       sign_in(user)
 
@@ -170,8 +173,8 @@ RSpec.describe 'Profile > Password' do
       expect(page).to have_current_path new_profile_password_path, ignore_query: true
 
       fill_in :user_password,      with: user.password
-      fill_in :user_new_password,  with: '12345678'
-      fill_in :user_password_confirmation, with: '12345678'
+      fill_in :user_new_password,  with: new_password
+      fill_in :user_password_confirmation, with: new_password
       click_button 'Set new password'
 
       expect(page).to have_current_path new_user_session_path, ignore_query: true
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index 08d0a8d556a..259a82498b9 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -49,15 +49,15 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
       expect(page).to have_current_path edit_user_password_path, ignore_query: true
       expect(page).to have_content('Please create a password for your new account.')
 
-      fill_in 'user_password',              with: 'password'
-      fill_in 'user_password_confirmation', with: 'password'
+      fill_in 'user_password',              with: user.password
+      fill_in 'user_password_confirmation', with: user.password
       click_button 'Change your password'
 
       expect(page).to have_current_path new_user_session_path, ignore_query: true
       expect(page).to have_content(I18n.t('devise.passwords.updated_not_active'))
 
       fill_in 'user_login',    with: user.username
-      fill_in 'user_password', with: 'password'
+      fill_in 'user_password', with: user.password
       click_button 'Sign in'
 
       expect_single_session_with_authenticated_ttl
@@ -231,7 +231,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
       end
 
       it 'does not allow sign-in if the user password is updated before entering a one-time code' do
-        user.update!(password: 'new_password')
+        user.update!(password: User.random_password)
 
         enter_code(user.current_otp)
 
@@ -468,7 +468,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           visit new_user_session_path
 
           fill_in 'user_login', with: user.email
-          fill_in 'user_password', with: '12345678'
+          fill_in 'user_password', with: user.password
           click_button 'Sign in'
 
           expect(page).to have_current_path(new_profile_password_path, ignore_query: true)
@@ -788,7 +788,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
       visit new_user_session_path
 
       fill_in 'user_login', with: user.email
-      fill_in 'user_password', with: '12345678'
+      fill_in 'user_password', with: user.password
 
       click_button 'Sign in'
 
@@ -809,7 +809,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
       visit new_user_session_path
 
       fill_in 'user_login', with: user.email
-      fill_in 'user_password', with: '12345678'
+      fill_in 'user_password', with: user.password
 
       click_button 'Sign in'
 
@@ -830,7 +830,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           visit new_user_session_path
 
           fill_in 'user_login', with: user.email
-          fill_in 'user_password', with: '12345678'
+          fill_in 'user_password', with: user.password
 
           click_button 'Sign in'
 
@@ -873,7 +873,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
           visit new_user_session_path
 
           fill_in 'user_login', with: user.email
-          fill_in 'user_password', with: '12345678'
+          fill_in 'user_password', with: user.password
           click_button 'Sign in'
 
           fill_in 'user_otp_attempt', with: user.reload.current_otp
@@ -899,7 +899,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
         visit new_user_session_path
 
         fill_in 'user_login', with: user.email
-        fill_in 'user_password', with: '12345678'
+        fill_in 'user_password', with: user.password
         click_button 'Sign in'
 
         expect_to_be_on_terms_page
@@ -907,9 +907,11 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions do
 
         expect(page).to have_current_path(new_profile_password_path, ignore_query: true)
 
-        fill_in 'user_password', with: '12345678'
-        fill_in 'user_new_password', with: 'new password'
-        fill_in 'user_password_confirmation', with: 'new password'
+        new_password = User.random_password
+
+        fill_in 'user_password', with: user.password
+        fill_in 'user_new_password', with: new_password
+        fill_in 'user_password_confirmation', with: new_password
         click_button 'Set new password'
 
         expect(page).to have_content('Password successfully changed')
diff --git a/spec/frontend/boards/components/board_add_new_column_form_spec.js b/spec/frontend/boards/components/board_add_new_column_form_spec.js
index 3b26ca57d6f..7855b041951 100644
--- a/spec/frontend/boards/components/board_add_new_column_form_spec.js
+++ b/spec/frontend/boards/components/board_add_new_column_form_spec.js
@@ -61,7 +61,7 @@ describe('Board card layout', () => {
 
   const formTitle = () => wrapper.findByTestId('board-add-column-form-title').text();
   const findSearchInput = () => wrapper.find(GlSearchBoxByType);
-  const findSearchLabel = () => wrapper.find(GlFormGroup);
+  const findSearchLabelFormGroup = () => wrapper.find(GlFormGroup);
   const cancelButton = () => wrapper.findByTestId('cancelAddNewColumn');
   const submitButton = () => wrapper.findByTestId('addNewColumnButton');
   const findDropdown = () => wrapper.findComponent(GlDropdown);
@@ -121,10 +121,17 @@ describe('Board card layout', () => {
 
       mountComponent(props);
 
-      expect(findSearchLabel().attributes('label')).toEqual(props.searchLabel);
+      expect(findSearchLabelFormGroup().attributes('label')).toEqual(props.searchLabel);
       expect(findSearchInput().attributes('placeholder')).toEqual(props.searchPlaceholder);
     });
 
+    it('does not show the dropdown as invalid by default', () => {
+      mountComponent();
+
+      expect(findSearchLabelFormGroup().attributes('state')).toBe('true');
+      expect(findDropdown().props('toggleClass')).not.toContain('gl-inset-border-1-red-400!');
+    });
+
     it('emits filter event on input', () => {
       mountComponent();
 
@@ -137,13 +144,13 @@ describe('Board card layout', () => {
   });
 
   describe('Add list button', () => {
-    it('is disabled if no item is selected', () => {
+    it('is enabled by default', () => {
       mountComponent();
 
-      expect(submitButton().props('disabled')).toBe(true);
+      expect(submitButton().props('disabled')).toBe(false);
     });
 
-    it('emits add-list event on click', () => {
+    it('emits add-list event on click when an ID is selected', () => {
       mountComponent({
         selectedId: mockLabelList.label.id,
       });
@@ -152,5 +159,16 @@ describe('Board card layout', () => {
 
       expect(wrapper.emitted('add-list')).toEqual([[]]);
     });
+
+    it('does not emit the add-list event on click and shows the dropdown as invalid when no ID is selected', async () => {
+      mountComponent();
+
+      await submitButton().vm.$emit('click');
+
+      expect(findSearchLabelFormGroup().attributes('state')).toBeUndefined();
+      expect(findDropdown().props('toggleClass')).toContain('gl-inset-border-1-red-400!');
+
+      expect(wrapper.emitted('add-list')).toBeUndefined();
+    });
   });
 });
diff --git a/spec/frontend/fixtures/runner.rb b/spec/frontend/fixtures/runner.rb
index 91eef8b485c..22039d076b2 100644
--- a/spec/frontend/fixtures/runner.rb
+++ b/spec/frontend/fixtures/runner.rb
@@ -13,10 +13,10 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
   let_it_be(:project) { create(:project, :repository, :public) }
   let_it_be(:project_2) { create(:project, :repository, :public) }
 
-  let_it_be(:instance_runner) { create(:ci_runner, :instance, version: '1.0.0', revision: '123', description: 'Instance runner', ip_address: '127.0.0.1') }
-  let_it_be(:group_runner) { create(:ci_runner, :group, groups: [group], active: false, version: '2.0.0', revision: '456', description: 'Group runner', ip_address: '127.0.0.1') }
-  let_it_be(:group_runner_2) { create(:ci_runner, :group, groups: [group], active: false, version: '2.0.0', revision: '456', description: 'Group runner 2', ip_address: '127.0.0.1') }
-  let_it_be(:project_runner) { create(:ci_runner, :project, projects: [project, project_2], active: false, version: '2.0.0', revision: '456', description: 'Project runner', ip_address: '127.0.0.1') }
+  let_it_be(:instance_runner) { create(:ci_runner, :instance, version: '1.0.0', description: 'Instance runner', ip_address: '127.0.0.1') }
+  let_it_be(:group_runner) { create(:ci_runner, :group, groups: [group], active: false, version: '2.0.0', description: 'Group runner', ip_address: '127.0.0.1') }
+  let_it_be(:group_runner_2) { create(:ci_runner, :group, groups: [group], active: false, version: '2.0.0', description: 'Group runner 2', ip_address: '127.0.0.1') }
+  let_it_be(:project_runner) { create(:ci_runner, :project, projects: [project, project_2], active: false, version: '2.0.0', description: 'Project runner', ip_address: '127.0.0.1') }
   let_it_be(:build) { create(:ci_build, runner: instance_runner) }
 
   query_path = 'runner/graphql/'
diff --git a/spec/frontend/ide/components/activity_bar_spec.js b/spec/frontend/ide/components/activity_bar_spec.js
index 39fe2c7e723..a97e883a8bf 100644
--- a/spec/frontend/ide/components/activity_bar_spec.js
+++ b/spec/frontend/ide/components/activity_bar_spec.js
@@ -1,86 +1,82 @@
-import Vue, { nextTick } from 'vue';
-import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
+import { GlBadge } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
 import ActivityBar from '~/ide/components/activity_bar.vue';
 import { leftSidebarViews } from '~/ide/constants';
 import { createStore } from '~/ide/stores';
 
-describe('IDE activity bar', () => {
-  const Component = Vue.extend(ActivityBar);
-  let vm;
+describe('IDE ActivityBar component', () => {
+  let wrapper;
   let store;
 
-  const findChangesBadge = () => vm.$el.querySelector('.badge');
+  const findChangesBadge = () => wrapper.findComponent(GlBadge);
 
-  beforeEach(() => {
+  const mountComponent = (state) => {
     store = createStore();
-
-    Vue.set(store.state.projects, 'abcproject', {
-      web_url: 'testing',
+    store.replaceState({
+      ...store.state,
+      projects: { abcproject: { web_url: 'testing' } },
+      currentProjectId: 'abcproject',
+      ...state,
     });
-    Vue.set(store.state, 'currentProjectId', 'abcproject');
 
-    vm = createComponentWithStore(Component, store);
-  });
+    wrapper = shallowMount(ActivityBar, { store });
+  };
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
   describe('updateActivityBarView', () => {
     beforeEach(() => {
-      jest.spyOn(vm, 'updateActivityBarView').mockImplementation(() => {});
-
-      vm.$mount();
+      mountComponent();
+      jest.spyOn(wrapper.vm, 'updateActivityBarView').mockImplementation(() => {});
     });
 
     it('calls updateActivityBarView with edit value on click', () => {
-      vm.$el.querySelector('.js-ide-edit-mode').click();
+      wrapper.find('.js-ide-edit-mode').trigger('click');
 
-      expect(vm.updateActivityBarView).toHaveBeenCalledWith(leftSidebarViews.edit.name);
+      expect(wrapper.vm.updateActivityBarView).toHaveBeenCalledWith(leftSidebarViews.edit.name);
     });
 
     it('calls updateActivityBarView with commit value on click', () => {
-      vm.$el.querySelector('.js-ide-commit-mode').click();
+      wrapper.find('.js-ide-commit-mode').trigger('click');
 
-      expect(vm.updateActivityBarView).toHaveBeenCalledWith(leftSidebarViews.commit.name);
+      expect(wrapper.vm.updateActivityBarView).toHaveBeenCalledWith(leftSidebarViews.commit.name);
     });
 
     it('calls updateActivityBarView with review value on click', () => {
-      vm.$el.querySelector('.js-ide-review-mode').click();
+      wrapper.find('.js-ide-review-mode').trigger('click');
 
-      expect(vm.updateActivityBarView).toHaveBeenCalledWith(leftSidebarViews.review.name);
+      expect(wrapper.vm.updateActivityBarView).toHaveBeenCalledWith(leftSidebarViews.review.name);
     });
   });
 
   describe('active item', () => {
-    beforeEach(() => {
-      vm.$mount();
-    });
-
     it('sets edit item active', () => {
-      expect(vm.$el.querySelector('.js-ide-edit-mode').classList).toContain('active');
+      mountComponent();
+
+      expect(wrapper.find('.js-ide-edit-mode').classes()).toContain('active');
     });
 
-    it('sets commit item active', async () => {
-      vm.$store.state.currentActivityView = leftSidebarViews.commit.name;
+    it('sets commit item active', () => {
+      mountComponent({ currentActivityView: leftSidebarViews.commit.name });
 
-      await nextTick();
-      expect(vm.$el.querySelector('.js-ide-commit-mode').classList).toContain('active');
+      expect(wrapper.find('.js-ide-commit-mode').classes()).toContain('active');
     });
   });
 
   describe('changes badge', () => {
     it('is rendered when files are staged', () => {
-      store.state.stagedFiles = [{ path: '/path/to/file' }];
-      vm.$mount();
+      mountComponent({ stagedFiles: [{ path: '/path/to/file' }] });
 
-      expect(findChangesBadge()).toBeTruthy();
-      expect(findChangesBadge().textContent.trim()).toBe('1');
+      expect(findChangesBadge().exists()).toBe(true);
+      expect(findChangesBadge().text()).toBe('1');
     });
 
     it('is not rendered when no changes are present', () => {
-      vm.$mount();
-      expect(findChangesBadge()).toBeFalsy();
+      mountComponent();
+
+      expect(findChangesBadge().exists()).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/ide/components/ide_status_bar_spec.js b/spec/frontend/ide/components/ide_status_bar_spec.js
index 17a5aa17b1f..e6e0ebaf1e8 100644
--- a/spec/frontend/ide/components/ide_status_bar_spec.js
+++ b/spec/frontend/ide/components/ide_status_bar_spec.js
@@ -1,8 +1,8 @@
+import { mount } from '@vue/test-utils';
 import _ from 'lodash';
-import Vue, { nextTick } from 'vue';
 import { TEST_HOST } from 'helpers/test_constants';
-import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import IdeStatusBar from '~/ide/components/ide_status_bar.vue';
+import IdeStatusMR from '~/ide/components/ide_status_mr.vue';
 import { rightSidebarViews } from '~/ide/constants';
 import { createStore } from '~/ide/stores';
 import { projectData } from '../mock_data';
@@ -13,42 +13,48 @@ const TEST_MERGE_REQUEST_URL = `${TEST_HOST}merge-requests/${TEST_MERGE_REQUEST_
 
 jest.mock('~/lib/utils/poll');
 
-describe('ideStatusBar', () => {
-  let store;
-  let vm;
+describe('IdeStatusBar component', () => {
+  let wrapper;
+
+  const findMRStatus = () => wrapper.findComponent(IdeStatusMR);
+
+  const mountComponent = (state = {}) => {
+    const store = createStore();
+    store.replaceState({
+      ...store.state,
+      currentBranchId: 'main',
+      currentProjectId: TEST_PROJECT_ID,
+      projects: {
+        ...store.state.projects,
+        [TEST_PROJECT_ID]: _.clone(projectData),
+      },
+      ...state,
+    });
 
-  const createComponent = () => {
-    vm = createComponentWithStore(Vue.extend(IdeStatusBar), store).$mount();
+    wrapper = mount(IdeStatusBar, { store });
   };
-  const findMRStatus = () => vm.$el.querySelector('.js-ide-status-mr');
-
-  beforeEach(() => {
-    store = createStore();
-    store.state.currentProjectId = TEST_PROJECT_ID;
-    store.state.projects[TEST_PROJECT_ID] = _.clone(projectData);
-    store.state.currentBranchId = 'main';
-  });
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
   describe('default', () => {
-    beforeEach(() => {
-      createComponent();
-    });
-
     it('triggers a setInterval', () => {
-      expect(vm.intervalId).not.toBe(null);
+      mountComponent();
+
+      expect(wrapper.vm.intervalId).not.toBe(null);
     });
 
     it('renders the statusbar', () => {
-      expect(vm.$el.className).toBe('ide-status-bar');
+      mountComponent();
+
+      expect(wrapper.classes()).toEqual(['ide-status-bar']);
     });
 
     describe('commitAgeUpdate', () => {
       beforeEach(() => {
-        jest.spyOn(vm, 'commitAgeUpdate').mockImplementation(() => {});
+        mountComponent();
+        jest.spyOn(wrapper.vm, 'commitAgeUpdate').mockImplementation(() => {});
       });
 
       afterEach(() => {
@@ -56,70 +62,82 @@ describe('ideStatusBar', () => {
       });
 
       it('gets called every second', () => {
-        expect(vm.commitAgeUpdate).not.toHaveBeenCalled();
+        expect(wrapper.vm.commitAgeUpdate).not.toHaveBeenCalled();
 
         jest.advanceTimersByTime(1000);
 
-        expect(vm.commitAgeUpdate.mock.calls.length).toEqual(1);
+        expect(wrapper.vm.commitAgeUpdate.mock.calls).toHaveLength(1);
 
         jest.advanceTimersByTime(1000);
 
-        expect(vm.commitAgeUpdate.mock.calls.length).toEqual(2);
+        expect(wrapper.vm.commitAgeUpdate.mock.calls).toHaveLength(2);
       });
     });
 
     describe('getCommitPath', () => {
       it('returns the path to the commit details', () => {
-        expect(vm.getCommitPath('abc123de')).toBe('/commit/abc123de');
+        mountComponent();
+
+        expect(wrapper.vm.getCommitPath('abc123de')).toBe('/commit/abc123de');
       });
     });
 
     describe('pipeline status', () => {
-      it('opens right sidebar on clicking icon', async () => {
-        jest.spyOn(vm, 'openRightPane').mockImplementation(() => {});
-        Vue.set(vm.$store.state.pipelines, 'latestPipeline', {
-          details: {
-            status: {
-              text: 'success',
-              details_path: 'test',
-              icon: 'status_success',
+      it('opens right sidebar on clicking icon', () => {
+        const pipelines = {
+          latestPipeline: {
+            details: {
+              status: {
+                text: 'success',
+                details_path: 'test',
+                icon: 'status_success',
+              },
+            },
+            commit: {
+              author_gravatar_url: 'www',
             },
           },
-          commit: {
-            author_gravatar_url: 'www',
-          },
-        });
+        };
+        mountComponent({ pipelines });
+        jest.spyOn(wrapper.vm, 'openRightPane').mockImplementation(() => {});
 
-        await nextTick();
-        vm.$el.querySelector('.ide-status-pipeline button').click();
+        wrapper.find('button').trigger('click');
 
-        expect(vm.openRightPane).toHaveBeenCalledWith(rightSidebarViews.pipelines);
+        expect(wrapper.vm.openRightPane).toHaveBeenCalledWith(rightSidebarViews.pipelines);
       });
     });
 
     it('does not show merge request status', () => {
-      expect(findMRStatus()).toBe(null);
+      mountComponent();
+
+      expect(findMRStatus().exists()).toBe(false);
     });
   });
 
   describe('with merge request in store', () => {
     beforeEach(() => {
-      store.state.projects[TEST_PROJECT_ID].mergeRequests = {
-        [TEST_MERGE_REQUEST_ID]: {
-          web_url: TEST_MERGE_REQUEST_URL,
-          references: {
-            short: `!${TEST_MERGE_REQUEST_ID}`,
+      const state = {
+        currentMergeRequestId: TEST_MERGE_REQUEST_ID,
+        projects: {
+          [TEST_PROJECT_ID]: {
+            ..._.clone(projectData),
+            mergeRequests: {
+              [TEST_MERGE_REQUEST_ID]: {
+                web_url: TEST_MERGE_REQUEST_URL,
+                references: {
+                  short: `!${TEST_MERGE_REQUEST_ID}`,
+                },
+              },
+            },
           },
         },
       };
-      store.state.currentMergeRequestId = TEST_MERGE_REQUEST_ID;
-
-      createComponent();
+      mountComponent(state);
     });
 
     it('shows merge request status', () => {
-      expect(findMRStatus().textContent.trim()).toEqual(`Merge request !${TEST_MERGE_REQUEST_ID}`);
-      expect(findMRStatus().querySelector('a').href).toEqual(TEST_MERGE_REQUEST_URL);
+      expect(findMRStatus().text()).toBe(`Merge request !${TEST_MERGE_REQUEST_ID}`);
+      expect(findMRStatus().find('a').attributes('href')).toBe(TEST_MERGE_REQUEST_URL);
     });
   });
 });
diff --git a/spec/frontend/ide/components/new_dropdown/index_spec.js b/spec/frontend/ide/components/new_dropdown/index_spec.js
index 19dcd9569b3..747c099db33 100644
--- a/spec/frontend/ide/components/new_dropdown/index_spec.js
+++ b/spec/frontend/ide/components/new_dropdown/index_spec.js
@@ -1,70 +1,66 @@
-import Vue, { nextTick } from 'vue';
-import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
-import newDropdown from '~/ide/components/new_dropdown/index.vue';
+import { mount } from '@vue/test-utils';
+import NewDropdown from '~/ide/components/new_dropdown/index.vue';
+import Button from '~/ide/components/new_dropdown/button.vue';
 import { createStore } from '~/ide/stores';
 
 describe('new dropdown component', () => {
-  let store;
-  let vm;
-
-  beforeEach(() => {
-    store = createStore();
-
-    const component = Vue.extend(newDropdown);
-
-    vm = createComponentWithStore(component, store, {
-      branch: 'main',
-      path: '',
-      mouseOver: false,
-      type: 'tree',
+  let wrapper;
+
+  const findAllButtons = () => wrapper.findAllComponents(Button);
+
+  const mountComponent = () => {
+    const store = createStore();
+    store.state.currentProjectId = 'abcproject';
+    store.state.path = '';
+    store.state.trees['abcproject/mybranch'] = { tree: [] };
+
+    wrapper = mount(NewDropdown, {
+      store,
+      propsData: {
+        branch: 'main',
+        path: '',
+        mouseOver: false,
+        type: 'tree',
+      },
     });
+  };
 
-    vm.$store.state.currentProjectId = 'abcproject';
-    vm.$store.state.path = '';
-    vm.$store.state.trees['abcproject/mybranch'] = {
-      tree: [],
-    };
-
-    vm.$mount();
-
-    jest.spyOn(vm.$refs.newModal, 'open').mockImplementation(() => {});
+  beforeEach(() => {
+    mountComponent();
+    jest.spyOn(wrapper.vm.$refs.newModal, 'open').mockImplementation(() => {});
   });
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
   it('renders new file, upload and new directory links', () => {
-    const buttons = vm.$el.querySelectorAll('.dropdown-menu button');
-
-    expect(buttons[0].textContent.trim()).toBe('New file');
-    expect(buttons[1].textContent.trim()).toBe('Upload file');
-    expect(buttons[2].textContent.trim()).toBe('New directory');
+    expect(findAllButtons().at(0).text()).toBe('New file');
+    expect(findAllButtons().at(1).text()).toBe('Upload file');
+    expect(findAllButtons().at(2).text()).toBe('New directory');
   });
 
   describe('createNewItem', () => {
     it('opens modal for a blob when new file is clicked', () => {
-      vm.$el.querySelectorAll('.dropdown-menu button')[0].click();
+      findAllButtons().at(0).trigger('click');
 
-      expect(vm.$refs.newModal.open).toHaveBeenCalledWith('blob', '');
+      expect(wrapper.vm.$refs.newModal.open).toHaveBeenCalledWith('blob', '');
     });
 
     it('opens modal for a tree when new directory is clicked', () => {
-      vm.$el.querySelectorAll('.dropdown-menu button')[2].click();
+      findAllButtons().at(2).trigger('click');
 
-      expect(vm.$refs.newModal.open).toHaveBeenCalledWith('tree', '');
+      expect(wrapper.vm.$refs.newModal.open).toHaveBeenCalledWith('tree', '');
     });
   });
 
   describe('isOpen', () => {
     it('scrolls dropdown into view', async () => {
-      jest.spyOn(vm.$refs.dropdownMenu, 'scrollIntoView').mockImplementation(() => {});
-
-      vm.isOpen = true;
+      jest.spyOn(wrapper.vm.$refs.dropdownMenu, 'scrollIntoView').mockImplementation(() => {});
 
-      await nextTick();
+      await wrapper.setProps({ isOpen: true });
 
-      expect(vm.$refs.dropdownMenu.scrollIntoView).toHaveBeenCalledWith({
+      expect(wrapper.vm.$refs.dropdownMenu.scrollIntoView).toHaveBeenCalledWith({
         block: 'nearest',
       });
     });
@@ -72,11 +68,11 @@ describe('new dropdown component', () => {
 
   describe('delete entry', () => {
     it('calls delete action', () => {
-      jest.spyOn(vm, 'deleteEntry').mockImplementation(() => {});
+      jest.spyOn(wrapper.vm, 'deleteEntry').mockImplementation(() => {});
 
-      vm.$el.querySelectorAll('.dropdown-menu button')[4].click();
+      findAllButtons().at(4).trigger('click');
 
-      expect(vm.deleteEntry).toHaveBeenCalledWith('');
+      expect(wrapper.vm.deleteEntry).toHaveBeenCalledWith('');
     });
   });
 });
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
index 9faa5e1567c..036d2effc0f 100644
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
@@ -482,12 +482,6 @@ RSpec.describe WebHook do
 
         expect(hook).not_to be_temporarily_disabled
       end
-
-      it 'can ignore the feature flag' do
-        stub_feature_flags(web_hooks_disable_failed: false)
-
-        expect(hook).to be_temporarily_disabled(ignore_flag: true)
-      end
     end
   end
 
@@ -510,12 +504,6 @@ RSpec.describe WebHook do
 
         expect(hook).not_to be_permanently_disabled
       end
-
-      it 'can ignore the feature flag' do
-        stub_feature_flags(web_hooks_disable_failed: false)
-
-        expect(hook).to be_permanently_disabled(ignore_flag: true)
-      end
     end
   end
 
diff --git a/spec/services/web_hooks/log_execution_service_spec.rb b/spec/services/web_hooks/log_execution_service_spec.rb
index 873f6adc8dc..1967a8368fb 100644
--- a/spec/services/web_hooks/log_execution_service_spec.rb
+++ b/spec/services/web_hooks/log_execution_service_spec.rb
@@ -101,27 +101,6 @@ RSpec.describe WebHooks::LogExecutionService do
         it 'resets the failure count' do
           expect { service.execute }.to change(project_hook, :recent_failures).to(0)
         end
-
-        it 'sends a message to AuthLogger if the hook as not previously enabled' do
-          project_hook.update!(recent_failures: ::WebHook::FAILURE_THRESHOLD + 1)
-
-          expect(Gitlab::AuthLogger).to receive(:info).with include(
-            message: 'WebHook change active_state',
-            # identification
-            hook_id: project_hook.id,
-            hook_type: project_hook.type,
-            project_id: project_hook.project_id,
-            group_id: nil,
-            # relevant data
-            prev_state: :permanently_disabled,
-            new_state: :enabled,
-            duration: 1.2,
-            response_status: '200',
-            recent_hook_failures: 0
-          )
-
-          service.execute
-        end
       end
     end
 
@@ -158,27 +137,6 @@ RSpec.describe WebHooks::LogExecutionService do
           expect { service.execute }.not_to change(project_hook, :recent_failures)
         end
       end
-
-      it 'sends a message to AuthLogger if the state would change' do
-        project_hook.update!(recent_failures: ::WebHook::FAILURE_THRESHOLD)
-
-        expect(Gitlab::AuthLogger).to receive(:info).with include(
-          message: 'WebHook change active_state',
-          # identification
-          hook_id: project_hook.id,
-          hook_type: project_hook.type,
-          project_id: project_hook.project_id,
-          group_id: nil,
-          # relevant data
-          prev_state: :enabled,
-          new_state: :permanently_disabled,
-          duration: (be > 0),
-          response_status: data[:response_status],
-          recent_hook_failures: ::WebHook::FAILURE_THRESHOLD + 1
-        )
-
-        service.execute
-      end
     end
 
     context 'when response_category is :error' do
@@ -200,25 +158,6 @@ RSpec.describe WebHooks::LogExecutionService do
         expect { service.execute }.to change(project_hook, :backoff_count).by(1)
       end
 
-      it 'sends a message to AuthLogger if the state would change' do
-        expect(Gitlab::AuthLogger).to receive(:info).with include(
-          message: 'WebHook change active_state',
-          # identification
-          hook_id: project_hook.id,
-          hook_type: project_hook.type,
-          project_id: project_hook.project_id,
-          group_id: nil,
-          # relevant data
-          prev_state: :enabled,
-          new_state: :temporarily_disabled,
-          duration: (be > 0),
-          response_status: data[:response_status],
-          recent_hook_failures: 0
-        )
-
-        service.execute
-      end
-
       context 'when the previous cool-off was near the maximum' do
         before do
           project_hook.update!(disabled_until: 5.minutes.ago, backoff_count: 8)