From 15c20f17293f288fb491e8fbe8ba288d0b384673 Mon Sep 17 00:00:00 2001
From: Boris Serdiuk <just-boris@hotmail.com>
Date: Wed, 5 Oct 2016 13:18:04 +0200
Subject: [PATCH] load setupTests file at setupTestFramework stage (#846)
fixes facebookincubator/create-react-app#824
---
packages/react-scripts/utils/createJestConfig.js | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/packages/react-scripts/utils/createJestConfig.js b/packages/react-scripts/utils/createJestConfig.js
index 41409abd2..7eb9f9775 100644
--- a/packages/react-scripts/utils/createJestConfig.js
+++ b/packages/react-scripts/utils/createJestConfig.js
@@ -13,12 +13,9 @@ const pathExists = require('path-exists');
const paths = require('../config/paths');
module.exports = (resolve, rootDir, isEjecting) => {
- const setupFiles = [resolve('config/polyfills.js')];
- if (pathExists.sync(paths.testsSetup)) {
- // Use this instead of `paths.testsSetup` to avoid putting
- // an absolute filename into configuration after ejecting.
- setupFiles.push('<rootDir>/src/setupTests.js');
- }
+ // Use this instead of `paths.testsSetup` to avoid putting
+ // an absolute filename into configuration after ejecting.
+ const setupTestsFile = pathExists.sync(paths.testsSetup) ? '<rootDir>/src/setupTests.js' : undefined;
const config = {
moduleFileExtensions: ['jsx', 'js', 'json'],
@@ -26,7 +23,8 @@ module.exports = (resolve, rootDir, isEjecting) => {
'^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': resolve('config/jest/FileStub.js'),
'^.+\\.css$': resolve('config/jest/CSSStub.js')
},
- setupFiles: setupFiles,
+ setupFiles: [resolve('config/polyfills.js')],
+ setupTestFrameworkScriptFile: setupTestsFile,
testPathIgnorePatterns: ['<rootDir>/(build|docs|node_modules)/'],
testEnvironment: 'node',
testRegex: '(/__tests__/.*|\\.(test|spec))\\.(js|jsx)$',
--
GitLab