Cleanup.

Author: cpojer

.github/renovate.json

@@ -110,6 +110,7 @@ describe('worker', () => {
       await worker({
         computeDependencies: true,
         filePath: path.join('/project', 'fruits', 'Strawberry.js'),
+        hasteImplModulePath: require.resolve('./haste_impl.js'),
         rootDir,
       }),
     ).toEqual({

packages/jest-haste-map/src/__tests__/worker.test.js

@@ -60,16 +60,17 @@ module.exports = async function createRuntime(filename, projectConfig) {
   projectConfig = makeProjectConfig({
     cacheDirectory: getCacheDirectory(),
     cwd,
-    haste: {
-      hasteImplModulePath: require.resolve(
-        '../../../jest-haste-map/src/__tests__/haste_impl.js',
-      ),
-    },
     id: `Runtime-${filename.replace(/\W/, '-')}.tests`,
     moduleDirectories: ['node_modules'],
     moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json', 'node'],
     rootDir,
     ...projectConfig,
+    haste: {
+      ...projectConfig?.haste,
+      hasteImplModulePath: require.resolve(
+        '../../../jest-haste-map/src/__tests__/haste_impl.js',
+      ),
+    },
     moduleNameMapper,
     transform,
   });

packages/jest-runtime/src/__mocks__/createRuntime.js

@@ -268,69 +268,52 @@ describe('Runtime requireModule', () => {
   });
 
   it('resolves platform extensions based on the default platform', async () => {
-    await Promise.all([
-      createRuntime(__filename).then(runtime => {
-        const exports = runtime.requireModule(
-          runtime.__mockRootPath,
-          'Platform',
-        );
-
-        expect(exports.platform).toBe('default');
-      }),
-      createRuntime(__filename, {
-        haste: {
-          defaultPlatform: 'ios',
-          platforms: ['ios', 'android'],
-        },
-      }).then(runtime => {
-        const exports = runtime.requireModule(
-          runtime.__mockRootPath,
-          'Platform',
-        );
-
-        expect(exports.platform).toBe('ios');
-      }),
-      createRuntime(__filename, {
-        haste: {
-          platforms: ['ios', 'android'],
-        },
-      }).then(runtime => {
-        const exports = runtime.requireModule(
-          runtime.__mockRootPath,
-          'Platform',
-        );
-
-        expect(exports.platform).toBe('default');
-      }),
-      createRuntime(__filename, {
-        haste: {
-          defaultPlatform: 'android',
-          platforms: ['ios', 'android'],
-        },
-      }).then(runtime => {
-        const exports = runtime.requireModule(
-          runtime.__mockRootPath,
-          'Platform',
-        );
-
-        expect(exports.platform).toBe('android');
-      }),
-      createRuntime(__filename, {
-        haste: {
-          defaultPlatform: 'windows',
-          platforms: ['ios', 'android', 'native', 'windows'],
-        },
-      }).then(runtime => {
-        const exports = runtime.requireModule(
-          runtime.__mockRootPath,
-          'Platform',
-        );
-
-        // We prefer `native` over the default module if the default one
-        // cannot be found.
-        expect(exports.platform).toBe('native');
-      }),
-    ]);
+    await createRuntime(__filename).then(runtime => {
+      const exports = runtime.requireModule(runtime.__mockRootPath, 'Platform');
+
+      expect(exports.platform).toBe('default');
+    });
+    await createRuntime(__filename, {
+      haste: {
+        defaultPlatform: 'ios',
+        platforms: ['ios', 'android'],
+      },
+    }).then(runtime => {
+      const exports = runtime.requireModule(runtime.__mockRootPath, 'Platform');
+
+      expect(exports.platform).toBe('ios');
+    });
+    await createRuntime(__filename, {
+      haste: {
+        platforms: ['ios', 'android'],
+      },
+    }).then(runtime => {
+      const exports = runtime.requireModule(runtime.__mockRootPath, 'Platform');
+
+      expect(exports.platform).toBe('default');
+    });
+    await createRuntime(__filename, {
+      haste: {
+        defaultPlatform: 'android',
+        platforms: ['ios', 'android'],
+      },
+    }).then(runtime => {
+      const exports = runtime.requireModule(runtime.__mockRootPath, 'Platform');
+
+      expect(exports.platform).toBe('android');
+    });
+    await createRuntime(__filename, {
+      haste: {
+        defaultPlatform: 'windows',
+        platforms: ['ios', 'android', 'native', 'windows'],
+      },
+    }).then(runtime => {
+      const exports = runtime.requireModule(runtime.__mockRootPath, 'Platform');
+
+      // We prefer `native` over the default module if the default one
+      // cannot be found.
+      expect(exports.platform).toBe('native');
+    });
   });
 
   it('finds modules encoded in UTF-8 *with BOM*', async () => {

packages/jest-runtime/src/__tests__/runtime_require_module.test.js

@@ -939,7 +939,7 @@ const writeCacheFile = (cachePath: string, fileData: string) => {
     if (!(error instanceof Error)) {
       throw error;
     }
-    if (cacheWriteErrorSafeToIgnore(error, cachePath)) {
+    if (cacheWriteErrorSafeToIgnore(error)) {
       return;
     }
 
@@ -957,10 +957,8 @@ const writeCacheFile = (cachePath: string, fileData: string) => {
  * If the target does not exist we do not know if it is because it is still
  * being written by another process or is being overwritten by another process.
  */
-const cacheWriteErrorSafeToIgnore = (
-  e: NodeJS.ErrnoException,
-  cachePath: string,
-) => process.platform === 'win32' && e.code === 'EPERM';
+const cacheWriteErrorSafeToIgnore = (e: NodeJS.ErrnoException) =>
+  process.platform === 'win32' && e.code === 'EPERM';
 
 const readCacheFile = (cachePath: string): string | null => {
   if (!fs.existsSync(cachePath)) {