Fixes importer tests

This commit is contained in:
Mouse Reeve 2021-11-13 11:22:07 -08:00
parent 4dae851da0
commit 644d969330

View file

@ -140,7 +140,7 @@ class GenericImporter(TestCase):
with patch( with patch(
"bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"
) as mock: ) as mock:
import_item_task(self.importer.service, import_item.id) import_item_task(import_item.id)
kwargs = mock.call_args.kwargs kwargs = mock.call_args.kwargs
self.assertEqual(kwargs["queue"], "low_priority") self.assertEqual(kwargs["queue"], "low_priority")
import_item.refresh_from_db() import_item.refresh_from_db()
@ -160,9 +160,7 @@ class GenericImporter(TestCase):
import_item.save() import_item.save()
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
handle_imported_book( handle_imported_book(import_item)
self.importer.service, self.local_user, import_item, False, "public"
)
shelf.refresh_from_db() shelf.refresh_from_db()
self.assertEqual(shelf.books.first(), self.book) self.assertEqual(shelf.books.first(), self.book)
@ -179,16 +177,14 @@ class GenericImporter(TestCase):
) )
import_job = self.importer.create_job( import_job = self.importer.create_job(
self.local_user, self.csv, False, "unlisted" self.local_user, self.csv, False, "public"
) )
import_item = import_job.items.first() import_item = import_job.items.first()
import_item.book = self.book import_item.book = self.book
import_item.save() import_item.save()
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
handle_imported_book( handle_imported_book(import_item)
self.importer.service, self.local_user, import_item, False, "public"
)
shelf.refresh_from_db() shelf.refresh_from_db()
self.assertEqual(shelf.books.first(), self.book) self.assertEqual(shelf.books.first(), self.book)
@ -210,12 +206,8 @@ class GenericImporter(TestCase):
import_item.save() import_item.save()
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
handle_imported_book( handle_imported_book(import_item)
self.importer.service, self.local_user, import_item, False, "public" handle_imported_book(import_item)
)
handle_imported_book(
self.importer.service, self.local_user, import_item, False, "public"
)
shelf.refresh_from_db() shelf.refresh_from_db()
self.assertEqual(shelf.books.first(), self.book) self.assertEqual(shelf.books.first(), self.book)
@ -224,20 +216,16 @@ class GenericImporter(TestCase):
@patch("bookwyrm.activitystreams.add_status_task.delay") @patch("bookwyrm.activitystreams.add_status_task.delay")
def test_handle_imported_book_review(self, *_): def test_handle_imported_book_review(self, *_):
"""review import""" """review import"""
import_job = self.importer.create_job(self.local_user, self.csv, True, "public") import_job = self.importer.create_job(
self.local_user, self.csv, True, "unlisted"
)
import_item = import_job.items.filter(index=3).first() import_item = import_job.items.filter(index=3).first()
import_item.book = self.book import_item.book = self.book
import_item.save() import_item.save()
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
with patch("bookwyrm.models.Status.broadcast") as broadcast_mock: with patch("bookwyrm.models.Status.broadcast") as broadcast_mock:
handle_imported_book( handle_imported_book(import_item)
self.importer.service,
self.local_user,
import_item,
True,
"unlisted",
)
kwargs = broadcast_mock.call_args.kwargs kwargs = broadcast_mock.call_args.kwargs
self.assertEqual(kwargs["software"], "bookwyrm") self.assertEqual(kwargs["software"], "bookwyrm")
review = models.Review.objects.get(book=self.book, user=self.local_user) review = models.Review.objects.get(book=self.book, user=self.local_user)
@ -249,16 +237,14 @@ class GenericImporter(TestCase):
def test_handle_imported_book_rating(self, *_): def test_handle_imported_book_rating(self, *_):
"""rating import""" """rating import"""
import_job = self.importer.create_job( import_job = self.importer.create_job(
self.local_user, self.csv, False, "public" self.local_user, self.csv, True, "unlisted"
) )
import_item = import_job.items.filter(index=1).first() import_item = import_job.items.filter(index=1).first()
import_item.book = self.book import_item.book = self.book
import_item.save() import_item.save()
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
handle_imported_book( handle_imported_book(import_item)
self.importer.service, self.local_user, import_item, True, "unlisted"
)
review = models.ReviewRating.objects.get(book=self.book, user=self.local_user) review = models.ReviewRating.objects.get(book=self.book, user=self.local_user)
self.assertIsInstance(review, models.ReviewRating) self.assertIsInstance(review, models.ReviewRating)
self.assertEqual(review.rating, 3.0) self.assertEqual(review.rating, 3.0)
@ -274,9 +260,7 @@ class GenericImporter(TestCase):
import_item.save() import_item.save()
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
handle_imported_book( handle_imported_book(import_item)
self.importer.service, self.local_user, import_item, False, "unlisted"
)
self.assertFalse( self.assertFalse(
models.Review.objects.filter(book=self.book, user=self.local_user).exists() models.Review.objects.filter(book=self.book, user=self.local_user).exists()
) )