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/pages | |
| 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/pages')
| -rw-r--r-- | spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js b/spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js index 440a6585d57..a6fe9fb65e9 100644 --- a/spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js +++ b/spec/javascripts/pages/admin/jobs/index/components/stop_jobs_modal_spec.js @@ -4,7 +4,7 @@ import axios from '~/lib/utils/axios_utils'; import stopJobsModal from '~/pages/admin/jobs/index/components/stop_jobs_modal.vue'; import * as urlUtility from '~/lib/utils/url_utility'; -import mountComponent from '../../../../../helpers/vue_mount_component_helper'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; describe('stop_jobs_modal.vue', () => { const props = { diff --git a/spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js b/spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js index 3cd33a3e900..6074e06fcec 100644 --- a/spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js +++ b/spec/javascripts/pages/milestones/shared/components/delete_milestone_modal_spec.js @@ -5,7 +5,7 @@ import deleteMilestoneModal from '~/pages/milestones/shared/components/delete_mi import eventHub from '~/pages/milestones/shared/event_hub'; import * as urlUtility from '~/lib/utils/url_utility'; -import mountComponent from '../../../../helpers/vue_mount_component_helper'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; describe('delete_milestone_modal.vue', () => { const Component = Vue.extend(deleteMilestoneModal); |