Merge branch 'TT-513-Create-CI/CD-pipeline-in-timer-tracker-ui-to-deploy-changes-for-both-environments' of https://github.com/ioet/time-tracker-ui into TT-513-Create-CI/CD-pipeline-in-timer-tracker-ui-to-deploy-changes-for-both-environments

pull

Author: heikergil

Makefile

@@ -39,10 +39,15 @@ remove: ## Delete container timetracker_ui.
 	docker-compose down --volumes --remove-orphans --rmi local
 
 .PHONY: test
-test: ## Run all tests on docker container timetracker_ui.
-	docker-compose --env-file ./.env up -d
+test: ## Run all tests on docker container timetracker_ui at the CLI.
+	docker-compose -f docker-compose.yml --env-file ./.env up -d
 	docker exec -i timetracker_ui bash -c "npm run ci-test"
 
+.PHONY: testdev
+testdev: ## Run all tests on docker container timetracker_ui at the Dev
+	docker-compose -f docker-compose.dev.yml --env-file ./.env up -d
+	docker exec -it timetracker_ui bash -c "npm run test"
+
 .PHONY: publish
 publish: ## Publish the container image timetracker_ui.
 	docker tag timetracker_ui:latest $(acr).azurecr.io/timetracker_ui:latest

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

@@ -21,12 +21,12 @@ services:
       AUTHORITY_JSON: ${AUTHORITY_JSON}
       CLIENT_ID_JSON: ${CLIENT_ID_JSON}
       SCOPES_JSON: ${SCOPES_JSON}
-    # volumes:
-    #   # - ./src:/home/timetracker/time-tracker-ui/src/
-    #   # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
-    #   # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
-    #   # - ./coverage:/home/timetracker/time-tracker-ui/coverage
-    #   # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
-    #   # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
-    #   # - ./package.json:/home/timetracker/time-tracker-ui/package.json
-    #   # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
+    volumes:
+      - ./src:/home/timetracker/time-tracker-ui/src/
+      - ./scripts:/home/timetracker/time-tracker-ui/scripts/
+      - ./e2e:/home/timetracker/time-tracker-ui/e2e/
+      - ./coverage:/home/timetracker/time-tracker-ui/coverage
+      - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
+      - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
+      - ./package.json:/home/timetracker/time-tracker-ui/package.json
+      - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js

docker-compose.yml

@@ -21,12 +21,4 @@ services:
       AUTHORITY_JSON: ${AUTHORITY_JSON}
       CLIENT_ID_JSON: ${CLIENT_ID_JSON}
       SCOPES_JSON: ${SCOPES_JSON}
-    # volumes:
-    #   # - ./src:/home/timetracker/time-tracker-ui/src/
-    #   # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
-    #   # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
-    #   # - ./coverage:/home/timetracker/time-tracker-ui/coverage
-    #   # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
-    #   # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
-    #   # - ./package.json:/home/timetracker/time-tracker-ui/package.json
-    #   # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
+

package.json

@@ -7,7 +7,7 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --prod",
-    "test": "ng test",
+    "test": "ng test --browsers ChromeHeadless",
     "test-headless": "ng test --browsers ChromeHeadless",
     "ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless",
     "lint": "ng lint",