Skip to content

Commit 8804b2e

Browse files
committed
refactor: cleanup CI files
1 parent cdd099d commit 8804b2e

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Makefile

+8-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dev: build-dev
2727
@docker-compose --env-file .env.dev -f docker-compose.dev.yml up
2828

2929

30+
# The command to be replaced in `stemmaweb-e2e`'s entrypoint
3031
CY_NPM_COMMAND="cy:run"
3132

3233
build-tests:
@@ -36,11 +37,15 @@ build-tests:
3637
build-tests-arm:
3738
@make build-tests CY_NPM_COMMAND="cy:run:arm"
3839

39-
tests: build-tests
40+
tests: tests-down build-tests
4041
@echo "==> 🧪 Run E2E Tests"
4142
@CY_NPM_COMMAND=$(CY_NPM_COMMAND) docker-compose --env-file .env.dev -f docker-compose.test.yml up
4243

43-
tests-arm: build-tests-arm
44+
tests-down:
45+
@echo "==> 🛑 Stop Test Containers"
46+
@docker-compose --env-file .env.dev -f docker-compose.test.yml down
47+
48+
tests-arm:
4449
@make tests CY_NPM_COMMAND="cy:run:arm"
4550

4651
install-middleware:
@@ -76,4 +81,4 @@ stop: stop-middleware stop-frontend
7681

7782
dev-down:
7883
@echo "==> 🛑 Stop Dev Containers"
79-
@docker-compose -f docker-compose.dev.yml down
84+
@docker-compose --env-file .env.dev -f docker-compose.dev.yml down

frontend-e2e/Dockerfile

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@ COPY package.json package-lock.json ./
77
RUN npm ci
88

99
# Copy source files
10-
COPY . .
11-
12-
# Run tests
13-
CMD ["npm", "test"]
10+
COPY . .

frontend-e2e/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"cy:open": "cypress open",
99
"cy:run": "cypress run",
1010
"cy:run:arm": "cypress run --browser electron",
11-
"test": "npm run cy:run"
11+
"test": "npm run cy:run",
12+
"start": "npm run cy:open"
1213
},
1314
"keywords": [],
1415
"author": "",

0 commit comments

Comments
 (0)