From bf6aca5122bef7d24986045db2a88e683a792d25 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 7 Feb 2021 11:29:24 -0800 Subject: [PATCH] fixes mocks on tests --- bookwyrm/tests/test_goodreads_import.py | 17 +++++----- bookwyrm/tests/test_incoming.py | 45 ++++++++++++++----------- bookwyrm/tests/views/test_reading.py | 5 +-- bookwyrm/tests/views/test_status.py | 10 +++--- bookwyrm/tests/views/test_tag.py | 14 ++++---- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/bookwyrm/tests/test_goodreads_import.py b/bookwyrm/tests/test_goodreads_import.py index 5beba024c..6a14368ce 100644 --- a/bookwyrm/tests/test_goodreads_import.py +++ b/bookwyrm/tests/test_goodreads_import.py @@ -124,7 +124,7 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=index, data=entry, book=self.book) break - with patch('bookwyrm.broadcast.broadcast_task.delay'): + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): goodreads_import.handle_imported_book( self.user, import_item, False, 'public') @@ -144,9 +144,10 @@ class GoodreadsImport(TestCase): def test_handle_imported_book_already_shelved(self): ''' goodreads import added a book, this adds related connections ''' - shelf = self.user.shelf_set.filter(identifier='to-read').first() - models.ShelfBook.objects.create( - shelf=shelf, user=self.user, book=self.book) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + shelf = self.user.shelf_set.filter(identifier='to-read').first() + models.ShelfBook.objects.create( + shelf=shelf, user=self.user, book=self.book) import_job = models.ImportJob.objects.create(user=self.user) datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv') @@ -156,7 +157,7 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=index, data=entry, book=self.book) break - with patch('bookwyrm.broadcast.broadcast_task.delay'): + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): goodreads_import.handle_imported_book( self.user, import_item, False, 'public') @@ -185,7 +186,7 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=index, data=entry, book=self.book) break - with patch('bookwyrm.broadcast.broadcast_task.delay'): + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): goodreads_import.handle_imported_book( self.user, import_item, False, 'public') goodreads_import.handle_imported_book( @@ -214,7 +215,7 @@ class GoodreadsImport(TestCase): import_item = models.ImportItem.objects.create( job_id=import_job.id, index=0, data=entry, book=self.book) - with patch('bookwyrm.broadcast.broadcast_task.delay'): + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): goodreads_import.handle_imported_book( self.user, import_item, True, 'unlisted') review = models.Review.objects.get(book=self.book, user=self.user) @@ -235,7 +236,7 @@ class GoodreadsImport(TestCase): import_item = models.ImportItem.objects.create( job_id=import_job.id, index=0, data=entry, book=self.book) - with patch('bookwyrm.broadcast.broadcast_task.delay'): + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): goodreads_import.handle_imported_book( self.user, import_item, False, 'unlisted') self.assertFalse(models.Review.objects.filter( diff --git a/bookwyrm/tests/test_incoming.py b/bookwyrm/tests/test_incoming.py index 65679c295..7a2971308 100644 --- a/bookwyrm/tests/test_incoming.py +++ b/bookwyrm/tests/test_incoming.py @@ -22,7 +22,7 @@ class Incoming(TestCase): 'mouse@example.com', 'mouse@mouse.com', 'mouseword', local=True, localname='mouse') self.local_user.remote_id = 'https://example.com/user/mouse' - self.local_user.save() + self.local_user.save(broadcast=False) with patch('bookwyrm.models.user.set_remote_server.delay'): self.remote_user = models.User.objects.create_user( 'rat', 'rat@rat.com', 'ratword', @@ -31,11 +31,12 @@ class Incoming(TestCase): inbox='https://example.com/users/rat/inbox', outbox='https://example.com/users/rat/outbox', ) - self.status = models.Status.objects.create( - user=self.local_user, - content='Test status', - remote_id='https://example.com/status/1', - ) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + self.status = models.Status.objects.create( + user=self.local_user, + content='Test status', + remote_id='https://example.com/status/1', + ) self.factory = RequestFactory() @@ -177,8 +178,9 @@ class Incoming(TestCase): "object": "https://example.com/user/mouse" } } - models.UserFollows.objects.create( - user_subject=self.remote_user, user_object=self.local_user) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + models.UserFollows.objects.create( + user_subject=self.remote_user, user_object=self.local_user) self.assertEqual(self.remote_user, self.local_user.followers.first()) incoming.handle_unfollow(activity) @@ -200,10 +202,11 @@ class Incoming(TestCase): } } - models.UserFollowRequest.objects.create( - user_subject=self.local_user, - user_object=self.remote_user - ) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + models.UserFollowRequest.objects.create( + user_subject=self.local_user, + user_object=self.remote_user + ) self.assertEqual(models.UserFollowRequest.objects.count(), 1) incoming.handle_follow_accept(activity) @@ -232,10 +235,11 @@ class Incoming(TestCase): } } - models.UserFollowRequest.objects.create( - user_subject=self.local_user, - user_object=self.remote_user - ) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + models.UserFollowRequest.objects.create( + user_subject=self.local_user, + user_object=self.remote_user + ) self.assertEqual(models.UserFollowRequest.objects.count(), 1) incoming.handle_follow_reject(activity) @@ -280,9 +284,10 @@ class Incoming(TestCase): def test_handle_update_list(self): ''' a new list ''' - book_list = models.List.objects.create( - name='hi', remote_id='https://example.com/list/22', - user=self.local_user) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + book_list = models.List.objects.create( + name='hi', remote_id='https://example.com/list/22', + user=self.local_user) activity = { 'object': { "id": "https://example.com/list/22", @@ -539,7 +544,7 @@ class Incoming(TestCase): activity = { "id": "https://bookwyrm.social/shelfbook/6189#add", "type": "Add", - "actor": "hhttps://example.com/users/rat", + "actor": "https://example.com/users/rat", "object": "https://bookwyrm.social/book/37292", "target": "https://bookwyrm.social/user/mouse/shelf/to-read", "@context": "https://www.w3.org/ns/activitystreams" diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index 7158f36a1..2bb052ae2 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -65,8 +65,9 @@ class ReadingViews(TestCase): def test_start_reading_reshelf(self): ''' begin a book ''' to_read_shelf = self.local_user.shelf_set.get(identifier='to-read') - models.ShelfBook.objects.create( - shelf=to_read_shelf, book=self.book, user=self.local_user) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + models.ShelfBook.objects.create( + shelf=to_read_shelf, book=self.book, user=self.local_user) shelf = self.local_user.shelf_set.get(identifier='reading') self.assertEqual(to_read_shelf.books.get(), self.book) self.assertFalse(shelf.books.exists()) diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index a37aa465f..719b0d710 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -57,8 +57,9 @@ class StatusViews(TestCase): view = views.CreateStatus.as_view() 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.models.activitypub_mixin.broadcast_task.delay'): + parent = models.Status.objects.create( + content='parent status', user=self.local_user) form = forms.ReplyForm({ 'content': 'hi', 'user': user.id, @@ -219,8 +220,9 @@ class StatusViews(TestCase): def test_handle_delete_status(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.models.activitypub_mixin.broadcast_task.delay'): + status = models.Status.objects.create( + user=self.local_user, content='hi') self.assertFalse(status.deleted) request = self.factory.post('') request.user = self.local_user diff --git a/bookwyrm/tests/views/test_tag.py b/bookwyrm/tests/views/test_tag.py index 443f19e7a..21a7e22e9 100644 --- a/bookwyrm/tests/views/test_tag.py +++ b/bookwyrm/tests/views/test_tag.py @@ -39,9 +39,10 @@ class TagViews(TestCase): def test_tag_page(self): ''' there are so many views, this just makes sure it LOADS ''' view = views.Tag.as_view() - tag = models.Tag.objects.create(name='hi there') - models.UserTag.objects.create( - tag=tag, user=self.local_user, book=self.book) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + tag = models.Tag.objects.create(name='hi there') + models.UserTag.objects.create( + tag=tag, user=self.local_user, book=self.book) request = self.factory.get('') with patch('bookwyrm.views.tag.is_api_request') as is_api: is_api.return_value = False @@ -82,9 +83,10 @@ class TagViews(TestCase): def test_untag(self): ''' remove a tag from a book ''' view = views.RemoveTag.as_view() - tag = models.Tag.objects.create(name='A Tag!?') - models.UserTag.objects.create( - user=self.local_user, book=self.book, tag=tag) + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + tag = models.Tag.objects.create(name='A Tag!?') + models.UserTag.objects.create( + user=self.local_user, book=self.book, tag=tag) request = self.factory.post( '', { 'user': self.local_user.id,