diff --git a/src/platform/updates/common/releaseStore.test.ts b/src/platform/updates/common/releaseStore.test.ts index 1d99cc381..9c617340d 100644 --- a/src/platform/updates/common/releaseStore.test.ts +++ b/src/platform/updates/common/releaseStore.test.ts @@ -11,11 +11,15 @@ vi.mock('@/platform/distribution/types', () => ({ isCloud: false })) vi.mock('@/platform/updates/common/releaseService') vi.mock('@/platform/settings/settingStore') vi.mock('@/stores/systemStatsStore') -vi.mock('@vueuse/core', () => ({ - until: vi.fn(() => Promise.resolve()), - useStorage: vi.fn(() => ({ value: {} })), - createSharedComposable: vi.fn((fn) => fn) -})) +vi.mock('@vueuse/core', async (importOriginal) => { + const actual = await importOriginal() + return { + ...(actual as object), + until: vi.fn(() => Promise.resolve()), + useStorage: vi.fn(() => ({ value: {} })), + createSharedComposable: vi.fn((fn) => fn) + } +}) describe('useReleaseStore', () => { let store: ReturnType diff --git a/src/stores/firebaseAuthStore.ts b/src/stores/firebaseAuthStore.ts index 76ee0359e..c9d258133 100644 --- a/src/stores/firebaseAuthStore.ts +++ b/src/stores/firebaseAuthStore.ts @@ -323,12 +323,12 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => { ) if (isCloud) { - authEventHook.trigger({ + void authEventHook.trigger({ type: 'login', method: 'email', is_new_user: false }) - userResolvedHook.trigger({ + void userResolvedHook.trigger({ userId: result.user.uid, email: result.user.email, displayName: result.user.displayName @@ -349,12 +349,12 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => { ) if (isCloud) { - authEventHook.trigger({ + void authEventHook.trigger({ type: 'register', method: 'email', is_new_user: true }) - userResolvedHook.trigger({ + void userResolvedHook.trigger({ userId: result.user.uid, email: result.user.email, displayName: result.user.displayName @@ -373,12 +373,12 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => { if (isCloud) { const additionalUserInfo = getAdditionalUserInfo(result) const isNewUser = additionalUserInfo?.isNewUser ?? false - authEventHook.trigger({ + void authEventHook.trigger({ type: isNewUser ? 'register' : 'login', method: 'google', is_new_user: isNewUser }) - userResolvedHook.trigger({ + void userResolvedHook.trigger({ userId: result.user.uid, email: result.user.email, displayName: result.user.displayName @@ -397,12 +397,12 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => { if (isCloud) { const additionalUserInfo = getAdditionalUserInfo(result) const isNewUser = additionalUserInfo?.isNewUser ?? false - authEventHook.trigger({ + void authEventHook.trigger({ type: isNewUser ? 'register' : 'login', method: 'github', is_new_user: isNewUser }) - userResolvedHook.trigger({ + void userResolvedHook.trigger({ userId: result.user.uid, email: result.user.email, displayName: result.user.displayName diff --git a/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts b/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts index b3a92e5a3..ff97625d2 100644 --- a/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts +++ b/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts @@ -46,9 +46,11 @@ vi.mock('@/stores/workspace/colorPaletteStore', () => ({ })) })) -vi.mock('@vueuse/core', async () => { +vi.mock('@vueuse/core', async (importOriginal) => { + const actual = await importOriginal() const { ref } = await import('vue') return { + ...(actual as object), whenever: vi.fn(), useStorage: vi.fn((_key, defaultValue) => { return ref(defaultValue)