From b2d5d15a4cacf7afef4ee686018b9a7538077480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul-Guillaume=20D=C3=A9jardin?= <pgdejardin@xebia.fr>
Date: Thu, 6 Apr 2017 16:27:33 +0200
Subject: [PATCH] Override Jest config by package.json Jest config

---
 packages/react-scripts/scripts/utils/createJestConfig.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js
index 5ba7fd16cb2..612ee61c2cb 100644
--- a/packages/react-scripts/scripts/utils/createJestConfig.js
+++ b/packages/react-scripts/scripts/utils/createJestConfig.js
@@ -11,6 +11,7 @@
 
 const fs = require('fs');
 const paths = require('../../config/paths');
+const packageConfig = require(paths.appPackageJson).jest;
 
 module.exports = (resolve, rootDir, isEjecting) => {
   // Use this instead of `paths.testsSetup` to avoid putting
@@ -45,5 +46,5 @@ module.exports = (resolve, rootDir, isEjecting) => {
   if (rootDir) {
     config.rootDir = rootDir;
   }
-  return config;
+  return Object.assign({}, config, packageConfig);
 };