diff options
Diffstat (limited to 'spec/frontend/repository/components')
10 files changed, 46 insertions, 34 deletions
diff --git a/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap b/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap index 01494cb6a24..6fe60f3c2e6 100644 --- a/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap +++ b/spec/frontend/repository/components/__snapshots__/last_commit_spec.js.snap @@ -7,7 +7,7 @@ exports[`Repository last commit component renders commit widget 1`] = ` <user-avatar-link-stub class="gl-my-2 gl-mr-4" imgalt="" - imgcssclasses="gl-mr-0!" + imgcssclasses="" imgsize="32" imgsrc="https://test.com" linkhref="/test" diff --git a/spec/frontend/repository/components/blob_controls_spec.js b/spec/frontend/repository/components/blob_controls_spec.js index 6da1861ea7c..0d52542397f 100644 --- a/spec/frontend/repository/components/blob_controls_spec.js +++ b/spec/frontend/repository/components/blob_controls_spec.js @@ -8,9 +8,13 @@ import blobControlsQuery from '~/repository/queries/blob_controls.query.graphql' import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import createRouter from '~/repository/router'; import { updateElementsVisibility } from '~/repository/utils/dom'; +import ShortcutsBlob from '~/behaviors/shortcuts/shortcuts_blob'; +import BlobLinePermalinkUpdater from '~/blob/blob_line_permalink_updater'; import { blobControlsDataMock, refMock } from '../mock_data'; jest.mock('~/repository/utils/dom'); +jest.mock('~/behaviors/shortcuts/shortcuts_blob'); +jest.mock('~/blob/blob_line_permalink_updater'); let router; let wrapper; @@ -82,4 +86,12 @@ describe('Blob controls component', () => { expect(updateElementsVisibility).toHaveBeenCalledWith('.tree-controls', true); }, ); + + it('loads the ShortcutsBlob', () => { + expect(ShortcutsBlob).toHaveBeenCalled(); + }); + + it('loads the BlobLinePermalinkUpdater', () => { + expect(BlobLinePermalinkUpdater).toHaveBeenCalled(); + }); }); diff --git a/spec/frontend/repository/components/last_commit_spec.js b/spec/frontend/repository/components/last_commit_spec.js index bf9528953b6..964b135bee3 100644 --- a/spec/frontend/repository/components/last_commit_spec.js +++ b/spec/frontend/repository/components/last_commit_spec.js @@ -185,7 +185,7 @@ describe('Repository last commit component', () => { it('strips the first newline of the description', () => { expect(findCommitRowDescription().html()).toBe( - '<pre class="commit-row-description gl-mb-3">Update ADOPTERS.md</pre>', + '<pre class="commit-row-description gl-mb-3 gl-white-space-pre-line">Update ADOPTERS.md</pre>', ); }); diff --git a/spec/frontend/repository/components/new_directory_modal_spec.js b/spec/frontend/repository/components/new_directory_modal_spec.js index aaf751a9a8d..cf0d48280f4 100644 --- a/spec/frontend/repository/components/new_directory_modal_spec.js +++ b/spec/frontend/repository/components/new_directory_modal_spec.js @@ -4,7 +4,7 @@ import { nextTick } from 'vue'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import httpStatusCodes from '~/lib/utils/http_status'; import { visitUrl } from '~/lib/utils/url_utility'; import NewDirectoryModal from '~/repository/components/new_directory_modal.vue'; @@ -194,7 +194,7 @@ describe('NewDirectoryModal', () => { await fillForm({ dirName: 'foo', branchName: 'master', commitMessage: 'foo' }); await submitForm(); - expect(createFlash).toHaveBeenCalledWith({ + expect(createAlert).toHaveBeenCalledWith({ message: NewDirectoryModal.i18n.ERROR_MESSAGE, }); }); diff --git a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap index 26064e9b248..b99d741e984 100644 --- a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap +++ b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap @@ -40,10 +40,10 @@ exports[`Repository table row component renders a symlink table row 1`] = ` </td> <td - class="d-none d-sm-table-cell tree-commit cursor-default" + class="d-none d-sm-table-cell tree-commit cursor-default gl-text-secondary" > <gl-link-stub - class="str-truncated-100 tree-commit-link" + class="str-truncated-100 tree-commit-link gl-text-secondary" /> <gl-intersection-observer-stub> @@ -52,7 +52,7 @@ exports[`Repository table row component renders a symlink table row 1`] = ` </td> <td - class="tree-time-ago text-right cursor-default" + class="tree-time-ago text-right cursor-default gl-text-secondary" > <timeago-tooltip-stub cssclass="" @@ -105,10 +105,10 @@ exports[`Repository table row component renders table row 1`] = ` </td> <td - class="d-none d-sm-table-cell tree-commit cursor-default" + class="d-none d-sm-table-cell tree-commit cursor-default gl-text-secondary" > <gl-link-stub - class="str-truncated-100 tree-commit-link" + class="str-truncated-100 tree-commit-link gl-text-secondary" /> <gl-intersection-observer-stub> @@ -117,7 +117,7 @@ exports[`Repository table row component renders table row 1`] = ` </td> <td - class="tree-time-ago text-right cursor-default" + class="tree-time-ago text-right cursor-default gl-text-secondary" > <timeago-tooltip-stub cssclass="" @@ -170,10 +170,10 @@ exports[`Repository table row component renders table row for path with special </td> <td - class="d-none d-sm-table-cell tree-commit cursor-default" + class="d-none d-sm-table-cell tree-commit cursor-default gl-text-secondary" > <gl-link-stub - class="str-truncated-100 tree-commit-link" + class="str-truncated-100 tree-commit-link gl-text-secondary" /> <gl-intersection-observer-stub> @@ -182,7 +182,7 @@ exports[`Repository table row component renders table row for path with special </td> <td - class="tree-time-ago text-right cursor-default" + class="tree-time-ago text-right cursor-default gl-text-secondary" > <timeago-tooltip-stub cssclass="" diff --git a/spec/frontend/repository/components/table/index_spec.js b/spec/frontend/repository/components/table/index_spec.js index 697d2dcc7f5..2180f78a8df 100644 --- a/spec/frontend/repository/components/table/index_spec.js +++ b/spec/frontend/repository/components/table/index_spec.js @@ -159,7 +159,7 @@ describe('Repository table component', () => { }); describe('Show more button', () => { - const showMoreButton = () => vm.find(GlButton); + const showMoreButton = () => vm.findComponent(GlButton); it.each` hasMore | expectButtonToExist diff --git a/spec/frontend/repository/components/table/parent_row_spec.js b/spec/frontend/repository/components/table/parent_row_spec.js index 9daae8c36ef..03fb4242e40 100644 --- a/spec/frontend/repository/components/table/parent_row_spec.js +++ b/spec/frontend/repository/components/table/parent_row_spec.js @@ -39,7 +39,7 @@ describe('Repository parent row component', () => { `('renders link in $path to $to', ({ path, to }) => { factory(path); - expect(vm.find(RouterLinkStub).props().to).toEqual({ + expect(vm.findComponent(RouterLinkStub).props().to).toEqual({ path: to, }); }); @@ -69,6 +69,6 @@ describe('Repository parent row component', () => { it('renders loading icon when loading parent', () => { factory('app/assets', 'app'); - expect(vm.find(GlLoadingIcon).exists()).toBe(true); + expect(vm.findComponent(GlLoadingIcon).exists()).toBe(true); }); }); diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js index 13b09e57473..64aa6d179a8 100644 --- a/spec/frontend/repository/components/table/row_spec.js +++ b/spec/frontend/repository/components/table/row_spec.js @@ -47,7 +47,7 @@ function factory(propsData = {}) { } describe('Repository table row component', () => { - const findRouterLink = () => vm.find(RouterLinkStub); + const findRouterLink = () => vm.findComponent(RouterLinkStub); const findIntersectionObserver = () => vm.findComponent(GlIntersectionObserver); afterEach(() => { @@ -124,7 +124,7 @@ describe('Repository table row component', () => { }); await nextTick(); - expect(vm.find(component).exists()).toBe(true); + expect(vm.findComponent(component).exists()).toBe(true); }); it.each` @@ -141,7 +141,7 @@ describe('Repository table row component', () => { }); await nextTick(); - expect(vm.find({ ref: 'link' }).props('to')).toEqual({ + expect(vm.findComponent({ ref: 'link' }).props('to')).toEqual({ path: `/-/tree/main/${encodeURIComponent(path)}`, }); }); @@ -197,7 +197,7 @@ describe('Repository table row component', () => { }); await nextTick(); - expect(vm.find(GlBadge).exists()).toBe(true); + expect(vm.findComponent(GlBadge).exists()).toBe(true); }); it('renders commit and web links with href for submodule', async () => { @@ -213,7 +213,7 @@ describe('Repository table row component', () => { await nextTick(); expect(vm.find('a').attributes('href')).toEqual('https://test.com'); - expect(vm.find(GlLink).attributes('href')).toEqual('https://test.com/commit'); + expect(vm.findComponent(GlLink).attributes('href')).toEqual('https://test.com/commit'); }); it('renders lock icon', async () => { @@ -226,8 +226,8 @@ describe('Repository table row component', () => { }); await nextTick(); - expect(vm.find(GlIcon).exists()).toBe(true); - expect(vm.find(GlIcon).props('name')).toBe('lock'); + expect(vm.findComponent(GlIcon).exists()).toBe(true); + expect(vm.findComponent(GlIcon).props('name')).toBe('lock'); }); it('renders loading icon when path is loading', () => { @@ -240,7 +240,7 @@ describe('Repository table row component', () => { loadingPath: 'test', }); - expect(vm.find(FileIcon).props('loading')).toBe(true); + expect(vm.findComponent(FileIcon).props('loading')).toBe(true); }); describe('row visibility', () => { diff --git a/spec/frontend/repository/components/tree_content_spec.js b/spec/frontend/repository/components/tree_content_spec.js index 9d3a5394df8..352f4314232 100644 --- a/spec/frontend/repository/components/tree_content_spec.js +++ b/spec/frontend/repository/components/tree_content_spec.js @@ -38,7 +38,7 @@ function factory(path, data = () => ({})) { } describe('Repository table component', () => { - const findFileTable = () => vm.find(FileTable); + const findFileTable = () => vm.findComponent(FileTable); afterEach(() => { vm.destroy(); @@ -53,7 +53,7 @@ describe('Repository table component', () => { await nextTick(); - expect(vm.find(FilePreview).exists()).toBe(true); + expect(vm.findComponent(FilePreview).exists()).toBe(true); }); it('trigger fetchFiles and resetRequestedCommits when mounted', async () => { diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js index 505ff7f3dd6..8db169b02b4 100644 --- a/spec/frontend/repository/components/upload_blob_modal_spec.js +++ b/spec/frontend/repository/components/upload_blob_modal_spec.js @@ -4,7 +4,7 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import { nextTick } from 'vue'; import waitForPromises from 'helpers/wait_for_promises'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import httpStatusCodes from '~/lib/utils/http_status'; import { visitUrl } from '~/lib/utils/url_utility'; import UploadBlobModal from '~/repository/components/upload_blob_modal.vue'; @@ -47,12 +47,12 @@ describe('UploadBlobModal', () => { }); }; - const findModal = () => wrapper.find(GlModal); - const findAlert = () => wrapper.find(GlAlert); - const findCommitMessage = () => wrapper.find(GlFormTextarea); - const findBranchName = () => wrapper.find(GlFormInput); - const findMrToggle = () => wrapper.find(GlToggle); - const findUploadDropzone = () => wrapper.find(UploadDropzone); + const findModal = () => wrapper.findComponent(GlModal); + const findAlert = () => wrapper.findComponent(GlAlert); + const findCommitMessage = () => wrapper.findComponent(GlFormTextarea); + const findBranchName = () => wrapper.findComponent(GlFormInput); + const findMrToggle = () => wrapper.findComponent(GlToggle); + const findUploadDropzone = () => wrapper.findComponent(UploadDropzone); const actionButtonDisabledState = () => findModal().props('actionPrimary').attributes[0].disabled; const cancelButtonDisabledState = () => findModal().props('actionCancel').attributes[0].disabled; const actionButtonLoadingState = () => findModal().props('actionPrimary').attributes[0].loading; @@ -185,7 +185,7 @@ describe('UploadBlobModal', () => { }); it('creates a flash error', () => { - expect(createFlash).toHaveBeenCalledWith({ + expect(createAlert).toHaveBeenCalledWith({ message: 'Error uploading file. Please try again.', }); }); |