Ticket #9956: comments_urls_9956.diff

django/contrib/comments/urls.py

@@ -13 +13 @@
 )
 
 urlpatterns += patterns('',
-    url(r'^cr/(\d+)/(\w+)/$', 'django.views.defaults.shortcut', name='comments-url-redirect'),
+    url(r'^cr/(\d+)/((\w|-)+)/$', 'django.views.defaults.shortcut', name='comments-url-redirect'),
 )
 

tests/regressiontests/comment_tests/fixtures/comment_utils.xml

@@ -12 +12 @@
       <field type="DateField" name="pub_date">2008-01-02</field>
       <field type="BooleanField" name="enable_comments">False</field>
   </object>
+  <object pk="1" model="comment_tests.slugpost">
+      <field type="SlugField" name="slug">test-this</field>
+  </object>
 </django-objects>

tests/regressiontests/comment_tests/models.py

@@ -28 +28 @@
 
     def __str__(self):
         return self.title
+
+class SlugPost(models.Model):
+    """A Post like model whos PK is a slug"""
+    slug = models.SlugField(primary_key=True,max_length=100)
+    
+    def __str__(self):
+        return self.slug
+    
+    
+ No newline at end of file

tests/regressiontests/comment_tests/tests/__init__.py

@@ -4 +4 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.test import TestCase
-from regressiontests.comment_tests.models import Article, Author
+from regressiontests.comment_tests.models import Article, Author, SlugPost
 
 # Shortcut
 CT = ContentType.objects.get_for_model
@@ -55 +55 @@
             comment = "Damn, I wanted to be first.",
             site = Site.objects.get_current(),
         )
+        
         c4 = Comment.objects.create(
             content_type = CT(Author),
             object_pk = "2",
@@ -63 +64 @@
             comment = "You get here first, too?",
             site = Site.objects.get_current(),
         )
+        
+        c5 = Comment.objects.create(
+            content_type = CT(SlugPost),
+            object_pk = "test-this",
+            user = user,
+            user_url = "http://example.com/~frank/",
+            comment = "Wonder how the slugs work",
+            site = Site.objects.get_current(),
+        )
 
-        return c1, c2, c3, c4
+        return c1, c2, c3, c4, c5
 
     def getData(self):
         return {

tests/regressiontests/comment_tests/tests/comment_view_tests.py

@@ -3 +3 @@
 from django.contrib.auth.models import User
 from django.contrib.comments import signals
 from django.contrib.comments.models import Comment
-from regressiontests.comment_tests.models import Article
+from django.core import urlresolvers
+from regressiontests.comment_tests.models import Article, SlugPost
 from regressiontests.comment_tests.tests import CommentTestCase
 
 post_redirect_re = re.compile(r'^http://testserver/posted/\?c=(?P<pk>\d+$)')
@@ -206 +207 @@
         response = self.client.get(location)
         self.assertTemplateUsed(response, "comments/posted.html")
         self.assertEqual(response.context[0]["comment"], Comment.objects.get(pk=pk))
-
+        
+    #----------------------------------------------------------------------
+    def testCommentUrlLookup(self):
+        """"""
+        c1, c2, c3, c4, c5 = self.createSomeComments()
+        c5.save()
+        sp = Comment.objects.get(object_pk='test-this')
+        url = urlresolvers.reverse("comments-url-redirect", 
+                                   args=(c5.content_type_id, c5.object_pk))
+        self.assertEqual(url,'/cr/%i/%s/' % (c5.content_type_id,c5.object_pk) )

tests/regressiontests/comment_tests/tests/model_tests.py

@@ -9 +9 @@
             self.failIfEqual(c.submit_date, None)
 
     def testUserProperties(self):
-        c1, c2, c3, c4 = self.createSomeComments()
+        c1, c2, c3, c4, c5 = self.createSomeComments()
         self.assertEqual(c1.name, "Joe Somebody")
         self.assertEqual(c2.email, "jsomebody@example.com")
         self.assertEqual(c3.name, "Frank Nobody")
@@ -21 +21 @@
 
     def testInModeration(self):
         """Comments that aren't public are considered in moderation"""
-        c1, c2, c3, c4 = self.createSomeComments()
+        c1, c2, c3, c4, c5 = self.createSomeComments()
         c1.is_public = False
         c2.is_public = False
         c1.save()
@@ -31 +31 @@
 
     def testRemovedCommentsNotInModeration(self):
         """Removed comments are not considered in moderation"""
-        c1, c2, c3, c4 = self.createSomeComments()
+        c1, c2, c3, c4, c5 = self.createSomeComments()
         c1.is_public = False
         c2.is_public = False
         c2.is_removed = True
@@ -41 +41 @@
         self.assertEqual(moderated_comments, [c1])
 
     def testForModel(self):
-        c1, c2, c3, c4 = self.createSomeComments()
+        c1, c2, c3, c4, c5 = self.createSomeComments()
         article_comments = list(Comment.objects.for_model(Article).order_by("id"))
         author_comments = list(Comment.objects.for_model(Author.objects.get(pk=1)))
         self.assertEqual(article_comments, [c1, c3])

tests/regressiontests/comment_tests/tests/moderation_view_tests.py

@@ -130 +130 @@
 
     def testApprovePost(self):
         """POSTing the delete view should mark the comment as removed"""
-        c1, c2, c3, c4 = self.createSomeComments()
+        c1, c2, c3, c4, c5 = self.createSomeComments()
         c1.is_public = False; c1.save()
 
         makeModerator("normaluser")
@@ -174 +174 @@
 
     def testModerationQueueContents(self):
         """Moderation queue should display non-public, non-removed comments."""
-        c1, c2, c3, c4 = self.createSomeComments()
+        c1, c2, c3, c4, c5 = self.createSomeComments()
         makeModerator("normaluser")
         self.client.login(username="normaluser", password="normaluser")
 

tests/regressiontests/comment_tests/tests/templatetag_tests.py

@@ -52 +52 @@
         self.testGetCommentCount("{% get_comment_count for a as cc %}")
 
     def testGetCommentList(self, tag=None):
-        c1, c2, c3, c4 = self.createSomeComments()
+        c1, c2, c3, c4, c5 = self.createSomeComments()
         t = "{% load comments %}" + (tag or "{% get_comment_list for comment_tests.author a.id as cl %}")
         ctx, out = self.render(t, a=Author.objects.get(pk=1))
         self.assertEqual(out, "")