github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #20184 from overleaf/jpa-e2e-local

Browse source 
[server-pro] tests: make running test locally more robust

GitOrigin-RevId: 2944dc9faeb9ed5795e7ad28a5cabe7e018803bb
This commit is contained in:
Jakob Ackermann 2024-08-30 12:54:50 +02:00 committed by Copybot
parent 496a63cf23
commit 831a40390a
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server-ce/test/Makefile
View file

@ -6,21 +6,21 @@ all: test-e2e
# Notable the container labels com.docker.compose.project.working_dir and com.docker.compose.project.config_files need to match when creating containers from the docker host (how you started things) and from host-admin (how tests reconfigure the instance). # Notable the container labels com.docker.compose.project.working_dir and com.docker.compose.project.config_files need to match when creating containers from the docker host (how you started things) and from host-admin (how tests reconfigure the instance).
export PWD = $(shell pwd) export PWD = $(shell pwd)
export TEX_LIVE_DOCKER_IMAGE ?= quay.io/sharelatex/texlive-full:2023.1 export TEX_LIVE_DOCKER_IMAGE ?= gcr.io/overleaf-ops/texlive-full:2023.1
export ALL_TEX_LIVE_DOCKER_IMAGES ?= quay.io/sharelatex/texlive-full:2023.1,quay.io/sharelatex/texlive-full:2022.1 export ALL_TEX_LIVE_DOCKER_IMAGES ?= gcr.io/overleaf-ops/texlive-full:2023.1,gcr.io/overleaf-ops/texlive-full:2022.1
export IMAGE_TAG_PRO ?= quay.io/sharelatex/sharelatex-pro:latest export IMAGE_TAG_PRO ?= quay.io/sharelatex/sharelatex-pro:latest
export CYPRESS_SHARD ?= export CYPRESS_SHARD ?=
export COMPOSE_PROJECT_NAME ?= test export COMPOSE_PROJECT_NAME ?= test
test-e2e-native: build_mailtrap test-e2e-native:
docker compose -f docker-compose.yml -f docker-compose.native.yml up --build --no-log-prefix sharelatex host-admin -d docker compose -f docker-compose.yml -f docker-compose.native.yml up --no-log-prefix sharelatex host-admin -d
CYPRESS_ADMIN_CLIENT_URL='http://localhost:8081' CYPRESS_GIT_BRIDGE_PUBLIC_HOST='localhost' CYPRESS_SAML_PUBLIC_HOST='localhost:8082' CYPRESS_OVERLEAF_PUBLIC_HOST='localhost:8082' npm run cypress:open CYPRESS_ADMIN_CLIENT_URL='http://localhost:8081' CYPRESS_GIT_BRIDGE_PUBLIC_HOST='localhost' CYPRESS_SAML_PUBLIC_HOST='localhost:8082' CYPRESS_OVERLEAF_PUBLIC_HOST='localhost:8082' npm run cypress:open
test-e2e: test-e2e:
docker compose up --build --no-log-prefix --exit-code-from=e2e e2e docker compose up --no-log-prefix --exit-code-from=e2e e2e
test-e2e-open: build_mailtrap test-e2e-open:
docker compose up --build --no-log-prefix --exit-code-from=e2e-open e2e-open docker compose up --no-log-prefix --exit-code-from=e2e-open e2e-open
clean: clean:
docker compose down --volumes --timeout 0 docker compose down --volumes --timeout 0
@ -42,7 +42,7 @@ prefetch_custom_compose_pull:
prefetch_custom: prefetch_custom_texlive prefetch_custom: prefetch_custom_texlive
prefetch_custom_texlive: prefetch_custom_texlive:
echo -n "$$ALL_TEX_LIVE_DOCKER_IMAGES" | xargs -d, -I% \ echo -n "$$ALL_TEX_LIVE_DOCKER_IMAGES" | xargs -d, -I% \
sh -exc 'tag=%; re_tag=quay.io/sharelatex/$${tag#*/}; docker pull $$tag; docker tag $$tag $$re_tag' sh -exc 'tag=%; re_tag=quay.io/sharelatex/$${tag#*/*/}; docker pull $$tag; docker tag $$tag $$re_tag'
prefetch_custom: prefetch_old prefetch_custom: prefetch_old
prefetch_old: prefetch_old:

4
server-ce/test/package.json
View file

@ -3,8 +3,8 @@
"description": "e2e tests for Overleaf Community Edition", "description": "e2e tests for Overleaf Community Edition",
"private": true, "private": true,
"scripts": { "scripts": {
"cypress:open": "cypress open", "cypress:open": "cypress open --e2e --browser chrome",
"cypress:run": "cypress run --browser chrome", "cypress:run": "cypress run --e2e --browser chrome",
"format": "prettier --list-different $PWD/'**/*.{js,mjs,ts,tsx,json}'", "format": "prettier --list-different $PWD/'**/*.{js,mjs,ts,tsx,json}'",
"format:fix": "prettier --write $PWD/'**/*.{js,mjs,ts,tsx,json}'" "format:fix": "prettier --write $PWD/'**/*.{js,mjs,ts,tsx,json}'"
}, },