aboutsummaryrefslogtreecommitdiff
path: root/test/unit/specs/components/user_profile.spec.js
diff options
context:
space:
mode:
authorTarteka <info@tarteka.net>2019-10-30 22:17:19 +0100
committerTarteka <info@tarteka.net>2019-10-30 22:17:19 +0100
commitfe4845a7c1ca9d6fa51132a0ef9bc5103facae66 (patch)
tree92aceb88e58d149a5446e5a9d7bca6084cb6fa99 /test/unit/specs/components/user_profile.spec.js
parenta178346f1e0fbe2246532bbfeba5fd1cc0c1cb2d (diff)
parent74f5f168d639e9e21e294ac45dd6091694a041cc (diff)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
Diffstat (limited to 'test/unit/specs/components/user_profile.spec.js')
-rw-r--r--test/unit/specs/components/user_profile.spec.js16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 6de9491a..1b6a47d7 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -18,7 +18,14 @@ const actions = {
}
const testGetters = {
- findUser: state => getters.findUser(state.users)
+ findUser: state => getters.findUser(state.users),
+ mergedConfig: state => ({
+ colors: '',
+ highlight: {},
+ customTheme: {
+ colors: []
+ }
+ })
}
const localUser = {
@@ -45,13 +52,6 @@ const externalProfileStore = new Vuex.Store({
interface: {
browserSupport: ''
},
- config: {
- colors: '',
- highlight: {},
- customTheme: {
- colors: []
- }
- },
instance: {
hideUserStats: true
},