Commit d2c64354 authored by David O'Regan's avatar David O'Regan

Merge branch '330429-sast-artifact-download' into 'master'

Move merge request artifact download part I [RUN ALL RSPEC][RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!62449
parents 3abe6c4c 31071e4d
<script> <script>
import { reportTypeToSecurityReportTypeEnum } from 'ee/vue_shared/security_reports/constants'; import { reportTypeToSecurityReportTypeEnum } from 'ee_else_ce/vue_shared/security_reports/constants';
import createFlash from '~/flash'; import createFlash from '~/flash';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import SecurityReportDownloadDropdown from '~/vue_shared/security_reports/components/security_report_download_dropdown.vue'; import SecurityReportDownloadDropdown from '~/vue_shared/security_reports/components/security_report_download_dropdown.vue';
......
...@@ -10,8 +10,8 @@ import ReportSection from '~/reports/components/report_section.vue'; ...@@ -10,8 +10,8 @@ import ReportSection from '~/reports/components/report_section.vue';
import SummaryRow from '~/reports/components/summary_row.vue'; import SummaryRow from '~/reports/components/summary_row.vue';
import { LOADING } from '~/reports/constants'; import { LOADING } from '~/reports/constants';
import Tracking from '~/tracking'; import Tracking from '~/tracking';
import MergeRequestArtifactDownload from '~/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue';
import SecuritySummary from '~/vue_shared/security_reports/components/security_summary.vue'; import SecuritySummary from '~/vue_shared/security_reports/components/security_summary.vue';
import MrArtifactDownload from './components/artifact_downloads/merge_request_artifact_download.vue';
import DastModal from './components/dast_modal.vue'; import DastModal from './components/dast_modal.vue';
import IssueModal from './components/modal.vue'; import IssueModal from './components/modal.vue';
import { securityReportTypeEnumToReportType } from './constants'; import { securityReportTypeEnumToReportType } from './constants';
...@@ -33,7 +33,7 @@ import { ...@@ -33,7 +33,7 @@ import {
export default { export default {
store: createStore(), store: createStore(),
components: { components: {
MrArtifactDownload, MergeRequestArtifactDownload,
GroupedIssuesList, GroupedIssuesList,
ReportSection, ReportSection,
SummaryRow, SummaryRow,
...@@ -661,7 +661,7 @@ export default { ...@@ -661,7 +661,7 @@ export default {
<template #summary> <template #summary>
<security-summary :message="groupedCoverageFuzzingText" /> <security-summary :message="groupedCoverageFuzzingText" />
</template> </template>
<mr-artifact-download <merge-request-artifact-download
v-if="shouldShowDownloadGuidance" v-if="shouldShowDownloadGuidance"
:report-types="$options.reportTypes.COVERAGE_FUZZING" :report-types="$options.reportTypes.COVERAGE_FUZZING"
:target-project-full-path="targetProjectFullPath" :target-project-full-path="targetProjectFullPath"
...@@ -691,7 +691,7 @@ export default { ...@@ -691,7 +691,7 @@ export default {
<security-summary :message="groupedApiFuzzingText" /> <security-summary :message="groupedApiFuzzingText" />
</template> </template>
<mr-artifact-download <merge-request-artifact-download
v-if="shouldShowDownloadGuidance" v-if="shouldShowDownloadGuidance"
:report-types="$options.reportTypes.API_FUZZING" :report-types="$options.reportTypes.API_FUZZING"
:target-project-full-path="targetProjectFullPath" :target-project-full-path="targetProjectFullPath"
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import VueApollo from 'vue-apollo'; import VueApollo from 'vue-apollo';
import Component from 'ee/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue';
import {
REPORT_TYPE_SAST,
REPORT_TYPE_SECRET_DETECTION,
} from 'ee/vue_shared/security_reports/constants';
import createMockApollo from 'helpers/mock_apollo_helper'; import createMockApollo from 'helpers/mock_apollo_helper';
import { import {
expectedDownloadDropdownProps, expectedDownloadDropdownProps,
securityReportMergeRequestDownloadPathsQueryResponse, securityReportMergeRequestDownloadPathsQueryResponse,
} from 'jest/vue_shared/security_reports/mock_data'; } from 'jest/vue_shared/security_reports/mock_data';
import createFlash from '~/flash'; import createFlash from '~/flash';
import Component from '~/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue';
import SecurityReportDownloadDropdown from '~/vue_shared/security_reports/components/security_report_download_dropdown.vue'; import SecurityReportDownloadDropdown from '~/vue_shared/security_reports/components/security_report_download_dropdown.vue';
import {
REPORT_TYPE_SAST,
REPORT_TYPE_SECRET_DETECTION,
} from '~/vue_shared/security_reports/constants';
import securityReportMergeRequestDownloadPathsQuery from '~/vue_shared/security_reports/queries/security_report_merge_request_download_paths.query.graphql'; import securityReportMergeRequestDownloadPathsQuery from '~/vue_shared/security_reports/queries/security_report_merge_request_download_paths.query.graphql';
jest.mock('~/flash'); jest.mock('~/flash');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment