summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-08-21 18:53:41 +0000
committerMike Greiling <mike@pixelcog.com>2018-08-21 18:53:41 +0000
commita0c48d82e143b25913b977c526cb196daf517ad6 (patch)
tree95cbeb33fd41ea3019889da606d631e3f0afaeb7
parentbb5c1af78ab29c7cfcbd9a3de594b31359c236f2 (diff)
parente8197c7fe7828b74334a40a2af6469610556e063 (diff)
downloadgitlab-ce-a0c48d82e143b25913b977c526cb196daf517ad6.tar.gz
Merge branch '50101-move-test-files' into 'master'
Moves spec files for job log components into components folder See merge request gitlab-org/gitlab-ce!21303
-rw-r--r--spec/javascripts/jobs/components/artifacts_block_spec.js (renamed from spec/javascripts/jobs/artifacts_block_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/commit_block_spec.js (renamed from spec/javascripts/jobs/commit_block_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/empty_state_spec.js (renamed from spec/javascripts/jobs/empty_state_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/erased_block_spec.js (renamed from spec/javascripts/jobs/erased_block_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/header_spec.js (renamed from spec/javascripts/jobs/header_spec.js)0
-rw-r--r--spec/javascripts/jobs/components/job_details_mediator_spec.js (renamed from spec/javascripts/jobs/job_details_mediator_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/job_log_spec.js (renamed from spec/javascripts/jobs/job_log_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/job_store_spec.js (renamed from spec/javascripts/jobs/job_store_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/jobs_container_spec.js (renamed from spec/javascripts/jobs/jobs_container_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/sidebar_detail_row_spec.js (renamed from spec/javascripts/jobs/sidebar_detail_row_spec.js)0
-rw-r--r--spec/javascripts/jobs/components/sidebar_details_block_spec.js (renamed from spec/javascripts/jobs/sidebar_details_block_spec.js)4
-rw-r--r--spec/javascripts/jobs/components/stages_dropdown_spec.js (renamed from spec/javascripts/jobs/stages_dropdown_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/stuck_block_spec.js (renamed from spec/javascripts/jobs/stuck_block_spec.js)2
-rw-r--r--spec/javascripts/jobs/components/trigger_value_spec.js (renamed from spec/javascripts/jobs/trigger_value_spec.js)2
14 files changed, 13 insertions, 13 deletions
diff --git a/spec/javascripts/jobs/artifacts_block_spec.js b/spec/javascripts/jobs/components/artifacts_block_spec.js
index c544c6f3e89..a06d287b3fa 100644
--- a/spec/javascripts/jobs/artifacts_block_spec.js
+++ b/spec/javascripts/jobs/components/artifacts_block_spec.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import { getTimeago } from '~/lib/utils/datetime_utility';
import component from '~/jobs/components/artifacts_block.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Artifacts block', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/commit_block_spec.js b/spec/javascripts/jobs/components/commit_block_spec.js
index f755a5042b5..e21fa9c2874 100644
--- a/spec/javascripts/jobs/commit_block_spec.js
+++ b/spec/javascripts/jobs/components/commit_block_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import component from '~/jobs/components/commit_block.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Commit block', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/empty_state_spec.js b/spec/javascripts/jobs/components/empty_state_spec.js
index f8feb069fe0..dcc2b3d8a20 100644
--- a/spec/javascripts/jobs/empty_state_spec.js
+++ b/spec/javascripts/jobs/components/empty_state_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import component from '~/jobs/components/empty_state.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Empty State', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/erased_block_spec.js b/spec/javascripts/jobs/components/erased_block_spec.js
index 7cf32e984a2..a4ae0c7c81e 100644
--- a/spec/javascripts/jobs/erased_block_spec.js
+++ b/spec/javascripts/jobs/components/erased_block_spec.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import { getTimeago } from '~/lib/utils/datetime_utility';
import component from '~/jobs/components/erased_block.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Erased block', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/header_spec.js b/spec/javascripts/jobs/components/header_spec.js
index e21e2c6d6e3..e21e2c6d6e3 100644
--- a/spec/javascripts/jobs/header_spec.js
+++ b/spec/javascripts/jobs/components/header_spec.js
diff --git a/spec/javascripts/jobs/job_details_mediator_spec.js b/spec/javascripts/jobs/components/job_details_mediator_spec.js
index ca5c9cf87e4..3e2fb7bfbbb 100644
--- a/spec/javascripts/jobs/job_details_mediator_spec.js
+++ b/spec/javascripts/jobs/components/job_details_mediator_spec.js
@@ -1,7 +1,7 @@
import MockAdapter from 'axios-mock-adapter';
import axios from '~/lib/utils/axios_utils';
import JobMediator from '~/jobs/job_details_mediator';
-import job from './mock_data';
+import job from '../mock_data';
describe('JobMediator', () => {
let mediator;
diff --git a/spec/javascripts/jobs/job_log_spec.js b/spec/javascripts/jobs/components/job_log_spec.js
index 406f1c4ccc5..6a5b375a26c 100644
--- a/spec/javascripts/jobs/job_log_spec.js
+++ b/spec/javascripts/jobs/components/job_log_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import component from '~/jobs/components/job_log.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Job Log', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/job_store_spec.js b/spec/javascripts/jobs/components/job_store_spec.js
index d00faf29d1e..0dad5111b32 100644
--- a/spec/javascripts/jobs/job_store_spec.js
+++ b/spec/javascripts/jobs/components/job_store_spec.js
@@ -1,5 +1,5 @@
import JobStore from '~/jobs/stores/job_store';
-import job from './mock_data';
+import job from '../mock_data';
describe('Job Store', () => {
let store;
diff --git a/spec/javascripts/jobs/jobs_container_spec.js b/spec/javascripts/jobs/components/jobs_container_spec.js
index bf52e65cbc8..f3f8ff0d031 100644
--- a/spec/javascripts/jobs/jobs_container_spec.js
+++ b/spec/javascripts/jobs/components/jobs_container_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import component from '~/jobs/components/jobs_container.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Artifacts block', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/sidebar_detail_row_spec.js b/spec/javascripts/jobs/components/sidebar_detail_row_spec.js
index e6bfb0c4adc..e6bfb0c4adc 100644
--- a/spec/javascripts/jobs/sidebar_detail_row_spec.js
+++ b/spec/javascripts/jobs/components/sidebar_detail_row_spec.js
diff --git a/spec/javascripts/jobs/sidebar_details_block_spec.js b/spec/javascripts/jobs/components/sidebar_details_block_spec.js
index 21ef5650b80..ba19534dac2 100644
--- a/spec/javascripts/jobs/sidebar_details_block_spec.js
+++ b/spec/javascripts/jobs/components/sidebar_details_block_spec.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import sidebarDetailsBlock from '~/jobs/components/sidebar_details_block.vue';
-import job from './mock_data';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import job from '../mock_data';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Sidebar details block', () => {
let SidebarComponent;
diff --git a/spec/javascripts/jobs/stages_dropdown_spec.js b/spec/javascripts/jobs/components/stages_dropdown_spec.js
index d3a5d48f56c..402289345aa 100644
--- a/spec/javascripts/jobs/stages_dropdown_spec.js
+++ b/spec/javascripts/jobs/components/stages_dropdown_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import component from '~/jobs/components/stages_dropdown.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Artifacts block', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/stuck_block_spec.js b/spec/javascripts/jobs/components/stuck_block_spec.js
index 4e2108dfdfb..c320793b2be 100644
--- a/spec/javascripts/jobs/stuck_block_spec.js
+++ b/spec/javascripts/jobs/components/stuck_block_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import component from '~/jobs/components/stuck_block.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Stuck Block Job component', () => {
const Component = Vue.extend(component);
diff --git a/spec/javascripts/jobs/trigger_value_spec.js b/spec/javascripts/jobs/components/trigger_value_spec.js
index acf91510ed2..3d41a3cfac1 100644
--- a/spec/javascripts/jobs/trigger_value_spec.js
+++ b/spec/javascripts/jobs/components/trigger_value_spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import component from '~/jobs/components/trigger_block.vue';
-import mountComponent from '../helpers/vue_mount_component_helper';
+import mountComponent from '../../helpers/vue_mount_component_helper';
describe('Trigger block', () => {
const Component = Vue.extend(component);