Merged in master (pull request #20)

merge tests

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.3
+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,6 +29,12 @@ migrate:
 	$(DOCKER_EXEC) python3 manage.py migrate
 	make collectstatic
 
+tests:
+	$(DOCKER_EXEC) pytest --create-db
+
+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/conftest.py

@@ -0,0 +1,11 @@
+import pytest
+
+from django.core.management import call_command
+
+@pytest.fixture(scope='session')
+def django_db_setup(django_db_setup, django_db_blocker):
+    with django_db_blocker.unblock():
+        call_command('loaddata', 'fixtures-tests/sites.site.json')
+        call_command('loaddata', 'fixtures-tests/gsuser.user.json')
+        call_command('loaddata', 'fixtures-tests/gsmap.municipality.json')
+        call_command('loaddata', 'fixtures-tests/gsmap.snapshot.json')

django/docker/django/requirements/02.txt

@@ -42,6 +42,7 @@ pylint-django==2.0.13
 pylint-plugin-utils==0.6
 pyparsing==2.4.6
 pytest==5.3.5
+pytest-django==3.9.0
 pytz==2019.3
 requests==2.23.0
 Rx==1.6.1

django/fixtures-tests/gsmap.municipality.json

@@ -0,0 +1 @@
+[{"model": "gsuser.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$180000$0wINEkSnlTLQ$cKkWUQGHdT4/pT9KcNzOZ+XS0LNw8Wx4VF4tuZ1oXkE=", "last_login": "2020-05-10T16:16:58.410Z", "is_superuser": true, "username": "admin", "first_name": "", "last_name": "", "email": "[email protected]", "is_staff": true, "is_active": true, "date_joined": "2020-05-10T16:11:16.244Z", "groups": [], "user_permissions": []}}]

django/fixtures-tests/gsmap.snapshot.json

@@ -0,0 +1 @@
+[{"model": "sites.site", "pk": 1, "fields": {"domain": "localhost:8081", "name": "localhost:8081"}}]

django/fixtures-tests/gsuser.user.json

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.3 on 2020-05-10 17:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0017_auto_20200429_2118'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='snapshot',
+            name='id',
+            field=models.CharField(max_length=8, primary_key=True, serialize=False, unique=True),
+        ),
+    ]

django/fixtures-tests/sites.site.json

@@ -10,6 +10,7 @@
 from django.contrib.postgres import fields as pg_fields
 from django.contrib.sites.models import Site
 from django.utils.html import format_html
+from django.conf import settings
 from sortedm2m.fields import SortedManyToManyField
 from sorl.thumbnail import ImageField
 from gsuser.models import User
@@ -212,8 +213,8 @@ def save_screenshot():
             finally:
                 # always reconnect signal
                 post_save.connect(save_screenshot_handler, sender=Snapshot)
-
-    save_screenshot()
+    if hasattr(settings, 'SAVE_SCREENSHOT_ENABLED') and settings.SAVE_SCREENSHOT_ENABLED is True:
+        save_screenshot()
 
 
 class Workspace(models.Model):