diff options
| author | 2022-08-19 01:10:53 +0400 | |
|---|---|---|
| committer | 2022-09-04 18:52:01 +0200 | |
| commit | 4998984727c2474bea7577c89d6fadda864cb538 (patch) | |
| tree | a883457fb80ef374f9f8da90e2f81f1a383491eb | |
| parent | Fix Django Deprecation Warnings (diff) | |
Fix Unittest Deprecation Warnings
Signed-off-by: Hassan Abouelela <[email protected]>
| -rw-r--r-- | pydis_site/apps/api/tests/test_filterlists.py | 4 | ||||
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/aoc_completionist_block.py | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/aoc_link.py | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/infraction.py | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/nomination.py | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/reminder.py | 2 | ||||
| -rw-r--r-- | pydis_site/apps/api/viewsets/bot/user.py | 2 | ||||
| -rw-r--r-- | pydis_site/apps/content/tests/test_views.py | 2 | ||||
| -rw-r--r-- | pydis_site/apps/home/tests/test_repodata_helpers.py | 6 | 
9 files changed, 12 insertions, 12 deletions
| diff --git a/pydis_site/apps/api/tests/test_filterlists.py b/pydis_site/apps/api/tests/test_filterlists.py index 5a5bca60..9959617e 100644 --- a/pydis_site/apps/api/tests/test_filterlists.py +++ b/pydis_site/apps/api/tests/test_filterlists.py @@ -64,8 +64,8 @@ class FetchTests(AuthenticatedAPITestCase):          self.assertEqual(response.status_code, 200)          for api_type, model_type in zip(response.json(), FilterList.FilterListType.choices): -            self.assertEquals(api_type[0], model_type[0]) -            self.assertEquals(api_type[1], model_type[1]) +            self.assertEqual(api_type[0], model_type[0]) +            self.assertEqual(api_type[1], model_type[1])  class CreationTests(AuthenticatedAPITestCase): diff --git a/pydis_site/apps/api/viewsets/bot/aoc_completionist_block.py b/pydis_site/apps/api/viewsets/bot/aoc_completionist_block.py index 3a4cec60..97efb63c 100644 --- a/pydis_site/apps/api/viewsets/bot/aoc_completionist_block.py +++ b/pydis_site/apps/api/viewsets/bot/aoc_completionist_block.py @@ -70,4 +70,4 @@ class AocCompletionistBlockViewSet(      serializer_class = AocCompletionistBlockSerializer      queryset = AocCompletionistBlock.objects.all()      filter_backends = (DjangoFilterBackend,) -    filter_fields = ("user__id", "is_blocked") +    filterset_fields = ("user__id", "is_blocked") diff --git a/pydis_site/apps/api/viewsets/bot/aoc_link.py b/pydis_site/apps/api/viewsets/bot/aoc_link.py index c7a96629..3cdc342d 100644 --- a/pydis_site/apps/api/viewsets/bot/aoc_link.py +++ b/pydis_site/apps/api/viewsets/bot/aoc_link.py @@ -68,4 +68,4 @@ class AocAccountLinkViewSet(      serializer_class = AocAccountLinkSerializer      queryset = AocAccountLink.objects.all()      filter_backends = (DjangoFilterBackend,) -    filter_fields = ("user__id", "aoc_username") +    filterset_fields = ("user__id", "aoc_username") diff --git a/pydis_site/apps/api/viewsets/bot/infraction.py b/pydis_site/apps/api/viewsets/bot/infraction.py index 7f31292f..2b89fdb3 100644 --- a/pydis_site/apps/api/viewsets/bot/infraction.py +++ b/pydis_site/apps/api/viewsets/bot/infraction.py @@ -154,7 +154,7 @@ class InfractionViewSet(      queryset = Infraction.objects.all()      pagination_class = LimitOffsetPaginationExtended      filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter) -    filter_fields = ('user__id', 'actor__id', 'active', 'hidden', 'type') +    filterset_fields = ('user__id', 'actor__id', 'active', 'hidden', 'type')      search_fields = ('$reason',)      frozen_fields = ('id', 'inserted_at', 'type', 'user', 'actor', 'hidden') diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py index 144daab0..6af42bcb 100644 --- a/pydis_site/apps/api/viewsets/bot/nomination.py +++ b/pydis_site/apps/api/viewsets/bot/nomination.py @@ -172,7 +172,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge      serializer_class = NominationSerializer      queryset = Nomination.objects.all()      filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter) -    filter_fields = ('user__id', 'active') +    filterset_fields = ('user__id', 'active')      frozen_fields = ('id', 'inserted_at', 'user', 'ended_at')      frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at', 'reviewed') diff --git a/pydis_site/apps/api/viewsets/bot/reminder.py b/pydis_site/apps/api/viewsets/bot/reminder.py index 78d7cb3b..5f997052 100644 --- a/pydis_site/apps/api/viewsets/bot/reminder.py +++ b/pydis_site/apps/api/viewsets/bot/reminder.py @@ -125,4 +125,4 @@ class ReminderViewSet(      serializer_class = ReminderSerializer      queryset = Reminder.objects.prefetch_related('author')      filter_backends = (DjangoFilterBackend, SearchFilter) -    filter_fields = ('active', 'author__id') +    filterset_fields = ('active', 'author__id') diff --git a/pydis_site/apps/api/viewsets/bot/user.py b/pydis_site/apps/api/viewsets/bot/user.py index 3318b2b9..ba1bcd9d 100644 --- a/pydis_site/apps/api/viewsets/bot/user.py +++ b/pydis_site/apps/api/viewsets/bot/user.py @@ -237,7 +237,7 @@ class UserViewSet(ModelViewSet):      queryset = User.objects.all().order_by("id")      pagination_class = UserListPagination      filter_backends = (DjangoFilterBackend,) -    filter_fields = ('name', 'discriminator') +    filterset_fields = ('name', 'discriminator')      def get_serializer(self, *args, **kwargs) -> ModelSerializer:          """Set Serializer many attribute to True if request body contains a list.""" diff --git a/pydis_site/apps/content/tests/test_views.py b/pydis_site/apps/content/tests/test_views.py index eadad7e3..a09d22d8 100644 --- a/pydis_site/apps/content/tests/test_views.py +++ b/pydis_site/apps/content/tests/test_views.py @@ -172,7 +172,7 @@ class PageOrCategoryViewTests(MockPagesTestCase, SimpleTestCase, TestCase):          for item in context["breadcrumb_items"]:              item["path"] = Path(item["path"]) -        self.assertEquals( +        self.assertEqual(              context["breadcrumb_items"],              [                  {"name": PARSED_CATEGORY_INFO["title"], "path": Path(".")}, diff --git a/pydis_site/apps/home/tests/test_repodata_helpers.py b/pydis_site/apps/home/tests/test_repodata_helpers.py index 4007eded..a963f733 100644 --- a/pydis_site/apps/home/tests/test_repodata_helpers.py +++ b/pydis_site/apps/home/tests/test_repodata_helpers.py @@ -42,7 +42,7 @@ class TestRepositoryMetadataHelpers(TestCase):          metadata = self.home_view._get_repo_data()          self.assertIsInstance(metadata[0], RepositoryMetadata) -        self.assertEquals(len(metadata), len(self.home_view.repos)) +        self.assertEqual(len(metadata), len(self.home_view.repos))      def test_returns_cached_metadata(self):          """Test if the _get_repo_data helper returns cached data when available.""" @@ -82,7 +82,7 @@ class TestRepositoryMetadataHelpers(TestCase):          repo = self.home_view.repos[0]          self.assertIsInstance(api_data, dict) -        self.assertEquals(len(api_data), len(self.home_view.repos)) +        self.assertEqual(len(api_data), len(self.home_view.repos))          self.assertIn(repo, api_data.keys())          self.assertIn("stargazers_count", api_data[repo]) @@ -126,7 +126,7 @@ class TestRepositoryMetadataHelpers(TestCase):          with self.assertLogs():              metadata = self.home_view._get_repo_data() -        self.assertEquals(len(metadata), 0) +        self.assertEqual(len(metadata), 0)      def test_cleans_up_stale_metadata(self):          """Tests that we clean up stale metadata when we start the HomeView.""" | 
