mirror of
https://github.com/django/django.git
synced 2025-10-25 14:46:09 +00:00
[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 32e6a7d3a5 from master
This commit is contained in:
@@ -19,6 +19,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
|
||||
from django.test import override_settings
|
||||
@@ -177,7 +178,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")
|
||||
|
||||
@@ -191,7 +192,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/')
|
||||
|
||||
|
||||
@@ -212,7 +213,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.')
|
||||
|
||||
@@ -220,7 +221,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,
|
||||
@@ -386,7 +387,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">'
|
||||
@@ -585,7 +586,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
|
||||
@@ -625,7 +626,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')
|
||||
@@ -649,7 +650,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')
|
||||
@@ -675,7 +676,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()
|
||||
@@ -721,7 +722,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()
|
||||
@@ -775,7 +776,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')
|
||||
|
||||
@@ -952,8 +953,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')
|
||||
@@ -981,7 +982,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
|
||||
@@ -1082,7 +1083,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
|
||||
@@ -1117,7 +1118,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
|
||||
@@ -1169,7 +1170,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
|
||||
|
||||
Reference in New Issue
Block a user