Commit 100631ed authored by Mike Greiling's avatar Mike Greiling

Merge branch '3871-part-4' into 'master'

Resolve "Move EE JavaScript tests to their own respective directory"

See merge request gitlab-org/gitlab-ee!6663
parents 7c12cb90 38aba833
...@@ -3,7 +3,7 @@ import store from 'ee/vue_shared/security_reports/store'; ...@@ -3,7 +3,7 @@ import store from 'ee/vue_shared/security_reports/store';
import state from 'ee/vue_shared/security_reports/store/state'; import state from 'ee/vue_shared/security_reports/store/state';
import reportSummary from 'ee/pipelines/components/security_reports/report_summary_widget.vue'; import reportSummary from 'ee/pipelines/components/security_reports/report_summary_widget.vue';
import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
import { sastIssues, dast, dockerReport } from '../../vue_shared/security_reports/mock_data'; import { sastIssues, dast, dockerReport } from 'ee_spec/vue_shared/security_reports/mock_data';
describe('Report summary widget', () => { describe('Report summary widget', () => {
const Component = Vue.extend(reportSummary); const Component = Vue.extend(reportSummary);
......
...@@ -3,7 +3,7 @@ import Vue from 'vue'; ...@@ -3,7 +3,7 @@ import Vue from 'vue';
import MonthsHeaderItemComponent from 'ee/roadmap/components/preset_months/months_header_item.vue'; import MonthsHeaderItemComponent from 'ee/roadmap/components/preset_months/months_header_item.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import { mockTimeframeMonths, mockShellWidth, mockItemWidth } from '../../mock_data'; import { mockTimeframeMonths, mockShellWidth, mockItemWidth } from 'ee_spec/roadmap/mock_data';
const mockTimeframeIndex = 0; const mockTimeframeIndex = 0;
......
...@@ -3,7 +3,7 @@ import Vue from 'vue'; ...@@ -3,7 +3,7 @@ import Vue from 'vue';
import MonthsHeaderSubItemComponent from 'ee/roadmap/components/preset_months/months_header_sub_item.vue'; import MonthsHeaderSubItemComponent from 'ee/roadmap/components/preset_months/months_header_sub_item.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import { mockTimeframeMonths } from '../../mock_data'; import { mockTimeframeMonths } from 'ee_spec/roadmap/mock_data';
const createComponent = ({ const createComponent = ({
currentDate = mockTimeframeMonths[0], currentDate = mockTimeframeMonths[0],
......
...@@ -3,7 +3,7 @@ import Vue from 'vue'; ...@@ -3,7 +3,7 @@ import Vue from 'vue';
import QuartersHeaderItemComponent from 'ee/roadmap/components/preset_quarters/quarters_header_item.vue'; import QuartersHeaderItemComponent from 'ee/roadmap/components/preset_quarters/quarters_header_item.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import { mockTimeframeQuarters, mockShellWidth, mockItemWidth } from '../../mock_data'; import { mockTimeframeQuarters, mockShellWidth, mockItemWidth } from 'ee_spec/roadmap/mock_data';
const mockTimeframeIndex = 0; const mockTimeframeIndex = 0;
......
...@@ -3,7 +3,7 @@ import Vue from 'vue'; ...@@ -3,7 +3,7 @@ import Vue from 'vue';
import QuartersHeaderSubItemComponent from 'ee/roadmap/components/preset_quarters/quarters_header_sub_item.vue'; import QuartersHeaderSubItemComponent from 'ee/roadmap/components/preset_quarters/quarters_header_sub_item.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import { mockTimeframeQuarters } from '../../mock_data'; import { mockTimeframeQuarters } from 'ee_spec/roadmap/mock_data';
const createComponent = ({ const createComponent = ({
currentDate = mockTimeframeQuarters[0].range[1], currentDate = mockTimeframeQuarters[0].range[1],
......
...@@ -3,7 +3,7 @@ import Vue from 'vue'; ...@@ -3,7 +3,7 @@ import Vue from 'vue';
import WeeksHeaderItemComponent from 'ee/roadmap/components/preset_weeks/weeks_header_item.vue'; import WeeksHeaderItemComponent from 'ee/roadmap/components/preset_weeks/weeks_header_item.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import { mockTimeframeWeeks, mockShellWidth, mockItemWidth } from '../../mock_data'; import { mockTimeframeWeeks, mockShellWidth, mockItemWidth } from 'ee_spec/roadmap/mock_data';
const mockTimeframeIndex = 0; const mockTimeframeIndex = 0;
......
...@@ -3,7 +3,7 @@ import Vue from 'vue'; ...@@ -3,7 +3,7 @@ import Vue from 'vue';
import WeeksHeaderSubItemComponent from 'ee/roadmap/components/preset_weeks/weeks_header_sub_item.vue'; import WeeksHeaderSubItemComponent from 'ee/roadmap/components/preset_weeks/weeks_header_sub_item.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import { mockTimeframeWeeks } from '../../mock_data'; import { mockTimeframeWeeks } from 'ee_spec/roadmap/mock_data';
const createComponent = ({ const createComponent = ({
currentDate = mockTimeframeWeeks[0], currentDate = mockTimeframeWeeks[0],
......
...@@ -5,7 +5,7 @@ import { ...@@ -5,7 +5,7 @@ import {
getEpicsPathForPreset, getEpicsPathForPreset,
} from 'ee/roadmap/utils/roadmap_utils'; } from 'ee/roadmap/utils/roadmap_utils';
import { PRESET_TYPES } from 'ee//roadmap/constants'; import { PRESET_TYPES } from 'ee/roadmap/constants';
describe('getTimeframeForQuartersView', () => { describe('getTimeframeForQuartersView', () => {
let timeframe; let timeframe;
......
import CEMockData from './mock_data'; import CEMockData from 'spec/sidebar/mock_data';
const RESPONSE_MAP = { ...CEMockData.responseMap }; const RESPONSE_MAP = { ...CEMockData.responseMap };
......
import Vue from 'vue'; import Vue from 'vue';
import LinkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue'; import LinkedPipelinesMiniList from 'ee/vue_shared/components/linked_pipelines_mini_list.vue';
import mockData from 'spec/pipelines/graph/linked_pipelines_mock_data'; import mockData from 'ee_spec/pipelines/graph/linked_pipelines_mock_data';
const ListComponent = Vue.extend(LinkedPipelinesMiniList); const ListComponent = Vue.extend(LinkedPipelinesMiniList);
......
...@@ -9,7 +9,7 @@ import { ...@@ -9,7 +9,7 @@ import {
sastParsedIssues, sastParsedIssues,
dockerReportParsed, dockerReportParsed,
parsedDast, parsedDast,
} from 'spec/vue_shared/security_reports/mock_data'; } from 'ee_spec/vue_shared/security_reports/mock_data';
describe('Report issues', () => { describe('Report issues', () => {
let vm; let vm;
......
import Vue from 'vue'; import Vue from 'vue';
import component from 'ee/vue_shared/security_reports/components/dast_issue_body.vue'; import component from 'ee/vue_shared/security_reports/components/dast_issue_body.vue';
import mountComponent from '../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('dast issue body', () => { describe('dast issue body', () => {
let vm; let vm;
......
import Vue from 'vue'; import Vue from 'vue';
import component from 'ee/vue_shared/security_reports/components/sast_container_issue_body.vue'; import component from 'ee/vue_shared/security_reports/components/sast_container_issue_body.vue';
import mountComponent from '../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('sast container issue body', () => { describe('sast container issue body', () => {
let vm; let vm;
......
...@@ -4,7 +4,7 @@ import axios from '~/lib/utils/axios_utils'; ...@@ -4,7 +4,7 @@ import axios from '~/lib/utils/axios_utils';
import component from 'ee/vue_shared/security_reports/split_security_reports_app.vue'; import component from 'ee/vue_shared/security_reports/split_security_reports_app.vue';
import createStore from 'ee/vue_shared/security_reports/store'; import createStore from 'ee/vue_shared/security_reports/store';
import state from 'ee/vue_shared/security_reports/store/state'; import state from 'ee/vue_shared/security_reports/store/state';
import { mountComponentWithStore } from '../../helpers/vue_mount_component_helper'; import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
import { sastIssues, dast, dockerReport } from './mock_data'; import { sastIssues, dast, dockerReport } from './mock_data';
describe('Split security reports app', () => { describe('Split security reports app', () => {
......
...@@ -50,7 +50,7 @@ import actions, { ...@@ -50,7 +50,7 @@ import actions, {
} from 'ee/vue_shared/security_reports/store/actions'; } from 'ee/vue_shared/security_reports/store/actions';
import * as types from 'ee/vue_shared/security_reports/store/mutation_types'; import * as types from 'ee/vue_shared/security_reports/store/mutation_types';
import state from 'ee/vue_shared/security_reports/store/state'; import state from 'ee/vue_shared/security_reports/store/state';
import testAction from '../../../helpers/vuex_action_helper'; import testAction from 'spec/helpers/vuex_action_helper';
import { import {
sastIssues, sastIssues,
sastIssuesBase, sastIssuesBase,
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import graphComponent from '~/pipelines/components/graph/graph_component.vue'; import graphComponent from '~/pipelines/components/graph/graph_component.vue';
import pipelineJSON from 'spec/pipelines/graph/mock_data'; import pipelineJSON from 'spec/pipelines/graph/mock_data';
import linkedPipelineJSON from 'spec/pipelines/graph/linked_pipelines_mock_data'; import linkedPipelineJSON from 'ee_spec/pipelines/graph/linked_pipelines_mock_data';
const graphJSON = Object.assign(pipelineJSON, { const graphJSON = Object.assign(pipelineJSON, {
triggered: linkedPipelineJSON.triggered, triggered: linkedPipelineJSON.triggered,
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import pipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue'; import pipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mockData from '../mock_data'; import mockData from '../mock_data';
import mockLinkedPipelines from 'spec/pipelines/graph/linked_pipelines_mock_data'; // eslint-disable-line import/first import mockLinkedPipelines from 'ee_spec/pipelines/graph/linked_pipelines_mock_data'; // eslint-disable-line import/first
describe('MRWidgetPipeline', () => { describe('MRWidgetPipeline', () => {
let vm; let vm;
......
...@@ -19,7 +19,7 @@ import { ...@@ -19,7 +19,7 @@ import {
dastBase, dastBase,
sastBaseAllIssues, sastBaseAllIssues,
sastHeadAllIssues, sastHeadAllIssues,
} from '../vue_shared/security_reports/mock_data'; } from 'ee_spec/vue_shared/security_reports/mock_data'; // eslint-disable-line import/first
describe('ee merge request widget options', () => { describe('ee merge request widget options', () => {
let vm; let vm;
......
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