From 7aa3514b4947b69c3e78db0c98a81df304a83dbd Mon Sep 17 00:00:00 2001 From: Tara L Andrews Date: Fri, 24 Feb 2023 17:48:37 +0100 Subject: [PATCH] tests now run via `make tests`. #158 --- Makefile | 1 + bin/tests.sh | 6 ++++-- docker-compose.test.yml | 12 ++++++------ env.zip.gpg | Bin 3867 -> 3894 bytes .../modules/common/service/stemwebService.js | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 673cb553..215f9172 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ CY_NPM_COMMAND="cy:run" build-tests: @echo "==> 🏗 Build Test Containers" + @docker build -t stemmaweb-middleware ./middleware @CY_NPM_COMMAND=$(CY_NPM_COMMAND) docker compose --env-file .env.test -f docker-compose.test.yml build build-tests-arm: diff --git a/bin/tests.sh b/bin/tests.sh index 2ba5c887..654a1651 100755 --- a/bin/tests.sh +++ b/bin/tests.sh @@ -16,18 +16,20 @@ docker-compose --env-file $ENV_FILE -f $DOCKER_COMPOSE_FILE up -d # Check the exit status of the docker container responsible for starting the tests exit_status=$(docker wait $TEST_CONTAINER_NAME) -# Check if the exit status is 0 +# Check if the exit status is 0; if so we will remove the containers if [ "$exit_status" -eq 0 ]; then echo "All tests passed ✅" + stopcmd=down else echo "Some tests failed ❌" + stopcmd=stop fi # Display logs docker logs $TEST_CONTAINER_NAME # Stop the services -docker-compose --env-file $ENV_FILE -f $DOCKER_COMPOSE_FILE down +docker-compose --env-file $ENV_FILE -f $DOCKER_COMPOSE_FILE $stopcmd # Exit with the exit status of the docker container responsible for starting the tests exit "$exit_status" diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 78b6f9b3..63adc0ac 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -7,7 +7,7 @@ services: stemmarest-initializer: build: bin env_file: - - .env.dev + - .env.test depends_on: - stemmarest volumes: @@ -20,7 +20,7 @@ services: image: mariadb:10.4 restart: always env_file: - - stemweb/.env.dev + - stemweb/.env.prod stemweb_redis: container_name: stemweb_redis @@ -41,7 +41,7 @@ services: image: dhuniwien/stemweb_py37:latest restart: always env_file: - - stemweb/.env.dev + - stemweb/.env.prod depends_on: - stemweb_mysql - stemweb_redis @@ -53,18 +53,18 @@ services: - stemmarest - stemweb env_file: - - .env.prod + - .env.test volumes: - ./frontend/config/env.js.prod:/usr/src/app/stemmaweb_middleware/stemmaweb/src/js/env.js stemmaweb-e2e: container_name: stemmaweb-e2e build: frontend-e2e - env_file: - - .env.dev depends_on: - stemmaweb - stemmarest-initializer + env_file: + - .env.test volumes: - ./frontend-e2e/:/app entrypoint: > diff --git a/env.zip.gpg b/env.zip.gpg index 2c51c2a2127d5f7c308c9f9ba2a173ee6e3703d9..ad1990e61972d6452e23f61153585549460242ac 100644 GIT binary patch literal 3894 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 Eir?9I@&Et; literal 3867 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 */ runAlgorithm(userid, algorithmId, textid, data, parameters) { - const return_host = 'http://reverse-proxy:80'; - const return_path = '/stemmaweb/requests/stemweb/result'; + const return_host = this.baseUrl; + const return_path = '/result'; /** @type {RunAlgorithmDTO} */ const dto = { userid, textid, data, parameters, return_host, return_path }; return this.fetch(`/algorithms/process/${algorithmId}`, {