diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-01 00:11:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-01 00:11:00 +0300 |
commit | 5d3df551dda6104f1ed8aa8f3947a2c982f0a7bc (patch) | |
tree | 532e24a0ac6a159675bc1c9e66e5dd5f079e07ec /spec/frontend | |
parent | e33402e375d7c05441d1ba6ac5030efb8a9c9537 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
85 files changed, 235 insertions, 208 deletions
diff --git a/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js b/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js index f5e0b65d615..57220dfbd74 100644 --- a/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js +++ b/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js @@ -4,8 +4,8 @@ import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; import PipelineEditorMiniGraph from '~/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue'; -import LegacyPipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; -import getLinkedPipelinesQuery from '~/pipelines/graphql/queries/get_linked_pipelines.query.graphql'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql'; import { PIPELINE_FAILURE } from '~/ci/pipeline_editor/constants'; import { mockLinkedPipelines, mockProjectFullPath, mockProjectPipeline } from '../../mock_data'; diff --git a/spec/frontend/ci/pipeline_editor/components/header/pipeline_status_spec.js b/spec/frontend/ci/pipeline_editor/components/header/pipeline_status_spec.js index 3bbe14adb88..5423e7d4e40 100644 --- a/spec/frontend/ci/pipeline_editor/components/header/pipeline_status_spec.js +++ b/spec/frontend/ci/pipeline_editor/components/header/pipeline_status_spec.js @@ -6,7 +6,7 @@ import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; import PipelineStatus, { i18n } from '~/ci/pipeline_editor/components/header/pipeline_status.vue'; import getPipelineQuery from '~/ci/pipeline_editor/graphql/queries/pipeline.query.graphql'; -import PipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue'; +import PipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue'; import PipelineEditorMiniGraph from '~/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue'; import { mockCommitSha, mockProjectPipeline, mockProjectFullPath } from '../../mock_data'; diff --git a/spec/frontend/ci/pipeline_editor/components/pipeline_editor_tabs_spec.js b/spec/frontend/ci/pipeline_editor/components/pipeline_editor_tabs_spec.js index 77252a5c0b6..914fdfbcc37 100644 --- a/spec/frontend/ci/pipeline_editor/components/pipeline_editor_tabs_spec.js +++ b/spec/frontend/ci/pipeline_editor/components/pipeline_editor_tabs_spec.js @@ -19,7 +19,7 @@ import { VALIDATE_TAB, VALIDATE_TAB_BADGE_DISMISSED_KEY, } from '~/ci/pipeline_editor/constants'; -import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue'; +import PipelineGraph from '~/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue'; import getBlobContent from '~/ci/pipeline_editor/graphql/queries/blob_content.query.graphql'; import { mockBlobContentQueryResponse, diff --git a/spec/frontend/ci/pipeline_editor/mock_data.js b/spec/frontend/ci/pipeline_editor/mock_data.js index 007abde939f..245cdfa7043 100644 --- a/spec/frontend/ci/pipeline_editor/mock_data.js +++ b/spec/frontend/ci/pipeline_editor/mock_data.js @@ -1,5 +1,5 @@ import { CI_CONFIG_STATUS_INVALID, CI_CONFIG_STATUS_VALID } from '~/ci/pipeline_editor/constants'; -import { unwrapStagesWithNeeds } from '~/pipelines/components/unwrapping_utils'; +import { unwrapStagesWithNeeds } from '~/ci/pipeline_details/components/unwrapping_utils'; import { DOCS_URL_IN_EE_DIR } from 'jh_else_ce/lib/utils/url_utility'; export const commonOptions = { diff --git a/spec/frontend/commit/commit_box_pipeline_mini_graph_spec.js b/spec/frontend/commit/commit_box_pipeline_mini_graph_spec.js index 3b3e5098857..6b0286bbbf3 100644 --- a/spec/frontend/commit/commit_box_pipeline_mini_graph_spec.js +++ b/spec/frontend/commit/commit_box_pipeline_mini_graph_spec.js @@ -7,11 +7,11 @@ import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { createAlert } from '~/alert'; import CommitBoxPipelineMiniGraph from '~/projects/commit_box/info/components/commit_box_pipeline_mini_graph.vue'; -import PipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue'; -import LegacyPipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import PipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; import { COMMIT_BOX_POLL_INTERVAL } from '~/projects/commit_box/info/constants'; -import getLinkedPipelinesQuery from '~/pipelines/graphql/queries/get_linked_pipelines.query.graphql'; -import getPipelineStagesQuery from '~/pipelines/graphql/queries/get_pipeline_stages.query.graphql'; +import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql'; +import getPipelineStagesQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_stages.query.graphql'; import * as sharedGraphQlUtils from '~/graphql_shared/utils'; import { mockDownstreamQueryResponse, diff --git a/spec/frontend/commit/pipelines/pipelines_table_spec.js b/spec/frontend/commit/pipelines/pipelines_table_spec.js index 009ec68ddcf..21677d94b20 100644 --- a/spec/frontend/commit/pipelines/pipelines_table_spec.js +++ b/spec/frontend/commit/pipelines/pipelines_table_spec.js @@ -15,7 +15,7 @@ import { HTTP_STATUS_UNAUTHORIZED, } from '~/lib/utils/http_status'; import { createAlert } from '~/alert'; -import { TOAST_MESSAGE } from '~/pipelines/constants'; +import { TOAST_MESSAGE } from '~/ci/pipeline_details/constants'; import axios from '~/lib/utils/axios_utils'; const $toast = { diff --git a/spec/frontend/commit/pipelines/pipelines_table_wrapper_spec.js b/spec/frontend/commit/pipelines/pipelines_table_wrapper_spec.js index 2d1126f0aa3..f639c5f86a0 100644 --- a/spec/frontend/commit/pipelines/pipelines_table_wrapper_spec.js +++ b/spec/frontend/commit/pipelines/pipelines_table_wrapper_spec.js @@ -8,7 +8,7 @@ import waitForPromises from 'helpers/wait_for_promises'; import { createAlert } from '~/alert'; import PipelinesTableWrapper from '~/commit/pipelines/pipelines_table_wrapper.vue'; -import getMergeRequestsPipelines from '~/pipelines/graphql/queries/get_merge_request_pipelines.query.graphql'; +import getMergeRequestsPipelines from '~/ci/pipeline_details/graphql/queries/get_merge_request_pipelines.query.graphql'; import { mergeRequestPipelinesResponse } from '../mock_data'; diff --git a/spec/frontend/fixtures/pipeline_header.rb b/spec/frontend/fixtures/pipeline_header.rb index 3fdc45b1194..25abfe47dc7 100644 --- a/spec/frontend/fixtures/pipeline_header.rb +++ b/spec/frontend/fixtures/pipeline_header.rb @@ -12,7 +12,7 @@ RSpec.describe "GraphQL Pipeline Header", '(JavaScript fixtures)', type: :reques let_it_be(:user) { project.first_owner } let_it_be(:commit) { create(:commit, project: project) } - let(:query_path) { 'pipelines/graphql/queries/get_pipeline_header_data.query.graphql' } + let(:query_path) { 'ci/pipeline_details/graphql/queries/get_pipeline_header_data.query.graphql' } context 'with successful pipeline' do let_it_be(:pipeline) do diff --git a/spec/frontend/fixtures/pipelines.rb b/spec/frontend/fixtures/pipelines.rb index 24a6f6f7de6..44911e93dd1 100644 --- a/spec/frontend/fixtures/pipelines.rb +++ b/spec/frontend/fixtures/pipelines.rb @@ -71,7 +71,7 @@ RSpec.describe Projects::PipelinesController, '(JavaScript fixtures)', type: :co end let_it_be(:query) do - get_graphql_query_as_string("pipelines/graphql/queries/#{get_pipeline_actions_query}") + get_graphql_query_as_string("ci/pipeline_details/graphql/queries/#{get_pipeline_actions_query}") end it "#{fixtures_path}#{get_pipeline_actions_query}.json" do diff --git a/spec/frontend/pipelines/components/dag/dag_annotations_spec.js b/spec/frontend/pipelines/components/dag/dag_annotations_spec.js index 124f02bcec7..03e4b79ca4a 100644 --- a/spec/frontend/pipelines/components/dag/dag_annotations_spec.js +++ b/spec/frontend/pipelines/components/dag/dag_annotations_spec.js @@ -1,7 +1,7 @@ import { GlButton } from '@gitlab/ui'; import { shallowMount, mount } from '@vue/test-utils'; import { nextTick } from 'vue'; -import DagAnnotations from '~/pipelines/components/dag/dag_annotations.vue'; +import DagAnnotations from '~/ci/pipeline_details/components/dag/dag_annotations.vue'; import { singleNote, multiNote } from './mock_data'; describe('The DAG annotations', () => { diff --git a/spec/frontend/pipelines/components/dag/dag_graph_spec.js b/spec/frontend/pipelines/components/dag/dag_graph_spec.js index 6b46be3dd49..e7d632bdeeb 100644 --- a/spec/frontend/pipelines/components/dag/dag_graph_spec.js +++ b/spec/frontend/pipelines/components/dag/dag_graph_spec.js @@ -1,9 +1,13 @@ import { shallowMount } from '@vue/test-utils'; -import { IS_HIGHLIGHTED, LINK_SELECTOR, NODE_SELECTOR } from '~/pipelines/components/dag/constants'; -import DagGraph from '~/pipelines/components/dag/dag_graph.vue'; -import { createSankey } from '~/pipelines/components/dag/drawing_utils'; -import { highlightIn, highlightOut } from '~/pipelines/components/dag/interactions'; -import { removeOrphanNodes } from '~/pipelines/components/parsing_utils'; +import { + IS_HIGHLIGHTED, + LINK_SELECTOR, + NODE_SELECTOR, +} from '~/ci/pipeline_details/components/dag/constants'; +import DagGraph from '~/ci/pipeline_details/components/dag/dag_graph.vue'; +import { createSankey } from '~/ci/pipeline_details/components/dag/drawing_utils'; +import { highlightIn, highlightOut } from '~/ci/pipeline_details/components/dag/interactions'; +import { removeOrphanNodes } from '~/ci/pipeline_details/components/parsing_utils'; import { parsedData } from './mock_data'; describe('The DAG graph', () => { diff --git a/spec/frontend/pipelines/components/dag/dag_spec.js b/spec/frontend/pipelines/components/dag/dag_spec.js index 53719065611..2cc1e9cd48f 100644 --- a/spec/frontend/pipelines/components/dag/dag_spec.js +++ b/spec/frontend/pipelines/components/dag/dag_spec.js @@ -1,12 +1,16 @@ import { GlAlert, GlEmptyState } from '@gitlab/ui'; import { mount, shallowMount } from '@vue/test-utils'; import { nextTick } from 'vue'; -import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from '~/pipelines/components/dag/constants'; -import Dag from '~/pipelines/components/dag/dag.vue'; -import DagAnnotations from '~/pipelines/components/dag/dag_annotations.vue'; -import DagGraph from '~/pipelines/components/dag/dag_graph.vue'; - -import { PARSE_FAILURE, UNSUPPORTED_DATA } from '~/pipelines/constants'; +import { + ADD_NOTE, + REMOVE_NOTE, + REPLACE_NOTES, +} from '~/ci/pipeline_details/components/dag/constants'; +import Dag from '~/ci/pipeline_details/components/dag/dag.vue'; +import DagAnnotations from '~/ci/pipeline_details/components/dag/dag_annotations.vue'; +import DagGraph from '~/ci/pipeline_details/components/dag/dag_graph.vue'; + +import { PARSE_FAILURE, UNSUPPORTED_DATA } from '~/ci/pipeline_details/constants'; import { mockParsedGraphQLNodes, tooSmallGraph, diff --git a/spec/frontend/pipelines/components/dag/drawing_utils_spec.js b/spec/frontend/pipelines/components/dag/drawing_utils_spec.js index 095ded01298..41daf7065d5 100644 --- a/spec/frontend/pipelines/components/dag/drawing_utils_spec.js +++ b/spec/frontend/pipelines/components/dag/drawing_utils_spec.js @@ -1,5 +1,5 @@ -import { createSankey } from '~/pipelines/components/dag/drawing_utils'; -import { parseData } from '~/pipelines/components/parsing_utils'; +import { createSankey } from '~/ci/pipeline_details/components/dag/drawing_utils'; +import { parseData } from '~/ci/pipeline_details/components/parsing_utils'; import { mockParsedGraphQLNodes } from './mock_data'; describe('DAG visualization drawing utilities', () => { diff --git a/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js b/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js index 6a2453704db..c58b09871b9 100644 --- a/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js +++ b/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js @@ -5,9 +5,9 @@ import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { createAlert } from '~/alert'; -import FailedJobsApp from '~/pipelines/components/jobs/failed_jobs_app.vue'; -import FailedJobsTable from '~/pipelines/components/jobs/failed_jobs_table.vue'; -import GetFailedJobsQuery from '~/pipelines/graphql/queries/get_failed_jobs.query.graphql'; +import FailedJobsApp from '~/ci/pipeline_details/components/jobs/failed_jobs_app.vue'; +import FailedJobsTable from '~/ci/pipeline_details/components/jobs/failed_jobs_table.vue'; +import GetFailedJobsQuery from '~/ci/pipeline_details/graphql/queries/get_failed_jobs.query.graphql'; import { mockFailedJobsQueryResponse } from '../../mock_data'; Vue.use(VueApollo); diff --git a/spec/frontend/pipelines/components/jobs/failed_jobs_table_spec.js b/spec/frontend/pipelines/components/jobs/failed_jobs_table_spec.js index 99a178120cc..16f8cd1ea19 100644 --- a/spec/frontend/pipelines/components/jobs/failed_jobs_table_spec.js +++ b/spec/frontend/pipelines/components/jobs/failed_jobs_table_spec.js @@ -7,9 +7,9 @@ import waitForPromises from 'helpers/wait_for_promises'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import { createAlert } from '~/alert'; import { redirectTo } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated -import FailedJobsTable from '~/pipelines/components/jobs/failed_jobs_table.vue'; -import RetryFailedJobMutation from '~/pipelines/graphql/mutations/retry_failed_job.mutation.graphql'; -import { TRACKING_CATEGORIES } from '~/pipelines/constants'; +import FailedJobsTable from '~/ci/pipeline_details/components/jobs/failed_jobs_table.vue'; +import RetryFailedJobMutation from '~/ci/pipeline_details/graphql/mutations/retry_failed_job.mutation.graphql'; +import { TRACKING_CATEGORIES } from '~/ci/pipeline_details/constants'; import { successRetryMutationResponse, failedRetryMutationResponse, diff --git a/spec/frontend/pipelines/components/jobs/jobs_app_spec.js b/spec/frontend/pipelines/components/jobs/jobs_app_spec.js index 39475788fe2..4e48d20d7e2 100644 --- a/spec/frontend/pipelines/components/jobs/jobs_app_spec.js +++ b/spec/frontend/pipelines/components/jobs/jobs_app_spec.js @@ -5,9 +5,9 @@ import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { createAlert } from '~/alert'; -import JobsApp from '~/pipelines/components/jobs/jobs_app.vue'; +import JobsApp from '~/ci/pipeline_details/components/jobs/jobs_app.vue'; import JobsTable from '~/jobs/components/table/jobs_table.vue'; -import getPipelineJobsQuery from '~/pipelines/graphql/queries/get_pipeline_jobs.query.graphql'; +import getPipelineJobsQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_jobs.query.graphql'; import { mockPipelineJobsQueryResponse } from '../../mock_data'; Vue.use(VueApollo); diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/job_item_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/job_item_spec.js index b89f27e5c05..e7607325602 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/job_item_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/job_item_spec.js @@ -1,5 +1,5 @@ import { shallowMount } from '@vue/test-utils'; -import JobItem from '~/pipelines/components/pipeline_mini_graph/job_item.vue'; +import JobItem from '~/ci/pipeline_details/components/pipeline_mini_graph/job_item.vue'; describe('JobItem', () => { let wrapper; diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js index 6661bb079d2..fa2fd1d648f 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import { pipelines } from 'test_fixtures/pipelines/pipelines.json'; -import LegacyPipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; -import PipelineStages from '~/pipelines/components/pipeline_mini_graph/pipeline_stages.vue'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import PipelineStages from '~/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stages.vue'; import mockLinkedPipelines from './linked_pipelines_mock_data'; const mockStages = pipelines[0].details.stages; diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage_spec.js index 3697eaeea1a..b6ab8fa1ebe 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage_spec.js @@ -5,8 +5,8 @@ import MockAdapter from 'axios-mock-adapter'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; -import LegacyPipelineStage from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage.vue'; -import eventHub from '~/pipelines/event_hub'; +import LegacyPipelineStage from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_stage.vue'; +import eventHub from '~/ci/pipeline_details/event_hub'; import waitForPromises from 'helpers/wait_for_promises'; import { stageReply } from '../../mock_data'; diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/linked_pipelines_mini_list_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/linked_pipelines_mini_list_spec.js index a4ecb9041c9..513acab1874 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/linked_pipelines_mini_list_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/linked_pipelines_mini_list_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; -import LinkedPipelinesMiniList from '~/pipelines/components/pipeline_mini_graph/linked_pipelines_mini_list.vue'; +import LinkedPipelinesMiniList from '~/ci/pipeline_details/components/pipeline_mini_graph/linked_pipelines_mini_list.vue'; import mockData from './linked_pipelines_mock_data'; describe('Linked pipeline mini list', () => { diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_mini_graph_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_mini_graph_spec.js index b3e157f75f6..98b19535a86 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_mini_graph_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_mini_graph_spec.js @@ -7,10 +7,10 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import createMockApollo from 'helpers/mock_apollo_helper'; -import getLinkedPipelinesQuery from '~/pipelines/graphql/queries/get_linked_pipelines.query.graphql'; -import getPipelineStagesQuery from '~/pipelines/graphql/queries/get_pipeline_stages.query.graphql'; -import LegacyPipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; -import PipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue'; +import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql'; +import getPipelineStagesQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_stages.query.graphql'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import PipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/pipeline_mini_graph.vue'; import * as sharedGraphQlUtils from '~/graphql_shared/utils'; import { diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js index 1989aad12b0..ec1f3fb61c9 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stage_spec.js @@ -4,8 +4,8 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import createMockApollo from 'helpers/mock_apollo_helper'; -import getPipelineStageQuery from '~/pipelines/graphql/queries/get_pipeline_stage.query.graphql'; -import PipelineStage from '~/pipelines/components/pipeline_mini_graph/pipeline_stage.vue'; +import getPipelineStageQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_stage.query.graphql'; +import PipelineStage from '~/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stage.vue'; Vue.use(VueApollo); diff --git a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stages_spec.js b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stages_spec.js index c212087b7e3..717e66b2e31 100644 --- a/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stages_spec.js +++ b/spec/frontend/pipelines/components/pipeline_mini_graph/pipeline_stages_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import { pipelines } from 'test_fixtures/pipelines/pipelines.json'; -import LegacyPipelineStage from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_stage.vue'; -import PipelineStages from '~/pipelines/components/pipeline_mini_graph/pipeline_stages.vue'; +import LegacyPipelineStage from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_stage.vue'; +import PipelineStages from '~/ci/pipeline_details/components/pipeline_mini_graph/pipeline_stages.vue'; const mockStages = pipelines[0].details.stages; diff --git a/spec/frontend/pipelines/components/pipeline_tabs_spec.js b/spec/frontend/pipelines/components/pipeline_tabs_spec.js index 0951e1ffb46..2974f4fb916 100644 --- a/spec/frontend/pipelines/components/pipeline_tabs_spec.js +++ b/spec/frontend/pipelines/components/pipeline_tabs_spec.js @@ -1,8 +1,8 @@ import { GlTab } from '@gitlab/ui'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import PipelineTabs from '~/pipelines/components/pipeline_tabs.vue'; -import { TRACKING_CATEGORIES } from '~/pipelines/constants'; +import PipelineTabs from '~/ci/pipeline_details/components/pipeline_tabs.vue'; +import { TRACKING_CATEGORIES } from '~/ci/pipeline_details/constants'; describe('The Pipeline Tabs', () => { let wrapper; diff --git a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js index 51a4487a3ef..c2afeb2ccb9 100644 --- a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js +++ b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js @@ -5,12 +5,12 @@ import { nextTick } from 'vue'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import Api from '~/api'; import axios from '~/lib/utils/axios_utils'; -import PipelinesFilteredSearch from '~/pipelines/components/pipelines_list/pipelines_filtered_search.vue'; +import PipelinesFilteredSearch from '~/ci/pipeline_details/components/pipelines_list/pipelines_filtered_search.vue'; import { FILTERED_SEARCH_TERM, OPERATORS_IS, } from '~/vue_shared/components/filtered_search_bar/constants'; -import { TRACKING_CATEGORIES } from '~/pipelines/constants'; +import { TRACKING_CATEGORIES } from '~/ci/pipeline_details/constants'; import { users, mockSearch, branches, tags } from '../mock_data'; describe('Pipelines filtered search', () => { diff --git a/spec/frontend/pipelines/components/pipelines_list/empty_state/ci_templates_spec.js b/spec/frontend/pipelines/components/pipelines_list/empty_state/ci_templates_spec.js index b560eea4882..d83d536017e 100644 --- a/spec/frontend/pipelines/components/pipelines_list/empty_state/ci_templates_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/empty_state/ci_templates_spec.js @@ -1,6 +1,6 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import CiTemplates from '~/pipelines/components/pipelines_list/empty_state/ci_templates.vue'; +import CiTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/ci_templates.vue'; const pipelineEditorPath = '/-/ci/editor'; const suggestedCiTemplates = [ diff --git a/spec/frontend/pipelines/components/pipelines_list/empty_state/ios_templates_spec.js b/spec/frontend/pipelines/components/pipelines_list/empty_state/ios_templates_spec.js index 700be076e0c..ffb3cf2a294 100644 --- a/spec/frontend/pipelines/components/pipelines_list/empty_state/ios_templates_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/empty_state/ios_templates_spec.js @@ -3,8 +3,8 @@ import { nextTick } from 'vue'; import { GlPopover, GlButton } from '@gitlab/ui'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import RunnerInstructionsModal from '~/vue_shared/components/runner_instructions/runner_instructions_modal.vue'; -import IosTemplates from '~/pipelines/components/pipelines_list/empty_state/ios_templates.vue'; -import CiTemplates from '~/pipelines/components/pipelines_list/empty_state/ci_templates.vue'; +import IosTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/ios_templates.vue'; +import CiTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/ci_templates.vue'; const pipelineEditorPath = '/-/ci/editor'; const registrationToken = 'SECRET_TOKEN'; diff --git a/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js b/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js index 4bf4257f462..fc4020c7f6a 100644 --- a/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates_spec.js @@ -1,8 +1,8 @@ import '~/commons'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import PipelinesCiTemplates from '~/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue'; -import CiTemplates from '~/pipelines/components/pipelines_list/empty_state/ci_templates.vue'; +import PipelinesCiTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/pipelines_ci_templates.vue'; +import CiTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/ci_templates.vue'; const pipelineEditorPath = '/-/ci/editor'; diff --git a/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_job_details_spec.js b/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_job_details_spec.js index 479ee854ecf..2e76da7ed66 100644 --- a/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_job_details_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_job_details_spec.js @@ -6,9 +6,9 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { createAlert } from '~/alert'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import FailedJobDetails from '~/pipelines/components/pipelines_list/failure_widget/failed_job_details.vue'; -import RetryMrFailedJobMutation from '~/pipelines/graphql/mutations/retry_mr_failed_job.mutation.graphql'; -import { BRIDGE_KIND } from '~/pipelines/components/graph/constants'; +import FailedJobDetails from '~/ci/pipeline_details/components/pipelines_list/failure_widget/failed_job_details.vue'; +import RetryMrFailedJobMutation from '~/ci/pipeline_details/graphql/mutations/retry_mr_failed_job.mutation.graphql'; +import { BRIDGE_KIND } from '~/ci/pipeline_details/components/graph/constants'; import { job } from './mock'; Vue.use(VueApollo); diff --git a/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_jobs_list_spec.js b/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_jobs_list_spec.js index 967812cc627..6865b63d055 100644 --- a/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_jobs_list_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/failure_widget/failed_jobs_list_spec.js @@ -6,10 +6,10 @@ import createMockApollo from 'helpers/mock_apollo_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { createAlert } from '~/alert'; -import FailedJobsList from '~/pipelines/components/pipelines_list/failure_widget/failed_jobs_list.vue'; -import FailedJobDetails from '~/pipelines/components/pipelines_list/failure_widget/failed_job_details.vue'; -import * as utils from '~/pipelines/components/pipelines_list/failure_widget/utils'; -import getPipelineFailedJobs from '~/pipelines/graphql/queries/get_pipeline_failed_jobs.query.graphql'; +import FailedJobsList from '~/ci/pipeline_details/components/pipelines_list/failure_widget/failed_jobs_list.vue'; +import FailedJobDetails from '~/ci/pipeline_details/components/pipelines_list/failure_widget/failed_job_details.vue'; +import * as utils from '~/ci/pipeline_details/components/pipelines_list/failure_widget/utils'; +import getPipelineFailedJobs from '~/ci/pipeline_details/graphql/queries/get_pipeline_failed_jobs.query.graphql'; import { failedJobsMock, failedJobsMock2, failedJobsMockEmpty, activeFailedJobsMock } from './mock'; Vue.use(VueApollo); diff --git a/spec/frontend/pipelines/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget_spec.js b/spec/frontend/pipelines/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget_spec.js index 5bbb874edb0..7bcde4d57d8 100644 --- a/spec/frontend/pipelines/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget_spec.js @@ -1,7 +1,7 @@ import { GlButton, GlCard, GlIcon, GlPopover } from '@gitlab/ui'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import PipelineFailedJobsWidget from '~/pipelines/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue'; -import FailedJobsList from '~/pipelines/components/pipelines_list/failure_widget/failed_jobs_list.vue'; +import PipelineFailedJobsWidget from '~/ci/pipeline_details/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue'; +import FailedJobsList from '~/ci/pipeline_details/components/pipelines_list/failure_widget/failed_jobs_list.vue'; jest.mock('~/alert'); diff --git a/spec/frontend/pipelines/components/pipelines_list/failure_widget/utils_spec.js b/spec/frontend/pipelines/components/pipelines_list/failure_widget/utils_spec.js index 44f16478151..73115091456 100644 --- a/spec/frontend/pipelines/components/pipelines_list/failure_widget/utils_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/failure_widget/utils_spec.js @@ -1,7 +1,7 @@ import { isFailedJob, sortJobsByStatus, -} from '~/pipelines/components/pipelines_list/failure_widget/utils'; +} from '~/ci/pipeline_details/components/pipelines_list/failure_widget/utils'; describe('isFailedJob', () => { describe('when the job argument is undefined', () => { diff --git a/spec/frontend/pipelines/components/pipelines_list/pipieline_stop_modal_spec.js b/spec/frontend/pipelines/components/pipelines_list/pipieline_stop_modal_spec.js index 249126390f1..9314522282f 100644 --- a/spec/frontend/pipelines/components/pipelines_list/pipieline_stop_modal_spec.js +++ b/spec/frontend/pipelines/components/pipelines_list/pipieline_stop_modal_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; -import PipelineStopModal from '~/pipelines/components/pipelines_list/pipeline_stop_modal.vue'; +import PipelineStopModal from '~/ci/pipeline_details/components/pipelines_list/pipeline_stop_modal.vue'; import { mockPipelineHeader } from '../../mock_data'; describe('PipelineStopModal', () => { diff --git a/spec/frontend/pipelines/empty_state_spec.js b/spec/frontend/pipelines/empty_state_spec.js index 5465e4d77da..f264b21f6a3 100644 --- a/spec/frontend/pipelines/empty_state_spec.js +++ b/spec/frontend/pipelines/empty_state_spec.js @@ -2,10 +2,10 @@ import '~/commons'; import { shallowMount } from '@vue/test-utils'; import { GlEmptyState } from '@gitlab/ui'; import { stubExperiments } from 'helpers/experimentation_helper'; -import EmptyState from '~/pipelines/components/pipelines_list/empty_state.vue'; +import EmptyState from '~/ci/pipeline_details/components/pipelines_list/empty_state.vue'; import GitlabExperiment from '~/experimentation/components/gitlab_experiment.vue'; -import PipelinesCiTemplates from '~/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue'; -import IosTemplates from '~/pipelines/components/pipelines_list/empty_state/ios_templates.vue'; +import PipelinesCiTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/pipelines_ci_templates.vue'; +import IosTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/ios_templates.vue'; describe('Pipelines Empty State', () => { let wrapper; diff --git a/spec/frontend/pipelines/graph/action_component_spec.js b/spec/frontend/pipelines/graph/action_component_spec.js index 890255f225e..c0774f2def2 100644 --- a/spec/frontend/pipelines/graph/action_component_spec.js +++ b/spec/frontend/pipelines/graph/action_component_spec.js @@ -5,7 +5,7 @@ import { nextTick } from 'vue'; import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; -import ActionComponent from '~/pipelines/components/jobs_shared/action_component.vue'; +import ActionComponent from '~/ci/pipeline_details/components/jobs_shared/action_component.vue'; describe('pipeline graph action component', () => { let wrapper; diff --git a/spec/frontend/pipelines/graph/graph_component_spec.js b/spec/frontend/pipelines/graph/graph_component_spec.js index e9bce037800..8ff54b06334 100644 --- a/spec/frontend/pipelines/graph/graph_component_spec.js +++ b/spec/frontend/pipelines/graph/graph_component_spec.js @@ -1,13 +1,13 @@ import { shallowMount } from '@vue/test-utils'; import mockPipelineResponse from 'test_fixtures/pipelines/pipeline_details.json'; import { mountExtended } from 'helpers/vue_test_utils_helper'; -import { LAYER_VIEW, STAGE_VIEW } from '~/pipelines/components/graph/constants'; -import PipelineGraph from '~/pipelines/components/graph/graph_component.vue'; -import JobItem from '~/pipelines/components/graph/job_item.vue'; -import LinkedPipelinesColumn from '~/pipelines/components/graph/linked_pipelines_column.vue'; -import StageColumnComponent from '~/pipelines/components/graph/stage_column_component.vue'; -import { calculatePipelineLayersInfo } from '~/pipelines/components/graph/utils'; -import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue'; +import { LAYER_VIEW, STAGE_VIEW } from '~/ci/pipeline_details/components/graph/constants'; +import PipelineGraph from '~/ci/pipeline_details/components/graph/graph_component.vue'; +import JobItem from '~/ci/pipeline_details/components/graph/job_item.vue'; +import LinkedPipelinesColumn from '~/ci/pipeline_details/components/graph/linked_pipelines_column.vue'; +import StageColumnComponent from '~/ci/pipeline_details/components/graph/stage_column_component.vue'; +import { calculatePipelineLayersInfo } from '~/ci/pipeline_details/components/graph/utils'; +import LinksLayer from '~/ci/pipeline_details/components/graph_shared/links_layer.vue'; import { generateResponse, pipelineWithUpstreamDownstream } from './mock_data'; diff --git a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js index 7b59d82ae6f..8a7ee82b2ef 100644 --- a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js +++ b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js @@ -23,15 +23,15 @@ import { LAYER_VIEW, STAGE_VIEW, VIEW_TYPE_KEY, -} from '~/pipelines/components/graph/constants'; -import PipelineGraph from '~/pipelines/components/graph/graph_component.vue'; -import PipelineGraphWrapper from '~/pipelines/components/graph/graph_component_wrapper.vue'; -import GraphViewSelector from '~/pipelines/components/graph/graph_view_selector.vue'; -import * as Api from '~/pipelines/components/graph_shared/api'; -import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue'; -import * as parsingUtils from '~/pipelines/components/parsing_utils'; -import getPipelineHeaderData from '~/pipelines/graphql/queries/get_pipeline_header_data.query.graphql'; -import * as sentryUtils from '~/pipelines/utils'; +} from '~/ci/pipeline_details/components/graph/constants'; +import PipelineGraph from '~/ci/pipeline_details/components/graph/graph_component.vue'; +import PipelineGraphWrapper from '~/ci/pipeline_details/components/graph/graph_component_wrapper.vue'; +import GraphViewSelector from '~/ci/pipeline_details/components/graph/graph_view_selector.vue'; +import * as Api from '~/ci/pipeline_details/components/graph_shared/api'; +import LinksLayer from '~/ci/pipeline_details/components/graph_shared/links_layer.vue'; +import * as parsingUtils from '~/ci/pipeline_details/components/parsing_utils'; +import getPipelineHeaderData from '~/ci/pipeline_details/graphql/queries/get_pipeline_header_data.query.graphql'; +import * as sentryUtils from '~/ci/pipeline_details/utils'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import { mockRunningPipelineHeaderData } from '../mock_data'; import { diff --git a/spec/frontend/pipelines/graph/graph_view_selector_spec.js b/spec/frontend/pipelines/graph/graph_view_selector_spec.js index 65ae9d19978..e42e8271fa0 100644 --- a/spec/frontend/pipelines/graph/graph_view_selector_spec.js +++ b/spec/frontend/pipelines/graph/graph_view_selector_spec.js @@ -1,7 +1,7 @@ import { GlAlert, GlButton, GlButtonGroup, GlLoadingIcon } from '@gitlab/ui'; import { mount, shallowMount } from '@vue/test-utils'; -import { LAYER_VIEW, STAGE_VIEW } from '~/pipelines/components/graph/constants'; -import GraphViewSelector from '~/pipelines/components/graph/graph_view_selector.vue'; +import { LAYER_VIEW, STAGE_VIEW } from '~/ci/pipeline_details/components/graph/constants'; +import GraphViewSelector from '~/ci/pipeline_details/components/graph/graph_view_selector.vue'; describe('the graph view selector component', () => { let wrapper; diff --git a/spec/frontend/pipelines/graph/job_group_dropdown_spec.js b/spec/frontend/pipelines/graph/job_group_dropdown_spec.js index 1419a7b9982..6f19f9fa2ae 100644 --- a/spec/frontend/pipelines/graph/job_group_dropdown_spec.js +++ b/spec/frontend/pipelines/graph/job_group_dropdown_spec.js @@ -1,5 +1,5 @@ import { shallowMount, mount } from '@vue/test-utils'; -import JobGroupDropdown from '~/pipelines/components/graph/job_group_dropdown.vue'; +import JobGroupDropdown from '~/ci/pipeline_details/components/graph/job_group_dropdown.vue'; describe('job group dropdown component', () => { const group = { diff --git a/spec/frontend/pipelines/graph/job_item_spec.js b/spec/frontend/pipelines/graph/job_item_spec.js index 8a8b0e9aa63..b1f55f278c3 100644 --- a/spec/frontend/pipelines/graph/job_item_spec.js +++ b/spec/frontend/pipelines/graph/job_item_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; import Vue, { nextTick } from 'vue'; import { GlBadge, GlModal, GlToast } from '@gitlab/ui'; -import JobItem from '~/pipelines/components/graph/job_item.vue'; +import JobItem from '~/ci/pipeline_details/components/graph/job_item.vue'; import axios from '~/lib/utils/axios_utils'; import { useLocalStorageSpy } from 'helpers/local_storage_helper'; -import ActionComponent from '~/pipelines/components/jobs_shared/action_component.vue'; +import ActionComponent from '~/ci/pipeline_details/components/jobs_shared/action_component.vue'; import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { diff --git a/spec/frontend/pipelines/graph/job_name_component_spec.js b/spec/frontend/pipelines/graph/job_name_component_spec.js index fca4c43d9fa..3d2f54c9f10 100644 --- a/spec/frontend/pipelines/graph/job_name_component_spec.js +++ b/spec/frontend/pipelines/graph/job_name_component_spec.js @@ -1,5 +1,5 @@ import { mount } from '@vue/test-utils'; -import jobNameComponent from '~/pipelines/components/jobs_shared/job_name_component.vue'; +import jobNameComponent from '~/ci/pipeline_details/components/jobs_shared/job_name_component.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; describe('job name component', () => { diff --git a/spec/frontend/pipelines/graph/linked_pipeline_spec.js b/spec/frontend/pipelines/graph/linked_pipeline_spec.js index 8dae2aac664..14aacf10665 100644 --- a/spec/frontend/pipelines/graph/linked_pipeline_spec.js +++ b/spec/frontend/pipelines/graph/linked_pipeline_spec.js @@ -6,10 +6,14 @@ import createMockApollo from 'helpers/mock_apollo_helper'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; -import { ACTION_FAILURE, UPSTREAM, DOWNSTREAM } from '~/pipelines/components/graph/constants'; -import LinkedPipelineComponent from '~/pipelines/components/graph/linked_pipeline.vue'; -import CancelPipelineMutation from '~/pipelines/graphql/mutations/cancel_pipeline.mutation.graphql'; -import RetryPipelineMutation from '~/pipelines/graphql/mutations/retry_pipeline.mutation.graphql'; +import { + ACTION_FAILURE, + UPSTREAM, + DOWNSTREAM, +} from '~/ci/pipeline_details/components/graph/constants'; +import LinkedPipelineComponent from '~/ci/pipeline_details/components/graph/linked_pipeline.vue'; +import CancelPipelineMutation from '~/ci/pipeline_details/graphql/mutations/cancel_pipeline.mutation.graphql'; +import RetryPipelineMutation from '~/ci/pipeline_details/graphql/mutations/retry_pipeline.mutation.graphql'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import mockPipeline from './linked_pipelines_mock_data'; diff --git a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js index bcea140f2dd..4bc757ee42a 100644 --- a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js +++ b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js @@ -10,12 +10,12 @@ import { UPSTREAM, LAYER_VIEW, STAGE_VIEW, -} from '~/pipelines/components/graph/constants'; -import PipelineGraph from '~/pipelines/components/graph/graph_component.vue'; -import LinkedPipeline from '~/pipelines/components/graph/linked_pipeline.vue'; -import LinkedPipelinesColumn from '~/pipelines/components/graph/linked_pipelines_column.vue'; -import * as parsingUtils from '~/pipelines/components/parsing_utils'; -import { LOAD_FAILURE } from '~/pipelines/constants'; +} from '~/ci/pipeline_details/components/graph/constants'; +import PipelineGraph from '~/ci/pipeline_details/components/graph/graph_component.vue'; +import LinkedPipeline from '~/ci/pipeline_details/components/graph/linked_pipeline.vue'; +import LinkedPipelinesColumn from '~/ci/pipeline_details/components/graph/linked_pipelines_column.vue'; +import * as parsingUtils from '~/ci/pipeline_details/components/parsing_utils'; +import { LOAD_FAILURE } from '~/ci/pipeline_details/constants'; import { pipelineWithUpstreamDownstream, wrappedPipelineReturn } from './mock_data'; diff --git a/spec/frontend/pipelines/graph/mock_data.js b/spec/frontend/pipelines/graph/mock_data.js index 8d06d6931ed..c3ab2c756f0 100644 --- a/spec/frontend/pipelines/graph/mock_data.js +++ b/spec/frontend/pipelines/graph/mock_data.js @@ -1,10 +1,10 @@ import mockPipelineResponse from 'test_fixtures/pipelines/pipeline_details.json'; -import { unwrapPipelineData } from '~/pipelines/components/graph/utils'; +import { unwrapPipelineData } from '~/ci/pipeline_details/components/graph/utils'; import { BUILD_KIND, BRIDGE_KIND, RETRY_ACTION_TITLE, -} from '~/pipelines/components/graph/constants'; +} from '~/ci/pipeline_details/components/graph/constants'; // We mock this instead of using fixtures for performance reason. const mockPipelineResponseCopy = JSON.parse(JSON.stringify(mockPipelineResponse)); diff --git a/spec/frontend/pipelines/graph/stage_column_component_spec.js b/spec/frontend/pipelines/graph/stage_column_component_spec.js index d4d7f1618c5..7b19ac439b3 100644 --- a/spec/frontend/pipelines/graph/stage_column_component_spec.js +++ b/spec/frontend/pipelines/graph/stage_column_component_spec.js @@ -1,7 +1,7 @@ import { mount, shallowMount } from '@vue/test-utils'; -import JobItem from '~/pipelines/components/graph/job_item.vue'; -import StageColumnComponent from '~/pipelines/components/graph/stage_column_component.vue'; -import ActionComponent from '~/pipelines/components/jobs_shared/action_component.vue'; +import JobItem from '~/ci/pipeline_details/components/graph/job_item.vue'; +import StageColumnComponent from '~/ci/pipeline_details/components/graph/stage_column_component.vue'; +import ActionComponent from '~/ci/pipeline_details/components/jobs_shared/action_component.vue'; const mockJob = { id: 4250, diff --git a/spec/frontend/pipelines/graph_shared/links_inner_spec.js b/spec/frontend/pipelines/graph_shared/links_inner_spec.js index b4ffd2658fe..5c79ca00702 100644 --- a/spec/frontend/pipelines/graph_shared/links_inner_spec.js +++ b/spec/frontend/pipelines/graph_shared/links_inner_spec.js @@ -1,8 +1,8 @@ import { shallowMount } from '@vue/test-utils'; import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; -import LinksInner from '~/pipelines/components/graph_shared/links_inner.vue'; -import { parseData } from '~/pipelines/components/parsing_utils'; -import { createJobsHash } from '~/pipelines/utils'; +import LinksInner from '~/ci/pipeline_details/components/graph_shared/links_inner.vue'; +import { parseData } from '~/ci/pipeline_details/components/parsing_utils'; +import { createJobsHash } from '~/ci/pipeline_details/utils'; import { jobRect, largePipelineData, diff --git a/spec/frontend/pipelines/graph_shared/links_layer_spec.js b/spec/frontend/pipelines/graph_shared/links_layer_spec.js index 88ba84c395a..16dfb103cf0 100644 --- a/spec/frontend/pipelines/graph_shared/links_layer_spec.js +++ b/spec/frontend/pipelines/graph_shared/links_layer_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import mockPipelineResponse from 'test_fixtures/pipelines/pipeline_details.json'; -import LinksInner from '~/pipelines/components/graph_shared/links_inner.vue'; -import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue'; +import LinksInner from '~/ci/pipeline_details/components/graph_shared/links_inner.vue'; +import LinksLayer from '~/ci/pipeline_details/components/graph_shared/links_layer.vue'; import { generateResponse } from '../graph/mock_data'; diff --git a/spec/frontend/pipelines/nav_controls_spec.js b/spec/frontend/pipelines/nav_controls_spec.js index 15de7dc51f1..a4567734c34 100644 --- a/spec/frontend/pipelines/nav_controls_spec.js +++ b/spec/frontend/pipelines/nav_controls_spec.js @@ -1,5 +1,5 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import NavControls from '~/pipelines/components/pipelines_list/nav_controls.vue'; +import NavControls from '~/ci/pipeline_details/components/pipelines_list/nav_controls.vue'; describe('Pipelines Nav Controls', () => { let wrapper; diff --git a/spec/frontend/pipelines/pipeline_details_header_spec.js b/spec/frontend/pipelines/pipeline_details_header_spec.js index 5c75020afad..6ea5d603111 100644 --- a/spec/frontend/pipelines/pipeline_details_header_spec.js +++ b/spec/frontend/pipelines/pipeline_details_header_spec.js @@ -5,13 +5,13 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import PipelineDetailsHeader from '~/pipelines/components/pipeline_details_header.vue'; -import { BUTTON_TOOLTIP_RETRY, BUTTON_TOOLTIP_CANCEL } from '~/pipelines/constants'; +import PipelineDetailsHeader from '~/ci/pipeline_details/components/pipeline_details_header.vue'; +import { BUTTON_TOOLTIP_RETRY, BUTTON_TOOLTIP_CANCEL } from '~/ci/pipeline_details/constants'; import CiBadgeLink from '~/vue_shared/components/ci_badge_link.vue'; -import cancelPipelineMutation from '~/pipelines/graphql/mutations/cancel_pipeline.mutation.graphql'; -import deletePipelineMutation from '~/pipelines/graphql/mutations/delete_pipeline.mutation.graphql'; -import retryPipelineMutation from '~/pipelines/graphql/mutations/retry_pipeline.mutation.graphql'; -import getPipelineDetailsQuery from '~/pipelines/graphql/queries/get_pipeline_header_data.query.graphql'; +import cancelPipelineMutation from '~/ci/pipeline_details/graphql/mutations/cancel_pipeline.mutation.graphql'; +import deletePipelineMutation from '~/ci/pipeline_details/graphql/mutations/delete_pipeline.mutation.graphql'; +import retryPipelineMutation from '~/ci/pipeline_details/graphql/mutations/retry_pipeline.mutation.graphql'; +import getPipelineDetailsQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_header_data.query.graphql'; import { pipelineHeaderSuccess, pipelineHeaderRunning, diff --git a/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js b/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js index 123f2e011c3..ed49aeeb1a0 100644 --- a/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js +++ b/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js @@ -2,11 +2,11 @@ import { GlAlert } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { setHTMLFixture } from 'helpers/fixtures'; import { CI_CONFIG_STATUS_VALID } from '~/ci/pipeline_editor/constants'; -import LinksInner from '~/pipelines/components/graph_shared/links_inner.vue'; -import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue'; -import JobPill from '~/pipelines/components/pipeline_graph/job_pill.vue'; -import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue'; -import StageName from '~/pipelines/components/pipeline_graph/stage_name.vue'; +import LinksInner from '~/ci/pipeline_details/components/graph_shared/links_inner.vue'; +import LinksLayer from '~/ci/pipeline_details/components/graph_shared/links_layer.vue'; +import JobPill from '~/ci/pipeline_details/components/pipeline_graph/job_pill.vue'; +import PipelineGraph from '~/ci/pipeline_details/components/pipeline_graph/pipeline_graph.vue'; +import StageName from '~/ci/pipeline_details/components/pipeline_graph/stage_name.vue'; import { pipelineData, singleStageData } from './mock_data'; describe('pipeline graph component', () => { diff --git a/spec/frontend/pipelines/pipeline_graph/utils_spec.js b/spec/frontend/pipelines/pipeline_graph/utils_spec.js index 96b18fcf96f..61230cb52e6 100644 --- a/spec/frontend/pipelines/pipeline_graph/utils_spec.js +++ b/spec/frontend/pipelines/pipeline_graph/utils_spec.js @@ -1,5 +1,9 @@ -import { createJobsHash, generateJobNeedsDict, getPipelineDefaultTab } from '~/pipelines/utils'; -import { validPipelineTabNames, pipelineTabName } from '~/pipelines/constants'; +import { + createJobsHash, + generateJobNeedsDict, + getPipelineDefaultTab, +} from '~/ci/pipeline_details/utils'; +import { validPipelineTabNames, pipelineTabName } from '~/ci/pipeline_details/constants'; describe('utils functions', () => { const jobName1 = 'build_1'; diff --git a/spec/frontend/pipelines/pipeline_labels_spec.js b/spec/frontend/pipelines/pipeline_labels_spec.js index 6a37e36352b..9a65cad4cba 100644 --- a/spec/frontend/pipelines/pipeline_labels_spec.js +++ b/spec/frontend/pipelines/pipeline_labels_spec.js @@ -1,6 +1,6 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { trimText } from 'helpers/text_helper'; -import PipelineLabelsComponent from '~/pipelines/components/pipelines_list/pipeline_labels.vue'; +import PipelineLabelsComponent from '~/ci/pipeline_details/components/pipelines_list/pipeline_labels.vue'; import { mockPipeline } from './mock_data'; const projectPath = 'test/test'; diff --git a/spec/frontend/pipelines/pipeline_multi_actions_spec.js b/spec/frontend/pipelines/pipeline_multi_actions_spec.js index 0fdc45a5931..b35ffaff4dc 100644 --- a/spec/frontend/pipelines/pipeline_multi_actions_spec.js +++ b/spec/frontend/pipelines/pipeline_multi_actions_spec.js @@ -10,8 +10,8 @@ import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; import PipelineMultiActions, { i18n, -} from '~/pipelines/components/pipelines_list/pipeline_multi_actions.vue'; -import { TRACKING_CATEGORIES } from '~/pipelines/constants'; +} from '~/ci/pipeline_details/components/pipelines_list/pipeline_multi_actions.vue'; +import { TRACKING_CATEGORIES } from '~/ci/pipeline_details/constants'; describe('Pipeline Multi Actions Dropdown', () => { let wrapper; diff --git a/spec/frontend/pipelines/pipeline_operations_spec.js b/spec/frontend/pipelines/pipeline_operations_spec.js index b2191453824..1952d704b9c 100644 --- a/spec/frontend/pipelines/pipeline_operations_spec.js +++ b/spec/frontend/pipelines/pipeline_operations_spec.js @@ -1,8 +1,8 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import PipelinesManualActions from '~/pipelines/components/pipelines_list/pipelines_manual_actions.vue'; -import PipelineMultiActions from '~/pipelines/components/pipelines_list/pipeline_multi_actions.vue'; -import PipelineOperations from '~/pipelines/components/pipelines_list/pipeline_operations.vue'; -import eventHub from '~/pipelines/event_hub'; +import PipelinesManualActions from '~/ci/pipeline_details/components/pipelines_list/pipelines_manual_actions.vue'; +import PipelineMultiActions from '~/ci/pipeline_details/components/pipelines_list/pipeline_multi_actions.vue'; +import PipelineOperations from '~/ci/pipeline_details/components/pipelines_list/pipeline_operations.vue'; +import eventHub from '~/ci/pipeline_details/event_hub'; describe('Pipeline operations', () => { let wrapper; diff --git a/spec/frontend/pipelines/pipeline_tabs_spec.js b/spec/frontend/pipelines/pipeline_tabs_spec.js index 8d1cd98e981..8d67cdef05c 100644 --- a/spec/frontend/pipelines/pipeline_tabs_spec.js +++ b/spec/frontend/pipelines/pipeline_tabs_spec.js @@ -1,4 +1,4 @@ -import { createAppOptions } from '~/pipelines/pipeline_tabs'; +import { createAppOptions } from '~/ci/pipeline_details/pipeline_tabs'; jest.mock('~/lib/utils/url_utility', () => ({ removeParams: () => 'gitlab.com', @@ -6,11 +6,11 @@ jest.mock('~/lib/utils/url_utility', () => ({ setUrlFragment: () => {}, })); -jest.mock('~/pipelines/utils', () => ({ +jest.mock('~/ci/pipeline_details/utils', () => ({ getPipelineDefaultTab: () => '', })); -describe('~/pipelines/pipeline_tabs.js', () => { +describe('~/ci/pipeline_details/pipeline_tabs.js', () => { describe('createAppOptions', () => { const SELECTOR = 'SELECTOR'; diff --git a/spec/frontend/pipelines/pipeline_triggerer_spec.js b/spec/frontend/pipelines/pipeline_triggerer_spec.js index 856c0484075..5e2a7df6fe9 100644 --- a/spec/frontend/pipelines/pipeline_triggerer_spec.js +++ b/spec/frontend/pipelines/pipeline_triggerer_spec.js @@ -1,6 +1,6 @@ import { GlAvatar, GlAvatarLink } from '@gitlab/ui'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import pipelineTriggerer from '~/pipelines/components/pipelines_list/pipeline_triggerer.vue'; +import pipelineTriggerer from '~/ci/pipeline_details/components/pipelines_list/pipeline_triggerer.vue'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; describe('Pipelines Triggerer', () => { diff --git a/spec/frontend/pipelines/pipeline_url_spec.js b/spec/frontend/pipelines/pipeline_url_spec.js index 797ec676ccc..be24ae80950 100644 --- a/spec/frontend/pipelines/pipeline_url_spec.js +++ b/spec/frontend/pipelines/pipeline_url_spec.js @@ -1,9 +1,9 @@ import { merge } from 'lodash'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import PipelineUrlComponent from '~/pipelines/components/pipelines_list/pipeline_url.vue'; +import PipelineUrlComponent from '~/ci/pipeline_details/components/pipelines_list/pipeline_url.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; -import { TRACKING_CATEGORIES } from '~/pipelines/constants'; +import { TRACKING_CATEGORIES } from '~/ci/pipeline_details/constants'; import { mockPipeline, mockPipelineBranch, mockPipelineTag } from './mock_data'; const projectPath = 'test/test'; diff --git a/spec/frontend/pipelines/pipelines_artifacts_spec.js b/spec/frontend/pipelines/pipelines_artifacts_spec.js index 1abc2887682..9b092a70965 100644 --- a/spec/frontend/pipelines/pipelines_artifacts_spec.js +++ b/spec/frontend/pipelines/pipelines_artifacts_spec.js @@ -5,7 +5,7 @@ import { GlSprintf, } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import PipelineArtifacts from '~/pipelines/components/pipelines_list/pipelines_artifacts.vue'; +import PipelineArtifacts from '~/ci/pipeline_details/components/pipelines_list/pipelines_artifacts.vue'; describe('Pipelines Artifacts dropdown', () => { let wrapper; diff --git a/spec/frontend/pipelines/pipelines_manual_actions_spec.js b/spec/frontend/pipelines/pipelines_manual_actions_spec.js index 82cab88c9eb..15cdceed850 100644 --- a/spec/frontend/pipelines/pipelines_manual_actions_spec.js +++ b/spec/frontend/pipelines/pipelines_manual_actions_spec.js @@ -11,9 +11,9 @@ import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal'; -import PipelinesManualActions from '~/pipelines/components/pipelines_list/pipelines_manual_actions.vue'; -import getPipelineActionsQuery from '~/pipelines/graphql/queries/get_pipeline_actions.query.graphql'; -import { TRACKING_CATEGORIES } from '~/pipelines/constants'; +import PipelinesManualActions from '~/ci/pipeline_details/components/pipelines_list/pipelines_manual_actions.vue'; +import getPipelineActionsQuery from '~/ci/pipeline_details/graphql/queries/get_pipeline_actions.query.graphql'; +import { TRACKING_CATEGORIES } from '~/ci/pipeline_details/constants'; import GlCountdown from '~/vue_shared/components/gl_countdown.vue'; Vue.use(VueApollo); diff --git a/spec/frontend/pipelines/pipelines_spec.js b/spec/frontend/pipelines/pipelines_spec.js index cc85d6d99e0..62e2e28f311 100644 --- a/spec/frontend/pipelines/pipelines_spec.js +++ b/spec/frontend/pipelines/pipelines_spec.js @@ -24,12 +24,12 @@ import { createAlert, VARIANT_WARNING } from '~/alert'; import setSortPreferenceMutation from '~/issues/list/queries/set_sort_preference.mutation.graphql'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; -import NavigationControls from '~/pipelines/components/pipelines_list/nav_controls.vue'; -import PipelinesComponent from '~/pipelines/components/pipelines_list/pipelines.vue'; -import PipelinesCiTemplates from '~/pipelines/components/pipelines_list/empty_state/pipelines_ci_templates.vue'; -import PipelinesTableComponent from '~/pipelines/components/pipelines_list/pipelines_table.vue'; -import { RAW_TEXT_WARNING, TRACKING_CATEGORIES } from '~/pipelines/constants'; -import Store from '~/pipelines/stores/pipelines_store'; +import NavigationControls from '~/ci/pipeline_details/components/pipelines_list/nav_controls.vue'; +import PipelinesComponent from '~/ci/pipeline_details/components/pipelines_list/pipelines.vue'; +import PipelinesCiTemplates from '~/ci/pipeline_details/components/pipelines_list/empty_state/pipelines_ci_templates.vue'; +import PipelinesTableComponent from '~/ci/pipeline_details/components/pipelines_list/pipelines_table.vue'; +import { RAW_TEXT_WARNING, TRACKING_CATEGORIES } from '~/ci/pipeline_details/constants'; +import Store from '~/ci/pipeline_details/stores/pipelines_store'; import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { diff --git a/spec/frontend/pipelines/pipelines_store_spec.js b/spec/frontend/pipelines/pipelines_store_spec.js index f374ecd0c0a..43e605f4306 100644 --- a/spec/frontend/pipelines/pipelines_store_spec.js +++ b/spec/frontend/pipelines/pipelines_store_spec.js @@ -1,4 +1,4 @@ -import PipelineStore from '~/pipelines/stores/pipelines_store'; +import PipelineStore from '~/ci/pipeline_details/stores/pipelines_store'; describe('Pipelines Store', () => { let store; diff --git a/spec/frontend/pipelines/pipelines_table_spec.js b/spec/frontend/pipelines/pipelines_table_spec.js index 950a6b21e16..508e1eb833f 100644 --- a/spec/frontend/pipelines/pipelines_table_spec.js +++ b/spec/frontend/pipelines/pipelines_table_spec.js @@ -4,23 +4,23 @@ import { mount } from '@vue/test-utils'; import fixture from 'test_fixtures/pipelines/pipelines.json'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import LegacyPipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; -import PipelineFailedJobsWidget from '~/pipelines/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue'; -import PipelineOperations from '~/pipelines/components/pipelines_list/pipeline_operations.vue'; -import PipelineTriggerer from '~/pipelines/components/pipelines_list/pipeline_triggerer.vue'; -import PipelineUrl from '~/pipelines/components/pipelines_list/pipeline_url.vue'; -import PipelinesTable from '~/pipelines/components/pipelines_list/pipelines_table.vue'; -import PipelinesTimeago from '~/pipelines/components/pipelines_list/time_ago.vue'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import PipelineFailedJobsWidget from '~/ci/pipeline_details/components/pipelines_list/failure_widget/pipeline_failed_jobs_widget.vue'; +import PipelineOperations from '~/ci/pipeline_details/components/pipelines_list/pipeline_operations.vue'; +import PipelineTriggerer from '~/ci/pipeline_details/components/pipelines_list/pipeline_triggerer.vue'; +import PipelineUrl from '~/ci/pipeline_details/components/pipelines_list/pipeline_url.vue'; +import PipelinesTable from '~/ci/pipeline_details/components/pipelines_list/pipelines_table.vue'; +import PipelinesTimeago from '~/ci/pipeline_details/components/pipelines_list/time_ago.vue'; import { PipelineKeyOptions, BUTTON_TOOLTIP_RETRY, BUTTON_TOOLTIP_CANCEL, TRACKING_CATEGORIES, -} from '~/pipelines/constants'; +} from '~/ci/pipeline_details/constants'; import CiBadgeLink from '~/vue_shared/components/ci_badge_link.vue'; -jest.mock('~/pipelines/event_hub'); +jest.mock('~/ci/pipeline_details/event_hub'); describe('Pipelines Table', () => { let pipeline; diff --git a/spec/frontend/pipelines/test_reports/empty_state_spec.js b/spec/frontend/pipelines/test_reports/empty_state_spec.js index ee0f8a90a11..c5879bbf0c0 100644 --- a/spec/frontend/pipelines/test_reports/empty_state_spec.js +++ b/spec/frontend/pipelines/test_reports/empty_state_spec.js @@ -1,6 +1,6 @@ import { GlEmptyState } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import EmptyState, { i18n } from '~/pipelines/components/test_reports/empty_state.vue'; +import EmptyState, { i18n } from '~/ci/pipeline_details/components/test_reports/empty_state.vue'; describe('Test report empty state', () => { let wrapper; diff --git a/spec/frontend/pipelines/test_reports/mock_data.js b/spec/frontend/pipelines/test_reports/mock_data.js index c3ca1429842..7c9f9287c86 100644 --- a/spec/frontend/pipelines/test_reports/mock_data.js +++ b/spec/frontend/pipelines/test_reports/mock_data.js @@ -1,4 +1,4 @@ -import { TestStatus } from '~/pipelines/constants'; +import { TestStatus } from '~/ci/pipeline_details/constants'; export default [ { diff --git a/spec/frontend/pipelines/test_reports/stores/actions_spec.js b/spec/frontend/pipelines/test_reports/stores/actions_spec.js index e05d2151f0a..6636a7f1ed6 100644 --- a/spec/frontend/pipelines/test_reports/stores/actions_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/actions_spec.js @@ -5,8 +5,8 @@ import testAction from 'helpers/vuex_action_helper'; import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; -import * as actions from '~/pipelines/stores/test_reports/actions'; -import * as types from '~/pipelines/stores/test_reports/mutation_types'; +import * as actions from '~/ci/pipeline_details/stores/test_reports/actions'; +import * as types from '~/ci/pipeline_details/stores/test_reports/mutation_types'; jest.mock('~/alert'); diff --git a/spec/frontend/pipelines/test_reports/stores/getters_spec.js b/spec/frontend/pipelines/test_reports/stores/getters_spec.js index 70e3a01dbf1..e52e9a07ae0 100644 --- a/spec/frontend/pipelines/test_reports/stores/getters_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/getters_spec.js @@ -1,10 +1,10 @@ import testReports from 'test_fixtures/pipelines/test_report.json'; -import * as getters from '~/pipelines/stores/test_reports/getters'; +import * as getters from '~/ci/pipeline_details/stores/test_reports/getters'; import { iconForTestStatus, formatFilePath, formattedTime, -} from '~/pipelines/stores/test_reports/utils'; +} from '~/ci/pipeline_details/stores/test_reports/utils'; describe('Getters TestReports Store', () => { let state; diff --git a/spec/frontend/pipelines/test_reports/stores/mutations_spec.js b/spec/frontend/pipelines/test_reports/stores/mutations_spec.js index 685ac6ea3e5..d58515dcc6d 100644 --- a/spec/frontend/pipelines/test_reports/stores/mutations_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/mutations_spec.js @@ -1,6 +1,6 @@ import testReports from 'test_fixtures/pipelines/test_report.json'; -import * as types from '~/pipelines/stores/test_reports/mutation_types'; -import mutations from '~/pipelines/stores/test_reports/mutations'; +import * as types from '~/ci/pipeline_details/stores/test_reports/mutation_types'; +import mutations from '~/ci/pipeline_details/stores/test_reports/mutations'; import { createAlert } from '~/alert'; jest.mock('~/alert'); diff --git a/spec/frontend/pipelines/test_reports/stores/utils_spec.js b/spec/frontend/pipelines/test_reports/stores/utils_spec.js index 703fe69026c..c0ffc2b34fb 100644 --- a/spec/frontend/pipelines/test_reports/stores/utils_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/utils_spec.js @@ -1,4 +1,4 @@ -import { formatFilePath, formattedTime } from '~/pipelines/stores/test_reports/utils'; +import { formatFilePath, formattedTime } from '~/ci/pipeline_details/stores/test_reports/utils'; describe('Test reports utils', () => { describe('formatFilePath', () => { diff --git a/spec/frontend/pipelines/test_reports/test_case_details_spec.js b/spec/frontend/pipelines/test_reports/test_case_details_spec.js index f8663408817..e4058e6b1dc 100644 --- a/spec/frontend/pipelines/test_reports/test_case_details_spec.js +++ b/spec/frontend/pipelines/test_reports/test_case_details_spec.js @@ -1,7 +1,7 @@ import { GlModal, GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import TestCaseDetails from '~/pipelines/components/test_reports/test_case_details.vue'; +import TestCaseDetails from '~/ci/pipeline_details/components/test_reports/test_case_details.vue'; import CodeBlock from '~/vue_shared/components/code_block.vue'; import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; diff --git a/spec/frontend/pipelines/test_reports/test_reports_spec.js b/spec/frontend/pipelines/test_reports/test_reports_spec.js index de16f496eff..73c07e660d4 100644 --- a/spec/frontend/pipelines/test_reports/test_reports_spec.js +++ b/spec/frontend/pipelines/test_reports/test_reports_spec.js @@ -5,11 +5,11 @@ import Vue from 'vue'; import Vuex from 'vuex'; import testReports from 'test_fixtures/pipelines/test_report.json'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import EmptyState from '~/pipelines/components/test_reports/empty_state.vue'; -import TestReports from '~/pipelines/components/test_reports/test_reports.vue'; -import TestSummary from '~/pipelines/components/test_reports/test_summary.vue'; -import TestSummaryTable from '~/pipelines/components/test_reports/test_summary_table.vue'; -import * as getters from '~/pipelines/stores/test_reports/getters'; +import EmptyState from '~/ci/pipeline_details/components/test_reports/empty_state.vue'; +import TestReports from '~/ci/pipeline_details/components/test_reports/test_reports.vue'; +import TestSummary from '~/ci/pipeline_details/components/test_reports/test_summary.vue'; +import TestSummaryTable from '~/ci/pipeline_details/components/test_reports/test_summary_table.vue'; +import * as getters from '~/ci/pipeline_details/stores/test_reports/getters'; Vue.use(Vuex); diff --git a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js index 08b430fa703..bb29be5343a 100644 --- a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js +++ b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js @@ -4,11 +4,13 @@ import Vue from 'vue'; import Vuex from 'vuex'; import testReports from 'test_fixtures/pipelines/test_report.json'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import SuiteTable, { i18n } from '~/pipelines/components/test_reports/test_suite_table.vue'; -import { TestStatus } from '~/pipelines/constants'; -import * as getters from '~/pipelines/stores/test_reports/getters'; -import { formatFilePath } from '~/pipelines/stores/test_reports/utils'; -import { ARTIFACTS_EXPIRED_ERROR_MESSAGE } from '~/pipelines/stores/test_reports/constants'; +import SuiteTable, { + i18n, +} from '~/ci/pipeline_details/components/test_reports/test_suite_table.vue'; +import { TestStatus } from '~/ci/pipeline_details/constants'; +import * as getters from '~/ci/pipeline_details/stores/test_reports/getters'; +import { formatFilePath } from '~/ci/pipeline_details/stores/test_reports/utils'; +import { ARTIFACTS_EXPIRED_ERROR_MESSAGE } from '~/ci/pipeline_details/stores/test_reports/constants'; import skippedTestCases from './mock_data'; Vue.use(Vuex); diff --git a/spec/frontend/pipelines/test_reports/test_summary_spec.js b/spec/frontend/pipelines/test_reports/test_summary_spec.js index 7eed6671fb9..ecb81838627 100644 --- a/spec/frontend/pipelines/test_reports/test_summary_spec.js +++ b/spec/frontend/pipelines/test_reports/test_summary_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import testReports from 'test_fixtures/pipelines/test_report.json'; -import Summary from '~/pipelines/components/test_reports/test_summary.vue'; -import { formattedTime } from '~/pipelines/stores/test_reports/utils'; +import Summary from '~/ci/pipeline_details/components/test_reports/test_summary.vue'; +import { formattedTime } from '~/ci/pipeline_details/stores/test_reports/utils'; describe('Test reports summary', () => { let wrapper; diff --git a/spec/frontend/pipelines/test_reports/test_summary_table_spec.js b/spec/frontend/pipelines/test_reports/test_summary_table_spec.js index a45946d5a03..55cb0a7566a 100644 --- a/spec/frontend/pipelines/test_reports/test_summary_table_spec.js +++ b/spec/frontend/pipelines/test_reports/test_summary_table_spec.js @@ -3,8 +3,8 @@ import Vue from 'vue'; // eslint-disable-next-line no-restricted-imports import Vuex from 'vuex'; import testReports from 'test_fixtures/pipelines/test_report.json'; -import SummaryTable from '~/pipelines/components/test_reports/test_summary_table.vue'; -import * as getters from '~/pipelines/stores/test_reports/getters'; +import SummaryTable from '~/ci/pipeline_details/components/test_reports/test_summary_table.vue'; +import * as getters from '~/ci/pipeline_details/stores/test_reports/getters'; Vue.use(Vuex); diff --git a/spec/frontend/pipelines/time_ago_spec.js b/spec/frontend/pipelines/time_ago_spec.js index d2aa340a980..68597a1f59b 100644 --- a/spec/frontend/pipelines/time_ago_spec.js +++ b/spec/frontend/pipelines/time_ago_spec.js @@ -1,7 +1,7 @@ import { GlIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import TimeAgo from '~/pipelines/components/pipelines_list/time_ago.vue'; +import TimeAgo from '~/ci/pipeline_details/components/pipelines_list/time_ago.vue'; describe('Timeago component', () => { let wrapper; diff --git a/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js index d518519a424..2b97130a264 100644 --- a/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js +++ b/spec/frontend/pipelines/tokens/pipeline_branch_name_token_spec.js @@ -3,7 +3,7 @@ import { nextTick } from 'vue'; import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; import Api from '~/api'; -import PipelineBranchNameToken from '~/pipelines/components/pipelines_list/tokens/pipeline_branch_name_token.vue'; +import PipelineBranchNameToken from '~/ci/pipeline_details/components/pipelines_list/tokens/pipeline_branch_name_token.vue'; import { branches, mockBranchesAfterMap } from '../mock_data'; describe('Pipeline Branch Name Token', () => { diff --git a/spec/frontend/pipelines/tokens/pipeline_source_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_source_token_spec.js index 60abb63a7e0..096174d8c36 100644 --- a/spec/frontend/pipelines/tokens/pipeline_source_token_spec.js +++ b/spec/frontend/pipelines/tokens/pipeline_source_token_spec.js @@ -1,8 +1,8 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { PIPELINE_SOURCES } from 'ee_else_ce/pipelines/components/pipelines_list/tokens/constants'; +import { PIPELINE_SOURCES } from 'ee_else_ce/ci/pipeline_details/components/pipelines_list/tokens/constants'; import { stubComponent } from 'helpers/stub_component'; -import PipelineSourceToken from '~/pipelines/components/pipelines_list/tokens/pipeline_source_token.vue'; +import PipelineSourceToken from '~/ci/pipeline_details/components/pipelines_list/tokens/pipeline_source_token.vue'; describe('Pipeline Source Token', () => { let wrapper; diff --git a/spec/frontend/pipelines/tokens/pipeline_status_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_status_token_spec.js index cf4ccb5ce43..17c038a1e58 100644 --- a/spec/frontend/pipelines/tokens/pipeline_status_token_spec.js +++ b/spec/frontend/pipelines/tokens/pipeline_status_token_spec.js @@ -1,7 +1,7 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { stubComponent } from 'helpers/stub_component'; -import PipelineStatusToken from '~/pipelines/components/pipelines_list/tokens/pipeline_status_token.vue'; +import PipelineStatusToken from '~/ci/pipeline_details/components/pipelines_list/tokens/pipeline_status_token.vue'; import { TOKEN_TITLE_STATUS, TOKEN_TYPE_STATUS, diff --git a/spec/frontend/pipelines/tokens/pipeline_tag_name_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_tag_name_token_spec.js index 88c88d8f16f..fbd5d6dd9a3 100644 --- a/spec/frontend/pipelines/tokens/pipeline_tag_name_token_spec.js +++ b/spec/frontend/pipelines/tokens/pipeline_tag_name_token_spec.js @@ -1,7 +1,7 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import Api from '~/api'; -import PipelineTagNameToken from '~/pipelines/components/pipelines_list/tokens/pipeline_tag_name_token.vue'; +import PipelineTagNameToken from '~/ci/pipeline_details/components/pipelines_list/tokens/pipeline_tag_name_token.vue'; import { tags, mockTagsAfterMap } from '../mock_data'; describe('Pipeline Branch Name Token', () => { diff --git a/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js b/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js index e9ec684a350..dcb7d51e1ae 100644 --- a/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js +++ b/spec/frontend/pipelines/tokens/pipeline_trigger_author_token_spec.js @@ -2,7 +2,7 @@ import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlLoadingIcon } from import { shallowMount } from '@vue/test-utils'; import { stubComponent } from 'helpers/stub_component'; import Api from '~/api'; -import PipelineTriggerAuthorToken from '~/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue'; +import PipelineTriggerAuthorToken from '~/ci/pipeline_details/components/pipelines_list/tokens/pipeline_trigger_author_token.vue'; import { users } from '../mock_data'; describe('Pipeline Trigger Author Token', () => { diff --git a/spec/frontend/pipelines/unwrapping_utils_spec.js b/spec/frontend/pipelines/unwrapping_utils_spec.js index a6ce7d4049f..3f7abe3f024 100644 --- a/spec/frontend/pipelines/unwrapping_utils_spec.js +++ b/spec/frontend/pipelines/unwrapping_utils_spec.js @@ -2,7 +2,7 @@ import { unwrapGroups, unwrapNodesWithName, unwrapStagesWithNeeds, -} from '~/pipelines/components/unwrapping_utils'; +} from '~/ci/pipeline_details/components/unwrapping_utils'; const groupsArray = [ { diff --git a/spec/frontend/pipelines/utils_spec.js b/spec/frontend/pipelines/utils_spec.js index 286d79edc6c..1853d6ea703 100644 --- a/spec/frontend/pipelines/utils_spec.js +++ b/spec/frontend/pipelines/utils_spec.js @@ -1,5 +1,5 @@ import mockPipelineResponse from 'test_fixtures/pipelines/pipeline_details.json'; -import { createSankey } from '~/pipelines/components/dag/drawing_utils'; +import { createSankey } from '~/ci/pipeline_details/components/dag/drawing_utils'; import { makeLinksFromNodes, filterByAncestors, @@ -9,8 +9,8 @@ import { parseData, removeOrphanNodes, getMaxNodes, -} from '~/pipelines/components/parsing_utils'; -import { createNodeDict } from '~/pipelines/utils'; +} from '~/ci/pipeline_details/components/parsing_utils'; +import { createNodeDict } from '~/ci/pipeline_details/utils'; import { mockDownstreamPipelinesRest } from '../vue_merge_request_widget/mock_data'; import { mockDownstreamPipelinesGraphql } from '../commit/mock_data'; diff --git a/spec/frontend/time_tracking/components/timelogs_app_spec.js b/spec/frontend/time_tracking/components/timelogs_app_spec.js index ca470ce63ac..13188f3b937 100644 --- a/spec/frontend/time_tracking/components/timelogs_app_spec.js +++ b/spec/frontend/time_tracking/components/timelogs_app_spec.js @@ -95,12 +95,12 @@ describe('Timelogs app', () => { mountComponent(); const username = 'johnsmith'; - const fromDate = new Date('2023-02-28'); - const toDate = new Date('2023-03-28'); + const fromDateTime = new Date('2023-02-28'); + const toDateTime = new Date('2023-03-28'); findUsernameInput().vm.$emit('input', username); - findFromDatepicker().vm.$emit('input', fromDate); - findToDatepicker().vm.$emit('input', toDate); + findFromDatepicker().vm.$emit('input', fromDateTime); + findToDatepicker().vm.$emit('input', toDateTime); resolvedEmptyListMock.mockClear(); @@ -110,8 +110,8 @@ describe('Timelogs app', () => { expect(resolvedEmptyListMock).toHaveBeenCalledWith({ username, - startDate: fromDate, - endDate: toDate, + startTime: fromDateTime, + endTime: toDateTime, groupId: null, projectId: null, first: 20, @@ -119,6 +119,15 @@ describe('Timelogs app', () => { after: null, before: null, }); + + expect(`${wrapper.vm.queryVariables.startTime}`).toEqual( + 'Tue Feb 28 2023 00:00:00 GMT+0000 (Greenwich Mean Time)', + ); + // should be 1 day ahead of the initial To Date value + expect(`${wrapper.vm.queryVariables.endTime}`).toEqual( + 'Wed Mar 29 2023 00:00:00 GMT+0000 (Greenwich Mean Time)', + ); + expect(createAlert).not.toHaveBeenCalled(); expect(Sentry.captureException).not.toHaveBeenCalled(); }); @@ -140,8 +149,8 @@ describe('Timelogs app', () => { expect(resolvedEmptyListMock).toHaveBeenCalledWith({ username, - startDate: null, - endDate: null, + startTime: null, + endTime: null, groupId: null, projectId: null, first: 20, diff --git a/spec/frontend/user_lists/components/user_list_spec.js b/spec/frontend/user_lists/components/user_list_spec.js index 286fb9fef5f..0ed21114778 100644 --- a/spec/frontend/user_lists/components/user_list_spec.js +++ b/spec/frontend/user_lists/components/user_list_spec.js @@ -169,7 +169,7 @@ describe('User List', () => { it('displays the alert message', () => { const alert = findAlert(); - expect(alert.text()).toBe('Something went wrong on our end. Please try again!'); + expect(alert.text()).toBe('Unable to load user list. Reload the page and try again.'); }); it('can dismiss the alert', async () => { diff --git a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js index a0064224b46..dd2537448c0 100644 --- a/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js +++ b/spec/frontend/vue_merge_request_widget/components/mr_widget_pipeline_spec.js @@ -6,7 +6,7 @@ import { trimText } from 'helpers/text_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; import MRWidgetPipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue'; -import LegacyPipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; +import LegacyPipelineMiniGraph from '~/ci/pipeline_details/components/pipeline_mini_graph/legacy_pipeline_mini_graph.vue'; import { SUCCESS } from '~/vue_merge_request_widget/constants'; import mockData from '../mock_data'; diff --git a/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js b/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js index ff7f6b5c990..1c5a4e508bb 100644 --- a/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js +++ b/spec/frontend/vue_merge_request_widget/extensions/test_report/index_spec.js @@ -11,7 +11,7 @@ import { HTTP_STATUS_NO_CONTENT, HTTP_STATUS_OK, } from '~/lib/utils/http_status'; -import TestCaseDetails from '~/pipelines/components/test_reports/test_case_details.vue'; +import TestCaseDetails from '~/ci/pipeline_details/components/test_reports/test_case_details.vue'; import { failedReport } from 'jest/ci/reports/mock_data/mock_data'; import mixedResultsTestReports from 'jest/ci/reports/mock_data/new_and_fixed_failures_report.json'; |