Make tests platform specific.

Author: robinjhuang

src/handlers/pathHandlers.ts

@@ -38,7 +38,7 @@ export function registerPathHandlers() {
       return {
         appData: app.getPath('appData'),
         appPath: app.getAppPath(),
-        defaultInstallPath: path.win32.join(documentsPath, 'ComfyUI'),
+        defaultInstallPath: path.join(documentsPath, 'ComfyUI'),
       };
     }
 
@@ -74,9 +74,13 @@ export function registerPathHandlers() {
         if (process.platform === 'win32') {
           // Check if path is in OneDrive
           const { oneDrive } = process.env;
-          const normalizedPath = path.resolve(inputPath);
-          if (oneDrive && path.resolve(oneDrive).toLowerCase().startsWith(normalizedPath.toLowerCase())) {
-            result.isOneDrive = true;
+          if (oneDrive) {
+            const normalizedInput = path.resolve(inputPath).toLowerCase();
+            const normalizedOneDrive = path.resolve(oneDrive).toLowerCase();
+            // Check if the normalized OneDrive path is a parent of the input path
+            if (normalizedInput.startsWith(normalizedOneDrive)) {
+              result.isOneDrive = true;
+            }
           }
 
           // Check if path is on non-default drive
@@ -113,17 +117,15 @@ export function registerPathHandlers() {
         result.error = `${error}`;
       }
 
-      result.isValid = true; // Start with true and set to false if any validation fails
-      if (
+      result.isValid =
         result.cannotWrite ||
         result.parentMissing ||
         result.freeSpace < requiredSpace ||
         result.error ||
         result.isOneDrive ||
         result.isNonDefaultDrive
-      ) {
-        result.isValid = false;
-      }
+          ? false
+          : true;
       return result;
     }
   );

tests/unit/handlers/pathHandler.test.ts

@@ -83,21 +83,6 @@ const mockFileSystem = ({ exists = true, writable = true } = {}) => {
   }
 };
 
-const mockProcessPlatform = (platform: string, systemDrive?: string) => {
-  const originalPlatform = process.platform;
-  const originalSystemDrive = process.env.SystemDrive;
-  Object.defineProperty(process, 'platform', { value: platform });
-  if (systemDrive) {
-    process.env = { ...process.env, SystemDrive: systemDrive };
-  }
-  return () => {
-    Object.defineProperty(process, 'platform', { value: originalPlatform });
-    if (systemDrive) {
-      process.env = { ...process.env, SystemDrive: originalSystemDrive };
-    }
-  };
-};
-
 type HandlerType<T extends (...args: never[]) => unknown> = T;
 type IpcHandler = (event: IpcMainEvent, ...args: unknown[]) => unknown;
 
@@ -156,23 +141,27 @@ describe('PathHandlers', () => {
     });
 
     it('Windows: accepts valid install path with sufficient space', async () => {
+      if (process.platform !== 'win32') {
+        return;
+      }
       mockFileSystem({ exists: true, writable: true });
-      const restorePlatform = mockProcessPlatform('win32', '/');
+
       const result = await validateHandler({}, '/valid/path');
       expect(result).toMatchObject({
         isValid: true,
         exists: true,
         freeSpace: DEFAULT_FREE_SPACE,
         requiredSpace: WIN_REQUIRED_SPACE,
+        isOneDrive: false,
       });
-
-      restorePlatform();
     });
 
     it('Windows: rejects path with insufficient disk space', async () => {
+      if (process.platform !== 'win32') {
+        return;
+      }
       mockFileSystem({ exists: true, writable: true });
       mockDiskSpace(LOW_FREE_SPACE);
-      const restorePlatform = mockProcessPlatform('win32');
 
       const result = await validateHandler({}, '/low/space/path');
       expect(result).toMatchObject({
@@ -181,28 +170,29 @@ describe('PathHandlers', () => {
         freeSpace: LOW_FREE_SPACE,
         requiredSpace: WIN_REQUIRED_SPACE,
       });
-
-      restorePlatform();
     });
 
     it('Mac: accepts valid install path with sufficient space', async () => {
+      if (process.platform !== 'darwin') {
+        return;
+      }
       mockFileSystem({ exists: true, writable: true });
-      const restorePlatform = mockProcessPlatform('darwin');
+
       const result = await validateHandler({}, '/valid/path');
       expect(result).toMatchObject({
         isValid: true,
         exists: true,
         freeSpace: DEFAULT_FREE_SPACE,
         requiredSpace: MAC_REQUIRED_SPACE,
       });
-
-      restorePlatform();
     });
 
     it('Mac: rejects path with insufficient disk space', async () => {
+      if (process.platform !== 'darwin') {
+        return;
+      }
       mockFileSystem({ exists: true, writable: true });
       mockDiskSpace(LOW_FREE_SPACE_MAC);
-      const restorePlatform = mockProcessPlatform('darwin');
 
       const result = await validateHandler({}, '/low/space/path');
       expect(result).toMatchObject({
@@ -211,8 +201,6 @@ describe('PathHandlers', () => {
         freeSpace: LOW_FREE_SPACE_MAC,
         requiredSpace: MAC_REQUIRED_SPACE,
       });
-
-      restorePlatform();
     });
 
     it('rejects path with missing parent directory', async () => {
@@ -239,15 +227,15 @@ describe('PathHandlers', () => {
     });
 
     it('Windows: should handle and log errors during validation', async () => {
+      if (process.platform !== 'win32') {
+        return;
+      }
       const mockError = new Error('Test error');
       vi.mocked(fs.existsSync).mockImplementation(() => {
         throw mockError;
       });
       vi.spyOn(log, 'error').mockImplementation(() => {});
 
-      // Mock process.platform is win32
-      const restorePlatform = mockProcessPlatform('win32');
-
       const result = await validateHandler({}, '/error/path');
 
       expect(result).toMatchObject({
@@ -257,14 +245,13 @@ describe('PathHandlers', () => {
         requiredSpace: WIN_REQUIRED_SPACE,
       });
       expect(log.error).toHaveBeenCalledWith('Error validating install path:', mockError);
-
-      // Restore original platform
-      restorePlatform();
     });
 
     it('Windows: OneDrive paths not allowed', async () => {
       mockFileSystem({ exists: true, writable: true });
-      const restorePlatform = mockProcessPlatform('win32');
+      if (process.platform !== 'win32') {
+        return;
+      }
 
       const result = await validateHandler({}, String.raw`C:\Users\Test\OneDrive\ComfyUI`);
 
@@ -273,15 +260,13 @@ describe('PathHandlers', () => {
         isOneDrive: true,
         requiredSpace: WIN_REQUIRED_SPACE,
       });
-
-      // Restore original platform
-      restorePlatform();
     });
 
     it('Windows: non-system drive paths not allowed', async () => {
+      if (process.platform !== 'win32') {
+        return;
+      }
       mockFileSystem({ exists: true, writable: true });
-      const restorePlatform = mockProcessPlatform('win32', 'C:');
-
       const result = await validateHandler({}, String.raw`D:\ComfyUI`);
 
       expect(result).toMatchObject({
@@ -291,9 +276,6 @@ describe('PathHandlers', () => {
         isNonDefaultDrive: true,
         requiredSpace: WIN_REQUIRED_SPACE,
       });
-
-      // Restore original values
-      restorePlatform();
     });
   });
 
@@ -356,16 +338,14 @@ describe('PathHandlers', () => {
     });
 
     it('Windows: should remove OneDrive from documents path', async () => {
-      // Mock Windows platform
-      const restorePlatform = mockProcessPlatform('win32');
+      if (process.platform !== 'win32') {
+        return;
+      }
       mockPaths({ documents: String.raw`C:\Users\Test\OneDrive\Documents` });
 
       const result = await getSystemPathsHandler({});
       const expected = String.raw`C:\Users\Test\Documents\ComfyUI`;
       expect(result.defaultInstallPath).toBe(expected);
-
-      // Restore original platform
-      restorePlatform();
     });
   });