Ticket #14543: 14543.3.patch

django/contrib/contenttypes/tests.py

@@ -1 @@
-from django import db
+import urllib
+from django import db, http
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
@@ -6 +7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpRequest
 from django.test import TestCase
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import smart_str
 
+class FooWithUrl(models.Model):
+    """fake model defining get_absolute_url for test_shortcut_view"""
+    fooname = models.CharField(_('fooname'), max_length=30, unique=True, help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
+    class Meta:
+        verbose_name = _('foo_with_url')
+        verbose_name_plural = _('fooz_with_url')
+
+    def __unicode__(self):
+        return self.fooname
+
+    def get_absolute_url(self):
+        return "/users/%s/" % urllib.quote(smart_str(self.fooname))
+
+class FooWithoutUrl(models.Model):
+    """fake model not defining get_absolute_url for test_shortcut_view"""
+    fooname = models.CharField(_('fooname'), max_length=30, unique=True, help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
+    class Meta:
+        verbose_name = _('foo_without_url')
+        verbose_name_plural = _('fooz_without_url')
+
+    def __unicode__(self):
+        return self.fooname
 
 class ContentTypesTests(TestCase):
 
@@ -58 +84 @@
             "SERVER_NAME": "Example.com",
             "SERVER_PORT": "80",
         }
-        from django.contrib.auth.models import User
-        user_ct = ContentType.objects.get_for_model(User)
-        obj = User.objects.create(username="john")
+        user_ct = ContentType.objects.get_for_model(FooWithUrl)
+        obj = FooWithUrl.objects.create(fooname="john")
 
         if Site._meta.installed:
             current_site = Site.objects.get_current()
@@ -72 +97 @@
         response = shortcut(request, user_ct.id, obj.id)
         self.assertEqual("http://Example.com/users/john/",
                          response._headers.get("location")[1])
+
+    def test_shortcut_view_negative(self):
+        """
+        Check that the shortcut view (used for the admin "view on site"
+        functionality) returns 404 when get_absolute_url is not
+        defined
+        """
+
+        request = HttpRequest()
+        request.META = {
+            "SERVER_NAME": "Example.com",
+            "SERVER_PORT": "80",
+        }
+        user_ct = ContentType.objects.get_for_model(FooWithoutUrl)
+        obj = FooWithoutUrl.objects.create(fooname="john")
+
+        if Site._meta.installed:
+            current_site = Site.objects.get_current()
+            with self.assertRaises(http.Http404):
+                response = shortcut(request, user_ct.id, obj.id)
+
+        Site._meta.installed = False
+        with self.assertRaises(http.Http404):
+            response = shortcut(request, user_ct.id, obj.id)