From 3400faa1d24d0babcde5211f0e40d174e48ea24a Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Thu, 5 Dec 2024 01:31:06 +0100
Subject: [PATCH] stash

---
 .forgejo/workflows/test.yml                | 11 ++++++--
 core/.coveragerc                           |  1 +
 core/authentication/api_v2.py              |  4 +--
 core/authentication/tests/v2/test_users.py | 11 ++++++++
 core/integration_tests/__init__.py         |  0
 core/integration_tests/main.py             | 33 ++++++++++++++++++++++
 6 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 core/integration_tests/__init__.py
 create mode 100644 core/integration_tests/main.py

diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml
index 480e590..14c7591 100644
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@@ -1,3 +1,4 @@
+name: Test
 on:
   pull_request:
   push:
@@ -16,6 +17,12 @@ jobs:
       - name: Install dependencies
         working-directory: core
         run: pip3 install -r requirements.dev.txt
-      - name: Run django tests
+      - name: Run django tests with coverage
         working-directory: core
-        run: python3 manage.py test
+        run: coverage run manage.py test
+      - name: Run integration tests with coverage
+        working-directory: core
+        run: python3 integration_tests/main.py
+      - name: Evaluate coverage
+        working-directory: core
+        run: coverage report
diff --git a/core/.coveragerc b/core/.coveragerc
index 14c1fba..1a205a3 100644
--- a/core/.coveragerc
+++ b/core/.coveragerc
@@ -8,6 +8,7 @@ skip_covered = True
 omit =
     */tests/*
     */migrations/*
+    integration_tests/*
     core/asgi.py
     core/wsgi.py
     core/settings.py
diff --git a/core/authentication/api_v2.py b/core/authentication/api_v2.py
index 2547b6d..b7ecfe3 100644
--- a/core/authentication/api_v2.py
+++ b/core/authentication/api_v2.py
@@ -54,9 +54,9 @@ def registerUser(request):
             errors['password'] = 'Password is required'
         if not email:
             errors['email'] = 'Email is required'
-        if ExtendedUser.objects.filter(email=email).exists():
+        if email and ExtendedUser.objects.filter(email=email).exists():
             errors['email'] = 'Email already exists'
-        if ExtendedUser.objects.filter(username=username).exists():
+        if username and ExtendedUser.objects.filter(username=username).exists():
             errors['username'] = 'Username already exists'
         if errors:
             return Response({'errors': errors}, status=400)
diff --git a/core/authentication/tests/v2/test_users.py b/core/authentication/tests/v2/test_users.py
index 125be9b..02096ea 100644
--- a/core/authentication/tests/v2/test_users.py
+++ b/core/authentication/tests/v2/test_users.py
@@ -72,6 +72,17 @@ class UserApiTest(TestCase):
         self.assertEqual(ExtendedUser.objects.get(username='testuser2').email, 'test2')
         self.assertTrue(ExtendedUser.objects.get(username='testuser2').check_password('test'))
 
+    def test_register_user_fail(self):
+        anonymous = Client()
+        response = anonymous.post('/api/2/register/', {'username': 'testuser2', 'password': 'test', 'email': 'test2'},
+                                  content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json()['username'], 'testuser2')
+        self.assertEqual(response.json()['email'], 'test2')
+        self.assertEqual(len(ExtendedUser.objects.all()), 3)
+        self.assertEqual(ExtendedUser.objects.get(username='testuser2').email, 'test2')
+        self.assertTrue(ExtendedUser.objects.get(username='testuser2').check_password('test'))
+
     def test_register_user_duplicate(self):
         anonymous = Client()
         response = anonymous.post('/api/2/register/', {'username': 'testuser', 'password': 'test', 'email': 'test2'},
diff --git a/core/integration_tests/__init__.py b/core/integration_tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/core/integration_tests/main.py b/core/integration_tests/main.py
new file mode 100644
index 0000000..767a2d0
--- /dev/null
+++ b/core/integration_tests/main.py
@@ -0,0 +1,33 @@
+import time
+import os
+import signal
+
+import sys
+from os import path
+sys.path.append( path.dirname( path.dirname( path.abspath(__file__) ) ) )
+
+def run():
+    while True:
+        newpid = os.fork()
+        if newpid == 0:
+            import coverage
+            cov = coverage.Coverage()
+            cov.load()
+            cov.start()
+            signal.signal(signal.SIGINT, signal.default_int_handler)
+            try:
+                from server import main
+                main()
+            except KeyboardInterrupt:
+                pass
+            cov.stop()
+            cov.save()
+            os._exit(0)
+        else:
+            return newpid
+
+
+if __name__ == '__main__':
+    pid = run()
+    time.sleep(5)
+    os.kill(pid, signal.SIGINT)