From 94c0d2c36b62c103f85358f67178b5fb109e348b Mon Sep 17 00:00:00 2001
From: DorianGrey <ShadowVampire@web.de>
Date: Mon, 9 Apr 2018 09:34:04 +0200
Subject: [PATCH] Respect explicitly set --watchAll, and favor it over --watch

---
 packages/react-scripts/scripts/test.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/scripts/test.js b/packages/react-scripts/scripts/test.js
index b30113fe6..fa9ee7a85 100644
--- a/packages/react-scripts/scripts/test.js
+++ b/packages/react-scripts/scripts/test.js
@@ -26,8 +26,12 @@ require('../config/env');
 const jest = require('jest');
 const argv = process.argv.slice(2);
 
-// Watch unless on CI or in coverage mode
-if (!process.env.CI && argv.indexOf('--coverage') < 0) {
+// Watch unless on CI, in coverage mode, or explicitly running all tests
+if (
+  !process.env.CI &&
+  argv.indexOf('--coverage') === -1 &&
+  argv.indexOf('--watchAll') === -1
+) {
   argv.push('--watch');
 }