Add latest changes from gitlab-org/gitlab@master

11 files changed, 78 insertions, 52 deletions

diff --git a/spec/frontend/design_management/components/upload/design_dropzone_spec.js b/spec/frontend/design_management/components/upload/design_dropzone_spec.js
index bf97399368f..3c6adf56bbc 100644
--- a/spec/frontend/design_management/components/upload/design_dropzone_spec.js
+++ b/spec/frontend/design_management/components/upload/design_dropzone_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import { GlIcon } from '@gitlab/ui';
 import DesignDropzone from '~/design_management/components/upload/design_dropzone.vue';
-import { deprecatedCreateFlash as createFlash } from '~/flash';
+import createFlash from '~/flash';
 
 jest.mock('~/flash');
 
diff --git a/spec/frontend/design_management/pages/design/index_spec.js b/spec/frontend/design_management/pages/design/index_spec.js
index d0c14c4c7eb..88892bb1878 100644
--- a/spec/frontend/design_management/pages/design/index_spec.js
+++ b/spec/frontend/design_management/pages/design/index_spec.js
@@ -2,7 +2,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueRouter from 'vue-router';
 import { GlAlert } from '@gitlab/ui';
 import { ApolloMutation } from 'vue-apollo';
-import { deprecatedCreateFlash as createFlash } from '~/flash';
+import createFlash from '~/flash';
 import DesignIndex from '~/design_management/pages/design/index.vue';
 import DesignSidebar from '~/design_management/components/design_sidebar.vue';
 import DesignPresentation from '~/design_management/components/design_presentation.vue';
@@ -295,7 +295,7 @@ describe('Design management design index page', () => {
         wrapper.vm.onDesignQueryResult({ data: mockResponseNoDesigns, loading: false });
         return wrapper.vm.$nextTick().then(() => {
           expect(createFlash).toHaveBeenCalledTimes(1);
-          expect(createFlash).toHaveBeenCalledWith(DESIGN_NOT_FOUND_ERROR);
+          expect(createFlash).toHaveBeenCalledWith({ message: DESIGN_NOT_FOUND_ERROR });
           expect(router.push).toHaveBeenCalledTimes(1);
           expect(router.push).toHaveBeenCalledWith({ name: DESIGNS_ROUTE_NAME });
         });
@@ -316,7 +316,7 @@ describe('Design management design index page', () => {
         wrapper.vm.onDesignQueryResult({ data: mockResponseWithDesigns, loading: false });
         return wrapper.vm.$nextTick().then(() => {
           expect(createFlash).toHaveBeenCalledTimes(1);
-          expect(createFlash).toHaveBeenCalledWith(DESIGN_VERSION_NOT_EXIST_ERROR);
+          expect(createFlash).toHaveBeenCalledWith({ message: DESIGN_VERSION_NOT_EXIST_ERROR });
           expect(router.push).toHaveBeenCalledTimes(1);
           expect(router.push).toHaveBeenCalledWith({ name: DESIGNS_ROUTE_NAME });
         });
diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js
index 279403789f1..87d45196d54 100644
--- a/spec/frontend/design_management/pages/index_spec.js
+++ b/spec/frontend/design_management/pages/index_spec.js
@@ -16,7 +16,7 @@ import {
   EXISTING_DESIGN_DROP_MANY_FILES_MESSAGE,
   EXISTING_DESIGN_DROP_INVALID_FILENAME_MESSAGE,
 } from '~/design_management/utils/error_messages';
-import { deprecatedCreateFlash as createFlash } from '~/flash';
+import createFlash from '~/flash';
 import createRouter from '~/design_management/router';
 import * as utils from '~/design_management/utils/design_management_utils';
 import {
@@ -443,10 +443,10 @@ describe('Design management index page', () => {
 
       return uploadDesign.then(() => {
         expect(createFlash).toHaveBeenCalledTimes(1);
-        expect(createFlash).toHaveBeenCalledWith(
-          'Upload skipped. test.jpg did not change.',
-          'warning',
-        );
+        expect(createFlash).toHaveBeenCalledWith({
+          message: 'Upload skipped. test.jpg did not change.',
+          types: 'warning',
+        });
       });
     });
 
@@ -482,7 +482,7 @@ describe('Design management index page', () => {
         designDropzone.vm.$emit('change', eventPayload);
 
         expect(createFlash).toHaveBeenCalledTimes(1);
-        expect(createFlash).toHaveBeenCalledWith(message);
+        expect(createFlash).toHaveBeenCalledWith({ message });
       });
     });
 
@@ -747,7 +747,7 @@ describe('Design management index page', () => {
 
       await wrapper.vm.$nextTick();
 
-      expect(createFlash).toHaveBeenCalledWith('Houston, we have a problem');
+      expect(createFlash).toHaveBeenCalledWith({ message: 'Houston, we have a problem' });
     });
 
     it('displays flash if mutation had a non-recoverable error', async () => {
@@ -761,9 +761,9 @@ describe('Design management index page', () => {
       await jest.runOnlyPendingTimers(); // kick off the mocked GQL stuff (promises)
       await wrapper.vm.$nextTick(); // kick off the DOM update for flash
 
-      expect(createFlash).toHaveBeenCalledWith(
-        'Something went wrong when reordering designs. Please try again',
-      );
+      expect(createFlash).toHaveBeenCalledWith({
+        message: 'Something went wrong when reordering designs. Please try again',
+      });
     });
   });
 });
diff --git a/spec/frontend/design_management/utils/cache_update_spec.js b/spec/frontend/design_management/utils/cache_update_spec.js
index 6c859e8c3e8..56c9b91bef0 100644
--- a/spec/frontend/design_management/utils/cache_update_spec.js
+++ b/spec/frontend/design_management/utils/cache_update_spec.js
@@ -11,7 +11,7 @@ import {
   UPDATE_IMAGE_DIFF_NOTE_ERROR,
 } from '~/design_management/utils/error_messages';
 import design from '../mock_data/design';
-import { deprecatedCreateFlash as createFlash } from '~/flash';
+import createFlash from '~/flash';
 
 jest.mock('~/flash.js');
 
@@ -35,7 +35,7 @@ describe('Design Management cache update', () => {
       expect(createFlash).not.toHaveBeenCalled();
       expect(() => subject(mockStore, { errors: mockErrors }, {}, ...extraArgs)).toThrow();
       expect(createFlash).toHaveBeenCalledTimes(1);
-      expect(createFlash).toHaveBeenCalledWith(errorMessage);
+      expect(createFlash).toHaveBeenCalledWith({ message: errorMessage });
     });
   });
 });
diff --git a/spec/frontend/fixtures/search.rb b/spec/frontend/fixtures/search.rb
index 40f613a9422..7819d0774a7 100644
--- a/spec/frontend/fixtures/search.rb
+++ b/spec/frontend/fixtures/search.rb
@@ -26,8 +26,51 @@ RSpec.describe SearchController, '(JavaScript fixtures)', type: :controller do
   context 'search within a project' do
     let(:namespace) { create(:namespace, name: 'frontend-fixtures') }
     let(:project) { create(:project, :public, :repository, namespace: namespace, path: 'search-project') }
+    let(:blobs) do
+      Kaminari.paginate_array([
+        Gitlab::Search::FoundBlob.new(
+          path: 'CHANGELOG',
+          basename: 'CHANGELOG',
+          ref: 'master',
+          data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2),
+        Gitlab::Search::FoundBlob.new(
+          path: 'CONTRIBUTING',
+          basename: 'CONTRIBUTING',
+          ref: 'master',
+          data: "hello\nworld\nfoo\nSend # this is the highligh\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2),
+        Gitlab::Search::FoundBlob.new(
+          path: 'README',
+          basename: 'README',
+          ref: 'master',
+          data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2),
+        Gitlab::Search::FoundBlob.new(
+          path: 'test',
+          basename: 'test',
+          ref: 'master',
+          data: "foo\nSend # this is the highlight\nbaz\nboo\nbat",
+          project: project,
+          project_id: project.id,
+          startline: 2)
+     ],
+     total_count: 4,
+     limit: 4,
+     offset: 0)
+    end
 
     it 'search/blob_search_result.html' do
+      expect_next_instance_of(SearchService) do |search_service|
+        expect(search_service).to receive(:search_objects).and_return(blobs)
+      end
+
       get :show, params: {
         search: 'Send',
         project_id: project.id,
diff --git a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js
index 788f3abf617..cc384aef231 100644
--- a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js
+++ b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js
@@ -1,5 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
-import { GlDeprecatedDropdown, GlDeprecatedDropdownItem } from '@gitlab/ui';
+import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import DropdownField from '~/monitoring/components/variables/dropdown_field.vue';
 
 describe('Custom variable component', () => {
@@ -23,8 +23,8 @@ describe('Custom variable component', () => {
     });
   };
 
-  const findDropdown = () => wrapper.find(GlDeprecatedDropdown);
-  const findDropdownItems = () => wrapper.findAll(GlDeprecatedDropdownItem);
+  const findDropdown = () => wrapper.find(GlDropdown);
+  const findDropdownItems = () => wrapper.findAll(GlDropdownItem);
 
   it('renders dropdown element when all necessary props are passed', () => {
     createShallowWrapper();
diff --git a/spec/frontend/notes/components/note_awards_list_spec.js b/spec/frontend/notes/components/note_awards_list_spec.js
index dce5424f154..5ab183e5452 100644
--- a/spec/frontend/notes/components/note_awards_list_spec.js
+++ b/spec/frontend/notes/components/note_awards_list_spec.js
@@ -92,15 +92,14 @@ describe('note_awards_list component', () => {
       }).$mount();
     };
 
-    const findTooltip = () =>
-      vm.$el.querySelector('[data-original-title]').getAttribute('data-original-title');
+    const findTooltip = () => vm.$el.querySelector('[title]').getAttribute('title');
 
     it('should only escape & and " characters', () => {
       awardsMock = [...new Array(1)].map(createAwardEmoji);
       mountComponent();
       const escapedName = awardsMock[0].user.name.replace(/&/g, '&').replace(/"/g, '"');
 
-      expect(vm.$el.querySelector('[data-original-title]').outerHTML).toContain(escapedName);
+      expect(vm.$el.querySelector('[title]').outerHTML).toContain(escapedName);
     });
 
     it('should not escape special HTML characters twice when only 1 person awarded', () => {
diff --git a/spec/frontend/pages/search/show/highlight_blob_search_result_spec.js b/spec/frontend/search/highlight_blob_search_result_spec.js
index 4083a65df75..112e6f5124f 100644
--- a/spec/frontend/pages/search/show/highlight_blob_search_result_spec.js
+++ b/spec/frontend/search/highlight_blob_search_result_spec.js
@@ -1,8 +1,8 @@
-import setHighlightClass from '~/pages/search/show/highlight_blob_search_result';
+import setHighlightClass from '~/search/highlight_blob_search_result';
 
 const fixture = 'search/blob_search_result.html';
 
-describe('pages/search/show/highlight_blob_search_result', () => {
+describe('search/highlight_blob_search_result', () => {
   preloadFixtures(fixture);
 
   beforeEach(() => loadFixtures(fixture));
@@ -10,6 +10,6 @@ describe('pages/search/show/highlight_blob_search_result', () => {
   it('highlights lines with search term occurrence', () => {
     setHighlightClass();
 
-    expect(document.querySelectorAll('.blob-result .hll').length).toBe(11);
+    expect(document.querySelectorAll('.blob-result .hll').length).toBe(4);
   });
 });
diff --git a/spec/frontend/search_spec.js b/spec/frontend/search_spec.js
index 1573365538c..7f480fe2a2b 100644
--- a/spec/frontend/search_spec.js
+++ b/spec/frontend/search_spec.js
@@ -1,10 +1,10 @@
 import $ from 'jquery';
+import setHighlightClass from 'ee_else_ce/search/highlight_blob_search_result';
 import Api from '~/api';
 import Search from '~/pages/search/show/search';
-import setHighlightClass from '~/pages/search/show/highlight_blob_search_result';
 
 jest.mock('~/api');
-jest.mock('~/pages/search/show/highlight_blob_search_result');
+jest.mock('ee_else_ce/search/highlight_blob_search_result');
 
 describe('Search', () => {
   const fixturePath = 'search/show.html';
diff --git a/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap b/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap
index 82503e5a025..04ae2a0f34d 100644
--- a/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap
+++ b/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap
@@ -6,10 +6,8 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
 >
   <button
     class="btn award-control"
-    data-boundary="viewport"
-    data-original-title="Ada, Leonardo, and Marie"
     data-testid="award-button"
-    title=""
+    title="Ada, Leonardo, and Marie"
     type="button"
   >
     <span
@@ -32,10 +30,8 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
   </button>
   <button
     class="btn award-control active"
-    data-boundary="viewport"
-    data-original-title="You, Ada, and Marie"
     data-testid="award-button"
-    title=""
+    title="You, Ada, and Marie"
     type="button"
   >
     <span
@@ -58,10 +54,8 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
   </button>
   <button
     class="btn award-control"
-    data-boundary="viewport"
-    data-original-title="Ada and Jane"
     data-testid="award-button"
-    title=""
+    title="Ada and Jane"
     type="button"
   >
     <span
@@ -84,10 +78,8 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
   </button>
   <button
     class="btn award-control active"
-    data-boundary="viewport"
-    data-original-title="You, Ada, Jane, and Leonardo"
     data-testid="award-button"
-    title=""
+    title="You, Ada, Jane, and Leonardo"
     type="button"
   >
     <span
@@ -110,10 +102,8 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
   </button>
   <button
     class="btn award-control active"
-    data-boundary="viewport"
-    data-original-title="You"
     data-testid="award-button"
-    title=""
+    title="You"
     type="button"
   >
     <span
@@ -136,10 +126,8 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
   </button>
   <button
     class="btn award-control"
-    data-boundary="viewport"
-    data-original-title="Marie"
     data-testid="award-button"
-    title=""
+    title="Marie"
     type="button"
   >
     <span
@@ -162,10 +150,8 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
   </button>
   <button
     class="btn award-control active"
-    data-boundary="viewport"
-    data-original-title="You"
     data-testid="award-button"
-    title=""
+    title="You"
     type="button"
   >
     <span
@@ -193,9 +179,7 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
     <button
       aria-label="Add reaction"
       class="award-control btn js-add-award js-test-add-button-class"
-      data-boundary="viewport"
-      data-original-title="Add reaction"
-      title=""
+      title="Add reaction"
       type="button"
     >
       <span
diff --git a/spec/frontend/vue_shared/components/awards_list_spec.js b/spec/frontend/vue_shared/components/awards_list_spec.js
index 0abb72ace2e..63fc8a5749d 100644
--- a/spec/frontend/vue_shared/components/awards_list_spec.js
+++ b/spec/frontend/vue_shared/components/awards_list_spec.js
@@ -62,7 +62,7 @@ describe('vue_shared/components/awards_list', () => {
     findAwardButtons().wrappers.map(x => {
       return {
         classes: x.classes(),
-        title: x.attributes('data-original-title'),
+        title: x.attributes('title'),
         html: x.find('[data-testid="award-html"]').element.innerHTML,
         count: Number(x.find('.js-counter').text()),
       };