refactored test commands, added make tests on top level

Author: yvess

Makefile

@@ -1,6 +1,5 @@
 SHELL = /bin/bash
-
-.PHONY: all
+.PHONY: tests
 
 init:
 	cd django && make init
@@ -63,3 +62,7 @@ dump-db:
 
 import-db:
 	@docker-compose exec pdb sh -c 'psql -U $$POSTGRES_USER $$POSTGRES_DB < /var/services/postgres/var/dump.sql'
+
+tests:
+	cd django && make tests
+	cd vue && make tests

django/Makefile

@@ -1,6 +1,6 @@
 GEMEINDESCAN_WEBUI_DJANGO=0.3.4
 DOCKER_EXEC=$(shell command -v docker > /dev/null && echo "docker-compose exec django")
-
+all: run-tests run-tests-dev
 .PHONY: all
 default: dev
 
@@ -29,11 +29,11 @@ migrate:
 	$(DOCKER_EXEC) python3 manage.py migrate
 	make collectstatic
 
-run-tests:
-	$(DOCKER_EXEC) DJANGO_SETTINGS_MODULE=main.settings_tests pytest --create-db
+tests:
+	$(DOCKER_EXEC) pytest --create-db
 
-run-tests-dev:
-	$(DOCKER_EXEC) DJANGO_SETTINGS_MODULE=main.settings_tests pytest --reuse-db -vvv --nomigrations
+tests-dev:
+	$(DOCKER_EXEC) pytest --reuse-db -vvv --nomigrations
 
 delete-gemeinden-django:
 	$(DOCKER_EXEC) python3 manage.py shell --command="from gsmap.models import Municipality;Municipality.objects.all().delete()"

django/gsmap/tests.py

@@ -17,8 +17,7 @@ def test_municipalities_exists():
       }
     }
   }
-}''',
-                            context={})
+}''', context={})
     result = json.loads(json.dumps(result)) # remove OrderedDics, default in python 3.7+
     assert result == {
         "data": {
@@ -116,8 +115,7 @@ def test_snapshots_exists():
             }
         }
     }
-}''',
-                            context={})
+}''', context={})
     result = json.loads(
         json.dumps(result))  # remove OrderedDics, default in python 3.7+
     assert result == {

vue/Makefile

@@ -24,6 +24,9 @@ dev:
 screenshotservice:
 	$(DOCKER_EXEC) node /opt/vue/screenshot-service/screenshot-server.js
 
+tests:
+	$(DOCKER_EXEC) yarn test
+
 build:
 	$(DOCKER_EXEC) yarn build --mode production
 	$(DOCKER_EXEC) rsync -av --delete dist /var/services/django/static/