From 2e397f8790d08ff13942927d3feb9a9805f68f6f Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sat, 29 Aug 2020 00:43:57 +0300 Subject: [PATCH] Fix tests by mocking mrfPolicies field in users state --- test/views/statuses/store.conf.js | 4 +++- test/views/users/index.test.js | 2 +- test/views/users/multipleUsersMenu.test.js | 4 ++-- test/views/users/show.test.js | 2 +- test/views/users/store.conf.js | 13 ++++++++++++- test/views/users/usersFilters.test.js | 2 +- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/test/views/statuses/store.conf.js b/test/views/statuses/store.conf.js index 6e22b617..5cc059fb 100644 --- a/test/views/statuses/store.conf.js +++ b/test/views/statuses/store.conf.js @@ -1,6 +1,7 @@ import app from '@/store/modules/app' import peers from '@/store/modules/peers' import user from '@/store/modules/user' +import users from '@/store/modules/users' import settings from '@/store/modules/settings' import status from '@/store/modules/status' import getters from '@/store/getters' @@ -11,7 +12,8 @@ export default { peers, settings, status, - user: { ...user, state: { ...user.state, authHost: 'localhost:4000' }} + user: { ...user, state: { ...user.state, authHost: 'localhost:4000' }}, + users }, getters } diff --git a/test/views/users/index.test.js b/test/views/users/index.test.js index c95dbabe..ad77a9be 100644 --- a/test/views/users/index.test.js +++ b/test/views/users/index.test.js @@ -4,7 +4,7 @@ import flushPromises from 'flush-promises' import Element from 'element-ui' import Users from '@/views/users/index' import NewAccountDialog from '@/views/users/components/NewAccountDialog' -import storeConfig from './store.conf' +import { storeConfig } from './store.conf' import { cloneDeep } from 'lodash' config.mocks["$t"] = () => {} diff --git a/test/views/users/multipleUsersMenu.test.js b/test/views/users/multipleUsersMenu.test.js index 3cfe53ba..74ea7617 100644 --- a/test/views/users/multipleUsersMenu.test.js +++ b/test/views/users/multipleUsersMenu.test.js @@ -2,7 +2,7 @@ import Vuex from 'vuex' import { mount, createLocalVue, config } from '@vue/test-utils' import Element from 'element-ui' import MultipleUsersMenu from '@/views/users/components/MultipleUsersMenu' -import storeConfig from './store.conf' +import { storeWithTagPolicy } from './store.conf' import { cloneDeep } from 'lodash' import flushPromises from 'flush-promises' import { users } from '@/api/__mocks__/users.js' @@ -20,7 +20,7 @@ describe('Apply users actions to multiple users', () => { let store beforeEach(async() => { - store = new Vuex.Store(cloneDeep(storeConfig)) + store = new Vuex.Store(cloneDeep(storeWithTagPolicy)) store.dispatch('FetchUsers', { page: 1 }) await flushPromises() }) diff --git a/test/views/users/show.test.js b/test/views/users/show.test.js index 2197d5f6..4dc353e7 100644 --- a/test/views/users/show.test.js +++ b/test/views/users/show.test.js @@ -3,7 +3,7 @@ import { mount, createLocalVue, config } from '@vue/test-utils' import flushPromises from 'flush-promises' import Element from 'element-ui' import UsersShow from '@/views/users/show' -import storeConfig from './store.conf' +import { storeConfig } from './store.conf' import { cloneDeep } from 'lodash' config.mocks["$t"] = () => {} diff --git a/test/views/users/store.conf.js b/test/views/users/store.conf.js index f4bc7417..4f24e9bf 100644 --- a/test/views/users/store.conf.js +++ b/test/views/users/store.conf.js @@ -5,7 +5,7 @@ import userProfile from '@/store/modules/userProfile' import users from '@/store/modules/users' import getters from '@/store/getters' -export default { +export const storeConfig = { modules: { app, settings, @@ -15,3 +15,14 @@ export default { }, getters } + +export const storeWithTagPolicy = { + modules: { + app, + settings, + user, + userProfile, + users: { ...users, state: { ...users.state, tagPolicies: ['Pleroma.Web.ActivityPub.MRF.TagPolicy'] }} + }, + getters +} diff --git a/test/views/users/usersFilters.test.js b/test/views/users/usersFilters.test.js index db3c1a4b..9318371f 100644 --- a/test/views/users/usersFilters.test.js +++ b/test/views/users/usersFilters.test.js @@ -2,7 +2,7 @@ import Vuex from 'vuex' import { mount, createLocalVue, config } from '@vue/test-utils' import Element from 'element-ui' import Filters from '@/views/users/components/UsersFilter' -import storeConfig from './store.conf' +import { storeConfig } from './store.conf' import { cloneDeep } from 'lodash' import flushPromises from 'flush-promises'