X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4cc06fc092836d96eb52ac12c691f1baa41f04b3..2f63ddbb8cb9d393f99a03ee057291d23c6655de:/Makefile

diff --git a/Makefile b/Makefile
index 98a68987c..3f1b3c4c9 100644
--- a/Makefile
+++ b/Makefile
@@ -12,15 +12,14 @@ deploy: src/wolnelektury/localsettings.py
 	src/manage.py collectstatic --noinput
 
 
-.ONESHELL:
+TEST_COMPOSE := docker compose -f docker-compose.test.yml
+
 test:
-	cd src
-	python -Wall -m coverage run --branch --source='.' ./manage.py test; true
-	coverage html -d ../htmlcov.new
-	rm -rf ../htmlcov
-	mv ../htmlcov.new ../htmlcov
-	coverage report
-	rm .coverage
+	mkdir -p htmlcov
+	UID=$(UID) GID=$(GID) $(TEST_COMPOSE) run --rm --build test sh -c '\
+	  python -Wall -m coverage run --branch --source=. ./manage.py test $(ARGS); s=$$?; \
+	  coverage report --skip-covered; coverage html -d /app/htmlcov; exit $$s'; \
+	status=$$?; $(TEST_COMPOSE) down; exit $$status
 
 
 up:
@@ -33,7 +32,7 @@ build:
 	UID=$(UID) GID=$(GID) docker compose build
 
 shell:
-	UID=$(UID) GID=$(GID) docker compose run --rm web bash
+	UID=$(UID) GID=$(GID) docker compose exec web bash
 
 logs:
 	docker compose logs -f