Commit cd260d03 authored by Claude Paroz's avatar Claude Paroz Committed by Tim Graham
Browse files

[1.8.x] Replaced hardcoded URLs in admin_* tests 

Refs #15779. This will allow easier admin URL changes, when needed.
Thanks Simon Charette for the review.

Backport of 32e6a7d3 from master
parent d5463872

django/contrib/auth/admin.py

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ class UserAdmin(admin.ModelAdmin): 


    def get_urls(self):

        return [

            url(r'^(\d+)/password/$', self.admin_site.admin_view(self.user_change_password)),

            url(r'^(\d+)/password/$', self.admin_site.admin_view(self.user_change_password), name='auth_user_password_change'),

        ] + super(UserAdmin, self).get_urls()



    def lookup_allowed(self, lookup, value):

tests/admin_changelist/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ class ChangeListTests(TestCase): 
            username='super', email='super@localhost', password='secret')

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

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

        response = self.client.get('/admin/admin_changelist/event/')

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

        self.assertContains(response, formats.localize(event.date))

        self.assertNotContains(response, six.text_type(event.date))
@@ -678,7 +678,7 @@ class SeleniumFirefoxTests(AdminSeleniumWebDriverTestCase): 
        """

        self.admin_login(username='super', password='secret')

        self.selenium.get('%s%s' % (self.live_server_url,

                                    '/admin/auth/user/'))

                                    reverse('admin:auth_user_changelist')))



        form_id = '#changelist-form'

tests/admin_custom_urls/tests.py

+5 −3
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ class AdminCustomUrlsTest(TestCase): 
        """

        Ensure GET on the add_view works.

        """

        response = self.client.get('/admin/admin_custom_urls/action/!add/')

        add_url = reverse('admin:admin_custom_urls_action_add')

        self.assertTrue(add_url.endswith('/!add/'))

        response = self.client.get(add_url)

        self.assertIsInstance(response, TemplateResponse)

        self.assertEqual(response.status_code, 200)
@@ -35,7 +37,7 @@ class AdminCustomUrlsTest(TestCase): 
        Ensure GET on the add_view plus specifying a field value in the query

        string works.

        """

        response = self.client.get('/admin/admin_custom_urls/action/!add/', {'name': 'My Action'})

        response = self.client.get(reverse('admin:admin_custom_urls_action_add'), {'name': 'My Action'})

        self.assertEqual(response.status_code, 200)

        self.assertContains(response, 'value="My Action"')
@@ -48,7 +50,7 @@ class AdminCustomUrlsTest(TestCase): 
            "name": 'Action added through a popup',

            "description": "Description of added action",

        }

        response = self.client.post('/admin/admin_custom_urls/action/!add/', post_data)

        response = self.client.post(reverse('admin:admin_custom_urls_action_add'), post_data)

        self.assertEqual(response.status_code, 200)

        self.assertContains(response, 'dismissAddRelatedObjectPopup')

        self.assertContains(response, 'Action added through a popup')

tests/admin_inlines/tests.py

+61 −54

File changed.

Preview size limit exceeded, changes collapsed.

tests/admin_views/customadmin.py

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class Admin2(admin.AdminSite): 


    def get_urls(self):

        return [

            url(r'^my_view/$', self.admin_view(self.my_view)),

            url(r'^my_view/$', self.admin_view(self.my_view), name='my_view'),

        ] + super(Admin2, self).get_urls()



    def my_view(self, request):