diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-06 00:15:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-06 00:15:39 +0300 |
commit | b7d0ee2a31d4d8b8037c07cb1df7c123d2e754b5 (patch) | |
tree | bcf64595feae95589ab1df153721c8371add34a2 /spec/frontend/pages | |
parent | 9c05a84cac5e6519ef545b14ead8989719c6f612 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/pages')
-rw-r--r-- | spec/frontend/pages/admin/jobs/components/cancel_jobs_modal_spec.js (renamed from spec/frontend/pages/admin/jobs/index/components/cancel_jobs_modal_spec.js) | 2 | ||||
-rw-r--r-- | spec/frontend/pages/admin/jobs/components/cancel_jobs_spec.js (renamed from spec/frontend/pages/admin/jobs/index/components/cancel_jobs_spec.js) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/frontend/pages/admin/jobs/index/components/cancel_jobs_modal_spec.js b/spec/frontend/pages/admin/jobs/components/cancel_jobs_modal_spec.js index 366d148a608..afd7ee09ae8 100644 --- a/spec/frontend/pages/admin/jobs/index/components/cancel_jobs_modal_spec.js +++ b/spec/frontend/pages/admin/jobs/components/cancel_jobs_modal_spec.js @@ -4,7 +4,7 @@ import { GlModal } from '@gitlab/ui'; import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; import { redirectTo } from '~/lib/utils/url_utility'; -import CancelJobsModal from '~/pages/admin/jobs/index/components/cancel_jobs_modal.vue'; +import CancelJobsModal from '~/pages/admin/jobs/components/cancel_jobs_modal.vue'; jest.mock('~/lib/utils/url_utility', () => ({ ...jest.requireActual('~/lib/utils/url_utility'), diff --git a/spec/frontend/pages/admin/jobs/index/components/cancel_jobs_spec.js b/spec/frontend/pages/admin/jobs/components/cancel_jobs_spec.js index de6d44eabdc..d94de48f238 100644 --- a/spec/frontend/pages/admin/jobs/index/components/cancel_jobs_spec.js +++ b/spec/frontend/pages/admin/jobs/components/cancel_jobs_spec.js @@ -2,12 +2,12 @@ import { GlButton } from '@gitlab/ui'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import { TEST_HOST } from 'helpers/test_constants'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import CancelJobs from '~/pages/admin/jobs/index/components/cancel_jobs.vue'; -import CancelJobsModal from '~/pages/admin/jobs/index/components/cancel_jobs_modal.vue'; +import CancelJobs from '~/pages/admin/jobs/components/cancel_jobs.vue'; +import CancelJobsModal from '~/pages/admin/jobs/components/cancel_jobs_modal.vue'; import { CANCEL_JOBS_MODAL_ID, CANCEL_BUTTON_TOOLTIP, -} from '~/pages/admin/jobs/index/components/constants'; +} from '~/pages/admin/jobs/components/constants'; describe('CancelJobs component', () => { let wrapper; |