unify the puppeteer test scripts

Shakefile.hs

@@ -124,15 +124,12 @@ main = do
         cmd (WithStdout True) (FileStdout out) "./node_modules/.bin/prettier" "--check" jsFiles
 
       "log/puppeteer-tests.txt" %> \out -> do
-        percyToken <- getEnv "PERCY_TOKEN"
+        -- `getEnv` looks like a no-op, but it actually makes Shake pay
-        case percyToken of
+        -- attention to this variable so that if it changes this command will be
-          Nothing -> do
+        -- re-run with the new token.
-            writeFileChanged out "PERCY_TOKEN not set, so skipping visual diff testing."
+        getEnv "PERCY_TOKEN"
-            need ["log/npm-install.txt", "log/public.txt"]
+        need ["log/npm-install.txt", "log/public.txt"]
-            cmd (WithStdout True) (FileStdout out) "script/puppeteer-tests-no-percy.sh"
+        cmd (WithStdout True) (FileStdout out) "script/puppeteer-tests.sh"
-          Just _ -> do
-            need ["log/npm-install.txt", "log/public.txt"]
-            cmd (WithStdout True) (FileStdout out) "script/puppeteer-tests-percy.sh"
 
       "log/forbidden-imports-report.txt" %> \out -> do
         need ["forbidden-imports.toml"]

script/puppeteer-tests-no-percy.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-env ONLYDOODAD=${1-default} npx mocha script/puppeteer-tests.js --timeout 25000 --exit

script/puppeteer-tests-percy.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-env ONLYDOODAD=${1-default} npx percy exec -- mocha script/puppeteer-tests.js --timeout 100000 --exit

script/puppeteer-tests.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+export ONLYDOODAD=${1:-default}
+
+if test -n "${PERCY_TOKEN:-}"; then
+  npx percy exec -- mocha script/puppeteer-tests.js --timeout 100000 --exit
+else
+  echo "PERCY_TOKEN not set, so skipping visual diff testing."
+  npx mocha script/puppeteer-tests.js --timeout 25000 --exit
+fi