Merge branch 'master' into revert-2387-catch-no-tests

gaearon · web-flow · commit ccb290696652 · 2017-05-27T23:25:51.000+01:00
diff --git a/packages/react-dev-utils/WebpackDevServerUtils.js b/packages/react-dev-utils/WebpackDevServerUtils.js
@@ -107,7 +107,7 @@ function printInstructions(appName, urls, useYarn) {
   console.log('Note that the development build is not optimized.');
   console.log(
     `To create a production build, use ` +
-      `${chalk.cyan(`${useYarn ? 'yarn' : 'npm'} run build`)}.`
+      `${chalk.cyan(`${useYarn ? 'yarn' : 'npm run'} build`)}.`
   );
   console.log();
 }
diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
@@ -156,7 +156,7 @@ REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \
   CI=true \
   NODE_PATH=src \
   NODE_ENV=test \
-  npm test -- --no-cache --testPathPattern="/src/"
+  npm test -- --no-cache --testPathPattern=src
 
 # Test "development" environment
 tmp_server_log=`mktemp`
@@ -220,7 +220,7 @@ REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \
   CI=true \
   NODE_PATH=src \
   NODE_ENV=test \
-  npm test -- --no-cache --testPathPattern='/src/'
+  npm test -- --no-cache --testPathPattern=src
 
 # Test "development" environment
 tmp_server_log=`mktemp`

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ function printInstructions(appName, urls, useYarn) {`
`107`	`107`	`console.log('Note that the development build is not optimized.');`
`108`	`108`	`console.log(`
`109`	`109`	`To create a production build, use ` +
`110`		- `${chalk.cyan(`${useYarn ? 'yarn' : 'npm'} run build`)}.`
	`110`	+ `${chalk.cyan(`${useYarn ? 'yarn' : 'npm run'} build`)}.`
`111`	`111`	`);`
`112`	`112`	`console.log();`
`113`	`113`	`}`