diff --git a/app/assets/javascripts/artifacts/components/app.vue b/app/assets/javascripts/ci/artifacts/components/app.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/app.vue rename to app/assets/javascripts/ci/artifacts/components/app.vue diff --git a/app/assets/javascripts/artifacts/components/artifact_delete_modal.vue b/app/assets/javascripts/ci/artifacts/components/artifact_delete_modal.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/artifact_delete_modal.vue rename to app/assets/javascripts/ci/artifacts/components/artifact_delete_modal.vue diff --git a/app/assets/javascripts/artifacts/components/artifact_row.vue b/app/assets/javascripts/ci/artifacts/components/artifact_row.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/artifact_row.vue rename to app/assets/javascripts/ci/artifacts/components/artifact_row.vue diff --git a/app/assets/javascripts/artifacts/components/artifacts_bulk_delete.vue b/app/assets/javascripts/ci/artifacts/components/artifacts_bulk_delete.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/artifacts_bulk_delete.vue rename to app/assets/javascripts/ci/artifacts/components/artifacts_bulk_delete.vue diff --git a/app/assets/javascripts/artifacts/components/artifacts_table_row_details.vue b/app/assets/javascripts/ci/artifacts/components/artifacts_table_row_details.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/artifacts_table_row_details.vue rename to app/assets/javascripts/ci/artifacts/components/artifacts_table_row_details.vue diff --git a/app/assets/javascripts/artifacts/components/feedback_banner.vue b/app/assets/javascripts/ci/artifacts/components/feedback_banner.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/feedback_banner.vue rename to app/assets/javascripts/ci/artifacts/components/feedback_banner.vue diff --git a/app/assets/javascripts/artifacts/components/job_artifacts_table.vue b/app/assets/javascripts/ci/artifacts/components/job_artifacts_table.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/job_artifacts_table.vue rename to app/assets/javascripts/ci/artifacts/components/job_artifacts_table.vue diff --git a/app/assets/javascripts/artifacts/components/job_checkbox.vue b/app/assets/javascripts/ci/artifacts/components/job_checkbox.vue similarity index 100% rename from app/assets/javascripts/artifacts/components/job_checkbox.vue rename to app/assets/javascripts/ci/artifacts/components/job_checkbox.vue diff --git a/app/assets/javascripts/artifacts/constants.js b/app/assets/javascripts/ci/artifacts/constants.js similarity index 100% rename from app/assets/javascripts/artifacts/constants.js rename to app/assets/javascripts/ci/artifacts/constants.js diff --git a/app/assets/javascripts/artifacts/graphql/cache_update.js b/app/assets/javascripts/ci/artifacts/graphql/cache_update.js similarity index 100% rename from app/assets/javascripts/artifacts/graphql/cache_update.js rename to app/assets/javascripts/ci/artifacts/graphql/cache_update.js diff --git a/app/assets/javascripts/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql b/app/assets/javascripts/ci/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql similarity index 100% rename from app/assets/javascripts/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql rename to app/assets/javascripts/ci/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql diff --git a/app/assets/javascripts/artifacts/graphql/mutations/destroy_artifact.mutation.graphql b/app/assets/javascripts/ci/artifacts/graphql/mutations/destroy_artifact.mutation.graphql similarity index 100% rename from app/assets/javascripts/artifacts/graphql/mutations/destroy_artifact.mutation.graphql rename to app/assets/javascripts/ci/artifacts/graphql/mutations/destroy_artifact.mutation.graphql diff --git a/app/assets/javascripts/artifacts/graphql/queries/get_build_artifacts_size.query.graphql b/app/assets/javascripts/ci/artifacts/graphql/queries/get_build_artifacts_size.query.graphql similarity index 100% rename from app/assets/javascripts/artifacts/graphql/queries/get_build_artifacts_size.query.graphql rename to app/assets/javascripts/ci/artifacts/graphql/queries/get_build_artifacts_size.query.graphql diff --git a/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql b/app/assets/javascripts/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql similarity index 100% rename from app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql rename to app/assets/javascripts/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql diff --git a/app/assets/javascripts/artifacts/index.js b/app/assets/javascripts/ci/artifacts/index.js similarity index 100% rename from app/assets/javascripts/artifacts/index.js rename to app/assets/javascripts/ci/artifacts/index.js diff --git a/app/assets/javascripts/artifacts/utils.js b/app/assets/javascripts/ci/artifacts/utils.js similarity index 100% rename from app/assets/javascripts/artifacts/utils.js rename to app/assets/javascripts/ci/artifacts/utils.js diff --git a/app/assets/javascripts/pages/projects/artifacts/index.js b/app/assets/javascripts/pages/projects/artifacts/index.js index 4aa9b22579061c651e6f6d4a37833b78287e04af..df8f110a60d2eafdf16ae8c7d766096d997037ea 100644 --- a/app/assets/javascripts/pages/projects/artifacts/index.js +++ b/app/assets/javascripts/pages/projects/artifacts/index.js @@ -1,3 +1,3 @@ -import { initArtifactsTable } from '~/artifacts/index'; +import { initArtifactsTable } from '~/ci/artifacts/index'; initArtifactsTable(); diff --git a/spec/frontend/artifacts/components/app_spec.js b/spec/frontend/ci/artifacts/components/app_spec.js similarity index 91% rename from spec/frontend/artifacts/components/app_spec.js rename to spec/frontend/ci/artifacts/components/app_spec.js index 931c4703e950fc7455666bd1b39bee3a6082ba0f..435b03e82abe263028d831eca575a6134d7cabfe 100644 --- a/spec/frontend/artifacts/components/app_spec.js +++ b/spec/frontend/ci/artifacts/components/app_spec.js @@ -2,13 +2,13 @@ import { GlSkeletonLoader } from '@gitlab/ui'; import VueApollo from 'vue-apollo'; import Vue from 'vue'; import { numberToHumanSize } from '~/lib/utils/number_utils'; -import ArtifactsApp from '~/artifacts/components/app.vue'; -import JobArtifactsTable from '~/artifacts/components/job_artifacts_table.vue'; -import getBuildArtifactsSizeQuery from '~/artifacts/graphql/queries/get_build_artifacts_size.query.graphql'; +import ArtifactsApp from '~/ci/artifacts/components/app.vue'; +import JobArtifactsTable from '~/ci/artifacts/components/job_artifacts_table.vue'; +import getBuildArtifactsSizeQuery from '~/ci/artifacts/graphql/queries/get_build_artifacts_size.query.graphql'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import { PAGE_TITLE, TOTAL_ARTIFACTS_SIZE, SIZE_UNKNOWN } from '~/artifacts/constants'; +import { PAGE_TITLE, TOTAL_ARTIFACTS_SIZE, SIZE_UNKNOWN } from '~/ci/artifacts/constants'; const TEST_BUILD_ARTIFACTS_SIZE = 1024; const TEST_PROJECT_PATH = 'project/path'; diff --git a/spec/frontend/artifacts/components/artifact_row_spec.js b/spec/frontend/ci/artifacts/components/artifact_row_spec.js similarity index 92% rename from spec/frontend/artifacts/components/artifact_row_spec.js rename to spec/frontend/ci/artifacts/components/artifact_row_spec.js index 268772ed4c03a1aa4c84fdb067127fd9035873f4..86875cd8566316b97a68fb1b2f55547be0c59a68 100644 --- a/spec/frontend/artifacts/components/artifact_row_spec.js +++ b/spec/frontend/ci/artifacts/components/artifact_row_spec.js @@ -1,10 +1,10 @@ import { GlBadge, GlButton, GlFriendlyWrap, GlFormCheckbox } from '@gitlab/ui'; -import mockGetJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; +import mockGetJobArtifactsResponse from 'test_fixtures/graphql/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; import { numberToHumanSize } from '~/lib/utils/number_utils'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import ArtifactRow from '~/artifacts/components/artifact_row.vue'; -import { BULK_DELETE_FEATURE_FLAG } from '~/artifacts/constants'; +import ArtifactRow from '~/ci/artifacts/components/artifact_row.vue'; +import { BULK_DELETE_FEATURE_FLAG } from '~/ci/artifacts/constants'; describe('ArtifactRow component', () => { let wrapper; diff --git a/spec/frontend/artifacts/components/artifacts_bulk_delete_spec.js b/spec/frontend/ci/artifacts/components/artifacts_bulk_delete_spec.js similarity index 89% rename from spec/frontend/artifacts/components/artifacts_bulk_delete_spec.js rename to spec/frontend/ci/artifacts/components/artifacts_bulk_delete_spec.js index 876906b2c3cde4872f6af65df5d1327fc3659c44..dd077dcac9f2b6abce1808fb2692e412692d3643 100644 --- a/spec/frontend/artifacts/components/artifacts_bulk_delete_spec.js +++ b/spec/frontend/ci/artifacts/components/artifacts_bulk_delete_spec.js @@ -1,12 +1,12 @@ import { GlSprintf, GlModal } from '@gitlab/ui'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import mockGetJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; +import mockGetJobArtifactsResponse from 'test_fixtures/graphql/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; import createMockApollo from 'helpers/mock_apollo_helper'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import ArtifactsBulkDelete from '~/artifacts/components/artifacts_bulk_delete.vue'; -import bulkDestroyArtifactsMutation from '~/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql'; +import ArtifactsBulkDelete from '~/ci/artifacts/components/artifacts_bulk_delete.vue'; +import bulkDestroyArtifactsMutation from '~/ci/artifacts/graphql/mutations/bulk_destroy_job_artifacts.mutation.graphql'; Vue.use(VueApollo); diff --git a/spec/frontend/artifacts/components/artifacts_table_row_details_spec.js b/spec/frontend/ci/artifacts/components/artifacts_table_row_details_spec.js similarity index 87% rename from spec/frontend/artifacts/components/artifacts_table_row_details_spec.js rename to spec/frontend/ci/artifacts/components/artifacts_table_row_details_spec.js index 6bf3498f9b080de70ff5c6ce45560400ec472ed8..ebdb7e25c4523495a4f4f7ad6e90742e0f8b9148 100644 --- a/spec/frontend/artifacts/components/artifacts_table_row_details_spec.js +++ b/spec/frontend/ci/artifacts/components/artifacts_table_row_details_spec.js @@ -1,15 +1,15 @@ import { GlModal } from '@gitlab/ui'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import getJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; +import getJobArtifactsResponse from 'test_fixtures/graphql/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; import waitForPromises from 'helpers/wait_for_promises'; -import ArtifactsTableRowDetails from '~/artifacts/components/artifacts_table_row_details.vue'; -import ArtifactRow from '~/artifacts/components/artifact_row.vue'; -import ArtifactDeleteModal from '~/artifacts/components/artifact_delete_modal.vue'; +import ArtifactsTableRowDetails from '~/ci/artifacts/components/artifacts_table_row_details.vue'; +import ArtifactRow from '~/ci/artifacts/components/artifact_row.vue'; +import ArtifactDeleteModal from '~/ci/artifacts/components/artifact_delete_modal.vue'; import createMockApollo from 'helpers/mock_apollo_helper'; import { mountExtended } from 'helpers/vue_test_utils_helper'; -import destroyArtifactMutation from '~/artifacts/graphql/mutations/destroy_artifact.mutation.graphql'; -import { I18N_DESTROY_ERROR, I18N_MODAL_TITLE } from '~/artifacts/constants'; +import destroyArtifactMutation from '~/ci/artifacts/graphql/mutations/destroy_artifact.mutation.graphql'; +import { I18N_DESTROY_ERROR, I18N_MODAL_TITLE } from '~/ci/artifacts/constants'; import { createAlert } from '~/alert'; jest.mock('~/alert'); diff --git a/spec/frontend/artifacts/components/feedback_banner_spec.js b/spec/frontend/ci/artifacts/components/feedback_banner_spec.js similarity index 93% rename from spec/frontend/artifacts/components/feedback_banner_spec.js rename to spec/frontend/ci/artifacts/components/feedback_banner_spec.js index af9599daefacc2b213020d2e2a829bbff8fa8e4e..53e0fdac6f66ac403f7786bbb72434bba5611bfd 100644 --- a/spec/frontend/artifacts/components/feedback_banner_spec.js +++ b/spec/frontend/ci/artifacts/components/feedback_banner_spec.js @@ -1,12 +1,12 @@ import { GlBanner } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import FeedbackBanner from '~/artifacts/components/feedback_banner.vue'; +import FeedbackBanner from '~/ci/artifacts/components/feedback_banner.vue'; import { makeMockUserCalloutDismisser } from 'helpers/mock_user_callout_dismisser'; import { I18N_FEEDBACK_BANNER_TITLE, I18N_FEEDBACK_BANNER_BUTTON, FEEDBACK_URL, -} from '~/artifacts/constants'; +} from '~/ci/artifacts/constants'; const mockBannerImagePath = 'banner/image/path'; diff --git a/spec/frontend/artifacts/components/job_artifacts_table_spec.js b/spec/frontend/ci/artifacts/components/job_artifacts_table_spec.js similarity index 95% rename from spec/frontend/artifacts/components/job_artifacts_table_spec.js rename to spec/frontend/ci/artifacts/components/job_artifacts_table_spec.js index 40f3c9633abb04ee44eeef62f3347ed417d1a27c..2855b0ecb37e4e6f679f47f9a82674bffbaf4dd6 100644 --- a/spec/frontend/artifacts/components/job_artifacts_table_spec.js +++ b/spec/frontend/ci/artifacts/components/job_artifacts_table_spec.js @@ -9,17 +9,17 @@ import { } from '@gitlab/ui'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import getJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; +import getJobArtifactsResponse from 'test_fixtures/graphql/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import waitForPromises from 'helpers/wait_for_promises'; -import JobArtifactsTable from '~/artifacts/components/job_artifacts_table.vue'; -import FeedbackBanner from '~/artifacts/components/feedback_banner.vue'; -import ArtifactsTableRowDetails from '~/artifacts/components/artifacts_table_row_details.vue'; -import ArtifactDeleteModal from '~/artifacts/components/artifact_delete_modal.vue'; -import ArtifactsBulkDelete from '~/artifacts/components/artifacts_bulk_delete.vue'; +import JobArtifactsTable from '~/ci/artifacts/components/job_artifacts_table.vue'; +import FeedbackBanner from '~/ci/artifacts/components/feedback_banner.vue'; +import ArtifactsTableRowDetails from '~/ci/artifacts/components/artifacts_table_row_details.vue'; +import ArtifactDeleteModal from '~/ci/artifacts/components/artifact_delete_modal.vue'; +import ArtifactsBulkDelete from '~/ci/artifacts/components/artifacts_bulk_delete.vue'; import createMockApollo from 'helpers/mock_apollo_helper'; import { mountExtended } from 'helpers/vue_test_utils_helper'; -import getJobArtifactsQuery from '~/artifacts/graphql/queries/get_job_artifacts.query.graphql'; +import getJobArtifactsQuery from '~/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { ARCHIVE_FILE_TYPE, @@ -27,8 +27,8 @@ import { I18N_FETCH_ERROR, INITIAL_CURRENT_PAGE, BULK_DELETE_FEATURE_FLAG, -} from '~/artifacts/constants'; -import { totalArtifactsSizeForJob } from '~/artifacts/utils'; +} from '~/ci/artifacts/constants'; +import { totalArtifactsSizeForJob } from '~/ci/artifacts/utils'; import { createAlert } from '~/alert'; jest.mock('~/alert'); diff --git a/spec/frontend/artifacts/components/job_checkbox_spec.js b/spec/frontend/ci/artifacts/components/job_checkbox_spec.js similarity index 91% rename from spec/frontend/artifacts/components/job_checkbox_spec.js rename to spec/frontend/ci/artifacts/components/job_checkbox_spec.js index 95cc548b8c8a3a665e2f11b4af565c6955decf6a..ae70bb4b17b6fd18761bb2af6eed5461debc9521 100644 --- a/spec/frontend/artifacts/components/job_checkbox_spec.js +++ b/spec/frontend/ci/artifacts/components/job_checkbox_spec.js @@ -1,7 +1,7 @@ import { GlFormCheckbox } from '@gitlab/ui'; -import mockGetJobArtifactsResponse from 'test_fixtures/graphql/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; +import mockGetJobArtifactsResponse from 'test_fixtures/graphql/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql.json'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import JobCheckbox from '~/artifacts/components/job_checkbox.vue'; +import JobCheckbox from '~/ci/artifacts/components/job_checkbox.vue'; describe('JobCheckbox component', () => { let wrapper; diff --git a/spec/frontend/artifacts/graphql/cache_update_spec.js b/spec/frontend/ci/artifacts/graphql/cache_update_spec.js similarity index 90% rename from spec/frontend/artifacts/graphql/cache_update_spec.js rename to spec/frontend/ci/artifacts/graphql/cache_update_spec.js index 4d6103282981d841c182a2bb583c3d2f5a4f9b11..3c415534c7cc43bf402b542be99893ac79267538 100644 --- a/spec/frontend/artifacts/graphql/cache_update_spec.js +++ b/spec/frontend/ci/artifacts/graphql/cache_update_spec.js @@ -1,5 +1,5 @@ -import getJobArtifactsQuery from '~/artifacts/graphql/queries/get_job_artifacts.query.graphql'; -import { removeArtifactFromStore } from '~/artifacts/graphql/cache_update'; +import getJobArtifactsQuery from '~/ci/artifacts/graphql/queries/get_job_artifacts.query.graphql'; +import { removeArtifactFromStore } from '~/ci/artifacts/graphql/cache_update'; describe('Artifact table cache updates', () => { let store; diff --git a/spec/frontend/fixtures/job_artifacts.rb b/spec/frontend/fixtures/job_artifacts.rb index e53cdbbaaa521f6c3ab26b8144f9d369dbc7c1ed..6dadd6750f167cfec3e34a2c7911ce378eb90132 100644 --- a/spec/frontend/fixtures/job_artifacts.rb +++ b/spec/frontend/fixtures/job_artifacts.rb @@ -12,7 +12,7 @@ let_it_be(:pipeline) { create(:ci_pipeline, project: project) } let_it_be(:user) { create(:user) } - job_artifacts_query_path = 'artifacts/graphql/queries/get_job_artifacts.query.graphql' + job_artifacts_query_path = 'ci/artifacts/graphql/queries/get_job_artifacts.query.graphql' it "graphql/#{job_artifacts_query_path}.json" do create(:ci_build, :failed, :artifacts, :trace_artifact, pipeline: pipeline)