Fix a few things

Author: gaearon

scripts/init.js

@@ -26,7 +26,7 @@ module.exports = function(appPath, appName, verbose, originalDirectory) {
   appPackage.scripts = {
     'start': 'react-scripts start',
     'build': 'react-scripts build',
-    'test': 'react-scripts test --watch --env=jsdom',
+    'test': 'react-scripts test --watch',
     'eject': 'react-scripts eject'
   };
 

scripts/test.js

@@ -16,11 +16,19 @@ const paths = require('../config/paths');
 
 const argv = process.argv.slice(2);
 
-const index = argv.indexOf('--debug-template');
-if (index !== -1) {
-  argv.splice(index, 1);
-  // When running end-to-end test, disable the watcher
-  var watchIndex = argv.indexOf('--watch');
+// Don't pass this option to Jest
+const debugTemplateIndex = argv.indexOf('--debug-template');
+if (debugTemplateIndex !== -1) {
+  argv.splice(debugTemplateIndex, 1);
+}
+
+// Don't pass this option to Jest either
+const smokeTestIndex = argv.indexOf('--smoke-test');
+if (smokeTestIndex !== -1) {
+  argv.splice(smokeTestIndex, 1);
+
+  // When running end-to-end test, disable watching
+  const watchIndex = argv.indexOf('--watch');
   if (watchIndex !== -1) {
     argv.splice(watchIndex, 1);
   }

tasks/e2e.sh

@@ -100,8 +100,9 @@ test -e build/static/media/*.svg
 test -e build/favicon.ico
 
 # Run tests
-npm run test
-test -e src/__tests__/__snapshots__/App-test.js.snap
+npm test --smoke-test
+# Uncomment when snapshot testing is enabled by default:
+# test -e src/__tests__/__snapshots__/App-test.js.snap
 
 # Test the server
 npm start -- --smoke-test
@@ -118,8 +119,9 @@ test -e build/static/media/*.svg
 test -e build/favicon.ico
 
 # Run tests
-npm run test
-test -e src/__tests__/__snapshots__/App-test.js.snap
+npm test -- --smoke-test
+# Uncomment when snapshot testing is enabled by default:
+# test -e src/__tests__/__snapshots__/App-test.js.snap
 
 # Test the server
 npm start -- --smoke-test