diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/frontend/repository | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/frontend/repository')
8 files changed, 55 insertions, 57 deletions
diff --git a/spec/frontend/repository/components/breadcrumbs_spec.js b/spec/frontend/repository/components/breadcrumbs_spec.js index a0dc608ddc9..2ac2069a177 100644 --- a/spec/frontend/repository/components/breadcrumbs_spec.js +++ b/spec/frontend/repository/components/breadcrumbs_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import { GlDropdown } from '@gitlab/ui'; +import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import Breadcrumbs from '~/repository/components/breadcrumbs.vue'; let vm; diff --git a/spec/frontend/repository/components/last_commit_spec.js b/spec/frontend/repository/components/last_commit_spec.js index fe77057c3d4..ebea7dde34a 100644 --- a/spec/frontend/repository/components/last_commit_spec.js +++ b/spec/frontend/repository/components/last_commit_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import LastCommit from '~/repository/components/last_commit.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; @@ -58,77 +58,75 @@ describe('Repository last commit component', () => { loading | label ${true} | ${'shows'} ${false} | ${'hides'} - `('$label when loading icon $loading is true', ({ loading }) => { + `('$label when loading icon $loading is true', async ({ loading }) => { factory(createCommitData(), loading); - return vm.vm.$nextTick(() => { - expect(vm.find(GlLoadingIcon).exists()).toBe(loading); - }); + await vm.vm.$nextTick(); + + expect(vm.find(GlLoadingIcon).exists()).toBe(loading); }); - it('renders commit widget', () => { + it('renders commit widget', async () => { factory(); - return vm.vm.$nextTick(() => { - expect(vm.element).toMatchSnapshot(); - }); + await vm.vm.$nextTick(); + + expect(vm.element).toMatchSnapshot(); }); - it('renders short commit ID', () => { + it('renders short commit ID', async () => { factory(); - return vm.vm.$nextTick(() => { - expect(vm.find('[data-testid="last-commit-id-label"]').text()).toEqual('12345678'); - }); + await vm.vm.$nextTick(); + + expect(vm.find('[data-testid="last-commit-id-label"]').text()).toEqual('12345678'); }); - it('hides pipeline components when pipeline does not exist', () => { + it('hides pipeline components when pipeline does not exist', async () => { factory(createCommitData({ pipeline: null })); - return vm.vm.$nextTick(() => { - expect(vm.find('.js-commit-pipeline').exists()).toBe(false); - }); + await vm.vm.$nextTick(); + + expect(vm.find('.js-commit-pipeline').exists()).toBe(false); }); - it('renders pipeline components', () => { + it('renders pipeline components', async () => { factory(); - return vm.vm.$nextTick(() => { - expect(vm.find('.js-commit-pipeline').exists()).toBe(true); - }); + await vm.vm.$nextTick(); + + expect(vm.find('.js-commit-pipeline').exists()).toBe(true); }); - it('hides author component when author does not exist', () => { + it('hides author component when author does not exist', async () => { factory(createCommitData({ author: null })); - return vm.vm.$nextTick(() => { - expect(vm.find('.js-user-link').exists()).toBe(false); - expect(vm.find(UserAvatarLink).exists()).toBe(false); - }); + await vm.vm.$nextTick(); + + expect(vm.find('.js-user-link').exists()).toBe(false); + expect(vm.find(UserAvatarLink).exists()).toBe(false); }); - it('does not render description expander when description is null', () => { + it('does not render description expander when description is null', async () => { factory(createCommitData({ descriptionHtml: null })); - return vm.vm.$nextTick(() => { - expect(vm.find('.text-expander').exists()).toBe(false); - expect(vm.find('.commit-row-description').exists()).toBe(false); - }); + await vm.vm.$nextTick(); + + expect(vm.find('.text-expander').exists()).toBe(false); + expect(vm.find('.commit-row-description').exists()).toBe(false); }); - it('expands commit description when clicking expander', () => { + it('expands commit description when clicking expander', async () => { factory(createCommitData({ descriptionHtml: 'Test description' })); - return vm.vm - .$nextTick() - .then(() => { - vm.find('.text-expander').vm.$emit('click'); - return vm.vm.$nextTick(); - }) - .then(() => { - expect(vm.find('.commit-row-description').isVisible()).toBe(true); - expect(vm.find('.text-expander').classes('open')).toBe(true); - }); + await vm.vm.$nextTick(); + + vm.find('.text-expander').vm.$emit('click'); + + await vm.vm.$nextTick(); + + expect(vm.find('.commit-row-description').isVisible()).toBe(true); + expect(vm.find('.text-expander').classes('open')).toBe(true); }); it('strips the first newline of the description', async () => { @@ -141,19 +139,19 @@ describe('Repository last commit component', () => { ); }); - it('renders the signature HTML as returned by the backend', () => { + it('renders the signature HTML as returned by the backend', async () => { factory(createCommitData({ signatureHtml: '<button>Verified</button>' })); - return vm.vm.$nextTick().then(() => { - expect(vm.element).toMatchSnapshot(); - }); + await vm.vm.$nextTick(); + + expect(vm.element).toMatchSnapshot(); }); - it('sets correct CSS class if the commit message is empty', () => { + it('sets correct CSS class if the commit message is empty', async () => { factory(createCommitData({ message: '' })); - return vm.vm.$nextTick().then(() => { - expect(vm.find('.item-title').classes()).toContain(emptyMessageClass); - }); + await vm.vm.$nextTick(); + + expect(vm.find('.item-title').classes()).toContain(emptyMessageClass); }); }); diff --git a/spec/frontend/repository/components/preview/index_spec.js b/spec/frontend/repository/components/preview/index_spec.js index ebd985e640c..466eed52739 100644 --- a/spec/frontend/repository/components/preview/index_spec.js +++ b/spec/frontend/repository/components/preview/index_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { handleLocationHash } from '~/lib/utils/common_utils'; import Preview from '~/repository/components/preview/index.vue'; diff --git a/spec/frontend/repository/components/table/index_spec.js b/spec/frontend/repository/components/table/index_spec.js index 1b8bbd5af6b..af263f43d7d 100644 --- a/spec/frontend/repository/components/table/index_spec.js +++ b/spec/frontend/repository/components/table/index_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Table from '~/repository/components/table/index.vue'; import TableRow from '~/repository/components/table/row.vue'; diff --git a/spec/frontend/repository/components/table/parent_row_spec.js b/spec/frontend/repository/components/table/parent_row_spec.js index b4800112fee..cf1ed272634 100644 --- a/spec/frontend/repository/components/table/parent_row_spec.js +++ b/spec/frontend/repository/components/table/parent_row_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import ParentRow from '~/repository/components/table/parent_row.vue'; let vm; diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js index 767b117c798..69cb69de5df 100644 --- a/spec/frontend/repository/components/table/row_spec.js +++ b/spec/frontend/repository/components/table/row_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import { GlBadge, GlLink, GlIcon } from '@gitlab/ui'; +import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import TableRow from '~/repository/components/table/row.vue'; import FileIcon from '~/vue_shared/components/file_icon.vue'; import { FILE_SYMLINK_MODE } from '~/vue_shared/constants'; diff --git a/spec/frontend/repository/components/tree_content_spec.js b/spec/frontend/repository/components/tree_content_spec.js index 70dbfaea551..2930e39df8a 100644 --- a/spec/frontend/repository/components/tree_content_spec.js +++ b/spec/frontend/repository/components/tree_content_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import TreeContent, { INITIAL_FETCH_COUNT } from '~/repository/components/tree_content.vue'; import FilePreview from '~/repository/components/preview/index.vue'; import FileTable from '~/repository/components/table/index.vue'; +import TreeContent, { INITIAL_FETCH_COUNT } from '~/repository/components/tree_content.vue'; let vm; let $apollo; diff --git a/spec/frontend/repository/utils/dom_spec.js b/spec/frontend/repository/utils/dom_spec.js index f9e619a82d1..9839ddc6cdb 100644 --- a/spec/frontend/repository/utils/dom_spec.js +++ b/spec/frontend/repository/utils/dom_spec.js @@ -1,5 +1,5 @@ -import { TEST_HOST } from 'helpers/test_constants'; import { setHTMLFixture } from 'helpers/fixtures'; +import { TEST_HOST } from 'helpers/test_constants'; import { updateElementsVisibility, updateFormAction } from '~/repository/utils/dom'; describe('updateElementsVisibility', () => { |