Merge pull request #526 from python-discord/subdomains-to-query-paths

Author: jb3

poetry.lock

@@ -2,6 +2,7 @@
 from django.urls import path
 
 
+app_name = 'admin'
 urlpatterns = (
     path('', admin.site.urls),
 )

pydis_site/apps/admin/urls.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django_hosts.resolvers import reverse
+from django.urls import reverse
 
 from pydis_site.apps.api.models.bot.user import User
 from pydis_site.apps.api.models.mixins import ModelReprMixin
@@ -33,7 +33,7 @@ class MessageDeletionContext(ModelReprMixin, models.Model):
     @property
     def log_url(self) -> str:
         """Create the url for the deleted message logs."""
-        return reverse('logs', host="staff", args=(self.id,))
+        return reverse('staff:logs', args=(self.id,))
 
     class Meta:
         """Set the ordering for list views to newest first."""

pydis_site/apps/api/models/bot/message_deletion_context.py

@@ -11,7 +11,7 @@
 )
 
 
-class APISubdomainTestCase(APITestCase):
+class AuthenticatedAPITestCase(APITestCase):
     """
     Configures the test client.
 
@@ -24,14 +24,13 @@ class APISubdomainTestCase(APITestCase):
     `self.client.force_authenticate(user=created_user)` to force authentication
     through the created user.
 
-    Using this performs the following niceties for you which ease writing tests:
-    - setting the `HTTP_HOST` request header to `api.pythondiscord.local:8000`, and
+    Using this performs the following nicety for you which eases writing tests:
     - forcing authentication for the test user.
     If you don't want to force authentication (for example, to test a route's response
     for an unauthenticated user), un-force authentication by using the following:
 
-    >>> from pydis_site.apps.api.tests.base import APISubdomainTestCase
-    >>> class UnauthedUserTestCase(APISubdomainTestCase):
+    >>> from pydis_site.apps.api.tests.base import AuthenticatedAPITestCase
+    >>> class UnauthedUserTestCase(AuthenticatedAPITestCase):
     ...     def setUp(self):
     ...         super().setUp()
     ...         self.client.force_authentication(user=None)
@@ -42,30 +41,26 @@ class APISubdomainTestCase(APITestCase):
     ...         resp = self.client.delete('/my-publicly-readable-endpoint/42')
     ...         self.assertEqual(resp.status_code, 401)
 
-    Make sure to include the `super().setUp(self)` call, otherwise, you may get
-    status code 404 for some URLs due to the missing `HTTP_HOST` header.
-
     ## Example
     Using this in a test case is rather straightforward:
 
-    >>> from pydis_site.apps.api.tests.base import APISubdomainTestCase
-    >>> class MyAPITestCase(APISubdomainTestCase):
+    >>> from pydis_site.apps.api.tests.base import AuthenticatedAPITestCase
+    >>> class MyAPITestCase(AuthenticatedAPITestCase):
     ...     def test_that_it_works(self):
     ...         response = self.client.get('/my-endpoint')
     ...         self.assertEqual(response.status_code, 200)
 
-    To reverse URLs of the API host, you need to use `django_hosts`:
+    To reverse URLs of the API host, you need to use `django.urls`:
 
-    >>> from django_hosts.resolvers import reverse
-    >>> from pydis_site.apps.api.tests.base import APISubdomainTestCase
-    >>> class MyReversedTestCase(APISubdomainTestCase):
+    >>> from django.urls import reverse
+    >>> from pydis_site.apps.api.tests.base import AuthenticatedAPITestCase
+    >>> class MyReversedTestCase(AuthenticatedAPITestCase):
     ...     def test_my_endpoint(self):
-    ...         url = reverse('user-detail', host='api')
+    ...         url = reverse('api:user-detail')
     ...         response = self.client.get(url)
     ...         self.assertEqual(response.status_code, 200)
     """
 
     def setUp(self):
         super().setUp()
-        self.client.defaults['HTTP_HOST'] = 'api.pythondiscord.local:8000'
         self.client.force_authenticate(test_user)

pydis_site/apps/api/tests/base.py

@@ -1,13 +1,13 @@
 from datetime import datetime
 
+from django.urls import reverse
 from django.utils import timezone
-from django_hosts.resolvers import reverse
 
-from .base import APISubdomainTestCase
+from .base import AuthenticatedAPITestCase
 from ..models import MessageDeletionContext, User
 
 
-class DeletedMessagesWithoutActorTests(APISubdomainTestCase):
+class DeletedMessagesWithoutActorTests(AuthenticatedAPITestCase):
     @classmethod
     def setUpTestData(cls):
         cls.author = User.objects.create(
@@ -40,14 +40,14 @@ def setUpTestData(cls):
         }
 
     def test_accepts_valid_data(self):
-        url = reverse('bot:messagedeletioncontext-list', host='api')
+        url = reverse('api:bot:messagedeletioncontext-list')
         response = self.client.post(url, data=self.data)
         self.assertEqual(response.status_code, 201)
         [context] = MessageDeletionContext.objects.all()
         self.assertIsNone(context.actor)
 
 
-class DeletedMessagesWithActorTests(APISubdomainTestCase):
+class DeletedMessagesWithActorTests(AuthenticatedAPITestCase):
     @classmethod
     def setUpTestData(cls):
         cls.author = cls.actor = User.objects.create(
@@ -72,14 +72,14 @@ def setUpTestData(cls):
         }
 
     def test_accepts_valid_data_and_sets_actor(self):
-        url = reverse('bot:messagedeletioncontext-list', host='api')
+        url = reverse('api:bot:messagedeletioncontext-list')
         response = self.client.post(url, data=self.data)
         self.assertEqual(response.status_code, 201)
         [context] = MessageDeletionContext.objects.all()
         self.assertEqual(context.actor.id, self.actor.id)
 
 
-class DeletedMessagesLogURLTests(APISubdomainTestCase):
+class DeletedMessagesLogURLTests(AuthenticatedAPITestCase):
     @classmethod
     def setUpTestData(cls):
         cls.author = cls.actor = User.objects.create(
@@ -94,6 +94,6 @@ def setUpTestData(cls):
         )
 
     def test_valid_log_url(self):
-        expected_url = reverse('logs', host="staff", args=(1,))
+        expected_url = reverse('staff:logs', args=(1,))
         [context] = MessageDeletionContext.objects.all()
         self.assertEqual(context.log_url, expected_url)