Ticket #14543: 14543.patch

django/contrib/contenttypes/tests.py

@@ -2 +2 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
-from django.contrib.contenttypes.views import shortcut
-from django.core.exceptions import ObjectDoesNotExist
-from django.http import HttpRequest
 from django.test import TestCase
 
 
@@ -45 +42 @@
         ContentType.objects.get_for_model(ContentType)
         len(db.connection.queries)
         self.assertEqual(2, len(db.connection.queries))
-
-    def test_shortcut_view(self):
-        """
-        Check that the shortcut view (used for the admin "view on site"
-        functionality) returns a complete URL regardless of whether the sites
-        framework is installed
-        """
-
-        request = HttpRequest()
-        request.META = {
-            "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")
-        Site._meta.installed = True
-        response = shortcut(request, user_ct.id, obj.id)
-        self.assertEqual("http://example.com/users/john/", response._headers.get("location")[1])
-        Site._meta.installed = False
-        response = shortcut(request, user_ct.id, obj.id)
-        self.assertEqual("http://Example.com/users/john/", response._headers.get("location")[1])

tests/regressiontests/ct_framework/tests.py

@@ +1 @@
+from django.test import TestCase
+from django.contrib.contenttypes.views import shortcut
+from django.http import HttpRequest
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.sites.models import Site
+from models import Article
+
+class ContentTypesTests(TestCase):
+    def test_shortcut_view(self):
+        """
+        Check that the shortcut view (used for the admin "view on site"
+        functionality) returns a complete URL regardless of whether the sites
+        framework is installed
+        """
+
+        request = HttpRequest()
+        request.META = {
+            "SERVER_NAME": "Example.com",
+            "SERVER_PORT": "80",
+        }
+        article_ct = ContentType.objects.get_for_model(Article)
+        obj = Article.objects.create(slug="test")
+        Site._meta.installed = True
+        response = shortcut(request, article_ct.id, obj.id)
+        self.assertEqual("http://example.com/articles/test/", response._headers.get("location")[1])
+        Site._meta.installed = False
+        response = shortcut(request, article_ct.id, obj.id)
+        self.assertEqual("http://Example.com/articles/test/", response._headers.get("location")[1])

tests/regressiontests/ct_framework/models.py

@@ +1 @@
+import urllib
+from django.db import models
+from django.utils.encoding import smart_str
+
+class Article(models.Model):
+    slug = models.SlugField(max_length=64)
+
+    def get_absolute_url(self):
+        return "/articles/%s/" % urllib.quote(smart_str(self.slug))