yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates tests

This commit is contained in:
Mouse Reeve 2021-08-04 18:22:06 -07:00
parent 9d75bc3982
commit 9d19092205
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bookwyrm/activitystreams.py
View File

@ -7,6 +7,7 @@ from bookwyrm.redis_store import RedisStore, r
from bookwyrm.settings import STREAMS from bookwyrm.settings import STREAMS
from bookwyrm.views.helpers import privacy_filter from bookwyrm.views.helpers import privacy_filter
class ActivityStream(RedisStore): class ActivityStream(RedisStore):
"""a category of activity stream (like home, local, federated)""" """a category of activity stream (like home, local, federated)"""
@ -219,12 +220,17 @@ class BooksStream(ActivityStream):
available_streams = [s["key"] for s in STREAMS] available_streams = [s["key"] for s in STREAMS]
streams = {k:v for (k, v) in { streams = {
"home": HomeStream(), k: v
"local": LocalStream(), for (k, v) in {
"federated": FederatedStream(), "home": HomeStream(),
"books": BooksStream(), "local": LocalStream(),
}.items() if k in available_streams} "federated": FederatedStream(),
"books": BooksStream(),
}.items()
if k in available_streams
}
@receiver(signals.post_save) @receiver(signals.post_save)
# pylint: disable=unused-argument # pylint: disable=unused-argument

2
bookwyrm/tests/management/test_populate_streams.py
View File

@ -46,4 +46,4 @@ class Activitystreams(TestCase):
"bookwyrm.activitystreams.ActivityStream.populate_store" "bookwyrm.activitystreams.ActivityStream.populate_store"
) as redis_mock: ) as redis_mock:
populate_streams() populate_streams()
self.assertEqual(redis_mock.call_count, 6) # 2 users x 3 streams self.assertEqual(redis_mock.call_count, 4) # 2 users x 2 streams

2
bookwyrm/tests/views/test_feed.py
View File

@ -45,7 +45,7 @@ class FeedViews(TestCase):
view = views.Feed.as_view() view = views.Feed.as_view()
request = self.factory.get("") request = self.factory.get("")
request.user = self.local_user request.user = self.local_user
result = view(request, "local") result = view(request, "home")
self.assertIsInstance(result, TemplateResponse) self.assertIsInstance(result, TemplateResponse)
result.render() result.render()
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)

6
bookwyrm/views/feed.py
View File

@ -24,9 +24,11 @@ class Feed(View):
def get(self, request, tab): def get(self, request, tab):
"""user's homepage with activity feed""" """user's homepage with activity feed"""
tab = [s for s in STREAMS if s["key"] == tab] tab = [s for s in STREAMS if s["key"] == tab]
tab = tab[0] or STREAMS[0] tab = tab[0] if tab else STREAMS[0]
activities = activitystreams.streams[tab["key"]].get_activity_stream(request.user) activities = activitystreams.streams[tab["key"]].get_activity_stream(
request.user
)
paginated = Paginator(activities, PAGE_LENGTH) paginated = Paginator(activities, PAGE_LENGTH)
suggestions = suggested_users.get_suggestions(request.user) suggestions = suggested_users.get_suggestions(request.user)