summaryrefslogtreecommitdiff
path: root/tests/syndication_tests
diff options
context:
space:
mode:
authorOctavio <octaperi@gmail.com>2020-10-21 00:33:23 -0300
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-10-21 06:43:19 +0200
commit4343430e9c83d1f139e6fbae3a1332f980d5d4fa (patch)
tree4af4ebe35c9b7f9ecfdeda17592458043a405ddc /tests/syndication_tests
parent197b55c53469cf8344d1ba35175236780cb83bd1 (diff)
downloaddjango-4343430e9c83d1f139e6fbae3a1332f980d5d4fa.tar.gz
Removed hardcoded pks in syndication tests.
Diffstat (limited to 'tests/syndication_tests')
-rw-r--r--tests/syndication_tests/feeds.py2
-rw-r--r--tests/syndication_tests/tests.py18
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/syndication_tests/feeds.py b/tests/syndication_tests/feeds.py
index 520f8c3ecd..94c36c1fd8 100644
--- a/tests/syndication_tests/feeds.py
+++ b/tests/syndication_tests/feeds.py
@@ -77,7 +77,7 @@ class TestLatestFeed(TestRss2Feed):
subtitle = TestRss2Feed.description
def items(self):
- return Entry.objects.exclude(pk=5)
+ return Entry.objects.exclude(title='My last entry')
class ArticlesFeed(TestRss2Feed):
diff --git a/tests/syndication_tests/tests.py b/tests/syndication_tests/tests.py
index 35b68e849b..6c4fe07506 100644
--- a/tests/syndication_tests/tests.py
+++ b/tests/syndication_tests/tests.py
@@ -129,7 +129,7 @@ class SyndicationFeedTest(FeedTestCase):
)
# Find the pubdate of the first feed item
- d = Entry.objects.get(pk=1).published
+ d = Entry.objects.get(pk=self.e1.pk).published
pub_date = rfc2822_date(timezone.make_aware(d, TZ))
items = chan.getElementsByTagName('item')
@@ -137,11 +137,11 @@ class SyndicationFeedTest(FeedTestCase):
self.assertChildNodeContent(items[0], {
'title': 'My first entry',
'description': 'Overridden description: My first entry',
- 'link': 'http://example.com/blog/1/',
- 'guid': 'http://example.com/blog/1/',
+ 'link': 'http://example.com/blog/%s/' % self.e1.pk,
+ 'guid': 'http://example.com/blog/%s/' % self.e1.pk,
'pubDate': pub_date,
'author': 'test@example.com (Sally Smith)',
- 'comments': '/blog/1/comments',
+ 'comments': '/blog/%s/comments' % self.e1.pk,
})
self.assertCategories(items[0], ['python', 'testing'])
for item in items:
@@ -252,7 +252,7 @@ class SyndicationFeedTest(FeedTestCase):
self.assertChildNodeContent(items[0], {
'title': 'My first entry',
'description': 'Overridden description: My first entry',
- 'link': 'http://example.com/blog/1/',
+ 'link': 'http://example.com/blog/%s/' % self.e1.pk,
})
for item in items:
self.assertChildNodes(item, ['title', 'link', 'description'])
@@ -344,7 +344,7 @@ class SyndicationFeedTest(FeedTestCase):
feed = minidom.parseString(response.content).firstChild
updated = feed.getElementsByTagName('updated')[0].firstChild.wholeText
- d = Entry.objects.exclude(pk=5).latest('updated').updated
+ d = Entry.objects.exclude(title='My last entry').latest('updated').updated
latest_updated = rfc3339_date(timezone.make_aware(d, TZ))
self.assertEqual(updated, latest_updated)
@@ -493,7 +493,7 @@ class SyndicationFeedTest(FeedTestCase):
self.assertChildNodeContent(items[0], {
'title': 'Title in your templates: My first entry\n',
'description': 'Description in your templates: My first entry\n',
- 'link': 'http://example.com/blog/1/',
+ 'link': 'http://example.com/blog/%s/' % self.e1.pk,
})
def test_template_context_feed(self):
@@ -536,9 +536,9 @@ class SyndicationFeedTest(FeedTestCase):
items = chan.getElementsByTagName('item')
self.assertChildNodeContent(items[0], {
- 'comments': '/blog/1/article/1/comments',
+ 'comments': '/blog/%s/article/%s/comments' % (self.e1.pk, self.a1.pk),
'description': 'Article description: My first article',
- 'link': 'http://example.com/blog/1/article/1/',
+ 'link': 'http://example.com/blog/%s/article/%s/' % (self.e1.pk, self.a1.pk),
'title': 'Title: My first article',
'pubDate': rfc2822_date(timezone.make_aware(self.a1.published, TZ)),
})