mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-26 11:31:08 +00:00
Code Issues Projects Releases Wiki Activity

improve tests and minor cleanup

Browse source
This commit is contained in:
Hugh Rundle 2023-11-22 20:04:17 +11:00
parent 8ed4a997f8
commit 6ba7418121
No known key found for this signature in database
GPG key ID: A7E35779918253F9
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/templates/snippets/user_options.html
View file

@ -22,7 +22,7 @@
</li> </li>
{% if followers_page %} {% if followers_page %}
<li role="menuitem"> <li role="menuitem">
{% include 'snippets/remove_follower_button.html' with user=user class="is-fullwidth" blocks=False %} {% include 'snippets/remove_follower_button.html' with user=user class="is-fullwidth" %}
</li> </li>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

18
bookwyrm/tests/views/test_follow.py
View file

@ -173,8 +173,15 @@ class FollowViews(TestCase):
user_subject=self.remote_user, user_object=self.local_user user_subject=self.remote_user, user_object=self.local_user
) )
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch(
"bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"
) as broadcast_mock:
views.delete_follow_request(request) views.delete_follow_request(request)
# did we send the reject activity?
activity = json.loads(broadcast_mock.call_args[1]["args"][1])
self.assertEqual(activity["actor"], self.local_user.remote_id)
self.assertEqual(activity["object"]["object"], rel.user_object.remote_id)
self.assertEqual(activity["type"], "Reject")
# request should be deleted # request should be deleted
self.assertEqual(models.UserFollowRequest.objects.filter(id=rel.id).count(), 0) self.assertEqual(models.UserFollowRequest.objects.filter(id=rel.id).count(), 0)
# follow relationship should not exist # follow relationship should not exist
@ -187,8 +194,15 @@ class FollowViews(TestCase):
rel = models.UserFollows.objects.create( rel = models.UserFollows.objects.create(
user_subject=self.remote_user, user_object=self.local_user user_subject=self.remote_user, user_object=self.local_user
) )
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch(
"bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"
) as broadcast_mock:
views.remove_follow(request, self.remote_user.id) views.remove_follow(request, self.remote_user.id)
# did we send the reject activity?
activity = json.loads(broadcast_mock.call_args[1]["args"][1])
self.assertEqual(activity["actor"], self.local_user.remote_id)
self.assertEqual(activity["object"]["object"], rel.user_object.remote_id)
self.assertEqual(activity["type"], "Reject")
# follow relationship should not exist # follow relationship should not exist
self.assertEqual(models.UserFollows.objects.filter(id=rel.id).count(), 0) self.assertEqual(models.UserFollows.objects.filter(id=rel.id).count(), 0)