Merge branch 'tests-python'

Author: yvess

django/Makefile

@@ -1,4 +1,4 @@
-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")
 
 .PHONY: all

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,20 @@
+from .settings import *
+
+SECRET_KEY = "#7r1uf5su86d($ita6venjygkru5zfe0)bkj68x0e8*)w6nar6"
+DEBUG = True
+USE_HTTPS = False
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': 'webui-tests    ',
+        'USER': os.getenv('DJANGO_DB_USER'),
+        'PASSWORD': os.getenv('DJANGO_DB_PASSWORD'),
+        'HOST': os.getenv('DJANGO_DB_HOST', 'pdb'),
+        'PORT': '5432',
+        'CONN_MAX_AGE': 600,
+        # 'OPTIONS': {'autocommit': True}
+    }
+}
+
+SAVE_SCREENSHOT_ENABLED = False

django/fixtures-tests/sites.site.json

@@ -0,0 +1,3 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = main.settings_tests
+python_files = tests.py test_*.py *_tests.py

django/main/settings_tests.py

@@ -10,5 +10,5 @@ services:
     hostname: vue
 
   django:
-    image: smartuse/gemeindescan-webui-django:0.3.3
+    image: smartuse/gemeindescan-webui-django:0.3.4
     hostname: django