From ad80ddfce480b08e86c69cddf6f29fd664d6dc10 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Fri, 24 Sep 2021 17:40:54 +0200
Subject: [PATCH] Fix frontend tests
---
front/src/store/auth.js | 6 ++----
front/tests/unit/specs/store/auth.spec.js | 6 ++++++
front/tests/unit/specs/store/queue.spec.js | 5 +++--
front/tests/unit/specs/store/radios.spec.js | 2 +-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/front/src/store/auth.js b/front/src/store/auth.js
index a818667375..7d7aa6fa63 100644
--- a/front/src/store/auth.js
+++ b/front/src/store/auth.js
@@ -183,10 +183,7 @@ export default {
axios.get('users/me/').then((response) => {
logger.default.info('Successfully fetched user profile')
dispatch('ui/initSettings', response.data.settings, { root: true })
- dispatch('updateProfile', response.data).then(() => {
- resolve(response.data)
- })
-
+ dispatch('updateProfile', response.data)
dispatch('ui/fetchUnreadNotifications', null, { root: true })
if (response.data.permissions.library) {
dispatch('ui/fetchPendingReviewEdits', null, { root: true })
@@ -200,6 +197,7 @@ export default {
dispatch('libraries/fetchFollows', null, { root: true })
dispatch('moderation/fetchContentFilters', null, { root: true })
dispatch('playlists/fetchOwn', null, { root: true })
+ resolve(response.data)
}, (response) => {
logger.default.info('Error while fetching user profile')
reject(new Error('Error while fetching user profile'))
diff --git a/front/tests/unit/specs/store/auth.spec.js b/front/tests/unit/specs/store/auth.spec.js
index ee08c0061c..023c253fe2 100644
--- a/front/tests/unit/specs/store/auth.spec.js
+++ b/front/tests/unit/specs/store/auth.spec.js
@@ -159,7 +159,13 @@ describe('store/auth', () => {
{ type: 'permission', payload: {key: 'admin', status: true} }
],
expectedActions: [
+ { type: 'ui/initSettings', payload: { root: true } },
+ { type: 'updateProfile', payload: profile },
+ { type: 'ui/fetchUnreadNotifications', payload: null },
{ type: 'favorites/fetch', payload: null, options: {root: true} },
+ { type: 'channels/fetchSubscriptions', payload: null, options: {root: true} },
+ { type: 'libraries/fetchFollows', payload: null, options: {root: true} },
+ { type: 'moderation/fetchContentFilters', payload: null, options: {root: true} },
{ type: 'playlists/fetchOwn', payload: null, options: {root: true} }
]
})
diff --git a/front/tests/unit/specs/store/queue.spec.js b/front/tests/unit/specs/store/queue.spec.js
index f690982468..7af57d97d6 100644
--- a/front/tests/unit/specs/store/queue.spec.js
+++ b/front/tests/unit/specs/store/queue.spec.js
@@ -274,7 +274,7 @@ describe('store/queue', () => {
it('shuffle', () => {
let _shuffle = sandbox.stub(_, 'shuffle')
let tracks = ['a', 'b', 'c', 'd', 'e']
- let shuffledTracks = ['e', 'd', 'c']
+ let shuffledTracks = ['a', 'b', 'e', 'd', 'c']
_shuffle.returns(shuffledTracks)
testAction({
action: store.actions.shuffle,
@@ -283,7 +283,8 @@ describe('store/queue', () => {
{ type: 'tracks', payload: [] }
],
expectedActions: [
- { type: 'appendMany', payload: {tracks: ['a', 'b'].concat(shuffledTracks)} }
+ { type: 'appendMany', payload: {tracks: shuffledTracks} },
+ { type: 'currentIndex', payload: {tracks: shuffledTracks} }
]
})
})
diff --git a/front/tests/unit/specs/store/radios.spec.js b/front/tests/unit/specs/store/radios.spec.js
index 512b0fc3f4..a4d348d0f1 100644
--- a/front/tests/unit/specs/store/radios.spec.js
+++ b/front/tests/unit/specs/store/radios.spec.js
@@ -51,7 +51,7 @@ describe('store/radios', () => {
{ type: 'running', payload: true }
],
expectedActions: [
- { type: 'populateQueue' }
+ { type: 'populateQueue', payload: true }
]
})
})
--
GitLab