Replaced hardcoded URLs in admin_* tests

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

django/contrib/auth/admin.py

@@ -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

@@ -368,7 +368,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))
 
@@ -681,7 +681,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

@@ -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_views/customadmin.py

@@ -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):

tests/admin_views/urls.py

@@ -4,10 +4,10 @@ from . import admin, custom_has_permission_admin, customadmin, views
 
 urlpatterns = [
     url(r'^test_admin/admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^test_admin/admin/secure-view/$', views.secure_view),
+    url(r'^test_admin/admin/secure-view/$', views.secure_view, name='secure_view'),
     url(r'^test_admin/admin/', include(admin.site.urls)),
     url(r'^test_admin/admin2/', include(customadmin.site.urls)),
-    url(r'^test_admin/admin3/', include(admin.site.urls), dict(form_url='pony')),
+    url(r'^test_admin/admin3/', include(admin.site.get_urls(), 'admin3', 'admin'), dict(form_url='pony')),
     url(r'^test_admin/admin4/', include(customadmin.simple_site.urls)),
     url(r'^test_admin/admin5/', include(admin.site2.urls)),
     url(r'^test_admin/admin7/', include(admin.site7.urls)),

tests/admin_widgets/tests.py

@@ -14,6 +14,7 @@ from django.contrib.admin import widgets
 from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.core.files.storage import default_storage
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.urlresolvers import reverse
 from django.db.models import CharField, DateField
 from django.test import TestCase as DjangoTestCase, override_settings
 from django.utils import six, translation
@@ -174,7 +175,7 @@ class AdminFormfieldForDBFieldWithRequestTests(DjangoTestCase):
         Ensure the user can only see their own cars in the foreign key dropdown.
         """
         self.client.login(username="super", password="secret")
-        response = self.client.get("/admin_widgets/cartire/add/")
+        response = self.client.get(reverse('admin:admin_widgets_cartire_add'))
         self.assertNotContains(response, "BMW M3")
         self.assertContains(response, "Volkswagon Passat")
 
@@ -188,7 +189,7 @@ class AdminForeignKeyWidgetChangeList(DjangoTestCase):
         self.client.login(username="super", password="secret")
 
     def test_changelist_ForeignKey(self):
-        response = self.client.get('/admin_widgets/car/')
+        response = self.client.get(reverse('admin:admin_widgets_car_changelist'))
         self.assertContains(response, '/auth/user/add/')
 
 
@@ -209,7 +210,7 @@ class AdminForeignKeyRawIdWidget(DjangoTestCase):
         }
         # Try posting with a non-existent pk in a raw id field: this
         # should result in an error message, not a server exception.
-        response = self.client.post('/admin_widgets/event/add/', post_data)
+        response = self.client.post(reverse('admin:admin_widgets_event_add'), post_data)
         self.assertContains(response,
             'Select a valid choice. That choice is not one of the available choices.')
 
@@ -217,7 +218,7 @@ class AdminForeignKeyRawIdWidget(DjangoTestCase):
 
         for test_str in ('Iñtërnâtiônàlizætiøn', "1234'", -1234):
             # This should result in an error message, not a server exception.
-            response = self.client.post('/admin_widgets/event/add/',
+            response = self.client.post(reverse('admin:admin_widgets_event_add'),
                 {"main_band": test_str})
 
             self.assertContains(response,
@@ -383,7 +384,7 @@ class AdminFileWidgetTests(DjangoTestCase):
         File widgets should render as a link when they're marked "read only."
         """
         self.client.login(username="super", password="secret")
-        response = self.client.get('/admin_widgets/album/%s/' % self.album.id)
+        response = self.client.get(reverse('admin:admin_widgets_album_change', args=(self.album.id,)))
         self.assertContains(
             response,
             '<p><a href="%(STORAGE_URL)salbums/hybrid_theory.jpg">'
@@ -582,7 +583,7 @@ class DateTimePickerSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
         self.admin_login(username='super', password='secret', login_url='/')
         # Open a page that has a date and time picker widgets
         self.selenium.get('%s%s' % (self.live_server_url,
-            '/admin_widgets/member/add/'))
+            reverse('admin:admin_widgets_member_add')))
 
         # First, with the date picker widget ---------------------------------
         # Check that the date picker is hidden
@@ -622,7 +623,7 @@ class DateTimePickerSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
         self.admin_login(username='super', password='secret', login_url='/')
         # Open a page that has a date and time picker widgets
         self.selenium.get('%s%s' % (self.live_server_url,
-            '/admin_widgets/member/add/'))
+            reverse('admin:admin_widgets_member_add')))
 
         # fill in the birth date.
         self.selenium.find_element_by_id('id_birthdate_0').send_keys('2013-06-01')
@@ -646,7 +647,7 @@ class DateTimePickerSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
         self.admin_login(username='super', password='secret', login_url='/')
         # Open a page that has a date and time picker widgets
         self.selenium.get('%s%s' % (self.live_server_url,
-            '/admin_widgets/member/add/'))
+            reverse('admin:admin_widgets_member_add')))
 
         # fill in the birth date.
         self.selenium.find_element_by_id('id_birthdate_0').send_keys('2013-06-01')
@@ -672,7 +673,7 @@ class DateTimePickerSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
         self.admin_login(username='super', password='secret', login_url='/')
         # Open a page that has a date and time picker widgets
         self.selenium.get('%s%s' % (self.live_server_url,
-            '/admin_widgets/member/add/'))
+            reverse('admin:admin_widgets_member_add')))
 
         # Click the calendar icon
         self.selenium.find_element_by_id('calendarlink0').click()
@@ -718,7 +719,7 @@ class DateTimePickerSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
 
                 # Open a page that has a date picker widget
                 self.selenium.get('{}{}'.format(self.live_server_url,
-                    '/admin_widgets/member/{}/'.format(member.pk)))
+                    reverse('admin:admin_widgets_member_change', args=(member.pk,))))
 
                 # Click on the calendar icon
                 self.selenium.find_element_by_id('calendarlink0').click()
@@ -772,7 +773,7 @@ class DateTimePickerShortcutsSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase
         now = datetime.now()
 
         self.selenium.get('%s%s' % (self.live_server_url,
-            '/admin_widgets/member/add/'))
+            reverse('admin:admin_widgets_member_add')))
 
         self.selenium.find_element_by_id('id_name').send_keys('test')
 
@@ -949,8 +950,8 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas
         self.school.save()
 
         self.admin_login(username='super', password='secret', login_url='/')
-        self.selenium.get(
-            '%s%s' % (self.live_server_url, '/admin_widgets/school/%s/' % self.school.id))
+        self.selenium.get('%s%s' % (
+            self.live_server_url, reverse('admin:admin_widgets_school_change', args=(self.school.id,))))
 
         self.wait_page_loaded()
         self.execute_basic_operations('vertical', 'students')
@@ -978,7 +979,7 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas
 
         self.admin_login(username='super', password='secret', login_url='/')
         self.selenium.get(
-            '%s%s' % (self.live_server_url, '/admin_widgets/school/%s/' % self.school.id))
+            '%s%s' % (self.live_server_url, reverse('admin:admin_widgets_school_change', args=(self.school.id,))))
 
         for field_name in ['students', 'alumni']:
             from_box = '#id_%s_from' % field_name
@@ -1079,7 +1080,7 @@ class AdminRawIdWidgetSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
     def test_ForeignKey(self):
         self.admin_login(username='super', password='secret', login_url='/')
         self.selenium.get(
-            '%s%s' % (self.live_server_url, '/admin_widgets/event/add/'))
+            '%s%s' % (self.live_server_url, reverse('admin:admin_widgets_event_add')))
         main_window = self.selenium.current_window_handle
 
         # No value has been selected yet
@@ -1114,7 +1115,7 @@ class AdminRawIdWidgetSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
     def test_many_to_many(self):
         self.admin_login(username='super', password='secret', login_url='/')
         self.selenium.get(
-            '%s%s' % (self.live_server_url, '/admin_widgets/event/add/'))
+            '%s%s' % (self.live_server_url, reverse('admin:admin_widgets_event_add')))
         main_window = self.selenium.current_window_handle
 
         # No value has been selected yet
@@ -1166,7 +1167,7 @@ class RelatedFieldWidgetSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase):
         self.admin_login(username='super', password='secret', login_url='/')
         self.selenium.get('%s%s' % (
             self.live_server_url,
-            '/admin_widgets/profile/add/'))
+            reverse('admin:admin_widgets_profile_add')))
 
         main_window = self.selenium.current_window_handle
         # Click the Add User button to add new