From cfaee1a1a7079dfdf0cbd7d9765813d3afc3c53e Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sat, 20 Jan 2024 18:28:30 +0100 Subject: [PATCH] Use script approach for starting etherpad. --- src/tests/frontend/travis/adminrunner.sh | 2 +- src/tests/frontend/travis/runner.sh | 2 +- src/tests/frontend/travis/runnerBackend.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/frontend/travis/adminrunner.sh b/src/tests/frontend/travis/adminrunner.sh index 070a4bca9..39bcede98 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" -npx ts-node src/node/server.ts --experimental-worker "${@}" & +npm run dev --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 e723762a2..7d9dbb086 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" -npx ts-node src/node/server.ts --experimental-worker "${@}" & +npm run dev --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 00e8c37bd..d20cc7469 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" -npx ts-node src/node/server.ts "${@}" & +npm run dev "${@}" & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..."