From b6901298835966654ad4e449b66595c7f511985b Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 22 Dec 2020 14:47:44 +0100 Subject: [PATCH] fix test --- .../src/__mocks__/createRuntime.js | 66 +++++++------------ 1 file changed, 25 insertions(+), 41 deletions(-) diff --git a/packages/jest-runtime/src/__mocks__/createRuntime.js b/packages/jest-runtime/src/__mocks__/createRuntime.js index 478359de5c2c..ff87494d2212 100644 --- a/packages/jest-runtime/src/__mocks__/createRuntime.js +++ b/packages/jest-runtime/src/__mocks__/createRuntime.js @@ -35,27 +35,14 @@ const setupModuleNameMapper = (config, rootDir) => { }; const setupTransform = (config, rootDir) => { - if (config && config.transform) { + if (config?.transform) { const transform = config.transform; return Object.keys(transform).map(regex => [ regex, path.resolve(rootDir, transform[regex]), ]); } - return [ - [ - '^.+\\.[jt]sx?$', - path.resolve( - __dirname, - '..', - '..', - '..', - 'babel-jest', - 'build', - 'index.js', - ), - ], - ]; + return [['^.+\\.[jt]sx?$', require.resolve('babel-jest')]]; }; module.exports = async function createRuntime(filename, config) { @@ -67,32 +54,29 @@ module.exports = async function createRuntime(filename, config) { const moduleNameMapper = setupModuleNameMapper(config, rootDir); const transform = setupTransform(config, rootDir); - config = makeProjectConfig( - { - cacheDirectory: getCacheDirectory(), - cwd: path.resolve(__dirname, '..', '..', '..', '..'), - haste: { - hasteImplModulePath: path.resolve( - __dirname, - '..', - '..', - '..', - 'jest-haste-map', - 'src', - '__tests__', - 'haste_impl.js', - ), - }, - moduleDirectories: ['node_modules'], - moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node'], - name: 'Runtime-' + filename.replace(/\W/, '-') + '.tests', - rootDir, - ...config, - moduleNameMapper, - transform, + config = makeProjectConfig({ + cacheDirectory: getCacheDirectory(), + cwd: path.resolve(__dirname, '..', '..', '..', '..'), + haste: { + hasteImplModulePath: path.resolve( + __dirname, + '..', + '..', + '..', + 'jest-haste-map', + 'src', + '__tests__', + 'haste_impl.js', + ), }, - {}, - ); + moduleDirectories: ['node_modules'], + moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json', 'node'], + name: 'Runtime-' + filename.replace(/\W/, '-') + '.tests', + rootDir, + ...config, + moduleNameMapper, + transform, + }); if (!config.roots.length) { config.roots = [config.rootDir]; @@ -110,7 +94,7 @@ module.exports = async function createRuntime(filename, config) { config, environment, Runtime.createResolver(config, hasteMap.moduleMap), - undefined, + new Map(), undefined, filename, );