Bump the testing group with 11 updates

cli/commands/auth/tests/login.test.ts

@@ -29,16 +29,16 @@ vi.mock( 'cli/lib/appdata' );
 vi.mock( 'cli/lib/browser' );
 vi.mock( 'cli/lib/i18n' );
 vi.mock( 'cli/logger', () => ( {
-	Logger: vi.fn( () => ( {
-		reportStart: mockReportStart,
-		reportSuccess: mockReportSuccess,
-		reportError: mockReportError,
-		reportProgress: mockReportProgress,
-		reportWarning: mockReportWarning,
-		reportKeyValuePair: mockReportKeyValuePair,
-		spinner: {},
-		currentAction: null,
-	} ) ),
+	Logger: class {
+		reportStart = mockReportStart;
+		reportSuccess = mockReportSuccess;
+		reportError = mockReportError;
+		reportProgress = mockReportProgress;
+		reportWarning = mockReportWarning;
+		reportKeyValuePair = mockReportKeyValuePair;
+		spinner = {};
+		currentAction = null;
+	},
 	LoggerError: class LoggerError extends Error {},
 } ) );
 

cli/commands/auth/tests/logout.test.ts

@@ -21,16 +21,16 @@ import { runCommand } from '../logout';
 vi.mock( 'cli/lib/appdata' );
 vi.mock( 'cli/lib/api' );
 vi.mock( 'cli/logger', () => ( {
-	Logger: vi.fn( () => ( {
-		reportStart: mockReportStart,
-		reportSuccess: mockReportSuccess,
-		reportError: mockReportError,
-		reportProgress: mockReportProgress,
-		reportWarning: mockReportWarning,
-		reportKeyValuePair: mockReportKeyValuePair,
-		spinner: {},
-		currentAction: null,
-	} ) ),
+	Logger: class {
+		reportStart = mockReportStart;
+		reportSuccess = mockReportSuccess;
+		reportError = mockReportError;
+		reportProgress = mockReportProgress;
+		reportWarning = mockReportWarning;
+		reportKeyValuePair = mockReportKeyValuePair;
+		spinner = {};
+		currentAction = null;
+	},
 	LoggerError: class LoggerError extends Error {},
 } ) );
 

cli/commands/auth/tests/status.test.ts

@@ -15,16 +15,16 @@ import { runCommand } from '../status';
 vi.mock( 'cli/lib/api' );
 vi.mock( 'cli/lib/appdata' );
 vi.mock( 'cli/logger', () => ( {
-	Logger: vi.fn( () => ( {
-		reportStart: mockReportStart,
-		reportSuccess: mockReportSuccess,
-		reportError: mockReportError,
-		reportProgress: mockReportProgress,
-		reportWarning: mockReportWarning,
-		reportKeyValuePair: mockReportKeyValuePair,
-		spinner: {},
-		currentAction: null,
-	} ) ),
+	Logger: class {
+		reportStart = mockReportStart;
+		reportSuccess = mockReportSuccess;
+		reportError = mockReportError;
+		reportProgress = mockReportProgress;
+		reportWarning = mockReportWarning;
+		reportKeyValuePair = mockReportKeyValuePair;
+		spinner = {};
+		currentAction = null;
+	},
 	LoggerError: class LoggerError extends Error {},
 } ) );
 

cli/commands/preview/tests/create.test.ts

@@ -31,16 +31,16 @@ vi.mock( 'cli/lib/archive' );
 vi.mock( 'cli/lib/api' );
 vi.mock( 'cli/lib/snapshots' );
 vi.mock( 'cli/logger', () => ( {
-	Logger: vi.fn( () => ( {
-		reportStart: mockReportStart,
-		reportSuccess: mockReportSuccess,
-		reportError: mockReportError,
-		reportProgress: mockReportProgress,
-		reportWarning: mockReportWarning,
-		reportKeyValuePair: mockReportKeyValuePair,
-		spinner: {},
-		currentAction: null,
-	} ) ),
+	Logger: class {
+		reportStart = mockReportStart;
+		reportSuccess = mockReportSuccess;
+		reportError = mockReportError;
+		reportProgress = mockReportProgress;
+		reportWarning = mockReportWarning;
+		reportKeyValuePair = mockReportKeyValuePair;
+		spinner = {};
+		currentAction = null;
+	},
 	LoggerError: class LoggerError extends Error {},
 } ) );
 

cli/commands/preview/tests/delete.test.ts

@@ -24,16 +24,16 @@ vi.mock( 'cli/lib/appdata', async () => {
 vi.mock( 'cli/lib/api' );
 vi.mock( 'cli/lib/snapshots' );
 vi.mock( 'cli/logger', () => ( {
-	Logger: vi.fn( () => ( {
-		reportStart: mockReportStart,
-		reportSuccess: mockReportSuccess,
-		reportError: mockReportError,
-		reportProgress: mockReportProgress,
-		reportWarning: mockReportWarning,
-		reportKeyValuePair: mockReportKeyValuePair,
-		spinner: {},
-		currentAction: null,
-	} ) ),
+	Logger: class {
+		reportStart = mockReportStart;
+		reportSuccess = mockReportSuccess;
+		reportError = mockReportError;
+		reportProgress = mockReportProgress;
+		reportWarning = mockReportWarning;
+		reportKeyValuePair = mockReportKeyValuePair;
+		spinner = {};
+		currentAction = null;
+	},
 	LoggerError: class LoggerError extends Error {},
 } ) );
 

cli/commands/preview/tests/list.test.ts

@@ -22,16 +22,16 @@ vi.mock( 'cli/lib/appdata', async () => {
 } );
 vi.mock( 'cli/lib/snapshots' );
 vi.mock( 'cli/logger', () => ( {
-	Logger: vi.fn( () => ( {
-		reportStart: mockReportStart,
-		reportSuccess: mockReportSuccess,
-		reportError: mockReportError,
-		reportProgress: mockReportProgress,
-		reportWarning: mockReportWarning,
-		reportKeyValuePair: mockReportKeyValuePair,
-		spinner: {},
-		currentAction: null,
-	} ) ),
+	Logger: class {
+		reportStart = mockReportStart;
+		reportSuccess = mockReportSuccess;
+		reportError = mockReportError;
+		reportProgress = mockReportProgress;
+		reportWarning = mockReportWarning;
+		reportKeyValuePair = mockReportKeyValuePair;
+		spinner = {};
+		currentAction = null;
+	},
 	LoggerError: class LoggerError extends Error {},
 } ) );
 

cli/commands/preview/tests/update.test.ts

@@ -27,11 +27,11 @@ vi.mock( 'cli/lib/api' );
 vi.mock( 'cli/lib/snapshots' );
 
 vi.mock( 'cli/logger', () => ( {
-	Logger: vi.fn( () => ( {
-		reportStart: mockReportStart,
-		reportSuccess: mockReportSuccess,
-		reportError: mockReportError,
-	} ) ),
+	Logger: class {
+		reportStart = mockReportStart;
+		reportSuccess = mockReportSuccess;
+		reportError = mockReportError;
+	},
 	LoggerError: class LoggerError extends Error {},
 } ) );
 

cli/commands/site/tests/create.test.ts

@@ -58,13 +58,13 @@ vi.mock( 'cli/lib/appdata', async () => {
 		updateSiteLatestCliPid: vi.fn(),
 		updateSiteAutoStart: vi.fn().mockResolvedValue( undefined ),
 		removeSiteFromAppdata: vi.fn(),
-		getSiteUrl: vi.fn( ( site ) => `http://localhost:${ site.port }` ),
+		getSiteUrl: vi.fn().mockImplementation( ( site ) => `http://localhost:${ site.port }` ),
 	};
 } );
 vi.mock( 'cli/lib/language-packs' );
 vi.mock( 'cli/lib/pm2-manager' );
 vi.mock( 'cli/lib/server-files', () => ( {
-	getServerFilesPath: vi.fn( () => '/test/server-files' ),
+	getServerFilesPath: vi.fn().mockReturnValue( '/test/server-files' ),
 } ) );
 vi.mock( 'cli/lib/site-language' );
 vi.mock( 'cli/lib/site-utils' );

cli/commands/site/tests/status.test.ts

@@ -10,7 +10,7 @@ vi.mock( 'cli/lib/appdata', async () => {
 		...actual,
 		getSiteByFolder: vi.fn(),
 		getSiteUrl: vi.fn(),
-		getAppdataDirectory: vi.fn( () => '/test/appdata' ),
+		getAppdataDirectory: vi.fn().mockReturnValue( '/test/appdata' ),
 	};
 } );
 vi.mock( 'cli/lib/pm2-manager' );

cli/lib/tests/api.test.ts

@@ -4,7 +4,12 @@ import wpcomFactory from 'src/lib/wpcom-factory';
 import { vi } from 'vitest';
 import { uploadArchive, waitForSiteReady, SnapshotStatus } from 'cli/lib/api';
 import { LoggerError } from 'cli/logger';
-vi.mock( 'fs' );
+
+vi.mock( 'fs', () => ( {
+	default: {
+		createReadStream: vi.fn(),
+	},
+} ) );
 vi.mock( 'wpcom' );
 vi.mock( 'wpcom-xhr-request' );
 vi.mock( 'src/lib/wpcom-factory', () => ( {
@@ -18,11 +23,11 @@ describe( 'API Module', () => {
 	const mockWordPressVersion = '6.8.1';
 	const mockSiteUrl = 'test-site.wp.build';
 	const mockSiteId = 12345;
-	const mockReadStream = { pipe: vi.fn() };
+	const mockReadStream = { pipe: vi.fn() } as unknown as ReturnType< typeof fs.createReadStream >;
 
 	beforeEach( () => {
 		vi.clearAllMocks();
-		vi.mocked( fs.createReadStream, { partial: true } ).mockReturnValue( mockReadStream );
+		vi.mocked( fs.createReadStream ).mockReturnValue( mockReadStream );
 	} );
 
 	describe( 'uploadArchive', () => {
@@ -37,7 +42,9 @@ describe( 'API Module', () => {
 					post: vi.fn().mockResolvedValue( mockResponse ),
 				} ),
 			};
-			vi.mocked( wpcomFactory, { partial: true } ).mockReturnValue( mockWpcom );
+			vi.mocked( wpcomFactory ).mockReturnValue(
+				mockWpcom as unknown as ReturnType< typeof wpcomFactory >
+			);
 
 			const result = await uploadArchive( mockArchivePath, mockToken, mockWordPressVersion );
 
@@ -72,7 +79,9 @@ describe( 'API Module', () => {
 					} ),
 				} ),
 			};
-			vi.mocked( wpcomFactory, { partial: true } ).mockReturnValue( mockWpcom );
+			vi.mocked( wpcomFactory ).mockReturnValue(
+				mockWpcom as unknown as ReturnType< typeof wpcomFactory >
+			);
 
 			await uploadArchive( mockArchivePath, mockToken, mockWordPressVersion );
 			expect( mockWpcom.req.post ).toHaveBeenCalledWith( {
@@ -99,7 +108,9 @@ describe( 'API Module', () => {
 					post: vi.fn().mockRejectedValue( mockError ),
 				} ),
 			};
-			vi.mocked( wpcomFactory, { partial: true } ).mockReturnValue( mockWpcom );
+			vi.mocked( wpcomFactory ).mockReturnValue(
+				mockWpcom as unknown as ReturnType< typeof wpcomFactory >
+			);
 
 			await expect(
 				uploadArchive( mockArchivePath, mockToken, mockWordPressVersion )
@@ -117,7 +128,9 @@ describe( 'API Module', () => {
 					post: vi.fn().mockResolvedValue( invalidResponse ),
 				} ),
 			};
-			vi.mocked( wpcomFactory, { partial: true } ).mockReturnValue( mockWpcom );
+			vi.mocked( wpcomFactory ).mockReturnValue(
+				mockWpcom as unknown as ReturnType< typeof wpcomFactory >
+			);
 
 			await expect(
 				uploadArchive( mockArchivePath, mockToken, mockWordPressVersion )
@@ -161,7 +174,9 @@ describe( 'API Module', () => {
 						.mockResolvedValueOnce( activeResponse ),
 				} ),
 			};
-			vi.mocked( wpcomFactory, { partial: true } ).mockReturnValue( mockWpcom );
+			vi.mocked( wpcomFactory ).mockReturnValue(
+				mockWpcom as unknown as ReturnType< typeof wpcomFactory >
+			);
 
 			const result = await waitForSiteReady( mockSiteId, mockToken );
 			expect( mockWpcom.req.get ).toHaveBeenCalledTimes( 2 );
@@ -181,7 +196,9 @@ describe( 'API Module', () => {
 					get: vi.fn().mockResolvedValue( pendingResponse ),
 				} ),
 			};
-			vi.mocked( wpcomFactory, { partial: true } ).mockReturnValue( mockWpcom );
+			vi.mocked( wpcomFactory ).mockReturnValue(
+				mockWpcom as unknown as ReturnType< typeof wpcomFactory >
+			);
 
 			try {
 				await waitForSiteReady( mockSiteId, mockToken );
@@ -212,7 +229,9 @@ describe( 'API Module', () => {
 						.mockResolvedValueOnce( validResponse ),
 				} ),
 			};
-			vi.mocked( wpcomFactory, { partial: true } ).mockReturnValue( mockWpcom );
+			vi.mocked( wpcomFactory ).mockReturnValue(
+				mockWpcom as unknown as ReturnType< typeof wpcomFactory >
+			);
 
 			const result = await waitForSiteReady( mockSiteId, mockToken );
 			expect( mockWpcom.req.get ).toHaveBeenCalledTimes( 2 );

cli/lib/tests/appdata.test.ts

@@ -13,15 +13,31 @@ import {
 	unlockAppdata,
 } from 'cli/lib/appdata';
 
-vi.mock( 'fs' );
-vi.mock( 'os' );
-vi.mock( 'path' );
+vi.mock( 'fs', () => ( {
+	default: {
+		existsSync: vi.fn(),
+	},
+} ) );
+vi.mock( 'os', () => ( {
+	default: {
+		homedir: vi.fn(),
+	},
+} ) );
+vi.mock( 'path', () => ( {
+	default: {
+		join: vi.fn(),
+		basename: vi.fn(),
+		resolve: vi.fn(),
+	},
+} ) );
 vi.mock( 'atomically', () => ( {
 	readFile: vi.fn(),
 	writeFile: vi.fn(),
 } ) );
 
-vi.mock( 'common/lib/fs-utils' );
+vi.mock( 'common/lib/fs-utils', () => ( {
+	arePathsEqual: vi.fn(),
+} ) );
 vi.mock( 'cli/lib/api', () => ( {
 	validateAccessToken: vi.fn().mockResolvedValue( undefined ),
 } ) );

cli/lib/tests/archive.test.ts

@@ -3,9 +3,22 @@ import path from 'path';
 import archiver from 'archiver';
 import { vi } from 'vitest';
 import { archiveSiteContent, cleanup } from 'cli/lib/archive';
-vi.mock( 'fs' );
-vi.mock( 'path' );
-vi.mock( 'archiver' );
+
+vi.mock( 'fs', () => ( {
+	default: {
+		createWriteStream: vi.fn(),
+		existsSync: vi.fn(),
+		unlinkSync: vi.fn(),
+	},
+} ) );
+vi.mock( 'path', () => ( {
+	default: {
+		join: vi.fn(),
+	},
+} ) );
+vi.mock( 'archiver', () => ( {
+	default: vi.fn(),
+} ) );
 
 describe( 'Archive Module', () => {
 	const mockSiteFolder = '/mock/site/folder';
@@ -44,8 +57,12 @@ describe( 'Archive Module', () => {
 		vi.clearAllMocks();
 		mockArchiver = createMockArchiver();
 		mockWriteStream = createMockWriteStream();
-		vi.mocked( archiver, { partial: true } ).mockReturnValue( mockArchiver );
-		vi.mocked( fs.createWriteStream, { partial: true } ).mockReturnValue( mockWriteStream );
+		vi.mocked( archiver ).mockReturnValue(
+			mockArchiver as unknown as ReturnType< typeof archiver >
+		);
+		vi.mocked( fs.createWriteStream ).mockReturnValue(
+			mockWriteStream as unknown as ReturnType< typeof fs.createWriteStream >
+		);
 		vi.mocked( path.join ).mockImplementation( ( ...args ) => args.join( '/' ) );
 	} );