Alexander Musikhin 2 дней назад
Родитель
Сommit
977cc0cab7
1 измененных файлов с 10 добавлено и 9 удалено
  1. 10 9
      Makefile

+ 10 - 9
Makefile

@@ -36,6 +36,7 @@ message = @echo "\n========================================\n$(1)\n=============
 # Containers
 #
 application = docker exec -it $(call get_container_name, "app")
+application-no-tty = docker exec $(call get_container_name, "app")
 queue = docker exec -it $(call get_container_name, "app-queue")
 scheduler = docker exec -it $(call get_container_name, "app-schedule")
 websocket = docker exec -it $(call get_container_name, "websocket")
@@ -154,25 +155,25 @@ scheduler-log: ## Лог планировщика
 	$(compose) logs app-schedule -f
 
 test: ## Run tests
-	$(application) php artisan config:clear
-	$(application) php artisan test
+	$(application-no-tty) php artisan config:clear
+	$(application-no-tty) php artisan test
 
 test-unit: ## Run unit tests only
-	$(application) php artisan config:clear
-	$(application) php artisan test --testsuite=Unit
+	$(application-no-tty) php artisan config:clear
+	$(application-no-tty) php artisan test --testsuite=Unit
 
 test-feature: ## Run feature tests only
-	$(application) php artisan config:clear
-	$(application) php artisan test --testsuite=Feature
+	$(application-no-tty) php artisan config:clear
+	$(application-no-tty) php artisan test --testsuite=Feature
 
 test-coverage: ## Run tests with coverage report (requires Xdebug or PCOV)
-	$(application) php artisan config:clear
-	$(application) php artisan test --coverage
+	$(application-no-tty) php artisan config:clear
+	$(application-no-tty) php artisan test --coverage
 
 test-setup: ## Create test database (crm_testing)
 	$(mysql) mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS crm_testing CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
 	$(mysql) mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON crm_testing.* TO 'dbuser'@'%'; FLUSH PRIVILEGES;"
-	$(application) php artisan migrate --env=testing
+	$(application-no-tty) php artisan migrate --env=testing
 
 websocket: ## Консоль приложения websocket
 	$(websocket) bash