From 50aa1a790ca66c2a93e0a52e00c53375b269ff49 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 9 Feb 2015 17:28:03 +0100 Subject: Replaced some more hardcoded admin URLs --- tests/generic_inline_admin/tests.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'tests/generic_inline_admin') diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py index 0394377466..d76e58bf3b 100644 --- a/tests/generic_inline_admin/tests.py +++ b/tests/generic_inline_admin/tests.py @@ -6,6 +6,7 @@ from django.contrib.admin.sites import AdminSite from django.contrib.auth.models import User from django.contrib.contenttypes.admin import GenericTabularInline from django.contrib.contenttypes.forms import generic_inlineformset_factory +from django.core.urlresolvers import reverse from django.forms.formsets import DEFAULT_MAX_NUM from django.forms.models import ModelForm from django.test import RequestFactory, TestCase, override_settings @@ -42,14 +43,16 @@ class GenericAdminViewTest(TestCase): """ A smoke test to ensure GET on the add_view works. """ - response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/episode/add/') + response = self.client.get(reverse('admin:generic_inline_admin_episode_add')) self.assertEqual(response.status_code, 200) def test_basic_edit_GET(self): """ A smoke test to ensure GET on the change_view works. """ - response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/episode/%d/' % self.episode_pk) + response = self.client.get( + reverse('admin:generic_inline_admin_episode_change', args=(self.episode_pk,)) + ) self.assertEqual(response.status_code, 200) def test_basic_add_POST(self): @@ -63,7 +66,7 @@ class GenericAdminViewTest(TestCase): "generic_inline_admin-media-content_type-object_id-INITIAL_FORMS": "0", "generic_inline_admin-media-content_type-object_id-MAX_NUM_FORMS": "0", } - response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/episode/add/', post_data) + response = self.client.post(reverse('admin:generic_inline_admin_episode_add'), post_data) self.assertEqual(response.status_code, 302) # redirect somewhere def test_basic_edit_POST(self): @@ -83,7 +86,7 @@ class GenericAdminViewTest(TestCase): "generic_inline_admin-media-content_type-object_id-2-id": "", "generic_inline_admin-media-content_type-object_id-2-url": "", } - url = '/generic_inline_admin/admin/generic_inline_admin/episode/%d/' % self.episode_pk + url = reverse('admin:generic_inline_admin_episode_change', args=(self.episode_pk,)) response = self.client.post(url, post_data) self.assertEqual(response.status_code, 302) # redirect somewhere @@ -147,7 +150,7 @@ class GenericInlineAdminParametersTest(TestCase): With one initial form, extra (default) at 3, there should be 4 forms. """ e = self._create_object(Episode) - response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/episode/%s/' % e.pk) + response = self.client.get(reverse('admin:generic_inline_admin_episode_change', args=(e.pk,))) formset = response.context['inline_admin_formsets'][0].formset self.assertEqual(formset.total_form_count(), 4) self.assertEqual(formset.initial_form_count(), 1) @@ -164,7 +167,7 @@ class GenericInlineAdminParametersTest(TestCase): modeladmin.inlines = [ExtraInline] e = self._create_object(Episode) - request = self.factory.get('/generic_inline_admin/admin/generic_inline_admin/episode/%s/' % e.pk) + request = self.factory.get(reverse('admin:generic_inline_admin_episode_change', args=(e.pk,))) request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(e.pk)) formset = response.context_data['inline_admin_formsets'][0].formset @@ -184,7 +187,7 @@ class GenericInlineAdminParametersTest(TestCase): modeladmin.inlines = [MaxNumInline] e = self._create_object(Episode) - request = self.factory.get('/generic_inline_admin/admin/generic_inline_admin/episode/%s/' % e.pk) + request = self.factory.get(reverse('admin:generic_inline_admin_episode_change', args=(e.pk,))) request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(e.pk)) formset = response.context_data['inline_admin_formsets'][0].formset @@ -204,7 +207,7 @@ class GenericInlineAdminParametersTest(TestCase): modeladmin.inlines = [MinNumInline] e = self._create_object(Episode) - request = self.factory.get('/generic_inline_admin/admin/generic_inline_admin/episode/%s/' % e.pk) + request = self.factory.get(reverse('admin:generic_inline_admin_episode_change', args=(e.pk,))) request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(e.pk)) formset = response.context_data['inline_admin_formsets'][0].formset @@ -223,7 +226,7 @@ class GenericInlineAdminParametersTest(TestCase): modeladmin = admin.ModelAdmin(Episode, admin_site) modeladmin.inlines = [GetExtraInline] e = self._create_object(Episode) - request = self.factory.get('/generic_inline_admin/admin/generic_inline_admin/episode/%s/' % e.pk) + request = self.factory.get(reverse('admin:generic_inline_admin_episode_change', args=(e.pk,))) request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(e.pk)) formset = response.context_data['inline_admin_formsets'][0].formset @@ -242,7 +245,7 @@ class GenericInlineAdminParametersTest(TestCase): modeladmin = admin.ModelAdmin(Episode, admin_site) modeladmin.inlines = [GetMinNumInline] e = self._create_object(Episode) - request = self.factory.get('/generic_inline_admin/admin/generic_inline_admin/episode/%s/' % e.pk) + request = self.factory.get(reverse('admin:generic_inline_admin_episode_change', args=(e.pk,))) request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(e.pk)) formset = response.context_data['inline_admin_formsets'][0].formset @@ -261,7 +264,7 @@ class GenericInlineAdminParametersTest(TestCase): modeladmin = admin.ModelAdmin(Episode, admin_site) modeladmin.inlines = [GetMaxNumInline] e = self._create_object(Episode) - request = self.factory.get('/generic_inline_admin/admin/generic_inline_admin/episode/%s/' % e.pk) + request = self.factory.get(reverse('admin:generic_inline_admin_episode_change', args=(e.pk,))) request.user = User(username='super', is_superuser=True) response = modeladmin.changeform_view(request, object_id=str(e.pk)) formset = response.context_data['inline_admin_formsets'][0].formset @@ -289,9 +292,9 @@ class GenericInlineAdminWithUniqueTogetherTest(TestCase): "generic_inline_admin-phonenumber-content_type-object_id-0-phone_number": "555-555-5555", "generic_inline_admin-phonenumber-content_type-object_id-0-category": "%s" % category_id, } - response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/contact/add/') + response = self.client.get(reverse('admin:generic_inline_admin_contact_add')) self.assertEqual(response.status_code, 200) - response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/contact/add/', post_data) + response = self.client.post(reverse('admin:generic_inline_admin_contact_add'), post_data) self.assertEqual(response.status_code, 302) # redirect somewhere -- cgit v1.3