Commit 015fad90 authored by Tim Graham's avatar Tim Graham
Browse files

Fixed #26175 -- Removed SHA1 password hashes in tests.

parent f8e865d7

tests/admin_changelist/tests.py

+4 −12
Original line number Diff line number Diff line
@@ -480,9 +480,8 @@ class ChangeListTests(TestCase): 
        Regression test for #13196: output of functions should be  localized

        in the changelist.

        """

        User.objects.create_superuser(

            username='super', email='super@localhost', password='secret')

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

        superuser = User.objects.create_superuser(username='super', email='super@localhost', password='secret')

        self.client.force_login(superuser)

        event = Event.objects.create(date=datetime.date.today())

        response = self.client.get(reverse('admin:admin_changelist_event_changelist'))

        self.assertContains(response, formats.localize(event.date))
@@ -882,21 +881,14 @@ class AdminLogNodeTestCase(TestCase): 
        self.assertEqual(t.render(Context({})), 'Added "<User: jondoe>".')





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

                   ROOT_URLCONF="admin_changelist.urls")

@override_settings(ROOT_URLCONF='admin_changelist.urls')

class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):



    available_apps = ['admin_changelist'] + AdminSeleniumWebDriverTestCase.available_apps

    webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'



    def setUp(self):

        # password = "secret"

        User.objects.create(

            pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',

            password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,

            is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),

            date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)

        )

        User.objects.create_superuser(username='super', password='secret', email=None)



    def test_add_row_selection(self):

        """

tests/admin_custom_urls/tests.py

+3 −12
Original line number Diff line number Diff line 
from __future__ import unicode_literals



import datetime



from django.contrib.admin.utils import quote

from django.contrib.auth.models import User

from django.template.response import TemplateResponse
@@ -11,8 +9,7 @@ from django.urls import reverse 
from .models import Action, Car, Person





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

                   ROOT_URLCONF='admin_custom_urls.urls',)

@override_settings(ROOT_URLCONF='admin_custom_urls.urls',)

class AdminCustomUrlsTest(TestCase):

    """

    Remember that:
@@ -23,13 +20,7 @@ class AdminCustomUrlsTest(TestCase): 


    @classmethod

    def setUpTestData(cls):

        # password = "secret"

        User.objects.create(

            pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',

            password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,

            is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),

            date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)

        )

        cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')

        Action.objects.create(name='delete', description='Remove things.')

        Action.objects.create(name='rename', description='Gives things other names.')

        Action.objects.create(name='add', description='Add things.')
@@ -44,7 +35,7 @@ class AdminCustomUrlsTest(TestCase): 
        )



    def setUp(self):

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

        self.client.force_login(self.superuser)



    def test_basic_add_GET(self):

        """

tests/admin_docs/tests.py

+9 −18
Original line number Diff line number Diff line 
import datetime

import sys

import unittest
@@ -18,18 +17,10 @@ class TestDataMixin(object): 


    @classmethod

    def setUpTestData(cls):

        # password = "secret"

        User.objects.create(

            pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',

            password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,

            is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),

            date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)

        )

        cls.superuser = User.objects.create_superuser(username='super', password='secret', email='super@example.com')





@override_settings(

    PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],

    ROOT_URLCONF='admin_docs.urls')

@override_settings(ROOT_URLCONF='admin_docs.urls')

@modify_settings(INSTALLED_APPS={'append': 'django.contrib.admindocs'})

class AdminDocsTestCase(TestCase):

    pass
@@ -38,8 +29,8 @@ class AdminDocsTestCase(TestCase): 
class MiscTests(AdminDocsTestCase):



    def setUp(self):

        User.objects.create_superuser('super', None, 'secret')

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

        superuser = User.objects.create_superuser('super', None, 'secret')

        self.client.force_login(superuser)



    @modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'})

    @override_settings(SITE_ID=None)    # will restore SITE_ID after the test
@@ -57,7 +48,7 @@ class MiscTests(AdminDocsTestCase): 
class AdminDocViewTests(TestDataMixin, AdminDocsTestCase):



    def setUp(self):

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

        self.client.force_login(self.superuser)



    def test_index(self):

        self.client.logout()
@@ -65,7 +56,7 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase): 
        # Should display the login screen

        self.assertContains(response,

            '<input type="hidden" name="next" value="/admindocs/" />', html=True)

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

        self.client.force_login(self.superuser)

        response = self.client.get(reverse('django-admindocs-docroot'))

        self.assertContains(response, '<h1>Documentation</h1>', html=True)

        self.assertContains(response,
@@ -168,7 +159,7 @@ class XViewMiddlewareTest(TestDataMixin, AdminDocsTestCase): 
        user = User.objects.get(username='super')

        response = self.client.head('/xview/func/')

        self.assertNotIn('X-View', response)

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

        self.client.force_login(self.superuser)

        response = self.client.head('/xview/func/')

        self.assertIn('X-View', response)

        self.assertEqual(response['X-View'], 'admin_docs.views.xview')
@@ -186,7 +177,7 @@ class XViewMiddlewareTest(TestDataMixin, AdminDocsTestCase): 
        user = User.objects.get(username='super')

        response = self.client.head('/xview/class/')

        self.assertNotIn('X-View', response)

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

        self.client.force_login(self.superuser)

        response = self.client.head('/xview/class/')

        self.assertIn('X-View', response)

        self.assertEqual(response['X-View'], 'admin_docs.views.XViewClass')
@@ -244,7 +235,7 @@ class TestModelDetailView(TestDataMixin, AdminDocsTestCase): 
    """



    def setUp(self):

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

        self.client.force_login(self.superuser)

        with captured_stderr() as self.docutils_stderr:

            self.response = self.client.get(reverse('django-admindocs-models-detail', args=['admin_docs', 'Person']))

tests/admin_inlines/tests.py

+12 −35
Original line number Diff line number Diff line 
from __future__ import unicode_literals



import datetime



from django.contrib.admin import ModelAdmin, TabularInline

from django.contrib.admin.helpers import InlineAdminForm

from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
@@ -26,17 +24,10 @@ class TestDataMixin(object): 


    @classmethod

    def setUpTestData(cls):

        # password = "secret"

        User.objects.create(

            pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',

            password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,

            is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),

            date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)

        )

        cls.superuser = User.objects.create_superuser(username='super', email='super@example.com', password='secret')





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

                   ROOT_URLCONF="admin_inlines.urls")

@override_settings(ROOT_URLCONF='admin_inlines.urls')

class TestInline(TestDataMixin, TestCase):



    def setUp(self):
@@ -44,8 +35,7 @@ class TestInline(TestDataMixin, TestCase): 
        holder.save()

        Inner(dummy=42, holder=holder).save()



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

        self.assertEqual(result, True)

        self.client.force_login(self.superuser)

        self.factory = RequestFactory()



    def test_can_delete(self):
@@ -418,13 +408,11 @@ class TestInline(TestDataMixin, TestCase): 
        self.assertNotContains(response, INLINE_CHANGELINK_HTML)





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

                   ROOT_URLCONF="admin_inlines.urls")

@override_settings(ROOT_URLCONF='admin_inlines.urls')

class TestInlineMedia(TestDataMixin, TestCase):



    def setUp(self):

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

        self.assertEqual(result, True)

        self.client.force_login(self.superuser)



    def test_inline_media_only_base(self):

        holder = Holder(dummy=13)
@@ -452,7 +440,7 @@ class TestInlineMedia(TestDataMixin, TestCase): 
        self.assertContains(response, 'my_awesome_inline_scripts.js')





@override_settings(ROOT_URLCONF="admin_inlines.urls")

@override_settings(ROOT_URLCONF='admin_inlines.urls')

class TestInlineAdminForm(TestCase):



    def test_immutable_content_type(self):
@@ -471,13 +459,11 @@ class TestInlineAdminForm(TestCase): 
        self.assertEqual(iaf.original.content_type, parent_ct)





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

    ROOT_URLCONF="admin_inlines.urls")

@override_settings(ROOT_URLCONF='admin_inlines.urls')

class TestInlineProtectedOnDelete(TestDataMixin, TestCase):



    def setUp(self):

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

        self.assertEqual(result, True)

        self.client.force_login(self.superuser)



    def test_deleting_inline_with_protected_delete_does_not_validate(self):

        lotr = Novel.objects.create(name='Lord of the rings')
@@ -503,7 +489,7 @@ class TestInlineProtectedOnDelete(TestDataMixin, TestCase): 
                            % (chapter, foot_note))





@override_settings(ROOT_URLCONF="admin_inlines.urls")

@override_settings(ROOT_URLCONF='admin_inlines.urls')

class TestInlinePermissions(TestCase):

    """

    Make sure the admin respects permissions for objects that are edited
@@ -546,9 +532,7 @@ class TestInlinePermissions(TestCase): 
        self.holder_change_url = reverse('admin:admin_inlines_holder2_change', args=(holder.id,))

        self.inner2_id = inner2.id



        self.assertEqual(

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

            True)

        self.client.force_login(self.user)



    def test_inline_add_m2m_noperm(self):

        response = self.client.get(reverse('admin:admin_inlines_author_add'))
@@ -703,21 +687,14 @@ class TestInlinePermissions(TestCase): 
        self.assertContains(response, 'id="id_inner2_set-0-DELETE"')





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

                   ROOT_URLCONF="admin_inlines.urls")

@override_settings(ROOT_URLCONF='admin_inlines.urls')

class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):



    available_apps = ['admin_inlines'] + AdminSeleniumWebDriverTestCase.available_apps

    webdriver_class = 'selenium.webdriver.firefox.webdriver.WebDriver'



    def setUp(self):

        # password = "secret"

        User.objects.create(

            pk=100, username='super', first_name='Super', last_name='User', email='super@example.com',

            password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', is_active=True, is_superuser=True,

            is_staff=True, last_login=datetime.datetime(2007, 5, 30, 13, 20, 10),

            date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10)

        )

        User.objects.create_superuser(username='super', password='secret', email='super@example.com')



    def test_add_stackeds(self):

        """

tests/admin_utils/test_logentry.py

+1 −6
Original line number Diff line number Diff line
@@ -20,12 +20,7 @@ from .models import Article, ArticleProxy, Site 
@override_settings(ROOT_URLCONF="admin_utils.urls")

class LogEntryTests(TestCase):

    def setUp(self):

        self.user = User.objects.create(

            password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158',

            is_superuser=True, username='super',

            first_name='Super', last_name='User', email='super@example.com',

            is_staff=True, is_active=True, date_joined=datetime(2007, 5, 30, 13, 20, 10)

        )

        self.user = User.objects.create_superuser(username='super', password='secret', email='super@example.com')

        self.site = Site.objects.create(domain='example.org')

        self.a1 = Article.objects.create(

            site=self.site,