Commit 3565efaa authored by Bouke Haarsma's avatar Bouke Haarsma Committed by Tim Graham
Browse files

Removed some direct settings manipulations in tests; refs #21230.

parent 499cd912

tests/admin_views/tests.py

+5 −21
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ ERROR_MESSAGE = "Please enter the correct username and password \ 
for a staff account. Note that both fields may be case-sensitive."





@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))

@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),

                   USE_I18N=True, USE_L10N=False, LANGUAGE_CODE='en')

class AdminViewBasicTestCase(TestCase):

    fixtures = ['admin-views-users.xml', 'admin-views-colors.xml',

                'admin-views-fabrics.xml', 'admin-views-books.xml']
@@ -69,16 +70,9 @@ class AdminViewBasicTestCase(TestCase): 
    urls = "admin_views.urls"



    def setUp(self):

        self.old_USE_I18N = settings.USE_I18N

        self.old_USE_L10N = settings.USE_L10N

        self.old_LANGUAGE_CODE = settings.LANGUAGE_CODE

        self.client.login(username='super', password='secret')

        settings.USE_I18N = True



    def tearDown(self):

        settings.USE_I18N = self.old_USE_I18N

        settings.USE_L10N = self.old_USE_L10N

        settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE

        self.client.logout()

        formats.reset_format_cache()
@@ -2410,15 +2404,12 @@ class AdminActionsTest(TestCase): 
        self.client.post('/test_admin/admin/admin_views/subscriber/', delete_confirmation_data)

        self.assertEqual(Subscriber.objects.count(), 0)



    @override_settings(USE_THOUSAND_SEPARATOR=True, USE_L10N=True)

    def test_non_localized_pk(self):

        """If USE_THOUSAND_SEPARATOR is set, make sure that the ids for

        the objects selected for deletion are rendered without separators.

        Refs #14895.

        """

        self.old_USE_THOUSAND_SEPARATOR = settings.USE_THOUSAND_SEPARATOR

        self.old_USE_L10N = settings.USE_L10N

        settings.USE_THOUSAND_SEPARATOR = True

        settings.USE_L10N = True

        subscriber = Subscriber.objects.get(id=1)

        subscriber.id = 9999

        subscriber.save()
@@ -2431,8 +2422,6 @@ class AdminActionsTest(TestCase): 
        self.assertTemplateUsed(response, 'admin/delete_selected_confirmation.html')

        self.assertContains(response, 'value="9999"')  # Instead of 9,999

        self.assertContains(response, 'value="2"')

        settings.USE_THOUSAND_SEPARATOR = self.old_USE_THOUSAND_SEPARATOR

        settings.USE_L10N = self.old_USE_L10N



    def test_model_admin_default_delete_action_protected(self):

        """
@@ -4127,21 +4116,16 @@ class ValidXHTMLTests(TestCase): 
        self.assertNotContains(response, ' xml:lang=""')





@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))

@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),

                   USE_THOUSAND_SEPARATOR=True, USE_L10N=True)

class DateHierarchyTests(TestCase):

    urls = "admin_views.urls"

    fixtures = ['admin-views-users.xml']



    def setUp(self):

        self.client.login(username='super', password='secret')

        self.old_USE_THOUSAND_SEPARATOR = settings.USE_THOUSAND_SEPARATOR

        self.old_USE_L10N = settings.USE_L10N

        settings.USE_THOUSAND_SEPARATOR = True

        settings.USE_L10N = True



    def tearDown(self):

        settings.USE_THOUSAND_SEPARATOR = self.old_USE_THOUSAND_SEPARATOR

        settings.USE_L10N = self.old_USE_L10N

        formats.reset_format_cache()



    def assert_non_localized_year(self, response, year):

tests/comment_tests/tests/test_comment_form.py

+8 −15
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ import time 
from django.conf import settings

from django.contrib.comments.forms import CommentForm

from django.contrib.comments.models import Comment

from django.test.utils import override_settings



from . import CommentTestCase

from ..models import Article
@@ -58,26 +59,18 @@ class CommentFormTests(CommentTestCase): 
        c.save()

        self.assertEqual(Comment.objects.count(), 1)



    @override_settings(PROFANITIES_LIST=["rooster"])

    def testProfanities(self):

        """Test COMMENTS_ALLOW_PROFANITIES and PROFANITIES_LIST settings"""

        a = Article.objects.get(pk=1)

        d = self.getValidData(a)



        # Save settings in case other tests need 'em

        saved = settings.PROFANITIES_LIST, settings.COMMENTS_ALLOW_PROFANITIES



        # Don't wanna swear in the unit tests if we don't have to...

        settings.PROFANITIES_LIST = ["rooster"]



        # Try with COMMENTS_ALLOW_PROFANITIES off

        settings.COMMENTS_ALLOW_PROFANITIES = False

        with self.settings(COMMENTS_ALLOW_PROFANITIES=False):

            f = CommentForm(a, data=dict(d, comment="What a rooster!"))

            self.assertFalse(f.is_valid())



        # Now with COMMENTS_ALLOW_PROFANITIES on

        settings.COMMENTS_ALLOW_PROFANITIES = True

        with self.settings(COMMENTS_ALLOW_PROFANITIES=True):

            f = CommentForm(a, data=dict(d, comment="What a rooster!"))

            self.assertTrue(f.is_valid())
 


        # Restore settings

        settings.PROFANITIES_LIST, settings.COMMENTS_ALLOW_PROFANITIES = saved

tests/comment_tests/tests/test_comment_view.py

+8 −11
Original line number Diff line number Diff line
@@ -83,23 +83,20 @@ class CommentViewTests(CommentTestCase): 


    def testDebugCommentErrors(self):

        """The debug error template should be shown only if DEBUG is True"""

        olddebug = settings.DEBUG



        settings.DEBUG = True

        a = Article.objects.get(pk=1)

        data = self.getValidData(a)

        data["security_hash"] = "Nobody expects the Spanish Inquisition!"



        with self.settings(DEBUG=True):

            response = self.client.post("/post/", data)

            self.assertEqual(response.status_code, 400)

            self.assertTemplateUsed(response, "comments/400-debug.html")



        settings.DEBUG = False

        with self.settings(DEBUG=False):

            response = self.client.post("/post/", data)

            self.assertEqual(response.status_code, 400)

            self.assertTemplateNotUsed(response, "comments/400-debug.html")



        settings.DEBUG = olddebug



    def testCreateValidComment(self):

        address = "1.2.3.4"

        a = Article.objects.get(pk=1)

tests/generic_inline_admin/tests.py

+3 −4
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ from .models import (Episode, EpisodeExtra, EpisodeMaxNum, Media, 
    EpisodePermanent, Category)





@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))

@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),

                   TEMPLATE_DEBUG=True)

class GenericAdminViewTest(TestCase):

    urls = "generic_inline_admin.urls"

    fixtures = ['users.xml']
@@ -27,8 +28,7 @@ class GenericAdminViewTest(TestCase): 
        # set TEMPLATE_DEBUG to True to ensure {% include %} will raise

        # exceptions since that is how inlines are rendered and #9498 will

        # bubble up if it is an issue.

        self.original_template_debug = settings.TEMPLATE_DEBUG

        settings.TEMPLATE_DEBUG = True



        self.client.login(username='super', password='secret')



        # Can't load content via a fixture (since the GenericForeignKey
@@ -46,7 +46,6 @@ class GenericAdminViewTest(TestCase): 


    def tearDown(self):

        self.client.logout()

        settings.TEMPLATE_DEBUG = self.original_template_debug



    def testBasicAddGet(self):

        """

tests/i18n/tests.py

+1 −9
Original line number Diff line number Diff line
@@ -968,17 +968,9 @@ class ResolutionOrderI18NTests(TransRealMixin, TestCase): 
        self.assertTrue(msgstr in result, ("The string '%s' isn't in the "

            "translation of '%s'; the actual result is '%s'." % (msgstr, msgid, result)))



@override_settings(INSTALLED_APPS=['i18n.resolution'] + list(settings.INSTALLED_APPS))

class AppResolutionOrderI18NTests(ResolutionOrderI18NTests):



    def setUp(self):

        self.old_installed_apps = settings.INSTALLED_APPS

        settings.INSTALLED_APPS = ['i18n.resolution'] + list(settings.INSTALLED_APPS)

        super(AppResolutionOrderI18NTests, self).setUp()



    def tearDown(self):

        settings.INSTALLED_APPS = self.old_installed_apps

        super(AppResolutionOrderI18NTests, self).tearDown()



    def test_app_translation(self):

        self.assertUgettext('Date/time', 'APP')