adjusted the test fixtures to be more pytest-y

Author: amirreza8002

tests/test_generic_views/test_base.py

@@ -305,13 +305,17 @@ async def test_direct_instantiation(self):
         assert response.status_code == 405
 
 
+@pytest.fixture(autouse=True)
+def urlconf_setting_set(settings):
+    old_urlconf = settings.ROOT_URLCONF
+    settings.ROOT_URLCONF = "test_generic_views.urls"
+    yield settings
+    settings.ROOT_URLCONF = old_urlconf
+
+
 class TestAsyncTemplateView:
     rf = RequestFactory()
 
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self, settings):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def _assert_about(self, response):
         response.render()
         assert b"<h1>About</h1>" in response.content
@@ -455,10 +459,6 @@ def test_extra_context(self):
 class TestAsyncRedirectView:
     rf = RequestFactory()
 
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self, settings):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     async def test_no_url(self):
         "Without any configuration, returns HTTP 410 GONE"
         response = await AsyncRedirectView.as_view()(self.rf.get("/foo/"))

tests/test_generic_views/test_dates.py

@@ -4,7 +4,6 @@
 from django.db import connection
 from pytest_django.asserts import assertNumQueries
 
-from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.test import Client
 from django.test.utils import TZ_SUPPORT
@@ -50,12 +49,16 @@ def setup(self):
         )
 
 
+@pytest.fixture(autouse=True)
+def url_setting_set(settings):
+    old_root_urlconf = settings.ROOT_URLCONF
+    settings.ROOT_URLCONF = "test_generic_views.urls"
+    yield settings
+    settings.ROOT_URLCONF = old_root_urlconf
+
+
 @pytest.mark.django_db
 class TestArchiveIndexView(TestDataMixin):
-    @pytest.fixture(autouse=True)
-    def url_setting_set(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def test_archive_view(self):
         res = client.get("/dates/books/")
         assert res.status_code == 200
@@ -216,10 +219,6 @@ def test_archive_view_without_date_field(self):
 
 @pytest.mark.django_db
 class TestYearArchiveView(TestDataMixin):
-    @pytest.fixture(autouse=True)
-    def url_setting_set(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def test_year_view(self):
         res = client.get("/dates/books/2008/")
         assert res.status_code == 200
@@ -389,10 +388,6 @@ def test_get_dated_items_not_implemented(self):
 
 @pytest.mark.django_db
 class TestMonthArchiveView(TestDataMixin):
-    @pytest.fixture(autouse=True)
-    def url_setting_set(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def test_month_view(self):
         res = client.get("/dates/books/2008/oct/")
         assert res.status_code == 200
@@ -552,10 +547,6 @@ def test_date_list_order(self):
 
 @pytest.mark.django_db
 class TestWeekArchiveView(TestDataMixin):
-    @pytest.fixture(autouse=True)
-    def url_setting_set(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def test_week_view(self):
         res = client.get("/dates/books/2008/week/39/")
         assert res.status_code == 200
@@ -692,10 +683,6 @@ def test_aware_datetime_week_view(self, settings):
 
 @pytest.mark.django_db
 class TestDayArchiveView(TestDataMixin):
-    @pytest.fixture(autouse=True)
-    def url_setting_set(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def test_day_view(self):
         res = client.get("/dates/books/2008/oct/01/")
         assert res.status_code == 200
@@ -837,10 +824,6 @@ def test_aware_datetime_day_view(self, settings):
 
 @pytest.mark.django_db
 class TestDateDetailView(TestDataMixin):
-    @pytest.fixture(autouse=True)
-    def url_setting_set(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def test_date_detail_by_pk(self):
         res = client.get("/dates/books/2008/oct/01/%s/" % self.book1.pk)
         assert res.status_code == 200

tests/test_generic_views/test_detail.py

@@ -2,7 +2,6 @@
 
 import pytest
 
-from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.test import Client
 from django.test.client import RequestFactory
@@ -16,12 +15,16 @@
 client = Client()
 
 
+@pytest.fixture(autouse=True)
+def url_setting_set(settings):
+    old_root_urlconf = settings.ROOT_URLCONF
+    settings.ROOT_URLCONF = "test_generic_views.urls"
+    yield settings
+    settings.ROOT_URLCONF = old_root_urlconf
+
+
 @pytest.mark.django_db
 class TestAsyncDetailView:
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     @pytest.fixture(autouse=True)
     def setup(self):
         self.artist1 = Artist.objects.create(name="Rene Magritte")

tests/test_generic_views/test_edit.py

@@ -1,7 +1,6 @@
 import re
 
 from django import forms
-from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.test import Client, AsyncClient
 from django.test.client import RequestFactory
@@ -76,15 +75,19 @@ class FormContext(AsyncFormMixin):
         assert isinstance(context_data["form"], forms.Form)
 
 
+@pytest.fixture(autouse=True)
+def url_setting_set(settings):
+    old_root_urlconf = settings.ROOT_URLCONF
+    settings.ROOT_URLCONF = "test_generic_views.urls"
+    yield settings
+    settings.ROOT_URLCONF = old_root_urlconf
+
+
 @pytest.mark.django_db
 class TestBasicForm:
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
-    # def test_post_data(self):
-    #     res = client.post("/contact/", {"name": "Me", "message": "Hello"})
-    #     assertRedirects(res, "/list/authors/")
+    def test_post_data(self):
+        res = client.post("/contact/", {"name": "Me", "message": "Hello"})
+        assertRedirects(res, "/list/authors/")
 
     async def test_late_form_validation(self):
         """
@@ -109,10 +112,6 @@ def test_get_form_checks_for_object(self):
 
 @pytest.mark.django_db
 class TestCreateView:
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     def test_create(self):
         res = client.get("/edit/authors/create/")
         assert res.status_code == 200
@@ -255,10 +254,6 @@ class MyCreateView(AsyncCreateView):
 
 @pytest.mark.django_db
 class TestUpdateView:
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     @pytest.fixture(autouse=True)
     def setup(cls):
         cls.author = Author.objects.create(
@@ -392,10 +387,6 @@ def test_update_get_object(self):
 
 @pytest.mark.django_db
 class TestDeleteView:
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     @pytest.fixture(autouse=True)
     def setup(cls):
         cls.author = Author.objects.create(

tests/test_generic_views/test_list.py

@@ -3,7 +3,6 @@
 
 import pytest
 
-from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.test import Client, TestCase
 
@@ -14,12 +13,16 @@
 client = Client()
 
 
+@pytest.fixture(autouse=True)
+def url_setting_set(settings):
+    old_root_urlconf = settings.ROOT_URLCONF
+    settings.ROOT_URLCONF = "test_generic_views.urls"
+    yield settings
+    settings.ROOT_URLCONF = old_root_urlconf
+
+
 @pytest.mark.django_db(transaction=True)
 class ListViewTests(TestCase):
-    @pytest.fixture(autouse=True)
-    def urlconf_for_tests(self):
-        settings.ROOT_URLCONF = "test_generic_views.urls"
-
     @classmethod
     def setUpTestData(self):
         self.artist1 = Artist.objects.create(name="Rene Magritte")
@@ -259,7 +262,7 @@ def test_explicitly_ordered_list_view(self):
         assert res.context["object_list"][2].name == "2066"
 
     @pytest.fixture(autouse=True)
-    def toggle_debug_tests(self):
+    def toggle_debug_tests(self, settings):
         settings.DEBUG = True
 
     def test_paginated_list_view_returns_useful_message_on_invalid_page(self):