Skip to content

Commit 0f43bdd

Browse files
levinqdlthymikee
authored andcommitted
Fix requireActual fail with moduleNameMapper (#8210)
* Fix requireActual fail with moduleNameMapper * update changelog * update PR link * fix PR number * fix CHANGELOG
1 parent 4b3483e commit 0f43bdd

5 files changed

Lines changed: 19 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
- `[jest-resolve-dependencies]`: Remove internal peer dependencies ([#8215](https://github.com/facebook/jest/pull/8215))
2727
- `[jest-resolve]`: Remove internal peer dependencies ([#8215](https://github.com/facebook/jest/pull/8215))
2828
- `[jest-snapshot]`: Remove internal peer dependencies ([#8215](https://github.com/facebook/jest/pull/8215))
29+
- `[jest-resolve]` Fix requireActual with moduleNameMapper ([#8210](https://github.com/facebook/jest/pull/8210))
2930

3031
### Chore & Maintenance
3132

e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ FAIL __tests__/index.js
3030
12 | module.exports = () => 'test';
3131
13 |
3232
33-
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:473:17)
33+
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:471:17)
3434
at Object.require (index.js:10:1)
3535
`;

e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ FAIL __tests__/test.js
3333
| ^
3434
4 |
3535
36-
at Resolver.resolveModule (../../packages/jest-resolve/build/index.js:231:17)
36+
at Resolver.resolveModule (../../packages/jest-resolve/build/index.js:229:17)
3737
at Object.require (index.js:3:18)
3838
`;

packages/jest-resolve/src/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,9 @@ class Resolver {
195195
options?: Resolver.ResolveModuleConfig,
196196
): Config.Path {
197197
const dirname = path.dirname(from);
198-
const module = this.resolveModuleFromDirIfExists(
199-
dirname,
200-
moduleName,
201-
options,
202-
);
198+
const module =
199+
this.resolveStubModuleName(from, moduleName) ||
200+
this.resolveModuleFromDirIfExists(dirname, moduleName, options);
203201
if (module) return module;
204202

205203
// 5. Throw an error if the module could not be found. `resolve.sync` only

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,17 @@ describe('Runtime requireActual', () => {
2323
);
2424
expect(exports.isManualMockModule).toBe(false);
2525
}));
26+
27+
test('requireActual with moduleNameMapper', () =>
28+
createRuntime(__filename, {
29+
moduleNameMapper: {
30+
'^testMapped/(.*)': '<rootDir>/mapped_dir/$1',
31+
},
32+
}).then(runtime => {
33+
const exports = runtime.requireActual(
34+
runtime.__mockRootPath,
35+
'testMapped/moduleInMapped',
36+
);
37+
expect(exports).toBe('in_mapped');
38+
}));
2639
});

0 commit comments

Comments
 (0)