Add latest changes from gitlab-org/gitlab@master

20 files changed, 382 insertions, 328 deletions

diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index e4cdcda756b..e346c329720 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -23,6 +23,12 @@ RSpec.describe Admin::UsersController do
 
       expect(assigns(:users)).to eq([admin])
     end
+
+    it 'eager loads authorized projects association' do
+      get :index
+
+      expect(assigns(:users).first.association(:authorized_projects)).to be_loaded
+    end
   end
 
   describe 'GET :id' do
diff --git a/spec/controllers/groups/labels_controller_spec.rb b/spec/controllers/groups/labels_controller_spec.rb
index 20ee19b01d1..8a08b5b8849 100644
--- a/spec/controllers/groups/labels_controller_spec.rb
+++ b/spec/controllers/groups/labels_controller_spec.rb
@@ -56,4 +56,43 @@ RSpec.describe Groups::LabelsController do
       expect(response).to have_gitlab_http_status(:ok)
     end
   end
+
+  describe 'DELETE #destroy' do
+    context 'when current user has ability to destroy the label' do
+      before do
+        sign_in(user)
+      end
+
+      it 'removes the label' do
+        label = create(:group_label, group: group)
+        delete :destroy, params: { group_id: group.to_param, id: label.to_param }
+
+        expect { label.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      context 'when label is succesfuly destroyed' do
+        it 'redirects to the group labels page' do
+          label = create(:group_label, group: group)
+          delete :destroy, params: { group_id: group.to_param, id: label.to_param }
+
+          expect(response).to redirect_to(group_labels_path)
+        end
+      end
+    end
+
+    context 'when current_user does not have ability to destroy the label' do
+      let(:another_user) { create(:user) }
+
+      before do
+        sign_in(another_user)
+      end
+
+      it 'responds with status 404' do
+        label = create(:group_label, group: group)
+        delete :destroy, params: { group_id: group.to_param, id: label.to_param }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
 end
diff --git a/spec/factories/usage_data.rb b/spec/factories/usage_data.rb
index 5b20205a235..6fb2268ff7d 100644
--- a/spec/factories/usage_data.rb
+++ b/spec/factories/usage_data.rb
@@ -102,6 +102,9 @@ FactoryBot.define do
       create(:package, project: projects[1])
       create(:package, created_at: 2.months.ago, project: projects[1])
 
+      # User Preferences
+      create(:user_preference, gitpod_enabled: true)
+
       ProjectFeature.first.update_attribute('repository_access_level', 0)
 
       # Create fresh & a month (28-days SMAU) old  data
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index a37210d2acc..c9da9ef5735 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -31,6 +31,7 @@ RSpec.describe "Admin::Users" do
       expect(page).to have_content(current_user.last_activity_on.strftime("%e %b, %Y"))
       expect(page).to have_content(user.email)
       expect(page).to have_content(user.name)
+      expect(page).to have_content('Projects')
       expect(page).to have_button('Block')
       expect(page).to have_button('Deactivate')
       expect(page).to have_button('Delete user')
@@ -48,6 +49,19 @@ RSpec.describe "Admin::Users" do
       end
     end
 
+    context 'user project count' do
+      before do
+        project = create(:project)
+        project.add_maintainer(current_user)
+      end
+
+      it 'displays count of users projects' do
+        visit admin_users_path
+
+        expect(page.find("[data-testid='user-project-count-#{current_user.id}']").text).to eq("1")
+      end
+    end
+
     describe 'search and sort' do
       before do
         create(:user, name: 'Foo Bar', last_activity_on: 3.days.ago)
diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb
index d1e635f11c0..3382bdcd65f 100644
--- a/spec/features/projects/badges/list_spec.rb
+++ b/spec/features/projects/badges/list_spec.rb
@@ -17,10 +17,10 @@ RSpec.describe 'list of badges' do
       expect(page).to have_content 'Markdown'
       expect(page).to have_content 'HTML'
       expect(page).to have_content 'AsciiDoc'
-      expect(page).to have_css('.js-syntax-highlight', count: 3)
+      expect(page).to have_css('.highlight', count: 3)
       expect(page).to have_xpath("//img[@alt='pipeline status']")
 
-      page.within('.js-syntax-highlight', match: :first) do
+      page.within('.highlight', match: :first) do
         expect(page).to have_content 'badges/master/pipeline.svg'
       end
     end
@@ -32,10 +32,10 @@ RSpec.describe 'list of badges' do
       expect(page).to have_content 'Markdown'
       expect(page).to have_content 'HTML'
       expect(page).to have_content 'AsciiDoc'
-      expect(page).to have_css('.js-syntax-highlight', count: 3)
+      expect(page).to have_css('.highlight', count: 3)
       expect(page).to have_xpath("//img[@alt='coverage report']")
 
-      page.within('.js-syntax-highlight', match: :first) do
+      page.within('.highlight', match: :first) do
         expect(page).to have_content 'badges/master/coverage.svg'
       end
     end
diff --git a/spec/frontend/diffs/components/diff_row_utils_spec.js b/spec/frontend/diffs/components/diff_row_utils_spec.js
new file mode 100644
index 00000000000..394b6cb1914
--- /dev/null
+++ b/spec/frontend/diffs/components/diff_row_utils_spec.js
@@ -0,0 +1,203 @@
+import * as utils from '~/diffs/components/diff_row_utils';
+import {
+  MATCH_LINE_TYPE,
+  CONTEXT_LINE_TYPE,
+  OLD_NO_NEW_LINE_TYPE,
+  NEW_NO_NEW_LINE_TYPE,
+  EMPTY_CELL_TYPE,
+} from '~/diffs/constants';
+
+const LINE_CODE = 'abc123';
+
+describe('isHighlighted', () => {
+  it('should return true if line is highlighted', () => {
+    const state = { diffs: { highlightedRow: LINE_CODE } };
+    const line = { line_code: LINE_CODE };
+    const isCommented = false;
+    expect(utils.isHighlighted(state, line, isCommented)).toBe(true);
+  });
+
+  it('should return false if line is not highlighted', () => {
+    const state = { diffs: { highlightedRow: 'xxx' } };
+    const line = { line_code: LINE_CODE };
+    const isCommented = false;
+    expect(utils.isHighlighted(state, line, isCommented)).toBe(false);
+  });
+
+  it('should return true if isCommented is true', () => {
+    const state = { diffs: { highlightedRow: 'xxx' } };
+    const line = { line_code: LINE_CODE };
+    const isCommented = true;
+    expect(utils.isHighlighted(state, line, isCommented)).toBe(true);
+  });
+});
+
+describe('isContextLine', () => {
+  it('return true if line type is context', () => {
+    expect(utils.isContextLine(CONTEXT_LINE_TYPE)).toBe(true);
+  });
+
+  it('return false if line type is not context', () => {
+    expect(utils.isContextLine('xxx')).toBe(false);
+  });
+});
+
+describe('isMatchLine', () => {
+  it('return true if line type is match', () => {
+    expect(utils.isMatchLine(MATCH_LINE_TYPE)).toBe(true);
+  });
+
+  it('return false if line type is not match', () => {
+    expect(utils.isMatchLine('xxx')).toBe(false);
+  });
+});
+
+describe('isMetaLine', () => {
+  it.each`
+    type                    | expectation
+    ${OLD_NO_NEW_LINE_TYPE} | ${true}
+    ${NEW_NO_NEW_LINE_TYPE} | ${true}
+    ${EMPTY_CELL_TYPE}      | ${true}
+    ${'xxx'}                | ${false}
+  `('should return $expectation if type is $type', ({ type, expectation }) => {
+    expect(utils.isMetaLine(type)).toBe(expectation);
+  });
+});
+
+describe('shouldRenderCommentButton', () => {
+  it('should return false if comment button is not rendered', () => {
+    expect(utils.shouldRenderCommentButton(true, false)).toBe(false);
+  });
+
+  it('should return false if not logged in', () => {
+    expect(utils.shouldRenderCommentButton(false, true)).toBe(false);
+  });
+
+  it('should return true logged in and rendered', () => {
+    expect(utils.shouldRenderCommentButton(true, true)).toBe(true);
+  });
+});
+
+describe('hasDiscussions', () => {
+  it('should return false if line is undefined', () => {
+    expect(utils.hasDiscussions()).toBe(false);
+  });
+
+  it('should return false if discussions is undefined', () => {
+    expect(utils.hasDiscussions({})).toBe(false);
+  });
+
+  it('should return false if discussions has legnth of 0', () => {
+    expect(utils.hasDiscussions({ discussions: [] })).toBe(false);
+  });
+
+  it('should return true if discussions has legnth > 0', () => {
+    expect(utils.hasDiscussions({ discussions: [1] })).toBe(true);
+  });
+});
+
+describe('lineHref', () => {
+  it(`should return #${LINE_CODE}`, () => {
+    expect(utils.lineHref({ line_code: LINE_CODE })).toEqual(`#${LINE_CODE}`);
+  });
+
+  it(`should return '#' if line is undefined`, () => {
+    expect(utils.lineHref()).toEqual('#');
+  });
+
+  it(`should return '#' if line_code is undefined`, () => {
+    expect(utils.lineHref({})).toEqual('#');
+  });
+});
+
+describe('lineCode', () => {
+  it(`should return undefined if line_code is undefined`, () => {
+    expect(utils.lineCode()).toEqual(undefined);
+    expect(utils.lineCode({ left: {} })).toEqual(undefined);
+    expect(utils.lineCode({ right: {} })).toEqual(undefined);
+  });
+
+  it(`should return ${LINE_CODE}`, () => {
+    expect(utils.lineCode({ line_code: LINE_CODE })).toEqual(LINE_CODE);
+    expect(utils.lineCode({ left: { line_code: LINE_CODE } })).toEqual(LINE_CODE);
+    expect(utils.lineCode({ right: { line_code: LINE_CODE } })).toEqual(LINE_CODE);
+  });
+});
+
+describe('classNameMapCell', () => {
+  it.each`
+    line               | hll      | loggedIn | hovered  | expectation
+    ${undefined}       | ${true}  | ${true}  | ${true}  | ${[]}
+    ${{ type: 'new' }} | ${false} | ${false} | ${false} | ${['new', { hll: false, 'is-over': false }]}
+    ${{ type: 'new' }} | ${true}  | ${true}  | ${false} | ${['new', { hll: true, 'is-over': false }]}
+    ${{ type: 'new' }} | ${true}  | ${false} | ${true}  | ${['new', { hll: true, 'is-over': false }]}
+    ${{ type: 'new' }} | ${true}  | ${true}  | ${true}  | ${['new', { hll: true, 'is-over': true }]}
+  `('should return $expectation', ({ line, hll, loggedIn, hovered, expectation }) => {
+    const classes = utils.classNameMapCell(line, hll, loggedIn, hovered);
+    expect(classes).toEqual(expectation);
+  });
+});
+
+describe('addCommentTooltip', () => {
+  const brokenSymLinkTooltip =
+    'Commenting on symbolic links that replace or are replaced by files is currently not supported.';
+  const brokenRealTooltip =
+    'Commenting on files that replace or are replaced by symbolic links is currently not supported.';
+  it('should return default tooltip', () => {
+    expect(utils.addCommentTooltip()).toBeUndefined();
+  });
+
+  it('should return broken symlink tooltip', () => {
+    expect(utils.addCommentTooltip({ commentsDisabled: { wasSymbolic: true } })).toEqual(
+      brokenSymLinkTooltip,
+    );
+    expect(utils.addCommentTooltip({ commentsDisabled: { isSymbolic: true } })).toEqual(
+      brokenSymLinkTooltip,
+    );
+  });
+
+  it('should return broken real tooltip', () => {
+    expect(utils.addCommentTooltip({ commentsDisabled: { wasReal: true } })).toEqual(
+      brokenRealTooltip,
+    );
+    expect(utils.addCommentTooltip({ commentsDisabled: { isReal: true } })).toEqual(
+      brokenRealTooltip,
+    );
+  });
+});
+
+describe('parallelViewLeftLineType', () => {
+  it(`should return ${OLD_NO_NEW_LINE_TYPE}`, () => {
+    expect(utils.parallelViewLeftLineType({ right: { type: NEW_NO_NEW_LINE_TYPE } })).toEqual(
+      OLD_NO_NEW_LINE_TYPE,
+    );
+  });
+
+  it(`should return 'new'`, () => {
+    expect(utils.parallelViewLeftLineType({ left: { type: 'new' } })).toContain('new');
+  });
+
+  it(`should return ${EMPTY_CELL_TYPE}`, () => {
+    expect(utils.parallelViewLeftLineType({})).toContain(EMPTY_CELL_TYPE);
+  });
+
+  it(`should return hll:true`, () => {
+    expect(utils.parallelViewLeftLineType({}, true)[1]).toEqual({ hll: true });
+  });
+});
+
+describe('shouldShowCommentButton', () => {
+  it.each`
+    hover    | context  | meta     | discussions | expectation
+    ${true}  | ${false} | ${false} | ${false}    | ${true}
+    ${false} | ${false} | ${false} | ${false}    | ${false}
+    ${true}  | ${true}  | ${false} | ${false}    | ${false}
+    ${true}  | ${true}  | ${true}  | ${false}    | ${false}
+    ${true}  | ${true}  | ${true}  | ${true}     | ${false}
+  `(
+    'should return $expectation when hover is $hover',
+    ({ hover, context, meta, discussions, expectation }) => {
+      expect(utils.shouldShowCommentButton(hover, context, meta, discussions)).toBe(expectation);
+    },
+  );
+});
diff --git a/spec/frontend/diffs/components/diff_table_cell_spec.js b/spec/frontend/diffs/components/diff_table_cell_spec.js
deleted file mode 100644
index 02f5c27eecb..00000000000
--- a/spec/frontend/diffs/components/diff_table_cell_spec.js
+++ /dev/null
@@ -1,279 +0,0 @@
-import { createLocalVue, shallowMount } from '@vue/test-utils';
-import Vuex from 'vuex';
-import { TEST_HOST } from 'helpers/test_constants';
-import DiffTableCell from '~/diffs/components/diff_table_cell.vue';
-import DiffGutterAvatars from '~/diffs/components/diff_gutter_avatars.vue';
-import { LINE_POSITION_RIGHT } from '~/diffs/constants';
-import { createStore } from '~/mr_notes/stores';
-import discussionsMockData from '../mock_data/diff_discussions';
-import diffFileMockData from '../mock_data/diff_file';
-
-const localVue = createLocalVue();
-localVue.use(Vuex);
-
-const TEST_USER_ID = 'abc123';
-const TEST_USER = { id: TEST_USER_ID };
-const TEST_LINE_NUMBER = 1;
-const TEST_LINE_CODE = 'LC_42';
-const TEST_FILE_HASH = diffFileMockData.file_hash;
-
-describe('DiffTableCell', () => {
-  const symlinkishFileTooltip =
-    'Commenting on symbolic links that replace or are replaced by files is currently not supported.';
-  const realishFileTooltip =
-    'Commenting on files that replace or are replaced by symbolic links is currently not supported.';
-  const otherFileTooltip = 'Add a comment to this line';
-
-  let wrapper;
-  let line;
-  let store;
-
-  beforeEach(() => {
-    store = createStore();
-    store.state.notes.userData = TEST_USER;
-
-    line = {
-      line_code: TEST_LINE_CODE,
-      type: 'new',
-      old_line: null,
-      new_line: 1,
-      discussions: [{ ...discussionsMockData }],
-      discussionsExpanded: true,
-      text: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
-      rich_text: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
-      meta_data: null,
-    };
-  });
-
-  afterEach(() => {
-    wrapper.destroy();
-  });
-
-  const setWindowLocation = value => {
-    Object.defineProperty(window, 'location', {
-      writable: true,
-      value,
-    });
-  };
-
-  const createComponent = (props = {}) => {
-    wrapper = shallowMount(DiffTableCell, {
-      localVue,
-      store,
-      propsData: {
-        line,
-        fileHash: TEST_FILE_HASH,
-        contextLinesPath: '/context/lines/path',
-        isHighlighted: false,
-        ...props,
-      },
-    });
-  };
-
-  const findTd = () => wrapper.find({ ref: 'td' });
-  const findNoteButton = () => wrapper.find({ ref: 'addDiffNoteButton' });
-  const findLineNumber = () => wrapper.find({ ref: 'lineNumberRef' });
-  const findTooltip = () => wrapper.find({ ref: 'addNoteTooltip' });
-  const findAvatars = () => wrapper.find(DiffGutterAvatars);
-
-  describe('td', () => {
-    it('highlights when isHighlighted true', () => {
-      createComponent({ isHighlighted: true });
-
-      expect(findTd().classes()).toContain('hll');
-    });
-
-    it('does not highlight when isHighlighted false', () => {
-      createComponent({ isHighlighted: false });
-
-      expect(findTd().classes()).not.toContain('hll');
-    });
-  });
-
-  describe('comment button', () => {
-    it.each`
-      showCommentButton | userData     | query                | mergeRefHeadComments | expectation
-      ${true}           | ${TEST_USER} | ${'diff_head=false'} | ${false}             | ${true}
-      ${true}           | ${TEST_USER} | ${'diff_head=true'}  | ${true}              | ${true}
-      ${true}           | ${TEST_USER} | ${'diff_head=true'}  | ${false}             | ${false}
-      ${false}          | ${TEST_USER} | ${'diff_head=true'}  | ${true}              | ${false}
-      ${false}          | ${TEST_USER} | ${'bogus'}           | ${true}              | ${false}
-      ${true}           | ${null}      | ${''}                | ${true}              | ${false}
-    `(
-      'exists is $expectation - with showCommentButton ($showCommentButton) userData ($userData) query ($query)',
-      ({ showCommentButton, userData, query, mergeRefHeadComments, expectation }) => {
-        store.state.notes.userData = userData;
-        gon.features = { mergeRefHeadComments };
-        setWindowLocation({ href: `${TEST_HOST}?${query}` });
-        createComponent({ showCommentButton });
-
-        wrapper.setData({ isCommentButtonRendered: showCommentButton });
-
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findNoteButton().exists()).toBe(expectation);
-        });
-      },
-    );
-
-    it.each`
-      isHover  | otherProps                                      | discussions | expectation
-      ${true}  | ${{}}                                           | ${[]}       | ${true}
-      ${false} | ${{}}                                           | ${[]}       | ${false}
-      ${true}  | ${{ line: { ...line, type: 'context' } }}       | ${[]}       | ${false}
-      ${true}  | ${{ line: { ...line, type: 'old-nonewline' } }} | ${[]}       | ${false}
-      ${true}  | ${{}}                                           | ${[{}]}     | ${false}
-    `(
-      'visible is $expectation - with isHover ($isHover), discussions ($discussions), otherProps ($otherProps)',
-      ({ isHover, otherProps, discussions, expectation }) => {
-        line.discussions = discussions;
-        createComponent({
-          showCommentButton: true,
-          isHover,
-          ...otherProps,
-        });
-
-        wrapper.setData({
-          isCommentButtonRendered: true,
-        });
-
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findNoteButton().isVisible()).toBe(expectation);
-        });
-      },
-    );
-
-    it.each`
-      disabled      | commentsDisabled
-      ${'disabled'} | ${true}
-      ${undefined}  | ${false}
-    `(
-      'has attribute disabled=$disabled when the outer component has prop commentsDisabled=$commentsDisabled',
-      ({ disabled, commentsDisabled }) => {
-        line.commentsDisabled = commentsDisabled;
-
-        createComponent({
-          showCommentButton: true,
-          isHover: true,
-        });
-
-        wrapper.setData({ isCommentButtonRendered: true });
-
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findNoteButton().attributes('disabled')).toBe(disabled);
-        });
-      },
-    );
-
-    it.each`
-      tooltip                  | commentsDisabled
-      ${symlinkishFileTooltip} | ${{ wasSymbolic: true }}
-      ${symlinkishFileTooltip} | ${{ isSymbolic: true }}
-      ${realishFileTooltip}    | ${{ wasReal: true }}
-      ${realishFileTooltip}    | ${{ isReal: true }}
-      ${otherFileTooltip}      | ${false}
-    `(
-      'has the correct tooltip when commentsDisabled=$commentsDisabled',
-      ({ tooltip, commentsDisabled }) => {
-        line.commentsDisabled = commentsDisabled;
-
-        createComponent({
-          showCommentButton: true,
-          isHover: true,
-        });
-
-        wrapper.setData({ isCommentButtonRendered: true });
-
-        return wrapper.vm.$nextTick().then(() => {
-          expect(findTooltip().attributes('title')).toBe(tooltip);
-        });
-      },
-    );
-  });
-
-  describe('line number', () => {
-    describe('without lineNumber prop', () => {
-      it('does not render', () => {
-        createComponent({ lineType: 'old' });
-
-        expect(findLineNumber().exists()).toBe(false);
-      });
-    });
-
-    describe('with lineNumber prop', () => {
-      describe.each`
-        lineProps                                                         | expectedHref            | expectedClickArg
-        ${{ line_code: TEST_LINE_CODE }}                                  | ${`#${TEST_LINE_CODE}`} | ${TEST_LINE_CODE}
-        ${{ line_code: undefined }}                                       | ${'#'}                  | ${undefined}
-        ${{ line_code: undefined, left: { line_code: TEST_LINE_CODE } }}  | ${'#'}                  | ${TEST_LINE_CODE}
-        ${{ line_code: undefined, right: { line_code: TEST_LINE_CODE } }} | ${'#'}                  | ${TEST_LINE_CODE}
-      `('with line ($lineProps)', ({ lineProps, expectedHref, expectedClickArg }) => {
-        beforeEach(() => {
-          jest.spyOn(store, 'dispatch').mockImplementation();
-          Object.assign(line, lineProps);
-          createComponent({ lineNumber: TEST_LINE_NUMBER });
-        });
-
-        it('renders', () => {
-          expect(findLineNumber().exists()).toBe(true);
-          expect(findLineNumber().attributes()).toEqual({
-            href: expectedHref,
-            'data-linenumber': TEST_LINE_NUMBER.toString(),
-          });
-        });
-
-        it('on click, dispatches setHighlightedRow', () => {
-          expect(store.dispatch).not.toHaveBeenCalled();
-
-          findLineNumber().trigger('click');
-
-          expect(store.dispatch).toHaveBeenCalledWith('diffs/setHighlightedRow', expectedClickArg);
-        });
-      });
-    });
-  });
-
-  describe('diff-gutter-avatars', () => {
-    describe('with showCommentButton', () => {
-      beforeEach(() => {
-        jest.spyOn(store, 'dispatch').mockImplementation();
-
-        createComponent({ showCommentButton: true });
-      });
-
-      it('renders', () => {
-        expect(findAvatars().props()).toEqual({
-          discussions: line.discussions,
-          discussionsExpanded: line.discussionsExpanded,
-        });
-      });
-
-      it('toggles line discussion', () => {
-        expect(store.dispatch).not.toHaveBeenCalled();
-
-        findAvatars().vm.$emit('toggleLineDiscussions');
-
-        expect(store.dispatch).toHaveBeenCalledWith('diffs/toggleLineDiscussions', {
-          lineCode: TEST_LINE_CODE,
-          fileHash: TEST_FILE_HASH,
-          expanded: !line.discussionsExpanded,
-        });
-      });
-    });
-
-    it.each`
-      props                                                             | lineProps              | expectation
-      ${{ showCommentButton: true }}                                    | ${{}}                  | ${true}
-      ${{ showCommentButton: false }}                                   | ${{}}                  | ${false}
-      ${{ showCommentButton: true, linePosition: LINE_POSITION_RIGHT }} | ${{ type: null }}      | ${false}
-      ${{ showCommentButton: true }}                                    | ${{ discussions: [] }} | ${false}
-    `(
-      'exists is $expectation - with props ($props), line ($lineProps)',
-      ({ props, lineProps, expectation }) => {
-        Object.assign(line, lineProps);
-        createComponent(props);
-
-        expect(findAvatars().exists()).toBe(expectation);
-      },
-    );
-  });
-});
diff --git a/spec/frontend/search/components/state_filter_spec.js b/spec/frontend/search/components/dropdown_filter_spec.js
index 26344f2b592..ffac038e1c5 100644
--- a/spec/frontend/search/components/state_filter_spec.js
+++ b/spec/frontend/search/components/dropdown_filter_spec.js
@@ -1,11 +1,11 @@
 import { shallowMount } from '@vue/test-utils';
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
-import StateFilter from '~/search/state_filter/components/state_filter.vue';
+import DropdownFilter from '~/search/components/dropdown_filter.vue';
 import {
   FILTER_STATES,
-  SCOPES,
   FILTER_STATES_BY_SCOPE,
-  FILTER_TEXT,
+  FILTER_HEADER,
+  SCOPES,
 } from '~/search/state_filter/constants';
 import * as urlUtils from '~/lib/utils/url_utility';
 
@@ -15,14 +15,19 @@ jest.mock('~/lib/utils/url_utility', () => ({
 }));
 
 function createComponent(props = { scope: 'issues' }) {
-  return shallowMount(StateFilter, {
+  return shallowMount(DropdownFilter, {
     propsData: {
+      filtersArray: FILTER_STATES_BY_SCOPE.issues,
+      filters: FILTER_STATES,
+      header: FILTER_HEADER,
+      param: 'state',
+      supportedScopes: Object.values(SCOPES),
       ...props,
     },
   });
 }
 
-describe('StateFilter', () => {
+describe('DropdownFilter', () => {
   let wrapper;
 
   beforeEach(() => {
@@ -41,7 +46,7 @@ describe('StateFilter', () => {
 
   describe('template', () => {
     describe.each`
-      scope               | showStateDropdown
+      scope               | showDropdown
       ${'issues'}         | ${true}
       ${'merge_requests'} | ${true}
       ${'projects'}       | ${false}
@@ -50,26 +55,25 @@ describe('StateFilter', () => {
       ${'notes'}          | ${false}
       ${'wiki_blobs'}     | ${false}
       ${'blobs'}          | ${false}
-    `(`state dropdown`, ({ scope, showStateDropdown }) => {
+    `(`dropdown`, ({ scope, showDropdown }) => {
       beforeEach(() => {
         wrapper = createComponent({ scope });
       });
 
-      it(`does${showStateDropdown ? '' : ' not'} render when scope is ${scope}`, () => {
-        expect(findGlDropdown().exists()).toBe(showStateDropdown);
+      it(`does${showDropdown ? '' : ' not'} render when scope is ${scope}`, () => {
+        expect(findGlDropdown().exists()).toBe(showDropdown);
       });
     });
 
     describe.each`
-      state                         | label
-      ${FILTER_STATES.ANY.value}    | ${FILTER_TEXT}
+      initialFilter                 | label
+      ${FILTER_STATES.ANY.value}    | ${`Any ${FILTER_HEADER}`}
       ${FILTER_STATES.OPEN.value}   | ${FILTER_STATES.OPEN.label}
       ${FILTER_STATES.CLOSED.value} | ${FILTER_STATES.CLOSED.label}
-      ${FILTER_STATES.MERGED.value} | ${FILTER_STATES.MERGED.label}
-    `(`filter text`, ({ state, label }) => {
-      describe(`when state is ${state}`, () => {
+    `(`filter text`, ({ initialFilter, label }) => {
+      describe(`when initialFilter is ${initialFilter}`, () => {
         beforeEach(() => {
-          wrapper = createComponent({ scope: 'issues', state });
+          wrapper = createComponent({ scope: 'issues', initialFilter });
         });
 
         it(`sets dropdown label to ${label}`, () => {
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 98ee7c7b97c..06f86e7716a 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -5,6 +5,16 @@ require 'spec_helper'
 RSpec.describe BlobHelper do
   include TreeHelper
 
+  describe '#highlight' do
+    it 'wraps highlighted content' do
+      expect(helper.highlight('test.rb', '52')).to eq(%q[<pre class="code highlight"><code><span id="LC1" class="line" lang="ruby"><span class="mi">52</span></span></code></pre>])
+    end
+
+    it 'handles plain version' do
+      expect(helper.highlight('test.rb', '52', plain: true)).to eq(%q[<pre class="code highlight"><code><span id="LC1" class="line" lang="">52</span></code></pre>])
+    end
+  end
+
   describe "#sanitize_svg_data" do
     let(:input_svg_path) { File.join(Rails.root, 'spec', 'fixtures', 'unsanitized.svg') }
     let(:data) { File.read(input_svg_path) }
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 e7b6c910b8a..35ef2abfa63 100644
--- a/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
@@ -5,6 +5,8 @@ require 'spec_helper'
 RSpec.describe Banzai::Filter::ExternalIssueReferenceFilter do
   include FilterSpecHelper
 
+  let_it_be_with_refind(:project) { create(:project) }
+
   shared_examples_for "external issue tracker" do
     it_behaves_like 'a reference containing an element node'
 
@@ -116,7 +118,7 @@ RSpec.describe Banzai::Filter::ExternalIssueReferenceFilter do
   end
 
   context "redmine project" do
-    let(:project) { create(:redmine_project) }
+    let_it_be(:service) { create(:redmine_service, project: project) }
 
     before do
       project.update!(issues_enabled: false)
@@ -138,7 +140,7 @@ RSpec.describe Banzai::Filter::ExternalIssueReferenceFilter do
   end
 
   context "youtrack project" do
-    let(:project) { create(:youtrack_project) }
+    let_it_be(:service) { create(:youtrack_service, project: project) }
 
     before do
       project.update!(issues_enabled: false)
@@ -181,7 +183,7 @@ RSpec.describe Banzai::Filter::ExternalIssueReferenceFilter do
   end
 
   context "jira project" do
-    let(:project) { create(:jira_project) }
+    let_it_be(:service) { create(:jira_service, project: project) }
     let(:reference) { issue.to_reference }
 
     context "with right markdown" do
@@ -210,7 +212,7 @@ RSpec.describe Banzai::Filter::ExternalIssueReferenceFilter do
   end
 
   context "ewm project" do
-    let_it_be(:project) { create(:ewm_project) }
+    let_it_be(:service) { create(:ewm_service, project: project) }
 
     before do
       project.update!(issues_enabled: false)
diff --git a/spec/lib/gitlab/checks/matching_merge_request_spec.rb b/spec/lib/gitlab/checks/matching_merge_request_spec.rb
new file mode 100644
index 00000000000..ca7ee784ee3
--- /dev/null
+++ b/spec/lib/gitlab/checks/matching_merge_request_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Checks::MatchingMergeRequest do
+  describe '#match?' do
+    let_it_be(:newrev) { '012345678' }
+    let_it_be(:target_branch) { 'feature' }
+    let_it_be(:project) { create(:project, :repository) }
+    let_it_be(:locked_merge_request) do
+      create(:merge_request,
+        :locked,
+        source_project: project,
+        target_project: project,
+        target_branch: target_branch,
+        in_progress_merge_commit_sha: newrev)
+    end
+
+    subject { described_class.new(newrev, target_branch, project) }
+
+    it 'matches a merge request' do
+      expect(subject.match?).to be true
+    end
+
+    it 'does not match any merge request' do
+      matcher = described_class.new(newrev, 'test', project)
+
+      expect(matcher.match?).to be false
+    end
+  end
+end
diff --git a/spec/lib/gitlab/search_results_spec.rb b/spec/lib/gitlab/search_results_spec.rb
index c9473a74ba1..b4cf6a568b4 100644
--- a/spec/lib/gitlab/search_results_spec.rb
+++ b/spec/lib/gitlab/search_results_spec.rb
@@ -58,25 +58,6 @@ RSpec.describe Gitlab::SearchResults do
       end
     end
 
-    describe '#highlight_map' do
-      using RSpec::Parameterized::TableSyntax
-
-      where(:scope, :expected) do
-        'projects'       | {}
-        'issues'         | {}
-        'merge_requests' | {}
-        'milestones'     | {}
-        'users'          | {}
-        'unknown'        | {}
-      end
-
-      with_them do
-        it 'returns the expected highlight_map' do
-          expect(results.highlight_map(scope)).to eq(expected)
-        end
-      end
-    end
-
     describe '#formatted_limited_count' do
       using RSpec::Parameterized::TableSyntax
 
diff --git a/spec/lib/gitlab/snippet_search_results_spec.rb b/spec/lib/gitlab/snippet_search_results_spec.rb
index 2177b2be6d6..e1ae26a4d9e 100644
--- a/spec/lib/gitlab/snippet_search_results_spec.rb
+++ b/spec/lib/gitlab/snippet_search_results_spec.rb
@@ -21,12 +21,6 @@ RSpec.describe Gitlab::SnippetSearchResults do
     end
   end
 
-  describe '#highlight_map' do
-    it 'returns the expected highlight map' do
-      expect(results.highlight_map('snippet_titles')).to eq({})
-    end
-  end
-
   describe '#objects' do
     it 'uses page and per_page to paginate results' do
       snippet2 = create(:snippet, :public, content: 'foo', file_name: 'foo')
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 5a54b29edc3..e54082b4521 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -499,6 +499,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
 
       expect(count_data[:projects_with_packages]).to eq(2)
       expect(count_data[:packages]).to eq(4)
+      expect(count_data[:user_preferences_user_gitpod_enabled]).to eq(1)
     end
 
     it 'gathers object store usage correctly' do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index c54064a182a..5fde9b8661d 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -4299,4 +4299,18 @@ RSpec.describe MergeRequest, factory_default: :keep do
       expect(merge_request.allows_reviewers?).to be(true)
     end
   end
+
+  describe '#update_and_mark_in_progress_merge_commit_sha' do
+    let(:ref) { subject.target_project.repository.commit.id }
+
+    before do
+      expect(subject.target_project).to receive(:mark_primary_write_location)
+    end
+
+    it 'updates commit ID' do
+      expect { subject.update_and_mark_in_progress_merge_commit_sha(ref) }
+        .to change { subject.in_progress_merge_commit_sha }
+        .from(nil).to(ref)
+    end
+  end
 end
diff --git a/spec/services/merge_requests/ff_merge_service_spec.rb b/spec/services/merge_requests/ff_merge_service_spec.rb
index 3038e48a184..64c473d947f 100644
--- a/spec/services/merge_requests/ff_merge_service_spec.rb
+++ b/spec/services/merge_requests/ff_merge_service_spec.rb
@@ -72,15 +72,22 @@ RSpec.describe MergeRequests::FfMergeService do
       end
 
       it 'does not update squash_commit_sha if it is not a squash' do
+        expect(merge_request).to receive(:update_and_mark_in_progress_merge_commit_sha).twice.and_call_original
+
         expect { execute_ff_merge }.not_to change { merge_request.squash_commit_sha }
+        expect(merge_request.in_progress_merge_commit_sha).to be_nil
       end
 
       it 'updates squash_commit_sha if it is a squash' do
+        expect(merge_request).to receive(:update_and_mark_in_progress_merge_commit_sha).twice.and_call_original
+
         merge_request.update!(squash: true)
 
         expect { execute_ff_merge }
           .to change { merge_request.squash_commit_sha }
           .from(nil)
+
+        expect(merge_request.in_progress_merge_commit_sha).to be_nil
       end
     end
 
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 184d54fe09b..d0e3102f157 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe MergeRequests::MergeService do
     context 'valid params' do
       before do
         allow(service).to receive(:execute_hooks)
+        expect(merge_request).to receive(:update_and_mark_in_progress_merge_commit_sha).twice.and_call_original
 
         perform_enqueued_jobs do
           service.execute(merge_request)
diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb
index d92fcdc2d4a..90f205eecdb 100644
--- a/spec/support/helpers/usage_data_helpers.rb
+++ b/spec/support/helpers/usage_data_helpers.rb
@@ -133,6 +133,7 @@ module UsageDataHelpers
       todos
       uploads
       web_hooks
+      user_preferences_user_gitpod_enabled
     ).push(*SMAU_KEYS)
 
   USAGE_DATA_KEYS = %i(
diff --git a/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb
index 4c14d97446e..33061f17bde 100644
--- a/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb
@@ -65,7 +65,7 @@ RSpec.shared_examples 'Notes user references' do
 
       include_examples 'sets the note author to the mapped user'
 
-      include_examples 'adds original autor note'
+      include_examples 'does not add original autor note'
     end
 
     context 'and the note author exists in the target instance' do
diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb
index 9e95dc40ff8..033b2304e33 100644
--- a/spec/views/search/_results.html.haml_spec.rb
+++ b/spec/views/search/_results.html.haml_spec.rb
@@ -60,6 +60,28 @@ RSpec.describe 'search/_results' do
 
           expect(rendered).to have_selector('#js-search-filter-by-state')
         end
+
+        context 'Feature search_filter_by_confidential' do
+          context 'when disabled' do
+            before do
+              stub_feature_flags(search_filter_by_confidential: false)
+            end
+
+            it 'does not render the confidential drop down' do
+              render
+
+              expect(rendered).not_to have_selector('#js-search-filter-by-confidential')
+            end
+          end
+
+          context 'when enabled' do
+            it 'renders the confidential drop down' do
+              render
+
+              expect(rendered).to have_selector('#js-search-filter-by-confidential')
+            end
+          end
+        end
       end
     end
   end