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/cycle_analytics | |
| 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/cycle_analytics')
| -rw-r--r-- | spec/javascripts/cycle_analytics/banner_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/cycle_analytics/total_time_component_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/cycle_analytics/banner_spec.js b/spec/javascripts/cycle_analytics/banner_spec.js index 64a76a6ee5f..2815bdba0c2 100644 --- a/spec/javascripts/cycle_analytics/banner_spec.js +++ b/spec/javascripts/cycle_analytics/banner_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import banner from '~/cycle_analytics/components/banner.vue'; -import mountComponent from '../helpers/vue_mount_component_helper'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; describe('Cycle analytics banner', () => { let vm; diff --git a/spec/javascripts/cycle_analytics/total_time_component_spec.js b/spec/javascripts/cycle_analytics/total_time_component_spec.js index ad0fc38a856..691e03cb8a6 100644 --- a/spec/javascripts/cycle_analytics/total_time_component_spec.js +++ b/spec/javascripts/cycle_analytics/total_time_component_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import component from '~/cycle_analytics/components/total_time_component.vue'; -import mountComponent from '../helpers/vue_mount_component_helper'; +import mountComponent from 'spec/helpers/vue_mount_component_helper'; describe('Total time component', () => { let vm; |