Skip to content

Commit e1f6376

Browse files
committed
test: remove vi.resetModules() from router spec
Use beforeAll() for module import and beforeEach() for mock state reset to prevent potential race conditions in CI. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
1 parent 3f3452f commit e1f6376

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/tests/router/router.spec.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import { describe, expect, it, beforeEach, vi, afterEach } from 'vitest'
6+
import { describe, expect, it, beforeAll, beforeEach, vi, afterEach } from 'vitest'
77
import Vue from 'vue'
88
import Router from 'vue-router'
99

@@ -59,29 +59,33 @@ describe('router business rules', () => {
5959
let router
6060
let loadState
6161
let generateUrl
62+
let getRootUrl
6263
let isExternal
6364
let selectAction
6465

65-
beforeEach(async () => {
66+
beforeAll(async () => {
6667
const { loadState: loadStateModule } = await import('@nextcloud/initial-state')
67-
const { generateUrl: generateUrlModule, getRootUrl } = await import('@nextcloud/router')
68+
const { generateUrl: generateUrlModule, getRootUrl: getRootUrlModule } = await import('@nextcloud/router')
6869
const { isExternal: isExternalModule } = await import('../../helpers/isExternal.js')
6970
const { selectAction: selectActionModule } = await import('../../helpers/SelectAction.js')
7071

7172
loadState = loadStateModule
7273
generateUrl = generateUrlModule
74+
getRootUrl = getRootUrlModule
7375
isExternal = isExternalModule
7476
selectAction = selectActionModule
7577

78+
const routerModule = await import('../../router/router.js')
79+
router = routerModule.default
80+
})
81+
82+
beforeEach(() => {
83+
vi.clearAllMocks()
7684
loadState.mockReturnValue('')
7785
generateUrl.mockImplementation(path => path)
7886
getRootUrl.mockReturnValue('')
7987
isExternal.mockReturnValue(false)
8088
selectAction.mockReturnValue(undefined)
81-
82-
vi.resetModules()
83-
const routerModule = await import('../../router/router.js')
84-
router = routerModule.default
8589
})
8690

8791
afterEach(() => {

0 commit comments

Comments
 (0)