diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/report_item_graphql.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/report_item_graphql.vue index fcc815409b240b317f56d0b58593e1a41dea8860..fae17d2b544420f81cfeeb6e036e6199698e6605 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/report_item_graphql.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/report_item_graphql.vue @@ -1,19 +1,19 @@ <script> const GRAPHQL_TYPENAME_TO_COMPONENT_MAP = { - VulnerabilityDetailUrl: () => import('./types/url.vue'), - VulnerabilityDetailDiff: () => import('./types/diff.vue'), - VulnerabilityDetailCode: () => import('./types/code.vue'), - VulnerabilityDetailFileLocation: () => import('./types/file_location.vue'), - VulnerabilityDetailModuleLocation: () => import('./types/module_location.vue'), - VulnerabilityDetailCommit: () => import('./types/commit.vue'), - VulnerabilityDetailValue: () => import('./types/value.vue'), - VulnerabilityDetailText: () => import('./types/value.vue'), - VulnerabilityDetailMarkdown: () => import('./types/markdown.vue'), - VulnerabilityDetailBoolean: () => import('./types/value.vue'), - VulnerabilityDetailInt: () => import('./types/value.vue'), - VulnerabilityDetailList: () => import('./types/list_graphql.vue'), - VulnerabilityDetailNamedList: () => import('./types/named_list_graphql.vue'), - VulnerabilityDetailTable: () => import('./types/table_graphql.vue'), + VulnerabilityDetailUrl: () => import('./types/report_type_url.vue'), + VulnerabilityDetailDiff: () => import('./types/report_type_diff.vue'), + VulnerabilityDetailCode: () => import('./types/report_type_code.vue'), + VulnerabilityDetailFileLocation: () => import('./types/report_type_file_location.vue'), + VulnerabilityDetailModuleLocation: () => import('./types/report_type_module_location.vue'), + VulnerabilityDetailCommit: () => import('./types/report_type_commit.vue'), + VulnerabilityDetailValue: () => import('./types/report_type_value.vue'), + VulnerabilityDetailText: () => import('./types/report_type_value.vue'), + VulnerabilityDetailMarkdown: () => import('./types/report_type_markdown.vue'), + VulnerabilityDetailBoolean: () => import('./types/report_type_value.vue'), + VulnerabilityDetailInt: () => import('./types/report_type_value.vue'), + VulnerabilityDetailList: () => import('./types/report_type_list_graphql.vue'), + VulnerabilityDetailNamedList: () => import('./types/report_type_named_list_graphql.vue'), + VulnerabilityDetailTable: () => import('./types/report_type_table_graphql.vue'), }; export const GRAPHQL_TYPENAMES = Object.keys(GRAPHQL_TYPENAME_TO_COMPONENT_MAP); diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/component_map.js b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/component_map.js index 8549b08bca1ee4dc94145478276634bca21331c2..5011599e77c3ccc94b521f88288798b876a39d9c 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/component_map.js +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/component_map.js @@ -19,16 +19,18 @@ export const getComponentNameForType = (reportType) => `ReportType${capitalizeFirstCharacter(reportType)}`; export const REPORT_COMPONENTS = { - [getComponentNameForType(REPORT_TYPE_LIST)]: () => import('./list.vue'), - [getComponentNameForType(REPORT_TYPE_URL)]: () => import('./url.vue'), - [getComponentNameForType(REPORT_TYPE_DIFF)]: () => import('./diff.vue'), - [getComponentNameForType(REPORT_TYPE_NAMED_LIST)]: () => import('./named_list.vue'), - [getComponentNameForType(REPORT_TYPE_TEXT)]: () => import('./value.vue'), - [getComponentNameForType(REPORT_TYPE_VALUE)]: () => import('./value.vue'), - [getComponentNameForType(REPORT_TYPE_MODULE_LOCATION)]: () => import('./module_location.vue'), - [getComponentNameForType(REPORT_TYPE_FILE_LOCATION)]: () => import('./file_location.vue'), - [getComponentNameForType(REPORT_TYPE_TABLE)]: () => import('./table.vue'), - [getComponentNameForType(REPORT_TYPE_CODE)]: () => import('./code.vue'), - [getComponentNameForType(REPORT_TYPE_MARKDOWN)]: () => import('./markdown.vue'), - [getComponentNameForType(REPORT_TYPE_COMMIT)]: () => import('./commit.vue'), + [getComponentNameForType(REPORT_TYPE_LIST)]: () => import('./report_type_list.vue'), + [getComponentNameForType(REPORT_TYPE_URL)]: () => import('./report_type_url.vue'), + [getComponentNameForType(REPORT_TYPE_DIFF)]: () => import('./report_type_diff.vue'), + [getComponentNameForType(REPORT_TYPE_NAMED_LIST)]: () => import('./report_type_named_list.vue'), + [getComponentNameForType(REPORT_TYPE_TEXT)]: () => import('./report_type_value.vue'), + [getComponentNameForType(REPORT_TYPE_VALUE)]: () => import('./report_type_value.vue'), + [getComponentNameForType(REPORT_TYPE_MODULE_LOCATION)]: () => + import('./report_type_module_location.vue'), + [getComponentNameForType(REPORT_TYPE_FILE_LOCATION)]: () => + import('./report_type_file_location.vue'), + [getComponentNameForType(REPORT_TYPE_TABLE)]: () => import('./report_type_table.vue'), + [getComponentNameForType(REPORT_TYPE_CODE)]: () => import('./report_type_code.vue'), + [getComponentNameForType(REPORT_TYPE_MARKDOWN)]: () => import('./report_type_markdown.vue'), + [getComponentNameForType(REPORT_TYPE_COMMIT)]: () => import('./report_type_commit.vue'), }; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/code.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_code.vue similarity index 83% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/code.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_code.vue index 33e9bdd204c944c6dca21bdb917f8ca4f0b02681..480b5a0f73ae76f17f528b97415458c5152c071d 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/code.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_code.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> import CodeBlock from '~/vue_shared/components/code_block.vue'; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/commit.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_commit.vue similarity index 93% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/commit.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_commit.vue index ca072e89795d081d534fedd08b15090e9116e16d..8a22f29896cde1fcc41dbb949b0d5d83d16c2a28 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/commit.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_commit.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> import { GlLink } from '@gitlab/ui'; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/diff.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_diff.vue similarity index 98% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/diff.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_diff.vue index 314b89fd765367176a55d9f54842767deb9c41c6..620de2a7556b5095709717ae7f4cca0bdfb8b6c4 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/diff.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_diff.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> import { GlButtonGroup, GlButton } from '@gitlab/ui'; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/file_location.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_file_location.vue similarity index 100% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/file_location.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_file_location.vue diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/list.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_list.vue similarity index 92% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/list.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_list.vue index a17df9201b311ce8facffe733dc95f46badda391..e798054aaba003a5c2eda9f0e289320744e61515 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/list.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_list.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> import { isOfTypeList } from './utils'; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/list_graphql.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_list_graphql.vue similarity index 100% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/list_graphql.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_list_graphql.vue diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/markdown.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_markdown.vue similarity index 95% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/markdown.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_markdown.vue index 0be5c1c26042120e88d69373a0777fb4e0c58e1e..92c152f5591e077fd149439e2a0c9789d374e3ea 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/markdown.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_markdown.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> import { GlSkeletonLoader } from '@gitlab/ui'; import * as Sentry from '~/sentry/sentry_browser_wrapper'; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/module_location.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_module_location.vue similarity index 100% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/module_location.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_module_location.vue diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/named_list.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_named_list.vue similarity index 100% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/named_list.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_named_list.vue diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/named_list_graphql.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_named_list_graphql.vue similarity index 100% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/named_list_graphql.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_named_list_graphql.vue diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/table.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_table.vue similarity index 93% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/table.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_table.vue index 1cc988805ed54371bbf40d677837f67dd601791f..cf23b63139a56e75a4c6504a12510aca7e66bcc6 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/table.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_table.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> import { GlTableLite } from '@gitlab/ui'; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/table_graphql.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_table_graphql.vue similarity index 100% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/table_graphql.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_table_graphql.vue diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/url.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_url.vue similarity index 88% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/url.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_url.vue index 2db1ca68fc288ceb130eed268a3e7a7459a6fd29..a53c74d3aaaa9503d7853922098344eca9f6d9fa 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/url.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_url.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> import { GlFriendlyWrap, GlLink } from '@gitlab/ui'; diff --git a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/value.vue b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_value.vue similarity index 79% rename from ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/value.vue rename to ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_value.vue index b26ca6cbcb5c4889a8458b3406bb1f66f01146bd..24152ce0f3105d91495167a15a8cd431a059b622 100644 --- a/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/value.vue +++ b/ee/app/assets/javascripts/vulnerabilities/components/generic_report/types/report_type_value.vue @@ -1,4 +1,3 @@ -<!-- eslint-disable vue/multi-word-component-names --> <script> export default { inheritAttrs: false, diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/code_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/code_spec.js index 2ba66aba0eedf83974eb3d9375331dc34328a479..5f792d774b064b3bc25609303ed047934a507ad5 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/code_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/code_spec.js @@ -1,12 +1,12 @@ import { shallowMount } from '@vue/test-utils'; -import Code from 'ee/vulnerabilities/components/generic_report/types/code.vue'; +import Code from 'ee/vulnerabilities/components/generic_report/types/report_type_code.vue'; import CodeBlock from '~/vue_shared/components/code_block.vue'; const TEST_DATA = { value: '<h1>Foo</h1>', }; -describe('ee/vulnerabilities/components/generic_report/types/code.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_code.vue', () => { let wrapper; const createWrapper = () => { diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/commit_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/commit_spec.js index 96dbfdf04c4f71f0801b5a4869f379051c315ca0..dbae3c515375a6ac2fa747cc6dd9c77a2a83f3a0 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/commit_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/commit_spec.js @@ -1,6 +1,6 @@ import { GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import Commit from 'ee/vulnerabilities/components/generic_report/types/commit.vue'; +import Commit from 'ee/vulnerabilities/components/generic_report/types/report_type_commit.vue'; const TEST_DATA = { value: '24922148', @@ -9,7 +9,7 @@ const TEST_COMMIT_PATH_BASE = `/foo/bar`; const TEST_COMMIT_PATH_PARAMETERS = '?baz=quz'; const TEST_COMMIT_PATH_TEMPLATE = `${TEST_COMMIT_PATH_BASE}/$COMMIT_SHA/${TEST_COMMIT_PATH_PARAMETERS}`; -describe('ee/vulnerabilities/components/generic_report/types/commit.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_commit.vue', () => { let wrapper; const createWrapper = () => { diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/diff_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/diff_spec.js index 2560792118a11a25d2c286bf23d0ebc817a38863..e81958972f4ed3f3543871b5ed5372910eae2d56 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/diff_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/diff_spec.js @@ -1,5 +1,5 @@ import { mount } from '@vue/test-utils'; -import Diff from 'ee/vulnerabilities/components/generic_report/types/diff.vue'; +import Diff from 'ee/vulnerabilities/components/generic_report/types/report_type_diff.vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; const TEST_DATA = { @@ -7,7 +7,7 @@ const TEST_DATA = { after: `afterText`, }; -describe('ee/vulnerabilities/components/generic_report/types/diff.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_diff.vue', () => { let wrapper; const createWrapper = () => { diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/file_location_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/file_location_spec.js index 115b9cc6426a5312a4e4a2b203b14af394f5c57c..ac777d963bcfe84af56fa49499c2c55d019775c8 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/file_location_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/file_location_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import FileLocation from 'ee/vulnerabilities/components/generic_report/types/file_location.vue'; +import FileLocation from 'ee/vulnerabilities/components/generic_report/types/report_type_file_location.vue'; -describe('ee/vulnerabilities/components/generic_report/types/file_location.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_file_location.vue', () => { let wrapper; describe.each` diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/list_graphql_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/list_graphql_spec.js index e46baa052595390fc74c79114b8ba6555bf5a405..7a0e690e6309928afdb18547aec2eebaa913e12e 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/list_graphql_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/list_graphql_spec.js @@ -1,5 +1,5 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import List from 'ee/vulnerabilities/components/generic_report/types/list_graphql.vue'; +import List from 'ee/vulnerabilities/components/generic_report/types/report_type_list_graphql.vue'; const TEST_DATA = { items: [ @@ -9,7 +9,7 @@ const TEST_DATA = { listItem: { type: 'VulnerabilityDetailList', items: [] }, }; -describe('ee/vulnerabilities/components/generic_report/types/list_graphql.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_list_graphql.vue', () => { let wrapper; const createWrapper = (options = {}) => diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/list_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/list_spec.js index c2b52f75eef0b32cf620c73ce089b5d8fbfa1025..cc09290a7c615a5797f4ec568ee4050c7e33f111 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/list_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/list_spec.js @@ -1,6 +1,6 @@ import { screen } from '@testing-library/dom'; import { shallowMount } from '@vue/test-utils'; -import List from 'ee/vulnerabilities/components/generic_report/types/list.vue'; +import List from 'ee/vulnerabilities/components/generic_report/types/report_type_list.vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; const TEST_DATA = { @@ -10,7 +10,7 @@ const TEST_DATA = { ], }; -describe('ee/vulnerabilities/components/generic_report/types/list.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_list.vue', () => { let wrapper; const createWrapper = () => diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/markdown_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/markdown_spec.js index ac8749e94453a712eb5d04487b1b028111aadb9c..bc29ff1978e48ae6707bd7ffbdb3d9288be0f581 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/markdown_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/markdown_spec.js @@ -1,7 +1,7 @@ import { GlSkeletonLoader } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import Markdown from 'ee/vulnerabilities/components/generic_report/types/markdown.vue'; +import Markdown from 'ee/vulnerabilities/components/generic_report/types/report_type_markdown.vue'; import { buildApiUrl } from '~/api/api_utils'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_OK } from '~/lib/utils/http_status'; @@ -17,7 +17,7 @@ const RENDERED_MARKDOWN = const HTML_SAFE_RENDERED_MARKDOWN = '\u003cp dir="auto" data-sourcepos="1:1-1:79"\u003eCheckout \u003ca href="http://gitlab.com"\u003eGitLab\u003c/a\u003e Hello! Welcome "\u0026gt;\u003c/p\u003e'; -describe('ee/vulnerabilities/components/generic_report/types/markdown.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_markdown.vue', () => { let wrapper; let mock; diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/module_location_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/module_location_spec.js index ae5be70c127d8647aeb1d29202c0d652c1d32c08..0bed33842f01ea169003c401c5378ca28611d9eb 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/module_location_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/module_location_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import ModuleLocation from 'ee/vulnerabilities/components/generic_report/types/module_location.vue'; +import ModuleLocation from 'ee/vulnerabilities/components/generic_report/types/report_type_module_location.vue'; -describe('ee/vulnerabilities/components/generic_report/types/module_location.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_module_location.vue', () => { let wrapper; describe.each` diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_graphql_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_graphql_spec.js index ac66b76554ece0bc35bae4c971c37d27f9b49b21..2befb3cde6c50f9053efdc299b41d3b135693bfb 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_graphql_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_graphql_spec.js @@ -1,5 +1,5 @@ import { shallowMount } from '@vue/test-utils'; -import NamedList from 'ee/vulnerabilities/components/generic_report/types/named_list_graphql.vue'; +import NamedList from 'ee/vulnerabilities/components/generic_report/types/report_type_named_list_graphql.vue'; import ReportItem from 'ee/vulnerabilities/components/generic_report/report_item_graphql.vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; @@ -18,7 +18,7 @@ const TEST_DATA = { ], }; -describe('ee/vulnerabilities/components/generic_report/types/named_list_graphql.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_named_list_graphql.vue', () => { let wrapper; const createWrapper = () => diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_spec.js index b5d2ba37f0e85bc3e3f28a513219b4ed3d1e45c6..f91db1875faf9f57cc9433af6ee2fb486bf3ce5f 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/named_list_spec.js @@ -1,5 +1,5 @@ import { shallowMount } from '@vue/test-utils'; -import NamedList from 'ee/vulnerabilities/components/generic_report/types/named_list.vue'; +import NamedList from 'ee/vulnerabilities/components/generic_report/types/report_type_named_list.vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; const TEST_DATA = { @@ -9,7 +9,7 @@ const TEST_DATA = { ], }; -describe('ee/vulnerabilities/components/generic_report/types/named_list.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_named_list.vue', () => { let wrapper; const createWrapper = () => diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/table_graphql_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/table_graphql_spec.js index dde91119f678251aee2b32a300d246f4559ee85b..be4100aa21955db765f1f32e34b381b411e834b3 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/table_graphql_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/table_graphql_spec.js @@ -1,14 +1,14 @@ import { GlTableLite } from '@gitlab/ui'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import ReportItem from 'ee/vulnerabilities/components/generic_report/report_item_graphql.vue'; -import Table from 'ee/vulnerabilities/components/generic_report/types/table_graphql.vue'; +import Table from 'ee/vulnerabilities/components/generic_report/types/report_type_table_graphql.vue'; const TEST_DATA = { headers: [{ type: 'VulnerabilityDetailText', value: 'foo ' }], rows: [{ row: [{ type: 'VulnerabilityDetailUrl', href: 'bar' }] }], }; -describe('ee/vulnerabilities/components/generic_report/types/table_graphql.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_table_graphql.vue', () => { let wrapper; const createWrapper = () => { diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/table_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/table_spec.js index c0b4ce8fbd50a634ad81f666386ef106604efee5..416d17cff9dcaa1b81fcba506fb0af955c022e78 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/table_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/table_spec.js @@ -1,7 +1,7 @@ import { GlTableLite } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import ReportItem from 'ee/vulnerabilities/components/generic_report/report_item.vue'; -import Table from 'ee/vulnerabilities/components/generic_report/types/table.vue'; +import Table from 'ee/vulnerabilities/components/generic_report/types/report_type_table.vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; const TEST_DATA = { @@ -13,7 +13,7 @@ const TEST_DATA = { ], }; -describe('ee/vulnerabilities/components/generic_report/types/table.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_table.vue', () => { let wrapper; const createWrapper = () => { diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/url_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/url_spec.js index ed6aed91242518086f28d0eec57286c7be74af6e..1d66de6b33ae537f10148982da15df9cd59d22dc 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/url_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/url_spec.js @@ -1,12 +1,12 @@ import { GlFriendlyWrap, GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import Url from 'ee/vulnerabilities/components/generic_report/types/url.vue'; +import Url from 'ee/vulnerabilities/components/generic_report/types/report_type_url.vue'; const TEST_DATA = { href: 'http://gitlab.com', }; -describe('ee/vulnerabilities/components/generic_report/types/url.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_url.vue', () => { let wrapper; const createWrapper = () => { diff --git a/ee/spec/frontend/vulnerabilities/generic_report/types/value_spec.js b/ee/spec/frontend/vulnerabilities/generic_report/types/value_spec.js index cc8804a6441f57d19f853f198bc6fb29bccbdc30..240c84a8c57854af59ddbaef39054ab9df15aa65 100644 --- a/ee/spec/frontend/vulnerabilities/generic_report/types/value_spec.js +++ b/ee/spec/frontend/vulnerabilities/generic_report/types/value_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import Text from 'ee/vulnerabilities/components/generic_report/types/value.vue'; +import Text from 'ee/vulnerabilities/components/generic_report/types/report_type_value.vue'; -describe('ee/vulnerabilities/components/generic_report/types/value.vue', () => { +describe('ee/vulnerabilities/components/generic_report/types/report_type_value.vue', () => { let wrapper; describe.each`