From 59cccd1474ca8ac4f691685372a607277534fa8e Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Thu, 28 Jan 2010 19:23:54 +0000 Subject: [PATCH] Fixed #12724: Fixed new comment tests to not hardcode comment primary key values. Thanks carljm. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12345 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../comment_tests/tests/templatetag_tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/regressiontests/comment_tests/tests/templatetag_tests.py b/tests/regressiontests/comment_tests/tests/templatetag_tests.py index 669caff6679..29a097a48f6 100644 --- a/tests/regressiontests/comment_tests/tests/templatetag_tests.py +++ b/tests/regressiontests/comment_tests/tests/templatetag_tests.py @@ -66,22 +66,22 @@ class CommentTemplateTagTests(CommentTestCase): self.testGetCommentList("{% get_comment_list for a as cl %}") def testGetCommentPermalink(self): - self.createSomeComments() + c1, c2, c3, c4 = self.createSomeComments() t = "{% load comments %}{% get_comment_list for comment_tests.author author.id as cl %}" t += "{% get_comment_permalink cl.0 %}" ct = ContentType.objects.get_for_model(Author) author = Author.objects.get(pk=1) ctx, out = self.render(t, author=author) - self.assertEqual(out, "/cr/%s/%s/#c2" % (ct.id, author.id)) + self.assertEqual(out, "/cr/%s/%s/#c%s" % (ct.id, author.id, c2.id)) def testGetCommentPermalinkFormatted(self): - self.createSomeComments() + c1, c2, c3, c4 = self.createSomeComments() t = "{% load comments %}{% get_comment_list for comment_tests.author author.id as cl %}" t += "{% get_comment_permalink cl.0 '#c%(id)s-by-%(user_name)s' %}" ct = ContentType.objects.get_for_model(Author) author = Author.objects.get(pk=1) ctx, out = self.render(t, author=author) - self.assertEqual(out, "/cr/%s/%s/#c2-by-Joe Somebody" % (ct.id, author.id)) + self.assertEqual(out, "/cr/%s/%s/#c%s-by-Joe Somebody" % (ct.id, author.id, c2.id)) def testRenderCommentList(self, tag=None): t = "{% load comments %}" + (tag or "{% render_comment_list for comment_tests.article a.id %}")