Skip to content
代码片段 群组 项目
未验证 提交 815aa046 编辑于 作者: Savas Vedova's avatar Savas Vedova 提交者: GitLab
浏览文件

Merge branch '497750-move-vue-shared-accordion-stories' into 'master'

Move vue_shared/accordion to security_dashboard

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/171050



Merged-by: default avatarSavas Vedova <svedova@gitlab.com>
Approved-by: default avatarSavas Vedova <svedova@gitlab.com>
Reviewed-by: default avatarEzekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Co-authored-by: default avatarEzekiel Kigbo <ekigbo@gitlab.com>
No related branches found
No related tags found
无相关合并请求
显示 5 个添加5 个删除
...@@ -8,7 +8,7 @@ import { ...@@ -8,7 +8,7 @@ import {
SEVERITY_LEVELS_ORDERED_BY_SEVERITY, SEVERITY_LEVELS_ORDERED_BY_SEVERITY,
SEVERITY_GROUPS, SEVERITY_GROUPS,
} from 'ee/security_dashboard/constants'; } from 'ee/security_dashboard/constants';
import { Accordion, AccordionItem } from 'ee/vue_shared/components/accordion'; import { Accordion, AccordionItem } from 'ee/security_dashboard/components/shared/accordion';
import { s__, n__, sprintf } from '~/locale'; import { s__, n__, sprintf } from '~/locale';
import SecurityDashboardCard from './security_dashboard_card.vue'; import SecurityDashboardCard from './security_dashboard_card.vue';
......
import { uniqueId } from 'lodash'; import { uniqueId } from 'lodash';
import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
import { AccordionItem } from 'ee/vue_shared/components/accordion'; import { AccordionItem } from 'ee/security_dashboard/components/shared/accordion';
import accordionEventBus from 'ee/vue_shared/components/accordion/accordion_event_bus'; import accordionEventBus from 'ee/security_dashboard/components/shared/accordion/accordion_event_bus';
jest.mock('lodash/uniqueId', () => jest.fn().mockReturnValue('mockUniqueId')); jest.mock('lodash/uniqueId', () => jest.fn().mockReturnValue('mockUniqueId'));
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { Accordion } from 'ee/vue_shared/components/accordion'; import { Accordion } from 'ee/security_dashboard/components/shared/accordion';
jest.mock('lodash/uniqueId', () => () => 'foo'); jest.mock('lodash/uniqueId', () => () => 'foo');
......
...@@ -3,10 +3,10 @@ import { shallowMount } from '@vue/test-utils'; ...@@ -3,10 +3,10 @@ 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 VulnerabilitySeverity from 'ee/security_dashboard/components/shared/project_security_status_chart.vue'; import VulnerabilitySeverity from 'ee/security_dashboard/components/shared/project_security_status_chart.vue';
import { Accordion, AccordionItem } from 'ee/security_dashboard/components/shared/accordion';
import groupVulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/group_vulnerability_grades.query.graphql'; import groupVulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/group_vulnerability_grades.query.graphql';
import instanceVulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/instance_vulnerability_grades.query.graphql'; import instanceVulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/instance_vulnerability_grades.query.graphql';
import { severityGroupTypes } from 'ee/security_dashboard/constants'; import { severityGroupTypes } from 'ee/security_dashboard/constants';
import { Accordion, AccordionItem } from 'ee/vue_shared/components/accordion';
import createMockApollo from 'helpers/mock_apollo_helper'; import createMockApollo from 'helpers/mock_apollo_helper';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import { trimText } from 'helpers/text_helper'; import { trimText } from 'helpers/text_helper';
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册