From 4780e198832ff5a3c695175c121db6896bcb848b Mon Sep 17 00:00:00 2001 From: chauchakching Date: Mon, 4 May 2020 14:15:49 +0800 Subject: [PATCH] fix: absolute path moduleNameMapper + jest.mock issue --- CHANGELOG.md | 1 + .../__snapshots__/moduleNameMapper.test.ts.snap | 5 +++++ e2e/__tests__/moduleNameMapper.test.ts | 14 ++++++++++++++ .../__tests__/index.js | 16 ++++++++++++++++ .../index.js | 12 ++++++++++++ .../package.json | 7 +++++++ .../src/components/Button.js | 8 ++++++++ packages/jest-runtime/src/index.ts | 10 ++++------ 8 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 e2e/module-name-mapper-correct-mock-absolute-path/__tests__/index.js create mode 100644 e2e/module-name-mapper-correct-mock-absolute-path/index.js create mode 100644 e2e/module-name-mapper-correct-mock-absolute-path/package.json create mode 100644 e2e/module-name-mapper-correct-mock-absolute-path/src/components/Button.js diff --git a/CHANGELOG.md b/CHANGELOG.md index ad6205cfa706..b4de8727ffde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - `[jest-config, jest-resolve]` [**BREAKING**] Remove support for `browser` field ([#9943](https://github.com/facebook/jest/pull/9943)) - `[jest-haste-map]` Stop reporting files as changed when they are only accessed ([#7347](https://github.com/facebook/jest/pull/7347)) - `[jest-resolve]` Show relative path from root dir for `module not found` errors ([#9963](https://github.com/facebook/jest/pull/9963)) +- `[jest-runtime]` Fix absolute path moduleNameMapper + jest.mock bug ([#8727](https://github.com/facebook/jest/pull/8727)) ### Chore & Maintenance diff --git a/e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap b/e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap index faac572b892d..88a80f3a3e76 100644 --- a/e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap +++ b/e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap @@ -5,6 +5,11 @@ PASS __tests__/index.js ✓ moduleNameMapping correct configuration `; +exports[`moduleNameMapper correct configuration mocking module of absolute path 1`] = ` +PASS __tests__/index.js + ✓ moduleNameMapping correct configuration +`; + exports[`moduleNameMapper wrong array configuration 1`] = ` FAIL __tests__/index.js ● Test suite failed to run diff --git a/e2e/__tests__/moduleNameMapper.test.ts b/e2e/__tests__/moduleNameMapper.test.ts index c3faccac226e..9b0eb82075a9 100644 --- a/e2e/__tests__/moduleNameMapper.test.ts +++ b/e2e/__tests__/moduleNameMapper.test.ts @@ -35,6 +35,20 @@ test('moduleNameMapper correct configuration', () => { expect(wrap(rest)).toMatchSnapshot(); }); +test('moduleNameMapper correct configuration mocking module of absolute path', () => { + const {stderr, exitCode} = runJest( + 'module-name-mapper-correct-mock-absolute-path', + [], + { + stripAnsi: true, + }, + ); + const {rest} = extractSummary(stderr); + + expect(exitCode).toBe(0); + expect(wrap(rest)).toMatchSnapshot(); +}); + test('moduleNameMapper with mocking', () => { const {json} = runWithJson('module-name-mapper-mock'); expect(json.numTotalTests).toBe(2); diff --git a/e2e/module-name-mapper-correct-mock-absolute-path/__tests__/index.js b/e2e/module-name-mapper-correct-mock-absolute-path/__tests__/index.js new file mode 100644 index 000000000000..959e1bc9b32d --- /dev/null +++ b/e2e/module-name-mapper-correct-mock-absolute-path/__tests__/index.js @@ -0,0 +1,16 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +'use strict'; + +const importedFn = require('../'); + +jest.mock('/components/Button'); + +test('moduleNameMapping correct configuration', () => { + expect(importedFn).toBeDefined(); +}); diff --git a/e2e/module-name-mapper-correct-mock-absolute-path/index.js b/e2e/module-name-mapper-correct-mock-absolute-path/index.js new file mode 100644 index 000000000000..9552c0b25edd --- /dev/null +++ b/e2e/module-name-mapper-correct-mock-absolute-path/index.js @@ -0,0 +1,12 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +'use strict'; + +require('/components/Button'); + +module.exports = () => 'test'; diff --git a/e2e/module-name-mapper-correct-mock-absolute-path/package.json b/e2e/module-name-mapper-correct-mock-absolute-path/package.json new file mode 100644 index 000000000000..67f3c9a77889 --- /dev/null +++ b/e2e/module-name-mapper-correct-mock-absolute-path/package.json @@ -0,0 +1,7 @@ +{ + "jest": { + "moduleNameMapper": { + "^/(.*)$": "/src/$1" + } + } +} diff --git a/e2e/module-name-mapper-correct-mock-absolute-path/src/components/Button.js b/e2e/module-name-mapper-correct-mock-absolute-path/src/components/Button.js new file mode 100644 index 000000000000..ad032eb1bbfe --- /dev/null +++ b/e2e/module-name-mapper-correct-mock-absolute-path/src/components/Button.js @@ -0,0 +1,8 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +module.exports = () => 'Button'; diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts index 6c42dba9b8bc..aaacea67f06f 100644 --- a/packages/jest-runtime/src/index.ts +++ b/packages/jest-runtime/src/index.ts @@ -584,12 +584,10 @@ class Runtime { } const manualMockOrStub = this._resolver.getMockModule(from, moduleName); - let modulePath; - if (manualMockOrStub) { - modulePath = this._resolveModule(from, manualMockOrStub); - } else { - modulePath = this._resolveModule(from, moduleName); - } + + let modulePath = + this._resolver.getMockModule(from, moduleName) || + this._resolveModule(from, moduleName); let isManualMock = manualMockOrStub &&