From fadc56e4377288d25f248e268a4b146d559fe3b4 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sat, 20 Jan 2024 18:27:32 +0100 Subject: [PATCH] Fixed tests. --- src/tests/frontend/travis/adminrunner.sh | 2 +- src/tests/frontend/travis/runner.sh | 2 +- src/tests/frontend/travis/runnerBackend.sh | 2 +- src/tests/frontend/travis/runnerLoadTest.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/frontend/travis/adminrunner.sh b/src/tests/frontend/travis/adminrunner.sh index eeefbf3fa..070a4bca9 100755 --- a/src/tests/frontend/travis/adminrunner.sh +++ b/src/tests/frontend/travis/adminrunner.sh @@ -11,7 +11,7 @@ MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1 try cd "${MY_DIR}/../../../.." log "Assuming src/bin/installDeps.sh has already been run" -node ts-node src/node/server.ts --experimental-worker "${@}" & +npx ts-node src/node/server.ts --experimental-worker "${@}" & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..." diff --git a/src/tests/frontend/travis/runner.sh b/src/tests/frontend/travis/runner.sh index 427e78dc9..e723762a2 100755 --- a/src/tests/frontend/travis/runner.sh +++ b/src/tests/frontend/travis/runner.sh @@ -11,7 +11,7 @@ MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1 try cd "${MY_DIR}/../../../.." log "Assuming src/bin/installDeps.sh has already been run" -node ts-node src/node/server.ts --experimental-worker "${@}" & +npx ts-node src/node/server.ts --experimental-worker "${@}" & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..." diff --git a/src/tests/frontend/travis/runnerBackend.sh b/src/tests/frontend/travis/runnerBackend.sh index 080728d86..00e8c37bd 100755 --- a/src/tests/frontend/travis/runnerBackend.sh +++ b/src/tests/frontend/travis/runnerBackend.sh @@ -19,7 +19,7 @@ s!"points":[^,]*!"points": 1000! log "Deprecation notice: runnerBackend.sh - Please use: cd src && npm test" log "Assuming src/bin/installDeps.sh has already been run" -node ts-node src/node/server.ts "${@}" & +npx ts-node src/node/server.ts "${@}" & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..." diff --git a/src/tests/frontend/travis/runnerLoadTest.sh b/src/tests/frontend/travis/runnerLoadTest.sh index 3b7d4856e..52f133bd9 100755 --- a/src/tests/frontend/travis/runnerLoadTest.sh +++ b/src/tests/frontend/travis/runnerLoadTest.sh @@ -24,7 +24,7 @@ s!"points":[^,]*!"points": 1000! ' settings.json.template >settings.json log "Assuming src/bin/installDeps.sh has already been run" -node ts-node src/node/server.ts & +npm run dev & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..."