Add latest changes from gitlab-org/gitlab@master

24 files changed, 267 insertions, 678 deletions

diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 7f330681a82..fb86f4672bc 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -265,7 +265,6 @@ FactoryBot.define do
 
     trait :remote_mirror do
       transient do
-        remote_name { "remote_mirror_#{SecureRandom.hex}" }
         url { "http://foo.com" }
         enabled { true }
       end
diff --git a/spec/features/clusters/cluster_health_dashboard_spec.rb b/spec/features/clusters/cluster_health_dashboard_spec.rb
index 20c07f4d6ac..32caad775e4 100644
--- a/spec/features/clusters/cluster_health_dashboard_spec.rb
+++ b/spec/features/clusters/cluster_health_dashboard_spec.rb
@@ -63,21 +63,33 @@ RSpec.describe 'Cluster Health board', :js, :kubeclient, :use_clean_rails_memory
     context 'connected, prometheus returns data' do
       before do
         stub_connected
-      end
 
-      it 'renders charts' do
         visit cluster_path
 
         click_link 'Health'
 
         wait_for_requests
+      end
 
+      it 'renders charts' do
         expect(page).to have_css('.prometheus-graphs')
         expect(page).to have_css('.prometheus-graph')
         expect(page).to have_css('.prometheus-graph-title')
         expect(page).to have_css('[_echarts_instance_]')
+        expect(page).to have_css('.prometheus-graph', count: 2)
         expect(page).to have_content('Avg')
       end
+
+      it 'focuses the single panel on toggle' do
+        click_button('More actions')
+        click_button('Expand panel')
+
+        expect(page).to have_css('.prometheus-graph', count: 1)
+
+        click_button('Collapse panel')
+
+        expect(page).to have_css('.prometheus-graph', count: 2)
+      end
     end
 
     def stub_empty_response
diff --git a/spec/frontend/content_editor/extensions/code_block_highlight_spec.js b/spec/frontend/content_editor/extensions/code_block_highlight_spec.js
index 79e55db30cd..188e6580dc6 100644
--- a/spec/frontend/content_editor/extensions/code_block_highlight_spec.js
+++ b/spec/frontend/content_editor/extensions/code_block_highlight_spec.js
@@ -25,7 +25,6 @@ describe('content_editor/extensions/code_block_highlight', () => {
 
     expect(tiptapEditor.getJSON().content[0].attrs).toMatchObject({
       language,
-      params: language,
     });
   });
 
diff --git a/spec/frontend/tracking_spec.js b/spec/frontend/tracking_spec.js
index 13498cfb823..a17efdd61a9 100644
--- a/spec/frontend/tracking_spec.js
+++ b/spec/frontend/tracking_spec.js
@@ -387,11 +387,13 @@ describe('Tracking', () => {
     beforeEach(() => {
       eventSpy = jest.spyOn(Tracking, 'event');
       setHTMLFixture(`
-        <input data-track-${term}="render" data-track-label="label1" value=1 data-track-property="_property_"/>
-        <span data-track-${term}="render" data-track-label="label2" data-track-value=1>
-          Something
-        </span>
-        <input data-track-${term}="_render_bogus_" data-track-label="label3" value="_value_" data-track-property="_property_"/>
+        <div data-track-${term}="click_link" data-track-label="all_nested_links">
+          <input data-track-${term}="render" data-track-label="label1" value=1 data-track-property="_property_"/>
+          <span data-track-${term}="render" data-track-label="label2" data-track-value=1>
+            <a href="#" id="link">Something</a>
+          </span>
+          <input data-track-${term}="_render_bogus_" data-track-label="label3" value="_value_" data-track-property="_property_"/>
+        </div>
       `);
       Tracking.trackLoadEvents('_category_'); // only happens once
     });
@@ -417,6 +419,35 @@ describe('Tracking', () => {
         ],
       ]);
     });
+
+    describe.each`
+      event                 | actionSuffix
+      ${'click'}            | ${''}
+      ${'show.bs.dropdown'} | ${'_show'}
+      ${'hide.bs.dropdown'} | ${'_hide'}
+    `(`auto-tracking $event events on nested elements`, ({ event, actionSuffix }) => {
+      let link;
+
+      beforeEach(() => {
+        link = document.querySelector('#link');
+        eventSpy.mockClear();
+      });
+
+      it(`avoids using ancestor [data-track-${term}="render"] tracking configurations`, () => {
+        link.dispatchEvent(new Event(event, { bubbles: true }));
+
+        expect(eventSpy).not.toHaveBeenCalledWith(
+          '_category_',
+          `render${actionSuffix}`,
+          expect.any(Object),
+        );
+        expect(eventSpy).toHaveBeenCalledWith(
+          '_category_',
+          `click_link${actionSuffix}`,
+          expect.objectContaining({ label: 'all_nested_links' }),
+        );
+      });
+    });
   });
 
   describe('tracking mixin', () => {
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view_spec.js
index 46a11bc28d8..90bc1980ac3 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_create_view_spec.js
@@ -1,6 +1,6 @@
 import { GlLoadingIcon, GlLink } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import Vue, { nextTick } from 'vue';
+import { nextTick } from 'vue';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -14,7 +14,7 @@ jest.mock('~/flash');
 const colors = Object.keys(mockSuggestedColors);
 
 const localVue = createLocalVue();
-Vue.use(VueApollo);
+localVue.use(VueApollo);
 
 const userRecoverableError = {
   ...createLabelSuccessfulResponse,
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_labels_view_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_labels_view_spec.js
index 51301387c99..8bd944a3d54 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_labels_view_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_labels_view_spec.js
@@ -1,357 +1,213 @@
-import { GlIntersectionObserver, GlLoadingIcon, GlSearchBoxByType, GlLink } from '@gitlab/ui';
+import { GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import Vuex from 'vuex';
-import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes';
+import { nextTick } from 'vue';
+import VueApollo from 'vue-apollo';
+import createMockApollo from 'helpers/mock_apollo_helper';
+import waitForPromises from 'helpers/wait_for_promises';
+import createFlash from '~/flash';
+import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
+import { DropdownVariant } from '~/vue_shared/components/sidebar/labels_select_widget/constants';
 import DropdownContentsLabelsView from '~/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_labels_view.vue';
+import projectLabelsQuery from '~/vue_shared/components/sidebar/labels_select_widget/graphql/project_labels.query.graphql';
 import LabelItem from '~/vue_shared/components/sidebar/labels_select_widget/label_item.vue';
+import { mockConfig, labelsQueryResponse } from './mock_data';
 
-import * as actions from '~/vue_shared/components/sidebar/labels_select_widget/store/actions';
-import * as getters from '~/vue_shared/components/sidebar/labels_select_widget/store/getters';
-import mutations from '~/vue_shared/components/sidebar/labels_select_widget/store/mutations';
-import defaultState from '~/vue_shared/components/sidebar/labels_select_widget/store/state';
-
-import { mockConfig, mockLabels, mockRegularLabel } from './mock_data';
+jest.mock('~/flash');
 
 const localVue = createLocalVue();
-localVue.use(Vuex);
+localVue.use(VueApollo);
+
+const selectedLabels = [
+  {
+    id: 28,
+    title: 'Bug',
+    description: 'Label for bugs',
+    color: '#FF0000',
+    textColor: '#FFFFFF',
+  },
+];
 
 describe('DropdownContentsLabelsView', () => {
   let wrapper;
 
-  const createComponent = (initialState = mockConfig) => {
-    const store = new Vuex.Store({
-      getters,
-      mutations,
-      state: {
-        ...defaultState(),
-        footerCreateLabelTitle: 'Create label',
-        footerManageLabelTitle: 'Manage labels',
-      },
-      actions: {
-        ...actions,
-        fetchLabels: jest.fn(),
-      },
-    });
+  const successfulQueryHandler = jest.fn().mockResolvedValue(labelsQueryResponse);
 
-    store.dispatch('setInitialState', initialState);
-    store.dispatch('receiveLabelsSuccess', mockLabels);
+  const createComponent = ({
+    initialState = mockConfig,
+    queryHandler = successfulQueryHandler,
+    injected = {},
+  } = {}) => {
+    const mockApollo = createMockApollo([[projectLabelsQuery, queryHandler]]);
 
     wrapper = shallowMount(DropdownContentsLabelsView, {
       localVue,
-      store,
+      apolloProvider: mockApollo,
+      provide: {
+        projectPath: 'test',
+        iid: 1,
+        allowLabelCreate: true,
+        labelsManagePath: '/gitlab-org/my-project/-/labels',
+        variant: DropdownVariant.Sidebar,
+        ...injected,
+      },
+      propsData: {
+        ...initialState,
+        selectedLabels,
+      },
+      stubs: {
+        GlSearchBoxByType,
+      },
     });
   };
 
-  beforeEach(() => {
-    createComponent();
-  });
-
   afterEach(() => {
     wrapper.destroy();
-    wrapper = null;
   });
 
-  const findDropdownContent = () => wrapper.find('[data-testid="dropdown-content"]');
+  const findSearchInput = () => wrapper.findComponent(GlSearchBoxByType);
+  const findLabels = () => wrapper.findAllComponents(LabelItem);
+  const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
+
+  const findLabelsList = () => wrapper.find('[data-testid="labels-list"]');
+  const findDropdownWrapper = () => wrapper.find('[data-testid="dropdown-wrapper"]');
   const findDropdownFooter = () => wrapper.find('[data-testid="dropdown-footer"]');
-  const findLoadingIcon = () => wrapper.find(GlLoadingIcon);
-
-  describe('computed', () => {
-    describe('visibleLabels', () => {
-      it('returns matching labels filtered with `searchKey`', () => {
-        wrapper.setData({
-          searchKey: 'bug',
-        });
-
-        expect(wrapper.vm.visibleLabels.length).toBe(1);
-        expect(wrapper.vm.visibleLabels[0].title).toBe('Bug');
-      });
-
-      it('returns matching labels with fuzzy filtering', () => {
-        wrapper.setData({
-          searchKey: 'bg',
-        });
-
-        expect(wrapper.vm.visibleLabels.length).toBe(2);
-        expect(wrapper.vm.visibleLabels[0].title).toBe('Bug');
-        expect(wrapper.vm.visibleLabels[1].title).toBe('Boog');
-      });
-
-      it('returns all labels when `searchKey` is empty', () => {
-        wrapper.setData({
-          searchKey: '',
-        });
-
-        expect(wrapper.vm.visibleLabels.length).toBe(mockLabels.length);
-      });
-    });
+  const findNoResultsMessage = () => wrapper.find('[data-testid="no-results"]');
+  const findCreateLabelButton = () => wrapper.find('[data-testid="create-label-button"]');
 
-    describe('showNoMatchingResultsMessage', () => {
-      it.each`
-        searchKey | labels        | labelsDescription | returnValue
-        ${''}     | ${[]}         | ${'empty'}        | ${false}
-        ${'bug'}  | ${[]}         | ${'empty'}        | ${true}
-        ${''}     | ${mockLabels} | ${'not empty'}    | ${false}
-        ${'bug'}  | ${mockLabels} | ${'not empty'}    | ${false}
-      `(
-        'returns $returnValue when searchKey is "$searchKey" and visibleLabels is $labelsDescription',
-        async ({ searchKey, labels, returnValue }) => {
-          wrapper.setData({
-            searchKey,
-          });
-
-          wrapper.vm.$store.dispatch('receiveLabelsSuccess', labels);
-
-          await wrapper.vm.$nextTick();
-
-          expect(wrapper.vm.showNoMatchingResultsMessage).toBe(returnValue);
-        },
-      );
+  describe('when loading labels', () => {
+    it('renders disabled search input field', async () => {
+      createComponent();
+      expect(findSearchInput().props('disabled')).toBe(true);
     });
-  });
-
-  describe('methods', () => {
-    describe('isLabelSelected', () => {
-      it('returns true when provided `label` param is one of the selected labels', () => {
-        expect(wrapper.vm.isLabelSelected(mockRegularLabel)).toBe(true);
-      });
 
-      it('returns false when provided `label` param is not one of the selected labels', () => {
-        expect(wrapper.vm.isLabelSelected(mockLabels[2])).toBe(false);
-      });
+    it('renders loading icon', async () => {
+      createComponent();
+      expect(findLoadingIcon().exists()).toBe(true);
     });
 
-    describe('handleComponentAppear', () => {
-      it('calls `focusInput` on searchInput field', async () => {
-        wrapper.vm.$refs.searchInput.focusInput = jest.fn();
-
-        await wrapper.vm.handleComponentAppear();
-
-        expect(wrapper.vm.$refs.searchInput.focusInput).toHaveBeenCalled();
-      });
+    it('does not render labels list', async () => {
+      createComponent();
+      expect(findLabelsList().exists()).toBe(false);
     });
+  });
 
-    describe('handleComponentDisappear', () => {
-      it('calls action `receiveLabelsSuccess` with empty array', () => {
-        jest.spyOn(wrapper.vm, 'receiveLabelsSuccess');
-
-        wrapper.vm.handleComponentDisappear();
-
-        expect(wrapper.vm.receiveLabelsSuccess).toHaveBeenCalledWith([]);
-      });
+  describe('when labels are loaded', () => {
+    beforeEach(async () => {
+      createComponent();
+      await waitForPromises();
     });
 
-    describe('handleCreateLabelClick', () => {
-      it('calls actions `receiveLabelsSuccess` with empty array and `toggleDropdownContentsCreateView`', () => {
-        jest.spyOn(wrapper.vm, 'receiveLabelsSuccess');
-        jest.spyOn(wrapper.vm, 'toggleDropdownContentsCreateView');
-
-        wrapper.vm.handleCreateLabelClick();
-
-        expect(wrapper.vm.receiveLabelsSuccess).toHaveBeenCalledWith([]);
-        expect(wrapper.vm.toggleDropdownContentsCreateView).toHaveBeenCalled();
-      });
+    it('renders enabled search input field', async () => {
+      expect(findSearchInput().props('disabled')).toBe(false);
     });
 
-    describe('handleKeyDown', () => {
-      it('decreases `currentHighlightItem` value by 1 when Up arrow key is pressed', () => {
-        wrapper.setData({
-          currentHighlightItem: 1,
-        });
-
-        wrapper.vm.handleKeyDown({
-          keyCode: UP_KEY_CODE,
-        });
-
-        expect(wrapper.vm.currentHighlightItem).toBe(0);
-      });
-
-      it('increases `currentHighlightItem` value by 1 when Down arrow key is pressed', () => {
-        wrapper.setData({
-          currentHighlightItem: 1,
-        });
-
-        wrapper.vm.handleKeyDown({
-          keyCode: DOWN_KEY_CODE,
-        });
-
-        expect(wrapper.vm.currentHighlightItem).toBe(2);
-      });
-
-      it('resets the search text when the Enter key is pressed', () => {
-        wrapper.setData({
-          currentHighlightItem: 1,
-          searchKey: 'bug',
-        });
-
-        wrapper.vm.handleKeyDown({
-          keyCode: ENTER_KEY_CODE,
-        });
-
-        expect(wrapper.vm.searchKey).toBe('');
-      });
-
-      it('calls action `updateSelectedLabels` with currently highlighted label when Enter key is pressed', () => {
-        jest.spyOn(wrapper.vm, 'updateSelectedLabels').mockImplementation();
-        wrapper.setData({
-          currentHighlightItem: 1,
-        });
-
-        wrapper.vm.handleKeyDown({
-          keyCode: ENTER_KEY_CODE,
-        });
-
-        expect(wrapper.vm.updateSelectedLabels).toHaveBeenCalledWith([
-          {
-            ...mockLabels[1],
-            set: true,
-          },
-        ]);
-      });
-
-      it('calls action `toggleDropdownContents` when Esc key is pressed', () => {
-        jest.spyOn(wrapper.vm, 'toggleDropdownContents').mockImplementation();
-        wrapper.setData({
-          currentHighlightItem: 1,
-        });
-
-        wrapper.vm.handleKeyDown({
-          keyCode: ESC_KEY_CODE,
-        });
-
-        expect(wrapper.vm.toggleDropdownContents).toHaveBeenCalled();
-      });
-
-      it('calls action `scrollIntoViewIfNeeded` in next tick when any key is pressed', () => {
-        jest.spyOn(wrapper.vm, 'scrollIntoViewIfNeeded').mockImplementation();
-        wrapper.setData({
-          currentHighlightItem: 1,
-        });
-
-        wrapper.vm.handleKeyDown({
-          keyCode: DOWN_KEY_CODE,
-        });
-
-        return wrapper.vm.$nextTick(() => {
-          expect(wrapper.vm.scrollIntoViewIfNeeded).toHaveBeenCalled();
-        });
-      });
+    it('does not render loading icon', async () => {
+      expect(findLoadingIcon().exists()).toBe(false);
     });
 
-    describe('handleLabelClick', () => {
-      beforeEach(() => {
-        jest.spyOn(wrapper.vm, 'updateSelectedLabels').mockImplementation();
-      });
-
-      it('calls action `updateSelectedLabels` with provided `label` param', () => {
-        wrapper.vm.handleLabelClick(mockRegularLabel);
-
-        expect(wrapper.vm.updateSelectedLabels).toHaveBeenCalledWith([mockRegularLabel]);
-      });
+    it('renders labels list', async () => {
+      expect(findLabelsList().exists()).toBe(true);
+      expect(findLabels()).toHaveLength(2);
+    });
 
-      it('calls action `toggleDropdownContents` when `state.allowMultiselect` is false', () => {
-        jest.spyOn(wrapper.vm, 'toggleDropdownContents');
-        wrapper.vm.$store.state.allowMultiselect = false;
+    it('changes highlighted label correctly on pressing down button', async () => {
+      expect(findLabels().at(0).attributes('highlight')).toBeUndefined();
 
-        wrapper.vm.handleLabelClick(mockRegularLabel);
+      await findDropdownWrapper().trigger('keydown.down');
+      expect(findLabels().at(0).attributes('highlight')).toBe('true');
 
-        expect(wrapper.vm.toggleDropdownContents).toHaveBeenCalled();
-      });
+      await findDropdownWrapper().trigger('keydown.down');
+      expect(findLabels().at(1).attributes('highlight')).toBe('true');
+      expect(findLabels().at(0).attributes('highlight')).toBeUndefined();
     });
-  });
 
-  describe('template', () => {
-    it('renders gl-intersection-observer as component root', () => {
-      expect(wrapper.find(GlIntersectionObserver).exists()).toBe(true);
-    });
+    it('changes highlighted label correctly on pressing up button', async () => {
+      await findDropdownWrapper().trigger('keydown.down');
+      await findDropdownWrapper().trigger('keydown.down');
+      expect(findLabels().at(1).attributes('highlight')).toBe('true');
 
-    it('renders gl-loading-icon component when `labelsFetchInProgress` prop is true', () => {
-      wrapper.vm.$store.dispatch('requestLabels');
+      await findDropdownWrapper().trigger('keydown.up');
+      expect(findLabels().at(0).attributes('highlight')).toBe('true');
+    });
 
-      return wrapper.vm.$nextTick(() => {
-        const loadingIconEl = findLoadingIcon();
+    it('changes label selected state when Enter is pressed', async () => {
+      expect(findLabels().at(0).attributes('islabelset')).toBeUndefined();
+      await findDropdownWrapper().trigger('keydown.down');
+      await findDropdownWrapper().trigger('keydown.enter');
 
-        expect(loadingIconEl.exists()).toBe(true);
-        expect(loadingIconEl.attributes('class')).toContain('labels-fetch-loading');
-      });
+      expect(findLabels().at(0).attributes('islabelset')).toBe('true');
     });
 
-    it('renders label search input element', () => {
-      const searchInputEl = wrapper.find(GlSearchBoxByType);
+    it('emits `closeDropdown event` when Esc button is pressed', () => {
+      findDropdownWrapper().trigger('keydown.esc');
 
-      expect(searchInputEl.exists()).toBe(true);
+      expect(wrapper.emitted('closeDropdown')).toEqual([[selectedLabels]]);
     });
+  });
 
-    it('renders label elements for all labels', () => {
-      expect(wrapper.findAll(LabelItem)).toHaveLength(mockLabels.length);
+  it('when search returns 0 results', async () => {
+    createComponent({
+      queryHandler: jest.fn().mockResolvedValue({
+        data: {
+          workspace: {
+            labels: {
+              nodes: [],
+            },
+          },
+        },
+      }),
     });
+    findSearchInput().vm.$emit('input', '123');
+    await waitForPromises();
+    await nextTick();
 
-    it('renders label element with `highlight` set to true when value of `currentHighlightItem` is more than -1', () => {
-      wrapper.setData({
-        currentHighlightItem: 0,
-      });
+    expect(findNoResultsMessage().isVisible()).toBe(true);
+  });
 
-      return wrapper.vm.$nextTick(() => {
-        const labelItemEl = findDropdownContent().find(LabelItem);
+  it('calls `createFlash` when fetching labels failed', async () => {
+    createComponent({ queryHandler: jest.fn().mockRejectedValue('Houston, we have a problem!') });
+    jest.advanceTimersByTime(DEFAULT_DEBOUNCE_AND_THROTTLE_MS);
+    await waitForPromises();
+    expect(createFlash).toHaveBeenCalled();
+  });
 
-        expect(labelItemEl.attributes('highlight')).toBe('true');
-      });
-    });
+  it('does not render footer on standalone dropdown', () => {
+    createComponent({ injected: { variant: DropdownVariant.Standalone } });
 
-    it('renders element containing "No matching results" when `searchKey` does not match with any label', () => {
-      wrapper.setData({
-        searchKey: 'abc',
-      });
+    expect(findDropdownFooter().exists()).toBe(false);
+  });
 
-      return wrapper.vm.$nextTick(() => {
-        const noMatchEl = findDropdownContent().find('li');
+  it('renders footer on sidebar dropdown', () => {
+    createComponent();
 
-        expect(noMatchEl.isVisible()).toBe(true);
-        expect(noMatchEl.text()).toContain('No matching results');
-      });
-    });
+    expect(findDropdownFooter().exists()).toBe(true);
+  });
 
-    it('renders empty content while loading', () => {
-      wrapper.vm.$store.state.labelsFetchInProgress = true;
+  it('renders footer on embedded dropdown', () => {
+    createComponent({ injected: { variant: DropdownVariant.Embedded } });
 
-      return wrapper.vm.$nextTick(() => {
-        const dropdownContent = findDropdownContent();
-        const loadingIcon = findLoadingIcon();
+    expect(findDropdownFooter().exists()).toBe(true);
+  });
 
-        expect(dropdownContent.exists()).toBe(true);
-        expect(dropdownContent.isVisible()).toBe(true);
-        expect(loadingIcon.exists()).toBe(true);
-        expect(loadingIcon.isVisible()).toBe(true);
-      });
-    });
+  it('does not render create label button if `allowLabelCreate` is false', () => {
+    createComponent({ injected: { allowLabelCreate: false } });
 
-    it('renders footer list items', () => {
-      const footerLinks = findDropdownFooter().findAll(GlLink);
-      const createLabelLink = footerLinks.at(0);
-      const manageLabelsLink = footerLinks.at(1);
+    expect(findCreateLabelButton().exists()).toBe(false);
+  });
 
-      expect(createLabelLink.exists()).toBe(true);
-      expect(createLabelLink.text()).toBe('Create label');
-      expect(manageLabelsLink.exists()).toBe(true);
-      expect(manageLabelsLink.text()).toBe('Manage labels');
+  describe('when `allowLabelCreate` is true', () => {
+    beforeEach(() => {
+      createComponent();
     });
 
-    it('does not render "Create label" footer link when `state.allowLabelCreate` is `false`', () => {
-      wrapper.vm.$store.state.allowLabelCreate = false;
-
-      return wrapper.vm.$nextTick(() => {
-        const createLabelLink = findDropdownFooter().findAll(GlLink).at(0);
-
-        expect(createLabelLink.text()).not.toBe('Create label');
-      });
+    it('renders create label button', () => {
+      expect(findCreateLabelButton().exists()).toBe(true);
     });
 
-    it('does not render footer list items when `state.variant` is "standalone"', () => {
-      createComponent({ ...mockConfig, variant: 'standalone' });
-      expect(findDropdownFooter().exists()).toBe(false);
-    });
+    it('emits `toggleDropdownContentsCreateView` event on create label button click', () => {
+      findCreateLabelButton().vm.$emit('click');
 
-    it('renders footer list items when `state.variant` is "embedded"', () => {
-      expect(findDropdownFooter().exists()).toBe(true);
+      expect(wrapper.emitted('toggleDropdownContentsCreateView')).toEqual([[]]);
     });
   });
 });
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_spec.js
index 8273bbdf7a7..3c2fd0c5acc 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/dropdown_contents_spec.js
@@ -5,7 +5,7 @@ import { DropdownVariant } from '~/vue_shared/components/sidebar/labels_select_w
 import DropdownContents from '~/vue_shared/components/sidebar/labels_select_widget/dropdown_contents.vue';
 import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_widget/store';
 
-import { mockConfig } from './mock_data';
+import { mockConfig, mockLabels } from './mock_data';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -19,6 +19,11 @@ const createComponent = (initialState = mockConfig, defaultProps = {}) => {
     propsData: {
       ...defaultProps,
       labelsCreateTitle: 'test',
+      selectedLabels: mockLabels,
+      allowMultiselect: true,
+      labelsListTitle: 'Assign labels',
+      footerCreateLabelTitle: 'create',
+      footerManageLabelTitle: 'manage',
     },
     localVue,
     store,
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/labels_select_root_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/labels_select_root_spec.js
index 66971446f47..e17dfd93efc 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/labels_select_root_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/labels_select_root_spec.js
@@ -50,58 +50,6 @@ describe('LabelsSelectRoot', () => {
   });
 
   describe('methods', () => {
-    describe('handleVuexActionDispatch', () => {
-      it('calls `handleDropdownClose` when params `action.type` is `toggleDropdownContents` and state has `showDropdownButton` & `showDropdownContents` props `false`', () => {
-        createComponent();
-        jest.spyOn(wrapper.vm, 'handleDropdownClose').mockImplementation();
-
-        wrapper.vm.handleVuexActionDispatch(
-          { type: 'toggleDropdownContents' },
-          {
-            showDropdownButton: false,
-            showDropdownContents: false,
-            labels: [{ id: 1 }, { id: 2, touched: true }],
-          },
-        );
-
-        expect(wrapper.vm.handleDropdownClose).toHaveBeenCalledWith(
-          expect.arrayContaining([
-            {
-              id: 2,
-              touched: true,
-            },
-          ]),
-        );
-      });
-
-      it('calls `handleDropdownClose` with state.labels filterd using `set` prop when dropdown variant is `embedded`', () => {
-        createComponent({
-          ...mockConfig,
-          variant: 'embedded',
-        });
-
-        jest.spyOn(wrapper.vm, 'handleDropdownClose').mockImplementation();
-
-        wrapper.vm.handleVuexActionDispatch(
-          { type: 'toggleDropdownContents' },
-          {
-            showDropdownButton: false,
-            showDropdownContents: false,
-            labels: [{ id: 1 }, { id: 2, set: true }],
-          },
-        );
-
-        expect(wrapper.vm.handleDropdownClose).toHaveBeenCalledWith(
-          expect.arrayContaining([
-            {
-              id: 2,
-              set: true,
-            },
-          ]),
-        );
-      });
-    });
-
     describe('handleDropdownClose', () => {
       beforeEach(() => {
         createComponent();
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/mock_data.js b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/mock_data.js
index 9e29030fb56..5dd8fc1b8b2 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/mock_data.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/mock_data.js
@@ -48,6 +48,8 @@ export const mockConfig = {
   labelsManagePath: '/gitlab-org/my-project/-/labels',
   labelsFilterBasePath: '/gitlab-org/my-project/issues',
   labelsFilterParam: 'label_name',
+  footerCreateLabelTitle: 'create',
+  footerManageLabelTitle: 'manage',
 };
 
 export const mockSuggestedColors = {
@@ -91,3 +93,26 @@ export const createLabelSuccessfulResponse = {
     },
   },
 };
+
+export const labelsQueryResponse = {
+  data: {
+    workspace: {
+      labels: {
+        nodes: [
+          {
+            color: '#330066',
+            description: null,
+            id: 'gid://gitlab/ProjectLabel/1',
+            title: 'Label1',
+          },
+          {
+            color: '#2f7b2e',
+            description: null,
+            id: 'gid://gitlab/ProjectLabel/2',
+            title: 'Label2',
+          },
+        ],
+      },
+    },
+  },
+};
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/actions_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/actions_spec.js
index 27de7de2411..ee905410ffa 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/actions_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/actions_spec.js
@@ -1,8 +1,4 @@
-import MockAdapter from 'axios-mock-adapter';
-
 import testAction from 'helpers/vuex_action_helper';
-import createFlash from '~/flash';
-import axios from '~/lib/utils/axios_utils';
 import * as actions from '~/vue_shared/components/sidebar/labels_select_widget/store/actions';
 import * as types from '~/vue_shared/components/sidebar/labels_select_widget/store/mutation_types';
 import defaultState from '~/vue_shared/components/sidebar/labels_select_widget/store/state';
@@ -72,90 +68,6 @@ describe('LabelsSelect Actions', () => {
     });
   });
 
-  describe('requestLabels', () => {
-    it('sets value of `state.labelsFetchInProgress` to `true`', (done) => {
-      testAction(actions.requestLabels, {}, state, [{ type: types.REQUEST_LABELS }], [], done);
-    });
-  });
-
-  describe('receiveLabelsSuccess', () => {
-    it('sets provided labels to `state.labels`', (done) => {
-      const labels = [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }];
-
-      testAction(
-        actions.receiveLabelsSuccess,
-        labels,
-        state,
-        [{ type: types.RECEIVE_SET_LABELS_SUCCESS, payload: labels }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('receiveLabelsFailure', () => {
-    it('sets value `state.labelsFetchInProgress` to `false`', (done) => {
-      testAction(
-        actions.receiveLabelsFailure,
-        {},
-        state,
-        [{ type: types.RECEIVE_SET_LABELS_FAILURE }],
-        [],
-        done,
-      );
-    });
-
-    it('shows flash error', () => {
-      actions.receiveLabelsFailure({ commit: () => {} });
-
-      expect(createFlash).toHaveBeenCalledWith({ message: 'Error fetching labels.' });
-    });
-  });
-
-  describe('fetchLabels', () => {
-    let mock;
-
-    beforeEach(() => {
-      mock = new MockAdapter(axios);
-      state.labelsFetchPath = 'labels.json';
-    });
-
-    afterEach(() => {
-      mock.restore();
-    });
-
-    describe('on success', () => {
-      it('dispatches `requestLabels` & `receiveLabelsSuccess` actions', (done) => {
-        const labels = [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }];
-        mock.onGet(/labels.json/).replyOnce(200, labels);
-
-        testAction(
-          actions.fetchLabels,
-          {},
-          state,
-          [],
-          [{ type: 'requestLabels' }, { type: 'receiveLabelsSuccess', payload: labels }],
-          done,
-        );
-      });
-    });
-
-    describe('on failure', () => {
-      it('dispatches `requestLabels` & `receiveLabelsFailure` actions', (done) => {
-        mock.onGet(/labels.json/).replyOnce(500, {});
-
-        testAction(
-          actions.fetchLabels,
-          {},
-          state,
-          [],
-          [{ type: 'requestLabels' }, { type: 'receiveLabelsFailure' }],
-          done,
-        );
-      });
-    });
-  });
-
   describe('updateSelectedLabels', () => {
     it('updates `state.labels` based on provided `labels` param', (done) => {
       const labels = [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }];
diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/mutations_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/mutations_spec.js
index 9e965cb33e8..1f0e0eee420 100644
--- a/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/mutations_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select_widget/store/mutations_spec.js
@@ -67,58 +67,6 @@ describe('LabelsSelect Mutations', () => {
     });
   });
 
-  describe(`${types.REQUEST_LABELS}`, () => {
-    it('sets value of `state.labelsFetchInProgress` to true', () => {
-      const state = {
-        labelsFetchInProgress: false,
-      };
-      mutations[types.REQUEST_LABELS](state);
-
-      expect(state.labelsFetchInProgress).toBe(true);
-    });
-  });
-
-  describe(`${types.RECEIVE_SET_LABELS_SUCCESS}`, () => {
-    const selectedLabels = [{ id: 2 }, { id: 4 }];
-    const labels = [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }];
-
-    it('sets value of `state.labelsFetchInProgress` to false', () => {
-      const state = {
-        selectedLabels,
-        labelsFetchInProgress: true,
-      };
-      mutations[types.RECEIVE_SET_LABELS_SUCCESS](state, labels);
-
-      expect(state.labelsFetchInProgress).toBe(false);
-    });
-
-    it('sets provided `labels` to `state.labels` along with `set` prop based on `state.selectedLabels`', () => {
-      const selectedLabelIds = selectedLabels.map((label) => label.id);
-      const state = {
-        selectedLabels,
-        labelsFetchInProgress: true,
-      };
-      mutations[types.RECEIVE_SET_LABELS_SUCCESS](state, labels);
-
-      state.labels.forEach((label) => {
-        if (selectedLabelIds.includes(label.id)) {
-          expect(label.set).toBe(true);
-        }
-      });
-    });
-  });
-
-  describe(`${types.RECEIVE_SET_LABELS_FAILURE}`, () => {
-    it('sets value of `state.labelsFetchInProgress` to false', () => {
-      const state = {
-        labelsFetchInProgress: true,
-      };
-      mutations[types.RECEIVE_SET_LABELS_FAILURE](state);
-
-      expect(state.labelsFetchInProgress).toBe(false);
-    });
-  });
-
   describe(`${types.UPDATE_SELECTED_LABELS}`, () => {
     let labels;
 
diff --git a/spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js b/spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js
deleted file mode 100644
index b85f50ec998..00000000000
--- a/spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * This file should only contain browser specific specs.
- * If you need to add or update a spec, please see spec/frontend/monitoring/components/*.js
- * https://gitlab.com/gitlab-org/gitlab/-/issues/194244#note_343427737
- * https://gitlab.com/groups/gitlab-org/-/epics/895#what-if-theres-a-karma-spec-which-is-simply-unmovable-to-jest-ie-it-is-dependent-on-a-running-browser-environment
- */
-
-import { createLocalVue } from '@vue/test-utils';
-import MockAdapter from 'axios-mock-adapter';
-import Vue from 'vue';
-import axios from '~/lib/utils/axios_utils';
-import Dashboard from '~/monitoring/components/dashboard.vue';
-import { createStore } from '~/monitoring/stores';
-import { metricsDashboardPayload, dashboardProps } from '../fixture_data';
-import { mockApiEndpoint } from '../mock_data';
-import { setupStoreWithData } from '../store_utils';
-
-const localVue = createLocalVue();
-
-describe('Dashboard', () => {
-  let DashboardComponent;
-  let mock;
-  let store;
-  let component;
-  let wrapper;
-
-  beforeEach(() => {
-    setFixtures(`
-      <div class="prometheus-graphs"></div>
-      <div class="layout-page"></div>
-    `);
-
-    store = createStore();
-    mock = new MockAdapter(axios);
-    DashboardComponent = localVue.extend(Dashboard);
-  });
-
-  afterEach(() => {
-    if (component) {
-      component.$destroy();
-    }
-    if (wrapper) {
-      wrapper.destroy();
-    }
-    mock.restore();
-  });
-
-  describe('responds to window resizes', () => {
-    let promPanel;
-    let promGroup;
-    let panelToggle;
-    let chart;
-    beforeEach(() => {
-      mock.onGet(mockApiEndpoint).reply(200, metricsDashboardPayload);
-
-      component = new DashboardComponent({
-        el: document.querySelector('.prometheus-graphs'),
-        propsData: {
-          ...dashboardProps,
-          hasMetrics: true,
-          showPanels: true,
-        },
-        store,
-        provide: { hasManagedPrometheus: false },
-      });
-
-      setupStoreWithData(component.$store);
-
-      return Vue.nextTick().then(() => {
-        [promPanel] = component.$el.querySelectorAll('.prometheus-panel');
-        promGroup = promPanel.querySelector('.prometheus-graph-group');
-        panelToggle = promPanel.querySelector('.js-graph-group-toggle');
-        chart = promGroup.querySelector('.position-relative svg');
-      });
-    });
-
-    it('setting chart size to zero when panel group is hidden', () => {
-      expect(promGroup.style.display).toBe('');
-      expect(chart.clientWidth).toBeGreaterThan(0);
-
-      panelToggle.click();
-      return Vue.nextTick().then(() => {
-        expect(promGroup.style.display).toBe('none');
-        expect(chart.clientWidth).toBe(0);
-        promPanel.style.width = '500px';
-      });
-    });
-
-    it('expanding chart panel group after resize displays chart', () => {
-      panelToggle.click();
-
-      expect(chart.clientWidth).toBeGreaterThan(0);
-    });
-  });
-});
diff --git a/spec/javascripts/monitoring/fixture_data.js b/spec/javascripts/monitoring/fixture_data.js
deleted file mode 100644
index 1375c27cdde..00000000000
--- a/spec/javascripts/monitoring/fixture_data.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../../frontend/monitoring/fixture_data';
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
deleted file mode 100644
index c80401e8c1d..00000000000
--- a/spec/javascripts/monitoring/mock_data.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// No new code should be added to this file. Instead, modify the
-// file this one re-exports from. For more detail about why, see:
-// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31349
-
-export * from '../../frontend/monitoring/mock_data';
diff --git a/spec/javascripts/monitoring/store_utils.js b/spec/javascripts/monitoring/store_utils.js
deleted file mode 100644
index 1222716c829..00000000000
--- a/spec/javascripts/monitoring/store_utils.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../../frontend/monitoring/store_utils';
diff --git a/spec/lib/gitlab/git/remote_mirror_spec.rb b/spec/lib/gitlab/git/remote_mirror_spec.rb
index 0954879f6bd..4b827e5d2d0 100644
--- a/spec/lib/gitlab/git/remote_mirror_spec.rb
+++ b/spec/lib/gitlab/git/remote_mirror_spec.rb
@@ -6,30 +6,17 @@ RSpec.describe Gitlab::Git::RemoteMirror do
   describe '#update' do
     let(:project) { create(:project, :repository) }
     let(:repository) { project.repository }
-    let(:ref_name) { 'foo' }
     let(:url) { 'https://example.com' }
     let(:options) { { only_branches_matching: ['master'], ssh_key: 'KEY', known_hosts: 'KNOWN HOSTS', keep_divergent_refs: true } }
 
-    subject(:remote_mirror) { described_class.new(repository, ref_name, url, **options) }
+    subject(:remote_mirror) { described_class.new(repository, url, **options) }
 
-    shared_examples 'an update' do
-      it 'delegates to the Gitaly client' do
-        expect(repository.gitaly_remote_client)
-          .to receive(:update_remote_mirror)
-          .with(ref_name, url, ['master'], ssh_key: 'KEY', known_hosts: 'KNOWN HOSTS', keep_divergent_refs: true)
-
-        remote_mirror.update # rubocop:disable Rails/SaveBang
-      end
-    end
-
-    context 'with url' do
-      it_behaves_like 'an update'
-    end
-
-    context 'without url' do
-      let(:url) { nil }
+    it 'delegates to the Gitaly client' do
+      expect(repository.gitaly_remote_client)
+        .to receive(:update_remote_mirror)
+        .with(url, ['master'], ssh_key: 'KEY', known_hosts: 'KNOWN HOSTS', keep_divergent_refs: true)
 
-      it_behaves_like 'an update'
+      remote_mirror.update # rubocop:disable Rails/SaveBang
     end
 
     it 'wraps gitaly errors' do
diff --git a/spec/lib/gitlab/gitaly_client/remote_service_spec.rb b/spec/lib/gitlab/gitaly_client/remote_service_spec.rb
index c01a070fcb8..3d0f8358406 100644
--- a/spec/lib/gitlab/gitaly_client/remote_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/remote_service_spec.rb
@@ -35,34 +35,19 @@ RSpec.describe Gitlab::GitalyClient::RemoteService do
   end
 
   describe '#update_remote_mirror' do
-    let(:ref_name) { 'remote_mirror_1' }
     let(:only_branches_matching) { %w[my-branch master] }
     let(:ssh_key) { 'KEY' }
     let(:known_hosts) { 'KNOWN HOSTS' }
+    let(:url) { 'http:://git.example.com/my-repo.git' }
+    let(:expected_params) { { remote: Gitaly::UpdateRemoteMirrorRequest::Remote.new(url: url) } }
 
-    shared_examples 'an update' do
-      it 'sends an update_remote_mirror message' do
-        expect_any_instance_of(Gitaly::RemoteService::Stub)
-          .to receive(:update_remote_mirror)
-          .with(array_including(gitaly_request_with_params(expected_params)), kind_of(Hash))
-          .and_return(double(:update_remote_mirror_response))
-
-        client.update_remote_mirror(ref_name, url, only_branches_matching, ssh_key: ssh_key, known_hosts: known_hosts, keep_divergent_refs: true)
-      end
-    end
-
-    context 'with remote name' do
-      let(:url) { nil }
-      let(:expected_params) { { ref_name: ref_name } }
-
-      it_behaves_like 'an update'
-    end
-
-    context 'with remote URL' do
-      let(:url) { 'http:://git.example.com/my-repo.git' }
-      let(:expected_params) { { remote: Gitaly::UpdateRemoteMirrorRequest::Remote.new(url: url) } }
+    it 'sends an update_remote_mirror message' do
+      expect_any_instance_of(Gitaly::RemoteService::Stub)
+        .to receive(:update_remote_mirror)
+        .with(array_including(gitaly_request_with_params(expected_params)), kind_of(Hash))
+        .and_return(double(:update_remote_mirror_response))
 
-      it_behaves_like 'an update'
+      client.update_remote_mirror(url, only_branches_matching, ssh_key: ssh_key, known_hosts: known_hosts, keep_divergent_refs: true)
     end
   end
 
diff --git a/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
index b1d5d106082..d4148b57348 100644
--- a/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe Gitlab::UsageDataCounters::CiTemplateUniqueCounter do
           Gitlab::Ci::Pipeline::Chain::Config::Content::AutoDevops.new(pipeline, command).content,
           project: project,
           user: double,
-          sha: double
+          sha: 'd310cc759caaa20cd05a9e0983d6017896d9c34c'
         ).execute
 
         config_source = :auto_devops_source
diff --git a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
index d89202ae7fe..887759014f5 100644
--- a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
@@ -143,7 +143,7 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
 
       context 'when usage_ping is disabled' do
         it 'does not track the event' do
-          stub_application_setting(usage_ping_enabled: false)
+          allow(::ServicePing::ServicePingSettings).to receive(:enabled?).and_return(false)
 
           described_class.track_event(weekly_event, values: entity1, time: Date.current)
 
@@ -153,7 +153,7 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
 
       context 'when usage_ping is enabled' do
         before do
-          stub_application_setting(usage_ping_enabled: true)
+          allow(::ServicePing::ServicePingSettings).to receive(:enabled?).and_return(true)
         end
 
         it 'tracks event when using symbol' do
diff --git a/spec/lib/gitlab/usage_data_counters/redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/redis_counter_spec.rb
index d4f6110b3df..753e09731bf 100644
--- a/spec/lib/gitlab/usage_data_counters/redis_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/redis_counter_spec.rb
@@ -8,12 +8,12 @@ RSpec.describe Gitlab::UsageDataCounters::RedisCounter, :clean_gitlab_redis_shar
   subject { Class.new.extend(described_class) }
 
   before do
-    stub_application_setting(usage_ping_enabled: setting_value)
+    allow(::ServicePing::ServicePingSettings).to receive(:enabled?).and_return(service_ping_enabled)
   end
 
   describe '.increment' do
     context 'when usage_ping is disabled' do
-      let(:setting_value) { false }
+      let(:service_ping_enabled) { false }
 
       it 'counter is not increased' do
         expect do
@@ -23,7 +23,7 @@ RSpec.describe Gitlab::UsageDataCounters::RedisCounter, :clean_gitlab_redis_shar
     end
 
     context 'when usage_ping is enabled' do
-      let(:setting_value) { true }
+      let(:service_ping_enabled) { true }
 
       it 'counter is increased' do
         expect do
@@ -35,7 +35,7 @@ RSpec.describe Gitlab::UsageDataCounters::RedisCounter, :clean_gitlab_redis_shar
 
   describe '.increment_by' do
     context 'when usage_ping is disabled' do
-      let(:setting_value) { false }
+      let(:service_ping_enabled) { false }
 
       it 'counter is not increased' do
         expect do
@@ -45,7 +45,7 @@ RSpec.describe Gitlab::UsageDataCounters::RedisCounter, :clean_gitlab_redis_shar
     end
 
     context 'when usage_ping is enabled' do
-      let(:setting_value) { true }
+      let(:service_ping_enabled) { true }
 
       it 'counter is increased' do
         expect do
diff --git a/spec/models/remote_mirror_spec.rb b/spec/models/remote_mirror_spec.rb
index 058cc2c5925..382359ccb17 100644
--- a/spec/models/remote_mirror_spec.rb
+++ b/spec/models/remote_mirror_spec.rb
@@ -105,35 +105,6 @@ RSpec.describe RemoteMirror, :mailer do
     end
   end
 
-  describe '#remote_name' do
-    context 'when remote name is persisted in the database' do
-      it 'returns remote name with random value' do
-        allow(SecureRandom).to receive(:hex).and_return('secret')
-
-        remote_mirror = create(:remote_mirror)
-
-        expect(remote_mirror.remote_name).to eq('remote_mirror_secret')
-      end
-    end
-
-    context 'when remote name is not persisted in the database' do
-      it 'returns remote name with remote mirror id' do
-        remote_mirror = create(:remote_mirror)
-        remote_mirror.remote_name = nil
-
-        expect(remote_mirror.remote_name).to eq("remote_mirror_#{remote_mirror.id}")
-      end
-    end
-
-    context 'when remote is not persisted in the database' do
-      it 'returns nil' do
-        remote_mirror = build(:remote_mirror, remote_name: nil)
-
-        expect(remote_mirror.remote_name).to be_nil
-      end
-    end
-  end
-
   describe '#bare_url' do
     it 'returns the URL without any credentials' do
       remote_mirror = build(:remote_mirror, url: 'http://user:pass@example.com/foo')
@@ -158,7 +129,6 @@ RSpec.describe RemoteMirror, :mailer do
 
       expect(git_remote_mirror).to have_received(:new).with(
         mirror.project.repository.raw,
-        mirror.remote_name,
         mirror.url,
         keep_divergent_refs: true
       )
diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb
index 19694a0a354..6e9404166f3 100644
--- a/spec/services/git/branch_hooks_service_spec.rb
+++ b/spec/services/git/branch_hooks_service_spec.rb
@@ -134,7 +134,7 @@ RSpec.describe Git::BranchHooksService, :clean_gitlab_redis_shared_state do
 
         context 'when usage ping is disabled' do
           before do
-            stub_application_setting(usage_ping_enabled: false)
+            allow(::ServicePing::ServicePingSettings).to receive(:enabled?).and_return(false)
           end
 
           it 'does not track the event' do
diff --git a/spec/services/projects/update_remote_mirror_service_spec.rb b/spec/services/projects/update_remote_mirror_service_spec.rb
index 686b204c726..f4a6d1b19e7 100644
--- a/spec/services/projects/update_remote_mirror_service_spec.rb
+++ b/spec/services/projects/update_remote_mirror_service_spec.rb
@@ -7,8 +7,6 @@ RSpec.describe Projects::UpdateRemoteMirrorService do
   let_it_be(:remote_project) { create(:forked_project_with_submodules) }
   let_it_be(:remote_mirror) { create(:remote_mirror, project: project, enabled: true) }
 
-  let(:remote_name) { remote_mirror.remote_name }
-
   subject(:service) { described_class.new(project, project.creator) }
 
   describe '#execute' do
diff --git a/spec/services/service_ping/service_ping_settings_spec.rb b/spec/services/service_ping/service_ping_settings_spec.rb
index 8446fee36c5..90a5c6b30eb 100644
--- a/spec/services/service_ping/service_ping_settings_spec.rb
+++ b/spec/services/service_ping/service_ping_settings_spec.rb
@@ -27,4 +27,20 @@ RSpec.describe ServicePing::ServicePingSettings do
       end
     end
   end
+
+  describe '#enabled?' do
+    describe 'has the correct enabled' do
+      it 'when false' do
+        stub_config_setting(usage_ping_enabled: false)
+
+        expect(described_class.enabled?).to eq(false)
+      end
+
+      it 'when true' do
+        stub_config_setting(usage_ping_enabled: true)
+
+        expect(described_class.enabled?).to eq(true)
+      end
+    end
+  end
 end