From f64a3de2d4b623087c70405523a08a4e6043d102 Mon Sep 17 00:00:00 2001 From: Markus Holtermann Date: Thu, 18 Jun 2015 21:57:08 +0200 Subject: [1.8.x] Fixed #24940 -- Made model managers hashable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks Federico Jaramillo Martínez for the report and Tim Graham for the test and review. Backport of d3d66d47222dd8765a20a15fdc754c0ed7635404 from master --- tests/generic_inline_admin/tests.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'tests/generic_inline_admin/tests.py') diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py index 4f94599f9d..fb85a7e33e 100644 --- a/tests/generic_inline_admin/tests.py +++ b/tests/generic_inline_admin/tests.py @@ -8,6 +8,8 @@ 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.contrib.contenttypes.models import ContentType +from django.core.urlresolvers import reverse from django.forms.formsets import DEFAULT_MAX_NUM from django.forms.models import ModelForm from django.test import ( @@ -16,7 +18,7 @@ from django.test import ( from django.utils.deprecation import RemovedInDjango19Warning from .admin import MediaInline, MediaPermanentInline, site as admin_site -from .models import Category, Episode, EpisodePermanent, Media +from .models import Category, Episode, EpisodePermanent, Media, PhoneNumber # Set DEBUG to True to ensure {% include %} will raise exceptions. @@ -301,6 +303,17 @@ class GenericInlineAdminWithUniqueTogetherTest(TestCase): response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/contact/add/', post_data) self.assertEqual(response.status_code, 302) # redirect somewhere + def test_delete(self): + from .models import Contact + c = Contact.objects.create(name='foo') + PhoneNumber.objects.create( + object_id=c.id, + content_type=ContentType.objects.get_for_model(Contact), + phone_number="555-555-5555", + ) + response = self.client.post(reverse('admin:generic_inline_admin_contact_delete', args=[c.pk])) + self.assertContains(response, 'Are you sure you want to delete') + @override_settings(ROOT_URLCONF="generic_inline_admin.urls") class NoInlineDeletionTest(TestCase): -- cgit v1.3