From e3cef0ad9afba1017b208f819281f261ed9abf5f Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 1 Feb 2020 19:02:31 -0500 Subject: [PATCH 1/2] Treat setupFilesAfterEnv like setupFiles when normalizing configs against presets --- .../src/__tests__/normalize.test.js | 78 ++++++++++--------- packages/jest-config/src/normalize.ts | 5 ++ 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/packages/jest-config/src/__tests__/normalize.test.js b/packages/jest-config/src/__tests__/normalize.test.js index 26bf21bb3a8d..b3b59a894df8 100644 --- a/packages/jest-config/src/__tests__/normalize.test.js +++ b/packages/jest-config/src/__tests__/normalize.test.js @@ -1137,6 +1137,7 @@ describe('preset', () => { preset: 'react-native', rootDir: '/root/path/foo', setupFiles: ['a'], + setupFilesAfterEnv: ['a'], transform: {a: 'a'}, }, {}, @@ -1151,6 +1152,10 @@ describe('preset', () => { '/node_modules/a', '/node_modules/b', ]); + expect(options.setupFilesAfterEnv.sort()).toEqual([ + '/node_modules/a', + '/node_modules/b', + ]); expect(options.transform).toEqual([ ['a', '/node_modules/a', {}], ['b', '/node_modules/b', {}], @@ -1278,45 +1283,48 @@ describe('preset with globals', () => { }); }); -describe('preset without setupFiles', () => { - let Resolver; - beforeEach(() => { - Resolver = require('jest-resolve'); - Resolver.findNodeModule = jest.fn( - name => path.sep + 'node_modules' + path.sep + name, - ); - }); +describe.each(['setupFiles', 'setupFilesAfterEnv'])( + 'preset without %s', + configKey => { + let Resolver; + beforeEach(() => { + Resolver = require('jest-resolve'); + Resolver.findNodeModule = jest.fn( + name => path.sep + 'node_modules' + path.sep + name, + ); + }); - beforeAll(() => { - jest.doMock( - '/node_modules/react-foo/jest-preset', - () => ({ - moduleNameMapper: {b: 'b'}, - modulePathIgnorePatterns: ['b'], - }), - {virtual: true}, - ); - }); + beforeAll(() => { + jest.doMock( + '/node_modules/react-foo/jest-preset', + () => ({ + moduleNameMapper: {b: 'b'}, + modulePathIgnorePatterns: ['b'], + }), + {virtual: true}, + ); + }); - afterAll(() => { - jest.dontMock('/node_modules/react-foo/jest-preset'); - }); + afterAll(() => { + jest.dontMock('/node_modules/react-foo/jest-preset'); + }); - it('should normalize setupFiles correctly', () => { - const {options} = normalize( - { - preset: 'react-foo', - rootDir: '/root/path/foo', - setupFiles: ['a'], - }, - {}, - ); + it(`should normalize ${configKey} correctly`, () => { + const {options} = normalize( + { + [configKey]: ['a'], + preset: 'react-foo', + rootDir: '/root/path/foo', + }, + {}, + ); - expect(options).toEqual( - expect.objectContaining({setupFiles: ['/node_modules/a']}), - ); - }); -}); + expect(options).toEqual( + expect.objectContaining({[configKey]: ['/node_modules/a']}), + ); + }); + }, +); describe('runner', () => { let Resolver; diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts index f0cf0213eee0..a2454c373732 100644 --- a/packages/jest-config/src/normalize.ts +++ b/packages/jest-config/src/normalize.ts @@ -156,6 +156,11 @@ const setupPreset = ( if (options.setupFiles) { options.setupFiles = (preset.setupFiles || []).concat(options.setupFiles); } + if (options.setupFilesAfterEnv) { + options.setupFilesAfterEnv = (preset.setupFilesAfterEnv || []).concat( + options.setupFilesAfterEnv, + ); + } if (options.modulePathIgnorePatterns && preset.modulePathIgnorePatterns) { options.modulePathIgnorePatterns = preset.modulePathIgnorePatterns.concat( options.modulePathIgnorePatterns, From 90fe8e822391c0d4ede57e083f865d96d6ef01f0 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sun, 2 Feb 2020 12:58:00 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f397eca124a6..e54ea1cb2619 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Fixes +- `[jest-config]` Treat `setupFilesAfterEnv` like `setupFiles` when normalizing configs against presets ([#9495](https://github.com/facebook/jest/pull/9495)) - `[jest-snapshot]` Downgrade semver to v6 to support node 8 ([#9451](https://github.com/facebook/jest/pull/9451)) - `[jest-transform]` Correct sourcemap behavior for transformed and instrumented code ([#9460](https://github.com/facebook/jest/pull/9460)) - `[pretty-format]` Export `OldPlugin` type ([#9491](https://github.com/facebook/jest/pull/9491))