Implement adjustments for DRF 3.15

python-discord · Mar 29, 2024 · 6d09746 · 6d09746
1 parent 2f23cb1
commit 6d09746
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/pydis_site/apps/api/tests/test_bumped_threads.py b/pydis_site/apps/api/tests/test_bumped_threads.py
@@ -60,4 +60,4 @@ def test_returns_404_for_non_existing_data(self):
 
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
-        self.assertEqual(response.json(), {"detail": "Not found."})
+        self.assertEqual(response.json(), {"detail": "No BumpedThread matches the given query."})
diff --git a/pydis_site/apps/api/tests/test_filters.py b/pydis_site/apps/api/tests/test_filters.py
@@ -211,7 +211,12 @@ def test_fetch_non_existing(self) -> None:
 
                 response = self.client.get(f"{sequence.url()}/42")
                 self.assertEqual(response.status_code, 404)
-                self.assertDictEqual(response.json(), {'detail': 'Not found.'})
+                parsed = response.json()
+                self.assertIn('detail', parsed)
+                self.assertIn(parsed['detail'], (
+                    "No Filter matches the given query.",
+                    "No FilterList matches the given query."
+                ))
 
     def test_creation(self) -> None:
         for name, sequence in get_test_sequences().items():

diff --git a/pydis_site/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py
@@ -559,7 +559,7 @@ def test_returns_400_for_second_active_infraction_of_the_same_type(self):
                     second_response.json(),
                     {
                         'non_field_errors': [
-                            'This user already has an active infraction of this type.'
+                            'The fields user, type must make a unique set.'
                         ]
                     }
                 )

diff --git a/pydis_site/apps/api/tests/test_nominations.py b/pydis_site/apps/api/tests/test_nominations.py
@@ -379,7 +379,7 @@ def test_returns_404_on_get_unknown_nomination(self):
         response = self.client.get(url, data={})
         self.assertEqual(response.status_code, 404)
         self.assertEqual(response.json(), {
-            "detail": "Not found."
+            "detail": "No Nomination matches the given query."
         })
 
     def test_returns_404_on_patch_unknown_nomination(self):
@@ -391,7 +391,7 @@ def test_returns_404_on_patch_unknown_nomination(self):
         response = self.client.patch(url, data={})
         self.assertEqual(response.status_code, 404)
         self.assertEqual(response.json(), {
-            "detail": "Not found."
+            "detail": "No Nomination matches the given query."
         })
 
     def test_returns_405_on_list_put(self):

diff --git a/pydis_site/apps/api/tests/test_roles.py b/pydis_site/apps/api/tests/test_roles.py
@@ -208,4 +208,4 @@ def test_role_detail_404_all_methods(self):
         for method in ('get', 'put', 'patch', 'delete'):
             response = getattr(self.client, method)(url)
             self.assertEqual(response.status_code, 404)
-            self.assertJSONEqual(response.content, '{"detail": "Not found."}')
+            self.assertJSONEqual(response.content, '{"detail": "No Role matches the given query."}')
diff --git a/pydis_site/apps/api/urls.py b/pydis_site/apps/api/urls.py
@@ -30,7 +30,8 @@
 bot_router = DefaultRouter(trailing_slash=False)
 bot_router.register(
     'filter/filter_lists',
-    FilterListViewSet
+    FilterListViewSet,
+    basename='filter-filter-lists',
 )
 bot_router.register(
     "aoc-account-links",