diff --git a/services/web/Makefile b/services/web/Makefile index 639994b016..051b7f9e9d 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -88,7 +88,7 @@ clean_ci: # Tests # -test: test_unit test_acceptance test_frontend test_frontend_ct test_writefull +test: test_unit test_acceptance test_frontend test_writefull test_module: test_unit_module test_acceptance_module @@ -161,11 +161,13 @@ mongo_migrations_for_tests: # Frontend tests # -test_frontend: export JUNIT_ROOT_SUITE_NAME = JSDOM frontend tests -test_frontend: - COMPOSE_PROJECT_NAME=frontend_test_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) run --rm test_frontend +test_frontend_jsdom: export JUNIT_ROOT_SUITE_NAME = JSDOM frontend tests +test_frontend_jsdom: + COMPOSE_PROJECT_NAME=frontend_test_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) run --rm test_frontend_jsdom COMPOSE_PROJECT_NAME=frontend_test_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down -v -t 0 +test_frontend: test_frontend_jsdom test_frontend_ct + # # Frontend component tests in Cypress # @@ -732,7 +734,7 @@ $(MODULE_TARGETS): $(MODULE_TARGETS) \ compile_modules compile_modules_full clean_ci \ test test_module mongo_migrations_for_tests test_unit test_unit_app \ - test_unit_modules test_unit_module test_frontend \ + test_unit_modules test_unit_module test_frontend_jsdom \ test_acceptance test_acceptance_app test_acceptance_modules \ test_acceptance_module ci format format_fix lint \ shellcheck shellcheck_fix \ diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index 1e63cad3db..3fbbdd9926 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -69,7 +69,7 @@ services: tmpfs: - /overleaf/services/web/data:uid=1000,gid=1000 - test_frontend: + test_frontend_jsdom: build: context: ../.. dockerfile: services/web/Dockerfile diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index 40cc0b9ae5..0b97069730 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -69,7 +69,7 @@ services: entrypoint: /overleaf/bin/shared/wait_for_it mongo:27017 --timeout=60 -- command: npm run --silent test:acceptance:app - test_frontend: + test_frontend_jsdom: build: context: ../.. dockerfile: services/web/Dockerfile