diff --git a/Makefile b/Makefile index 816164a82..5384548f0 100644 --- a/Makefile +++ b/Makefile @@ -212,10 +212,6 @@ frontend-format: ## run the frontend format cd $(PATH_FRONT) && npm run format .PHONY: frontend-format -frontend-test: ## run the frontend unit tests - cd $(PATH_FRONT) && npm test -.PHONY: frontend-test - run-frontend-development: ## run the frontend in development mode @$(COMPOSE) stop frontend cd $(PATH_FRONT) && npm run dev @@ -265,7 +261,7 @@ test: ## run project tests; pass extra pytest args via ARGS, e.g. `make test ARG @args="$(ARGS) $(filter-out $@,$(MAKECMDGOALS))" && \ $(MAKE) test-back-parallel ARGS="$${args}" && \ $(MAKE) test-summary ARGS="$${args}" && \ - $(MAKE) frontend-test + $(MAKE) test-frontend .PHONY: test test-back: ## run back-end tests (pass extra pytest args via ARGS) @@ -283,6 +279,10 @@ test-summary: ## run summary tests (pass extra pytest args via ARGS) bin/pytest-summary $${args} .PHONY: test-summary +test-frontend: ## run the frontend unit tests + cd $(PATH_FRONT) && npm test +.PHONY: test-frontend + makemigrations: ## run django makemigrations for the Meet project. @echo "$(BOLD)Running makemigrations$(RESET)" @$(COMPOSE) up -d postgresql