From bbdcb0703d8d88d679a0bec89aef0f09130b6f76 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 27 May 2017 20:38:42 +0100
Subject: [PATCH 1/2] Update e2e-kitchensink.sh
---
tasks/e2e-kitchensink.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index 9d60d6e2935..15919b29e27 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -62,6 +62,9 @@ trap 'set +x; handle_exit' SIGQUIT SIGTERM SIGINT SIGKILL SIGHUP
# Echo every command being executed
set -x
+# Don't expand globs
+set -f
+
# Go to root
cd ..
root_path=$PWD
From 47f29dc9462c1303400f96fd1999b83f8a35ef2b Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 27 May 2017 21:10:30 +0100
Subject: [PATCH 2/2] Try again (differently)
---
tasks/e2e-kitchensink.sh | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index 15919b29e27..4506066cc4f 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -62,9 +62,6 @@ trap 'set +x; handle_exit' SIGQUIT SIGTERM SIGINT SIGKILL SIGHUP
# Echo every command being executed
set -x
-# Don't expand globs
-set -f
-
# Go to root
cd ..
root_path=$PWD
@@ -159,13 +156,13 @@ 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
# Catch when no tests are detected
testsList=$(REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \
CI=true \
NODE_PATH=src \
- npm test -- --no-cache --testPathPattern="/src/" --listTests)
+ npm test -- --no-cache --testPathPattern=src --listTests)
if [[ ${testsList} =~ "[]" ]]; then
exit 1
@@ -233,7 +230,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`