Refactor almost all tests into /tests/

15 files changed, 31 insertions, 74 deletions

diff --git a/activities/tests/__init__.py b/activities/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/activities/tests/__init__.py
+++ /dev/null
diff --git a/activities/tests/models/__init__.py b/activities/tests/models/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/activities/tests/models/__init__.py
+++ /dev/null
diff --git a/activities/tests/templatetags/__init__.py b/activities/tests/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/activities/tests/templatetags/__init__.py
+++ /dev/null
diff --git a/core/tests/__init__.py b/core/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/core/tests/__init__.py
+++ /dev/null
diff --git a/core/tests/conftest.py b/core/tests/conftest.py
deleted file mode 100644
index ab8d6ea..0000000
--- a/core/tests/conftest.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import pytest
-from pyld import jsonld
-
-from core.ld import builtin_document_loader
-
-
-@pytest.fixture(scope="session", autouse=True)
-def ldloader():
-    jsonld.set_document_loader(builtin_document_loader)
diff --git a/activities/tests/models/test_post.py b/tests/activities/models/test_post.py
index 5c7fca2..5c7fca2 100644
--- a/activities/tests/models/test_post.py
+++ b/tests/activities/models/test_post.py
diff --git a/activities/tests/templatetags/test_activity_tags.py b/tests/activities/templatetags/test_activity_tags.py
index 987c008..987c008 100644
--- a/activities/tests/templatetags/test_activity_tags.py
+++ b/tests/activities/templatetags/test_activity_tags.py
diff --git a/users/tests/conftest.py b/tests/conftest.py
index 0b12793..79bdf60 100644
--- a/users/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,8 +2,14 @@ import pytest
 
 from core.models import Config
 
-# Our testing-only keypair
-private_key = """-----BEGIN PRIVATE KEY-----
+
+@pytest.fixture
+def keypair():
+    """
+    Testing-only keypair
+    """
+    return {
+        "private_key": """-----BEGIN PRIVATE KEY-----
 MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCzNJa9JIxQpOtQ
 z8UQKXDPREF9DyBliGu3uPWo6DMnkOm7hoh2+nOryrWDqWOFaVK//n7kltHXUEbm
 U3exh0/0iWfzx2AbNrI04csAvW/hRvHbHBnVTotSxzqTd3ESkpcSW4xVuz9aCcFR
@@ -30,9 +36,8 @@ pxxwUvuKdWsceVWhgAjZQj5iRtvDK8Fi0XDCFekCgYALTU1v5iMIpaRAe+eyA2B1
 42qm4B/uhXznvOu2YXU6iJFmMgHGYgpa+Dq8uUjKtpn/LIFeX1KN0hH8z/0LW3gB
 e7tN7taW0oLK3RQcEMfkZ7diE9x3LGqo/xMxsZMtxAr88p5eMEU/nxxznOqq+W9b
 qxRbXYzEtHz+cW9+FZkyVw==
------END PRIVATE KEY-----"""
-
-public_key = """-----BEGIN PUBLIC KEY-----
+-----END PRIVATE KEY-----""",
+        "public_key": """-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAszSWvSSMUKTrUM/FEClw
 z0RBfQ8gZYhrt7j1qOgzJ5Dpu4aIdvpzq8q1g6ljhWlSv/5+5JbR11BG5lN3sYdP
 9Iln88dgGzayNOHLAL1v4Ubx2xwZ1U6LUsc6k3dxEpKXEluMVbs/WgnBUZFt7p0g
@@ -40,12 +45,15 @@ jt3xdC4fCbMvTfwk+qE58BvmaXhrx1W4fcX0eVsOswO8/AOgde4W83THf96lD4o8
 iG+bHuHFlbRoP2SdF9bMp/bvZKcFI4R5clh/3rDER8T7luPQT2T4YSrNfrf/+MYG
 XEV+deahaj0thLWIGQH4ezN00b/Lgksy+E0/vJGvSFMCnVekxWqh9u2wBisiUHxm
 kwIDAQAB
------END PUBLIC KEY-----"""
+-----END PUBLIC KEY-----""",
+        "public_key_id": "https://example.com/test-actor#test-key",
+    }
 
 
 @pytest.fixture
-def config_system():
+def config_system(keypair):
     Config.system = Config.SystemOptions(
-        system_actor_private_key=private_key, system_actor_public_key=public_key
+        system_actor_private_key=keypair["private_key"],
+        system_actor_public_key=keypair["public_key"],
     )
     yield Config.system
diff --git a/core/tests/test_signatures.py b/tests/core/test_signatures.py
index 2d480b7..f15e090 100644
--- a/core/tests/test_signatures.py
+++ b/tests/core/test_signatures.py
@@ -5,50 +5,8 @@ from pytest_httpx import HTTPXMock
 
 from core.signatures import HttpSignature, LDSignature, VerificationError
 
-# Our testing-only keypair
-private_key = """-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCzNJa9JIxQpOtQ
-z8UQKXDPREF9DyBliGu3uPWo6DMnkOm7hoh2+nOryrWDqWOFaVK//n7kltHXUEbm
-U3exh0/0iWfzx2AbNrI04csAvW/hRvHbHBnVTotSxzqTd3ESkpcSW4xVuz9aCcFR
-kW3unSCO3fF0Lh8Jsy9N/CT6oTnwG+ZpeGvHVbh9xfR5Ww6zA7z8A6B17hbzdMd/
-3qUPijyIb5se4cWVtGg/ZJ0X1syn9u9kpwUjhHlyWH/esMRHxPuW49BPZPhhKs1+
-t//4xgZcRX515qFqPS2EtYgZAfh7M3TRv8uCSzL4TT+8ka9IUwKdV6TFaqH27bAG
-KyJQfGaTAgMBAAECggEALZY5qFjlRtiFMfQApdlc5KTw4d7Yt2tqN3zaJUMYTD7d
-boJNMbMJfNCetyT+d6Aw2D1ly0GglNzLhGkEQElzKfpQUt/Lj3CtCa3Mpd4K2Wxi
-NwJhgfUulPqwaHYQchCPVLCsNNziw0VLA7Rymionb6B+/TaEV8PYy0ZSo90ir3UD
-CL5t+IWgIPiy6pk1wGOmeB+tU4+V7/hFel+vPFNahafqVhLE311dfx2aOfweAEfN
-e4JoPeJP1/fB+BVZMyVSAraKz6wheymBBNKKn/vpFsdd6it2AP4UZeFp6ma9wT9t
-nk65IpHg1MBxazQd7621GrPH+ZnhMg62H/FEj6rIDQKBgQC1w1fEbk+zjI54DXU8
-FAe5cJbZS89fMP5CtzlWKzTzfdaavT+5cUYp3XAv37tSGsqYAXxY+4bHGa+qdCQO
-I41cmylWGNX2e29/p2BspDPM6YQ0Z21MxFRBTWvHFrhd0bF1cXKBKPttdkKvzOEP
-6uNy+/QtRNn9xF/ZjaMHcyPPTQKBgQD8ZdOmZ3TMsYJchAjjseN8S+Objw2oZzmK
-6I1ULJBz3DWiyCUfir+pMjSH4fsAf9zrHkiM7xUgMByTukVRt16BrT7TlEBanAxc
-/AKdNB3f0pza829LCz1lMAUn+ngZLTmRR+1rQFXqTjhB+0peJzKiMli+9BBhL9Ry
-jMeTuLHdXwKBgGiz9kL5KIBNX2RYnEfXYfu4l6zktrgnCNB1q1mv2fjJbG4GxkaU
-sc47+Pwa7VUGid22PWMkwSa/7SlLbdmXMT8/QjiOZfJueHQYfrsWe6B2g+mMCrJG
-BiL37jXpKJsiyA7XIxaz/OG5VgDfDGaW8B60dJv/JXPBQ1WW+Wq5MM+hAoGAAUdS
-xykHAnJzwpw4n06rZFnOEV+sJgo/1GBRNvfy02NuMiDpbzt4tRa4BWgzqVD8gYRp
-wa0EYmFcA7OR3lQbenSyOMgre0oHFgGA0eMNs7CRctqA2dR4vyZ7IDS4nwgHnqDK
-pxxwUvuKdWsceVWhgAjZQj5iRtvDK8Fi0XDCFekCgYALTU1v5iMIpaRAe+eyA2B1
-42qm4B/uhXznvOu2YXU6iJFmMgHGYgpa+Dq8uUjKtpn/LIFeX1KN0hH8z/0LW3gB
-e7tN7taW0oLK3RQcEMfkZ7diE9x3LGqo/xMxsZMtxAr88p5eMEU/nxxznOqq+W9b
-qxRbXYzEtHz+cW9+FZkyVw==
------END PRIVATE KEY-----"""
 
-public_key = """-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAszSWvSSMUKTrUM/FEClw
-z0RBfQ8gZYhrt7j1qOgzJ5Dpu4aIdvpzq8q1g6ljhWlSv/5+5JbR11BG5lN3sYdP
-9Iln88dgGzayNOHLAL1v4Ubx2xwZ1U6LUsc6k3dxEpKXEluMVbs/WgnBUZFt7p0g
-jt3xdC4fCbMvTfwk+qE58BvmaXhrx1W4fcX0eVsOswO8/AOgde4W83THf96lD4o8
-iG+bHuHFlbRoP2SdF9bMp/bvZKcFI4R5clh/3rDER8T7luPQT2T4YSrNfrf/+MYG
-XEV+deahaj0thLWIGQH4ezN00b/Lgksy+E0/vJGvSFMCnVekxWqh9u2wBisiUHxm
-kwIDAQAB
------END PUBLIC KEY-----"""
-
-public_key_id = "https://example.com/test-actor#test-key"
-
-
-def test_sign_ld():
+def test_sign_ld(keypair):
     """
     Tests signing JSON-LD documents by round-tripping them through the
     verifier.
@@ -65,18 +23,18 @@ def test_sign_ld():
     }
     signature_section = LDSignature.create_signature(
         document,
-        private_key,
-        public_key_id,
+        keypair["private_key"],
+        keypair["public_key_id"],
     )
     # Check it and assign it to the document
     assert "signatureValue" in signature_section
     assert signature_section["type"] == "RsaSignature2017"
     document["signature"] = signature_section
     # Now verify it ourselves
-    LDSignature.verify_signature(document, public_key)
+    LDSignature.verify_signature(document, keypair["public_key"])
 
 
-def test_verifying_ld():
+def test_verifying_ld(keypair):
     """
     Tests verifying JSON-LD signatures from a known-good document
     """
@@ -94,14 +52,14 @@ def test_verifying_ld():
         },
     }
     # Ensure it verifies with correct data
-    LDSignature.verify_signature(document, public_key)
+    LDSignature.verify_signature(document, keypair["public_key"])
     # Mutate it slightly and ensure it does not verify
     with pytest.raises(VerificationError):
         document["actor"] = "https://example.com/evil-actor"
-        LDSignature.verify_signature(document, public_key)
+        LDSignature.verify_signature(document, keypair["public_key"])
 
 
-def test_sign_http(httpx_mock: HTTPXMock):
+def test_sign_http(httpx_mock: HTTPXMock, keypair):
     """
     Tests signing HTTP requests by round-tripping them through our verifier
     """
@@ -120,8 +78,8 @@ def test_sign_http(httpx_mock: HTTPXMock):
     async_to_sync(HttpSignature.signed_request)(
         uri="https://example.com/test-actor",
         body=document,
-        private_key=private_key,
-        key_id=public_key_id,
+        private_key=keypair["private_key"],
+        key_id=keypair["public_key_id"],
     )
     # Retrieve it and construct a fake request object
     outbound_request = httpx_mock.get_request()
@@ -135,10 +93,10 @@ def test_sign_http(httpx_mock: HTTPXMock):
         HTTP_DIGEST=outbound_request.headers["digest"],
     )
     # Verify that
-    HttpSignature.verify_request(fake_request, public_key)
+    HttpSignature.verify_request(fake_request, keypair["public_key"])
 
 
-def test_verify_http():
+def test_verify_http(keypair):
     """
     Tests verifying HTTP requests against a known good example
     """
@@ -153,4 +111,4 @@ def test_verify_http():
         HTTP_DIGEST="SHA-256=07sIbQ3GlOHWMbFMNajtPNtmUQXXu20UuvrIYLlI3kc=",
     )
     # Verify that
-    HttpSignature.verify_request(fake_request, public_key, skip_date=True)
+    HttpSignature.verify_request(fake_request, keypair["public_key"], skip_date=True)
diff --git a/users/tests/models/test_identity.py b/tests/users/models/test_identity.py
index 738abe3..13c08f0 100644
--- a/users/tests/models/test_identity.py
+++ b/tests/users/models/test_identity.py
@@ -7,7 +7,7 @@ from users.views.identity import CreateIdentity
 
 
 @pytest.mark.django_db
-def test_create_identity_form(client):
+def test_create_identity_form(config_system, client):
     """ """
     # Make a user
     user = User.objects.create(email="test@example.com")
@@ -62,7 +62,7 @@ def test_create_identity_form(client):
 
 
 @pytest.mark.django_db
-def test_identity_max_per_user(client):
+def test_identity_max_per_user(config_system, client):
     """
     Ensures that the identity limit is functioning
     """
diff --git a/users/tests/test_activitypub.py b/tests/users/views/test_activitypub.py
index 72ab8c3..72ab8c3 100644
--- a/users/tests/test_activitypub.py
+++ b/tests/users/views/test_activitypub.py
diff --git a/users/tests/views/test_auth.py b/tests/users/views/test_auth.py
index 22e1fb6..22e1fb6 100644
--- a/users/tests/views/test_auth.py
+++ b/tests/users/views/test_auth.py
diff --git a/users/tests/__init__.py b/users/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/users/tests/__init__.py
+++ /dev/null
diff --git a/users/tests/models/__init__.py b/users/tests/models/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/users/tests/models/__init__.py
+++ /dev/null
diff --git a/users/tests/views/__init__.py b/users/tests/views/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/users/tests/views/__init__.py
+++ /dev/null