diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-26 20:02:59 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-26 20:02:59 -0600 |
| commit | cec3cb25a94e63be28396d6eee248d5a5a32c1c2 (patch) | |
| tree | 846c231d1c1f00091455fcc5c1f40a0aa24a5379 /spec/javascripts/pipelines | |
| parent | f3d06efcfd89c4d9bd80992df9e9b31958304999 (diff) | |
| parent | b53256559fbb8cc078cc16754e9bf34dbee09746 (diff) | |
| download | gitlab-ce-refactor-environments-folder.tar.gz | |
Merge branch 'master' into refactor-environments-folderrefactor-environments-folder
Diffstat (limited to 'spec/javascripts/pipelines')
| -rw-r--r-- | spec/javascripts/pipelines/graph/job_component_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/pipelines/pipelines_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/pipelines/graph/job_component_spec.js b/spec/javascripts/pipelines/graph/job_component_spec.js index c3dc7b53d0f..ce181a1e515 100644 --- a/spec/javascripts/pipelines/graph/job_component_spec.js +++ b/spec/javascripts/pipelines/graph/job_component_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import jobComponent from '~/pipelines/components/graph/job_component.vue'; -import mountComponent from '../../helpers/vue_mount_component_helper'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; describe('pipeline graph job component', () => { let JobComponent; diff --git a/spec/javascripts/pipelines/pipelines_spec.js b/spec/javascripts/pipelines/pipelines_spec.js index a99ebc4e51a..54d5bfd51e6 100644 --- a/spec/javascripts/pipelines/pipelines_spec.js +++ b/spec/javascripts/pipelines/pipelines_spec.js @@ -2,7 +2,7 @@ import _ from 'underscore'; import Vue from 'vue'; import pipelinesComp from '~/pipelines/components/pipelines.vue'; import Store from '~/pipelines/stores/pipelines_store'; -import mountComponent from '../helpers/vue_mount_component_helper'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; describe('Pipelines', () => { const jsonFixtureName = 'pipelines/pipelines.json'; |