load setupTests file at setupTestFramework stage (#846)

fixes #824
facebook · Oct 5, 2016 · 15c20f1 · 15c20f1
1 parent 11c9bdc
commit 15c20f1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/packages/react-scripts/utils/createJestConfig.js b/packages/react-scripts/utils/createJestConfig.js
@@ -13,20 +13,18 @@ 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'],
     moduleNameMapper: {
       '^.+\\.(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)$',