From fd56379518f93aa56dcb2e1a64f51fc2a400cc47 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 9 Aug 2021 07:38:43 -0700 Subject: [PATCH 1/3] Updates rss feed view --- bookwyrm/tests/views/test_rss_feed.py | 65 ++++++++++++--------------- bookwyrm/views/rss_feed.py | 15 ++++++- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 3608b043a..715add3f2 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -1,5 +1,4 @@ """ testing import """ - from unittest.mock import patch from django.test import RequestFactory, TestCase @@ -7,57 +6,51 @@ from bookwyrm import models from bookwyrm.views import rss_feed +@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") +@patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream") +@patch("bookwyrm.activitystreams.ActivityStream.add_status") class RssFeedView(TestCase): """rss feed behaves as expected""" - def setUp(self): - """test data""" - self.site = models.SiteSettings.objects.create() + def test_rss_feed(self, *_): + """load an rss feed""" + models.SiteSettings.objects.create() - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): - self.user = models.User.objects.create_user( - "rss_user", "rss@test.rss", "password", local=True - ) + user = models.User.objects.create_user( + "rss_user", "rss@test.rss", "password", local=True + ) work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.review = models.Review.objects.create( - name="Review name", - content="test content", - rating=3, - user=self.user, - book=self.book, - ) + models.Review.objects.create( + name="Review name", + content="test content", + rating=3, + user=user, + book=book, + ) - self.quote = models.Quotation.objects.create( - quote="a sickening sense", - content="test content", - user=self.user, - book=self.book, - ) + models.Quotation.objects.create( + quote="a sickening sense", + content="test content", + user=user, + book=book, + ) - self.generatednote = models.GeneratedNote.objects.create( - content="test content", user=self.user - ) + models.ReadStatus.objects.create(content="test content", user=user) - self.factory = RequestFactory() + factory = RequestFactory() - @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream") - def test_rss_feed(self, _): - """load an rss feed""" view = rss_feed.RssFeed() - request = self.factory.get("/user/rss_user/rss") - request.user = self.user - with patch("bookwyrm.models.SiteSettings.objects.get") as site: - site.return_value = self.site - result = view(request, username=self.user.username) + request = factory.get("/user/rss_user/rss") + request.user = user + + result = view(request, username=user.username) self.assertEqual(result.status_code, 200) self.assertIn(b"Status updates from rss_user", result.content) diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py index 0d3a8902e..5faa16243 100644 --- a/bookwyrm/views/rss_feed.py +++ b/bookwyrm/views/rss_feed.py @@ -1,6 +1,9 @@ """ serialize user's posts in rss feed """ from django.contrib.syndication.views import Feed +from django.template.loader import get_template +from django.utils.translation import gettext_lazy as _ + from .helpers import get_user_from_username, privacy_filter # pylint: disable=no-self-use, unused-argument @@ -8,7 +11,15 @@ class RssFeed(Feed): """serialize user's posts in rss feed""" description_template = "rss/content.html" - title_template = "rss/title.html" + + def item_title(self, item): + """render the item title""" + if hasattr(item, "pure_name") and item.pure_name: + return item.pure_name + title_template = get_template("snippets/status/header_content.html") + title = title_template.render({"status": item}) + template = get_template("rss/title.html") + return template.render({"user": item.user, "item_title": title}).strip() def get_object(self, request, username): # pylint: disable=arguments-differ """the user who's posts get serialized""" @@ -20,7 +31,7 @@ class RssFeed(Feed): def title(self, obj): """title of the rss feed entry""" - return f"Status updates from {obj.display_name}" + return _(f"Status updates from {obj.display_name}") def items(self, obj): """the user's activity feed""" From 7345b85ebde8f18c3c65e150aec0b6e4f360345c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 16 Aug 2021 10:25:21 -0700 Subject: [PATCH 2/3] Granular RSS tests --- bookwyrm/tests/views/test_rss_feed.py | 77 ++++++++++++++++++--------- 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 715add3f2..69a9ef02f 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -12,47 +12,76 @@ from bookwyrm.views import rss_feed class RssFeedView(TestCase): """rss feed behaves as expected""" - def test_rss_feed(self, *_): - """load an rss feed""" - models.SiteSettings.objects.create() - - user = models.User.objects.create_user( - "rss_user", "rss@test.rss", "password", local=True - ) - + def setUp(self): + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"): + self.local_user = models.User.objects.create_user( + "rss_user", "rss@test.rss", "password", local=True + ) work = models.Work.objects.create(title="Test Work") - book = models.Edition.objects.create( + self.book = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=work, ) + self.factory = RequestFactory() + models.SiteSettings.objects.create() + + + def test_rss_empty(self, *_): + """load an rss feed""" + view = rss_feed.RssFeed() + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) + self.assertEqual(result.status_code, 200) + self.assertIn(b"Status updates from rss_user", result.content) + result.render() + + def test_rss_comment(self, *_): + """load an rss feed""" + models.Comment.objects.create( + content="comment test content", + user=self.local_user, + book=self.book, + ) + view = rss_feed.RssFeed() + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) + self.assertEqual(result.status_code, 200) + self.assertIn(b"Example Edition", result.content) + result.render() + + def test_rss_review(self, *_): + """load an rss feed""" models.Review.objects.create( name="Review name", content="test content", rating=3, - user=user, - book=book, + user=self.local_user, + book=self.book, ) + view = rss_feed.RssFeed() + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) + self.assertEqual(result.status_code, 200) + result.render() + def test_rss_quotation(self, *_): + """load an rss feed""" models.Quotation.objects.create( quote="a sickening sense", content="test content", - user=user, - book=book, + user=self.local_user, + book=self.book, ) - - models.ReadStatus.objects.create(content="test content", user=user) - - factory = RequestFactory() - view = rss_feed.RssFeed() - request = factory.get("/user/rss_user/rss") - request.user = user - - result = view(request, username=user.username) + request = self.factory.get("/user/rss_user/rss") + request.user = self.local_user + result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) + result.render() - self.assertIn(b"Status updates from rss_user", result.content) self.assertIn(b"a sickening sense", result.content) - self.assertIn(b"Example Edition", result.content) From 5de3c75de36351f0b63f29e1bad7226b0ed22e5c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 16 Aug 2021 10:28:32 -0700 Subject: [PATCH 3/3] Remove render from tests --- bookwyrm/tests/views/test_rss_feed.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 69a9ef02f..f2d3baf2d 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -27,7 +27,6 @@ class RssFeedView(TestCase): models.SiteSettings.objects.create() - def test_rss_empty(self, *_): """load an rss feed""" view = rss_feed.RssFeed() @@ -36,7 +35,6 @@ class RssFeedView(TestCase): result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) self.assertIn(b"Status updates from rss_user", result.content) - result.render() def test_rss_comment(self, *_): """load an rss feed""" @@ -51,7 +49,6 @@ class RssFeedView(TestCase): result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) self.assertIn(b"Example Edition", result.content) - result.render() def test_rss_review(self, *_): """load an rss feed""" @@ -67,7 +64,6 @@ class RssFeedView(TestCase): request.user = self.local_user result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) - result.render() def test_rss_quotation(self, *_): """load an rss feed""" @@ -82,6 +78,5 @@ class RssFeedView(TestCase): request.user = self.local_user result = view(request, username=self.local_user.username) self.assertEqual(result.status_code, 200) - result.render() self.assertIn(b"a sickening sense", result.content)