mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-20 22:20:45 +00:00
Code Issues Projects Releases Wiki Activity

Fixes status views tests

Browse source
This commit is contained in:
Mouse Reeve 2021-03-23 08:13:57 -07:00
parent e17ee40800
commit ea71c2aa88
2 changed files with 47 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bookwyrm/activitystreams.py
View file

@ -184,7 +184,12 @@ streams = {
def add_status_on_create(sender, instance, created, *args, **kwargs):
""" add newly created statuses to activity feeds """
# we're only interested in new statuses
if not created or not issubclass(sender, models.Status):
if not issubclass(sender, models.Status):
return
if not created and instance.deleted:
for stream in streams.values():
stream.remove_status(instance)
return
# iterates through Home, Local, Federated

56
bookwyrm/tests/views/test_status.py
View file

@ -55,7 +55,10 @@ class StatusViews(TestCase):
request = self.factory.post("", form.data)
request.user = self.local_user
view(request, "comment")
with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
view(request, "comment")
self.assertTrue(redis_mock.called)
status = models.Comment.objects.get()
self.assertEqual(status.content, "<p>hi</p>")
self.assertEqual(status.user, self.local_user)
@ -67,9 +70,10 @@ class StatusViews(TestCase):
user = models.User.objects.create_user(
"rat", "rat@rat.com", "password", local=True
)
parent = models.Status.objects.create(
content="parent status", user=self.local_user
)
with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
parent = models.Status.objects.create(
content="parent status", user=self.local_user
)
form = forms.ReplyForm(
{
"content": "hi",
@ -81,7 +85,10 @@ class StatusViews(TestCase):
request = self.factory.post("", form.data)
request.user = user
view(request, "reply")
with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
view(request, "reply")
self.assertTrue(redis_mock.called)
status = models.Status.objects.get(user=user)
self.assertEqual(status.content, "<p>hi</p>")
self.assertEqual(status.user, user)
@ -104,7 +111,10 @@ class StatusViews(TestCase):
request = self.factory.post("", form.data)
request.user = self.local_user
view(request, "comment")
with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
view(request, "comment")
self.assertTrue(redis_mock.called)
status = models.Status.objects.get()
self.assertEqual(list(status.mention_users.all()), [user])
self.assertEqual(models.Notification.objects.get().user, user)
@ -129,7 +139,9 @@ class StatusViews(TestCase):
request = self.factory.post("", form.data)
request.user = self.local_user
view(request, "comment")
with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
view(request, "comment")
self.assertTrue(redis_mock.called)
status = models.Status.objects.get()
form = forms.ReplyForm(
@ -143,7 +155,10 @@ class StatusViews(TestCase):
request = self.factory.post("", form.data)
request.user = user
view(request, "reply")
with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
view(request, "reply")
self.assertTrue(redis_mock.called)
reply = models.Status.replies(status).first()
self.assertEqual(reply.content, "<p>right</p>")
@ -239,13 +254,18 @@ class StatusViews(TestCase):
def test_handle_delete_status(self, mock):
""" marks a status as deleted """
view = views.DeleteStatus.as_view()
status = models.Status.objects.create(user=self.local_user, content="hi")
with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
status = models.Status.objects.create(user=self.local_user, content="hi")
self.assertFalse(status.deleted)
request = self.factory.post("")
request.user = self.local_user
view(request, status.id)
activity = json.loads(mock.call_args_list[0][0][1])
with patch(
"bookwyrm.activitystreams.ActivityStream.remove_status"
) as redis_mock:
view(request, status.id)
self.assertTrue(redis_mock.called)
activity = json.loads(mock.call_args_list[1][0][1])
self.assertEqual(activity["type"], "Delete")
self.assertEqual(activity["object"]["type"], "Tombstone")
status.refresh_from_db()
@ -254,7 +274,8 @@ class StatusViews(TestCase):
def test_handle_delete_status_permission_denied(self, _):
""" marks a status as deleted """
view = views.DeleteStatus.as_view()
status = models.Status.objects.create(user=self.local_user, content="hi")
with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
status = models.Status.objects.create(user=self.local_user, content="hi")
self.assertFalse(status.deleted)
request = self.factory.post("")
request.user = self.remote_user
@ -267,14 +288,19 @@ class StatusViews(TestCase):
def test_handle_delete_status_moderator(self, mock):
""" marks a status as deleted """
view = views.DeleteStatus.as_view()
status = models.Status.objects.create(user=self.local_user, content="hi")
with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
status = models.Status.objects.create(user=self.local_user, content="hi")
self.assertFalse(status.deleted)
request = self.factory.post("")
request.user = self.remote_user
request.user.is_superuser = True
view(request, status.id)
activity = json.loads(mock.call_args_list[0][0][1])
with patch(
"bookwyrm.activitystreams.ActivityStream.remove_status"
) as redis_mock:
view(request, status.id)
self.assertTrue(redis_mock.called)
activity = json.loads(mock.call_args_list[1][0][1])
self.assertEqual(activity["type"], "Delete")
self.assertEqual(activity["object"]["type"], "Tombstone")
status.refresh_from_db()