Browse Source

shaved off some deprecation warnings on tests

Rafał Pitoń 8 years ago
parent
commit
58fa2d3835

+ 4 - 6
misago/core/templatetags/misago_forms.py

@@ -1,6 +1,5 @@
 from django import template
-from django.template import Context
-from django.template.loader import get_template
+from django.template.loader import render_to_string
 
 from crispy_forms.templatetags import crispy_forms_field, crispy_forms_filters
 
@@ -62,14 +61,13 @@ class FormRowNode(template.Node):
             field_class = None
 
         template_pack = crispy_forms_filters.TEMPLATE_PACK
-        template = get_template('%s/field.html' % template_pack)
-        c = Context({
+        return render_to_string('%s/field.html' % template_pack, {
             'field': field,
             'form_show_errors': True,
             'form_show_labels': True,
             'label_class': label_class or '',
-            'field_class': field_class or ''})
-        return template.render(c)
+            'field_class': field_class or ''
+        })
 
 
 """

+ 1 - 2
misago/core/templatetags/misago_pagination.py

@@ -1,6 +1,5 @@
 from django import template
 from django.core.urlresolvers import reverse
-from django.template import Context
 from django.template.loader import get_template
 
 
@@ -18,7 +17,7 @@ def pagination(page, template, link_name, **kwargs):
         'link_name': link_name,
     })
 
-    return template.render(Context(context))
+    return template.render(context)
 
 
 @register.simple_tag

+ 2 - 3
misago/core/tests/test_decorators.py

@@ -1,11 +1,10 @@
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
 class RequirePostTests(TestCase):
-    urls = 'misago.core.testproject.urls'
-
     def test_require_POST_success(self):
         """require_POST decorator allowed POST request"""
         response = self.client.post(reverse('test-require-post'))

+ 7 - 7
misago/core/tests/test_errorpages.py

@@ -1,5 +1,5 @@
 from django.core.urlresolvers import reverse
-from django.test import Client, TestCase
+from django.test import Client, TestCase, override_settings
 from django.test.client import RequestFactory
 
 from misago.users.models import AnonymousUser
@@ -11,14 +11,15 @@ class CSRFErrorViewTests(TestCase):
     def test_csrf_failure(self):
         """csrf_failure error page has no show-stoppers"""
         csrf_client = Client(enforce_csrf_checks=True)
-        response = csrf_client.post(reverse('misago:index'),
-                                    data={'eric': 'fish'})
+        response = csrf_client.post(reverse('misago:index'), data={
+            'eric': 'fish'
+        })
         self.assertContains(response, "Request blocked", status_code=403)
 
 
-class ErrorPageViewsTests(TestCase):
-    urls = 'misago.core.testproject.urls'
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
+class ErrorPageViewsTests(TestCase):
     def test_banned_returns_403(self):
         """banned error page has no show-stoppers"""
         response = self.client.get(reverse('raise-misago-banned'))
@@ -40,9 +41,8 @@ class ErrorPageViewsTests(TestCase):
         self.assertContains(response, "Wrong way", status_code=405)
 
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urlswitherrorhandlers')
 class CustomErrorPagesTests(TestCase):
-    urls = 'misago.core.testproject.urlswitherrorhandlers'
-
     def setUp(self):
         self.misago_request = RequestFactory().get(reverse('misago:index'))
         self.site_request = RequestFactory().get(reverse('raise-403'))

+ 2 - 3
misago/core/tests/test_mailer.py

@@ -1,12 +1,11 @@
 from django.contrib.auth import get_user_model
 from django.core import mail
 from django.core.urlresolvers import reverse
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
 class MisagoMailerTests(TestCase):
-    urls = 'misago.core.testproject.urls'
-
     def test_mail_user(self):
         """mail_user sets message in backend"""
         User = get_user_model()

+ 3 - 5
misago/core/tests/test_shortcuts.py

@@ -1,13 +1,12 @@
 from django.core.urlresolvers import reverse
 from django.http import Http404
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 from ..shortcuts import get_int_or_404
 
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
 class PaginateTests(TestCase):
-    urls = 'misago.core.testproject.urls'
-
     def test_valid_page_handling(self):
         """Valid page number causes no errors"""
         response = self.client.get(
@@ -34,9 +33,8 @@ class PaginateTests(TestCase):
         self.assertEqual(response['Location'], valid_url)
 
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
 class ValidateSlugTests(TestCase):
-    urls = 'misago.core.testproject.urls'
-
     def test_valid_slug_handling(self):
         """Valid slug causes no interruption in view processing"""
         response = self.client.get(reverse('validate-slug-view', kwargs={

+ 3 - 3
misago/core/tests/test_views.py

@@ -1,5 +1,5 @@
 from django.core.urlresolvers import reverse
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 
 class MomentJSCatalogViewTests(TestCase):
@@ -22,9 +22,9 @@ class PreloadJSDataViewTests(TestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class RedirectViewTests(TestCase):
-    urls = 'misago.core.testproject.urls'
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
+class RedirectViewTests(TestCase):
     def test_redirect_view(self):
         """redirect view always redirects to home page"""
         response = self.client.get(reverse('test-redirect'))

+ 2 - 1
misago/users/tests/test_djangoadmin_auth.py

@@ -1,11 +1,12 @@
 from django.core.urlresolvers import reverse
+from django.test import override_settings
 
 from misago.admin.testutils import AdminTestCase
 
 
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
 class DjangoAdminAuthTests(AdminTestCase):
     """assertions for Django admin auth interop with Misago User Model"""
-    urls = 'misago.core.testproject.urls'
 
     def test_login(self):
         """its possible to sign in to django admin"""

+ 5 - 8
misago/users/tests/test_djangoadmin_user.py

@@ -1,21 +1,18 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
 from django.core.urlresolvers import reverse
+from django.test import override_settings
 from django.utils import formats
 
 from misago.admin.testutils import AdminTestCase
 
 
-User = get_user_model()
-
-
+@override_settings(ROOT_URLCONF='misago.core.testproject.urls')
 class TestDjangoAdminUserForm(AdminTestCase):
-    urls = 'misago.core.testproject.urls'
-
     def test_edit_page_content(self):
-        """
-        Assert that edit-view of `test_user` contains expected content.
-        """
+        """assert that edit-view of `test_user` contains expected content."""
+        User = get_user_model()
+
         test_user = User.objects.create_user(
             username='Bob',
             email='bob@test.com',