From 092e08df26623cddc427a2e465b5e84e005f2ddd Mon Sep 17 00:00:00 2001 From: Johnpaul Date: Wed, 21 Jan 2026 18:55:07 +0100 Subject: [PATCH] test: remove any from newUserService.test.ts - Define MockSettingStore interface with proper Mock types - Create mockSettingStoreTyped with double-cast to useSettingStore return type - Replace all mockSettingStore usages in initializeIfNewUser calls - Import useSettingStore type from correct path --- src/services/newUserService.test.ts | 61 +++++++++++++++++------------ 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/src/services/newUserService.test.ts b/src/services/newUserService.test.ts index 43fcc92cd..e73dcbb3d 100644 --- a/src/services/newUserService.test.ts +++ b/src/services/newUserService.test.ts @@ -1,3 +1,4 @@ +import type { Mock } from 'vitest' import { beforeEach, describe, expect, it, vi } from 'vitest' const mockLocalStorage = vi.hoisted(() => ({ @@ -20,10 +21,18 @@ vi.mock('@/config/version', () => ({ global.__COMFYUI_FRONTEND_VERSION__ = '1.24.0' import type { newUserService as NewUserServiceType } from '@/services/newUserService' +import type { useSettingStore } from '@/platform/settings/settingStore' + +interface MockSettingStore { + settingValues: Record + get: Mock + set: Mock +} describe('newUserService', () => { let service: ReturnType - let mockSettingStore: any + let mockSettingStore: MockSettingStore + let mockSettingStoreTyped: ReturnType let newUserService: typeof NewUserServiceType beforeEach(async () => { @@ -42,6 +51,10 @@ describe('newUserService', () => { set: vi.fn() } + mockSettingStoreTyped = mockSettingStore as unknown as ReturnType< + typeof useSettingStore + > + mockLocalStorage.getItem.mockReturnValue(null) }) @@ -54,7 +67,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(true) }) @@ -69,7 +82,7 @@ describe('newUserService', () => { mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(true) }) @@ -82,7 +95,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(false) }) @@ -98,7 +111,7 @@ describe('newUserService', () => { return null }) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(false) }) @@ -114,7 +127,7 @@ describe('newUserService', () => { return null }) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(false) }) @@ -127,7 +140,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(true) }) @@ -143,7 +156,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(false) }) @@ -160,7 +173,7 @@ describe('newUserService', () => { return null }) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(false) }) @@ -177,7 +190,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(true) await service.registerInitCallback(mockCallback) @@ -207,7 +220,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) await service.registerInitCallback(mockCallback) @@ -228,7 +241,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(mockSettingStore.set).toHaveBeenCalledWith( 'Comfy.InstalledVersion', @@ -244,7 +257,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(mockSettingStore.set).not.toHaveBeenCalled() }) @@ -263,7 +276,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(mockCallback1).toHaveBeenCalledTimes(1) expect(mockCallback2).toHaveBeenCalledTimes(1) @@ -281,7 +294,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(mockCallback).not.toHaveBeenCalled() }) @@ -299,7 +312,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(consoleSpy).toHaveBeenCalledWith( 'New user initialization callback failed:', @@ -316,10 +329,10 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(mockSettingStore.set).toHaveBeenCalledTimes(1) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(mockSettingStore.set).toHaveBeenCalledTimes(1) }) @@ -334,7 +347,7 @@ describe('newUserService', () => { // Before initialization, isNewUser should return null expect(service.isNewUser()).toBeNull() - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) // After initialization, isNewUser should return true for a new user expect(service.isNewUser()).toBe(true) @@ -357,7 +370,7 @@ describe('newUserService', () => { mockSettingStore.get.mockReturnValue(undefined) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(true) }) @@ -372,7 +385,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) expect(service.isNewUser()).toBe(true) }) @@ -388,7 +401,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service.initializeIfNewUser(mockSettingStore) + await service.initializeIfNewUser(mockSettingStoreTyped) await service.registerInitCallback(mockCallback1) await service.registerInitCallback(mockCallback2) @@ -410,7 +423,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service1.initializeIfNewUser(mockSettingStore) + await service1.initializeIfNewUser(mockSettingStoreTyped) expect(service2.isNewUser()).toBe(true) expect(service1.isNewUser()).toBe(service2.isNewUser()) @@ -433,7 +446,7 @@ describe('newUserService', () => { }) mockLocalStorage.getItem.mockReturnValue(null) - await service1.initializeIfNewUser(mockSettingStore) + await service1.initializeIfNewUser(mockSettingStoreTyped) expect(mockCallback1).toHaveBeenCalledTimes(1) expect(mockCallback2).toHaveBeenCalledTimes(1)