diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 12:08:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 12:08:12 +0300 |
commit | 6b8040dc25fdc5fe614c3796a147517dd50bc7d8 (patch) | |
tree | 1930c21748fc632a7900659a71fcb7248097879f /spec/javascripts/reports | |
parent | 7b875aa3fd1645e2e881997256ba94c6cb73ab3d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/reports')
-rw-r--r-- | spec/javascripts/reports/components/modal_open_name_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/reports/components/summary_row_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/reports/store/actions_spec.js | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/reports/components/modal_open_name_spec.js b/spec/javascripts/reports/components/modal_open_name_spec.js index 53ae6453915..ae1fb2bf187 100644 --- a/spec/javascripts/reports/components/modal_open_name_spec.js +++ b/spec/javascripts/reports/components/modal_open_name_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import Vuex from 'vuex'; -import component from '~/reports/components/modal_open_name.vue'; import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; +import component from '~/reports/components/modal_open_name.vue'; Vue.use(Vuex); diff --git a/spec/javascripts/reports/components/summary_row_spec.js b/spec/javascripts/reports/components/summary_row_spec.js index fab7693581c..a19fbad403c 100644 --- a/spec/javascripts/reports/components/summary_row_spec.js +++ b/spec/javascripts/reports/components/summary_row_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import component from '~/reports/components/summary_row.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; +import component from '~/reports/components/summary_row.vue'; describe('Summary row', () => { const Component = Vue.extend(component); diff --git a/spec/javascripts/reports/store/actions_spec.js b/spec/javascripts/reports/store/actions_spec.js index 41137b50847..18fdb179597 100644 --- a/spec/javascripts/reports/store/actions_spec.js +++ b/spec/javascripts/reports/store/actions_spec.js @@ -1,4 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; +import testAction from 'spec/helpers/vuex_action_helper'; +import { TEST_HOST } from 'spec/test_constants'; import axios from '~/lib/utils/axios_utils'; import { setEndpoint, @@ -13,8 +15,6 @@ import { } from '~/reports/store/actions'; import state from '~/reports/store/state'; import * as types from '~/reports/store/mutation_types'; -import testAction from 'spec/helpers/vuex_action_helper'; -import { TEST_HOST } from 'spec/test_constants'; describe('Reports Store Actions', () => { let mockedState; |