Skip to content

Commit cb9246a

Browse files
committed
feat: TT-513 cli test and dev test make file
1 parent 09235cf commit cb9246a

File tree

4 files changed

+21
-24
lines changed

4 files changed

+21
-24
lines changed

Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,27 @@ logs: ## Show logs of timetracker_ui.
2727

2828
.PHONY: stop
2929
stop: ## Stop container timetracker_ui.
30-
docker-compose stop
30+
docker-compose stop
3131

3232
.PHONY: restart
3333
restart: ## Restart container timetracker_ui.
34-
docker-compose stop
34+
docker-compose stop
3535
docker-compose up -d
3636

3737
.PHONY: remove
3838
remove: ## Delete container timetracker_ui.
3939
docker-compose down --volumes --remove-orphans --rmi local
4040

4141
.PHONY: test
42-
test: ## Run all tests on docker container timetracker_ui.
43-
docker-compose --env-file ./.env up -d
42+
test: ## Run all tests on docker container timetracker_ui at the CLI.
43+
docker-compose -f docker-compose.yml --env-file ./.env up -d
4444
docker exec -i timetracker_ui bash -c "npm run ci-test"
4545

46+
.PHONY: testdev
47+
testdev: ## Run all tests on docker container timetracker_ui at the Dev
48+
docker-compose -f docker-compose.dev.yml --env-file ./.env up -d
49+
docker exec -it timetracker_ui bash -c "npm run test"
50+
4651
.PHONY: publish
4752
publish: ## Publish the container image timetracker_ui.
4853
docker tag timetracker_ui:latest $(registry_url)/timetracker_ui:latest
@@ -54,7 +59,7 @@ build_prod: ## Create docker image with dependencies needed for production.
5459

5560
.PHONY: run_prod
5661
run_prod: ## Execute timetracker_ui_prod docker container.
57-
docker run -d -p 4200:4200 --name timetracker_ui_prod timetracker_ui_prod
62+
docker run -d -p 4200:4200 --name timetracker_ui_prod timetracker_ui_prod
5863

5964
.PHONY: remove_prod
6065
remove_prod: ## Delete container timetracker_ui_pro.

docler-compose-dev.yml renamed to docker-compose.dev.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ services:
2121
AUTHORITY_JSON: ${AUTHORITY_JSON}
2222
CLIENT_ID_JSON: ${CLIENT_ID_JSON}
2323
SCOPES_JSON: ${SCOPES_JSON}
24-
# volumes:
25-
# # - ./src:/home/timetracker/time-tracker-ui/src/
26-
# # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
27-
# # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
28-
# # - ./coverage:/home/timetracker/time-tracker-ui/coverage
29-
# # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
30-
# # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
31-
# # - ./package.json:/home/timetracker/time-tracker-ui/package.json
32-
# # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
24+
volumes:
25+
- ./src:/home/timetracker/time-tracker-ui/src/
26+
- ./scripts:/home/timetracker/time-tracker-ui/scripts/
27+
- ./e2e:/home/timetracker/time-tracker-ui/e2e/
28+
- ./coverage:/home/timetracker/time-tracker-ui/coverage
29+
- ./angular.json:/home/timetracker/time-tracker-ui/angular.json
30+
- ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
31+
- ./package.json:/home/timetracker/time-tracker-ui/package.json
32+
- ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js

docker-compose.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,4 @@ services:
2121
AUTHORITY_JSON: ${AUTHORITY_JSON}
2222
CLIENT_ID_JSON: ${CLIENT_ID_JSON}
2323
SCOPES_JSON: ${SCOPES_JSON}
24-
# volumes:
25-
# # - ./src:/home/timetracker/time-tracker-ui/src/
26-
# # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
27-
# # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
28-
# # - ./coverage:/home/timetracker/time-tracker-ui/coverage
29-
# # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
30-
# # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
31-
# # - ./package.json:/home/timetracker/time-tracker-ui/package.json
32-
# # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
24+

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"ng": "ng",
88
"start": "ng serve",
99
"build": "ng build --prod",
10-
"test": "ng test",
10+
"test": "ng test --browsers ChromeHeadless",
1111
"test-headless": "ng test --browsers ChromeHeadless",
1212
"ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless",
1313
"lint": "ng lint",

0 commit comments

Comments
 (0)