diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 00:09:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 00:09:08 +0300 |
commit | 866ca4e49ff74ffadf8e6f6ff663a168489c2aba (patch) | |
tree | cc3135b1bae11dbd1cb3a30cb547473ad89a5551 /spec/javascripts/releases | |
parent | 26a50872e9da9509c52c70f74dc21698fec906db (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/releases')
-rw-r--r-- | spec/javascripts/releases/components/app_index_spec.js (renamed from spec/javascripts/releases/list/components/app_spec.js) | 11 | ||||
-rw-r--r-- | spec/javascripts/releases/stores/modules/list/actions_spec.js (renamed from spec/javascripts/releases/list/store/actions_spec.js) | 8 | ||||
-rw-r--r-- | spec/javascripts/releases/stores/modules/list/helpers.js (renamed from spec/javascripts/releases/list/store/helpers.js) | 2 | ||||
-rw-r--r-- | spec/javascripts/releases/stores/modules/list/mutations_spec.js (renamed from spec/javascripts/releases/list/store/mutations_spec.js) | 8 |
4 files changed, 15 insertions, 14 deletions
diff --git a/spec/javascripts/releases/list/components/app_spec.js b/spec/javascripts/releases/components/app_index_spec.js index de6208ab1fd..bcf062f357a 100644 --- a/spec/javascripts/releases/list/components/app_spec.js +++ b/spec/javascripts/releases/components/app_index_spec.js @@ -1,16 +1,17 @@ import _ from 'underscore'; import Vue from 'vue'; import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; -import app from '~/releases/list/components/app.vue'; -import createStore from '~/releases/list/store'; +import app from '~/releases/components/app_index.vue'; +import createStore from '~/releases/stores'; +import listModule from '~/releases/stores/modules/list'; import api from '~/api'; -import { resetStore } from '../store/helpers'; +import { resetStore } from '../stores/modules/list/helpers'; import { pageInfoHeadersWithoutPagination, pageInfoHeadersWithPagination, release, releases, -} from '../../mock_data'; +} from '../mock_data'; describe('Releases App ', () => { const Component = Vue.extend(app); @@ -25,7 +26,7 @@ describe('Releases App ', () => { }; beforeEach(() => { - store = createStore(); + store = createStore({ list: listModule }); releasesPagination = _.range(21).map(index => ({ ...release, tag_name: `${index}.00` })); }); diff --git a/spec/javascripts/releases/list/store/actions_spec.js b/spec/javascripts/releases/stores/modules/list/actions_spec.js index f03e019b95c..037c9d8d54a 100644 --- a/spec/javascripts/releases/list/store/actions_spec.js +++ b/spec/javascripts/releases/stores/modules/list/actions_spec.js @@ -4,12 +4,12 @@ import { fetchReleases, receiveReleasesSuccess, receiveReleasesError, -} from '~/releases/list/store/actions'; -import state from '~/releases/list/store/state'; -import * as types from '~/releases/list/store/mutation_types'; +} from '~/releases/stores/modules/list/actions'; +import state from '~/releases/stores/modules/list/state'; +import * as types from '~/releases/stores/modules/list/mutation_types'; import api from '~/api'; import { parseIntPagination } from '~/lib/utils/common_utils'; -import { pageInfoHeadersWithoutPagination, releases } from '../../mock_data'; +import { pageInfoHeadersWithoutPagination, releases } from '../../../mock_data'; describe('Releases State actions', () => { let mockedState; diff --git a/spec/javascripts/releases/list/store/helpers.js b/spec/javascripts/releases/stores/modules/list/helpers.js index fbc89ec2148..435ca36047e 100644 --- a/spec/javascripts/releases/list/store/helpers.js +++ b/spec/javascripts/releases/stores/modules/list/helpers.js @@ -1,4 +1,4 @@ -import state from '~/releases/list/store/state'; +import state from '~/releases/stores/modules/list/state'; // eslint-disable-next-line import/prefer-default-export export const resetStore = store => { diff --git a/spec/javascripts/releases/list/store/mutations_spec.js b/spec/javascripts/releases/stores/modules/list/mutations_spec.js index d756c69d53b..3035b916ff6 100644 --- a/spec/javascripts/releases/list/store/mutations_spec.js +++ b/spec/javascripts/releases/stores/modules/list/mutations_spec.js @@ -1,8 +1,8 @@ -import state from '~/releases/list/store/state'; -import mutations from '~/releases/list/store/mutations'; -import * as types from '~/releases/list/store/mutation_types'; +import state from '~/releases/stores/modules/list/state'; +import mutations from '~/releases/stores/modules/list/mutations'; +import * as types from '~/releases/stores/modules/list/mutation_types'; import { parseIntPagination } from '~/lib/utils/common_utils'; -import { pageInfoHeadersWithoutPagination, releases } from '../../mock_data'; +import { pageInfoHeadersWithoutPagination, releases } from '../../../mock_data'; describe('Releases Store Mutations', () => { let stateCopy; |