From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js | 14 ++++++++------ spec/frontend/blob/components/blob_content_error_spec.js | 4 ++-- spec/frontend/blob/components/blob_edit_content_spec.js | 2 +- spec/frontend/blob/components/blob_edit_header_spec.js | 2 +- .../frontend/blob/components/blob_header_filepath_spec.js | 14 ++------------ spec/frontend/blob/components/blob_header_spec.js | 2 +- spec/frontend/blob/pipeline_tour_success_modal_spec.js | 15 ++++++++++++--- spec/frontend/blob/sketch/index_spec.js | 6 +++--- spec/frontend/blob/utils_spec.js | 2 +- spec/frontend/blob/viewer/index_spec.js | 10 +++++----- 10 files changed, 36 insertions(+), 35 deletions(-) (limited to 'spec/frontend/blob') diff --git a/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js b/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js index 3b64e4910e2..09c49617bc5 100644 --- a/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js +++ b/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js @@ -1,7 +1,7 @@ import sqljs from 'sql.js'; +import ClassSpecHelper from 'helpers/class_spec_helper'; import axios from '~/lib/utils/axios_utils'; import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer'; -import ClassSpecHelper from '../../helpers/class_spec_helper'; jest.mock('sql.js'); @@ -49,7 +49,7 @@ describe('BalsamiqViewer', () => { ); }); - it('should call `renderFile` on request success', done => { + it('should call `renderFile` on request success', (done) => { jest.spyOn(axios, 'get').mockReturnValue(requestSuccess); jest.spyOn(bv, 'renderFile').mockImplementation(() => {}); @@ -61,7 +61,7 @@ describe('BalsamiqViewer', () => { .catch(done.fail); }); - it('should not call `renderFile` on request failure', done => { + it('should not call `renderFile` on request failure', (done) => { jest.spyOn(axios, 'get').mockReturnValue(Promise.reject()); jest.spyOn(bv, 'renderFile').mockImplementation(() => {}); @@ -95,8 +95,8 @@ describe('BalsamiqViewer', () => { balsamiqViewer.viewer = viewer; balsamiqViewer.getPreviews.mockReturnValue(previews); - balsamiqViewer.renderPreview.mockImplementation(preview => preview); - viewer.appendChild.mockImplementation(containerElement => { + balsamiqViewer.renderPreview.mockImplementation((preview) => preview); + viewer.appendChild.mockImplementation((containerElement) => { container = containerElement; }); @@ -177,7 +177,9 @@ describe('BalsamiqViewer', () => { database, }; - jest.spyOn(BalsamiqViewer, 'parsePreview').mockImplementation(preview => preview.toString()); + jest + .spyOn(BalsamiqViewer, 'parsePreview') + .mockImplementation((preview) => preview.toString()); database.exec.mockReturnValue(thumbnails); getPreviews = BalsamiqViewer.prototype.getPreviews.call(balsamiqViewer); diff --git a/spec/frontend/blob/components/blob_content_error_spec.js b/spec/frontend/blob/components/blob_content_error_spec.js index 0c6d269ad05..95686be8294 100644 --- a/spec/frontend/blob/components/blob_content_error_spec.js +++ b/spec/frontend/blob/components/blob_content_error_spec.js @@ -32,7 +32,7 @@ describe('Blob Content Error component', () => { viewerError: error.id, }); expect(wrapper.text()).toContain(reason); - options.forEach(option => { + options.forEach((option) => { expect(wrapper.text()).toContain(option); }); }); @@ -52,7 +52,7 @@ describe('Blob Content Error component', () => { }, }); expect(wrapper.text()).toContain(reason); - options.forEach(option => { + options.forEach((option) => { expect(wrapper.text()).toContain(option); }); }); diff --git a/spec/frontend/blob/components/blob_edit_content_spec.js b/spec/frontend/blob/components/blob_edit_content_spec.js index dbed086a552..7de8d9236ed 100644 --- a/spec/frontend/blob/components/blob_edit_content_spec.js +++ b/spec/frontend/blob/components/blob_edit_content_spec.js @@ -40,7 +40,7 @@ describe('Blob Header Editing', () => { wrapper.destroy(); }); - const triggerChangeContent = val => { + const triggerChangeContent = (val) => { getValue.mockReturnValue(val); const [cb] = onDidChangeModelContent.mock.calls[0]; diff --git a/spec/frontend/blob/components/blob_edit_header_spec.js b/spec/frontend/blob/components/blob_edit_header_spec.js index 4355f46db7e..22e8e6d986c 100644 --- a/spec/frontend/blob/components/blob_edit_header_spec.js +++ b/spec/frontend/blob/components/blob_edit_header_spec.js @@ -15,7 +15,7 @@ describe('Blob Header Editing', () => { }); }; const findDeleteButton = () => - wrapper.findAll(GlButton).wrappers.find(x => x.text() === 'Delete file'); + wrapper.findAll(GlButton).wrappers.find((x) => x.text() === 'Delete file'); beforeEach(() => { createComponent(); diff --git a/spec/frontend/blob/components/blob_header_filepath_spec.js b/spec/frontend/blob/components/blob_header_filepath_spec.js index 067a4ae61a0..7b8b5050486 100644 --- a/spec/frontend/blob/components/blob_header_filepath_spec.js +++ b/spec/frontend/blob/components/blob_header_filepath_spec.js @@ -32,12 +32,7 @@ describe('Blob Header Filepath', () => { it('renders regular name', () => { createComponent(); - expect( - wrapper - .find('.js-blob-header-filepath') - .text() - .trim(), - ).toBe(MockBlob.path); + expect(wrapper.find('.js-blob-header-filepath').text().trim()).toBe(MockBlob.path); }); it('does not fail if the name is empty', () => { @@ -71,12 +66,7 @@ describe('Blob Header Filepath', () => { ); expect(wrapper.text()).toContain(slotContent); - expect( - wrapper - .text() - .trim() - .substring(0, slotContent.length), - ).toBe(slotContent); + expect(wrapper.text().trim().substring(0, slotContent.length)).toBe(slotContent); }); }); diff --git a/spec/frontend/blob/components/blob_header_spec.js b/spec/frontend/blob/components/blob_header_spec.js index 3e84347bee4..b3f80183f6b 100644 --- a/spec/frontend/blob/components/blob_header_spec.js +++ b/spec/frontend/blob/components/blob_header_spec.js @@ -75,7 +75,7 @@ describe('Blob Header Default Actions', () => { expect(wrapper.find(DefaultActions).exists()).toBe(false); }); - Object.keys(slots).forEach(slot => { + Object.keys(slots).forEach((slot) => { it('renders the slots', () => { const slotContent = slots[slot]; createComponent( diff --git a/spec/frontend/blob/pipeline_tour_success_modal_spec.js b/spec/frontend/blob/pipeline_tour_success_modal_spec.js index e8011558765..d4562019302 100644 --- a/spec/frontend/blob/pipeline_tour_success_modal_spec.js +++ b/spec/frontend/blob/pipeline_tour_success_modal_spec.js @@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; import { GlSprintf, GlModal, GlLink } from '@gitlab/ui'; import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper'; +import { stubComponent } from 'helpers/stub_component'; import pipelineTourSuccess from '~/blob/pipeline_tour_success_modal.vue'; import modalProps from './pipeline_tour_success_mock_data'; @@ -10,13 +11,21 @@ describe('PipelineTourSuccessModal', () => { let cookieSpy; let trackingSpy; + const GlEmoji = { template: '' }; const createComponent = () => { wrapper = shallowMount(pipelineTourSuccess, { propsData: modalProps, stubs: { - GlModal, + GlModal: stubComponent(GlModal, { + template: ` +
+ + + +
`, + }), GlSprintf, - 'gl-emoji': '', + GlEmoji, }, }); }; @@ -67,7 +76,7 @@ describe('PipelineTourSuccessModal', () => { it('has expected structure', () => { const modal = wrapper.find(GlModal); const sprintf = modal.find(GlSprintf); - const emoji = modal.find('img'); + const emoji = modal.find(GlEmoji); expect(wrapper.text()).toContain("That's it, well done!"); expect(sprintf.exists()).toBe(true); diff --git a/spec/frontend/blob/sketch/index_spec.js b/spec/frontend/blob/sketch/index_spec.js index cd12d5e17a8..a24e7de9037 100644 --- a/spec/frontend/blob/sketch/index_spec.js +++ b/spec/frontend/blob/sketch/index_spec.js @@ -11,7 +11,7 @@ describe('Sketch viewer', () => { }); describe('with error message', () => { - beforeEach(done => { + beforeEach((done) => { jest.spyOn(SketchLoader.prototype, 'getZipFile').mockImplementation( () => new Promise((resolve, reject) => { @@ -37,7 +37,7 @@ describe('Sketch viewer', () => { }); describe('success', () => { - beforeEach(done => { + beforeEach((done) => { const loadAsyncMock = { files: { 'previews/preview.png': { @@ -48,7 +48,7 @@ describe('Sketch viewer', () => { loadAsyncMock.files['previews/preview.png'].async.mockImplementation( () => - new Promise(resolve => { + new Promise((resolve) => { resolve('foo'); done(); }), diff --git a/spec/frontend/blob/utils_spec.js b/spec/frontend/blob/utils_spec.js index ab9e325e963..fa83690c104 100644 --- a/spec/frontend/blob/utils_spec.js +++ b/spec/frontend/blob/utils_spec.js @@ -26,7 +26,7 @@ describe('Blob utilities', () => { it.each([[{}], [{ blobPath, blobContent, blobGlobalId }]])( 'creates the instance with the passed parameters %s', - extraParams => { + (extraParams) => { const params = { el: editorEl, ...extraParams, diff --git a/spec/frontend/blob/viewer/index_spec.js b/spec/frontend/blob/viewer/index_spec.js index a4b4044f5f9..4a5eb31602d 100644 --- a/spec/frontend/blob/viewer/index_spec.js +++ b/spec/frontend/blob/viewer/index_spec.js @@ -37,7 +37,7 @@ describe('Blob viewer', () => { window.location.hash = ''; }); - it('loads source file after switching views', done => { + it('loads source file after switching views', (done) => { document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); setImmediate(() => { @@ -51,7 +51,7 @@ describe('Blob viewer', () => { }); }); - it('loads source file when line number is in hash', done => { + it('loads source file when line number is in hash', (done) => { window.location.hash = '#L1'; new BlobViewer(); @@ -117,7 +117,7 @@ describe('Blob viewer', () => { expect(copyButton.blur).not.toHaveBeenCalled(); }); - it('enables after switching to simple view', done => { + it('enables after switching to simple view', (done) => { document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); setImmediate(() => { @@ -127,7 +127,7 @@ describe('Blob viewer', () => { }); }); - it('updates tooltip after switching to simple view', done => { + it('updates tooltip after switching to simple view', (done) => { document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); setImmediate(() => { @@ -171,7 +171,7 @@ describe('Blob viewer', () => { ${['simple', 'rich']} `('when view switches to $views', ({ views }) => { beforeEach(async () => { - views.forEach(view => blob.switchToViewer(view)); + views.forEach((view) => blob.switchToViewer(view)); await axios.waitForAll(); }); -- cgit v1.2.3